Skip to content

Commit 11e1fad

Browse files
committed
Add dip config
1 parent 13e7cc4 commit 11e1fad

File tree

9 files changed

+109
-18
lines changed

9 files changed

+109
-18
lines changed

.env

-1
This file was deleted.

.rubocop.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
require: rubocop-rspec
22

33
AllCops:
4-
TargetRubyVersion: 2.3
4+
TargetRubyVersion: 2.5
55
TargetRailsVersion: 4.0
66
Exclude:
77
- 'dbcop.gemspec'
88
- 'spec/support/*'
9+
- 'tmp/**/*'
10+
- 'gemfiles/*'
911

1012
Metrics/LineLength:
1113
Max: 110

.travis.yml

+15-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
1-
sudo: false
2-
language: ruby
3-
addons:
4-
postgresql: '9.6'
5-
rvm:
6-
- 2.5.1
7-
before_install: gem install bundler -v 1.16.1
1+
sudo: require
2+
3+
services:
4+
- docker
5+
6+
install:
7+
- gem install dip
8+
9+
before_script:
10+
- unset BUNDLE_GEMFILE
11+
- dip provision
12+
13+
script:
14+
- dip rspec
15+
- dip rubocop

Appraisals

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# frozen_string_literal: true
2+
3+
appraise '5.0' do
4+
gem 'activerecord', '~> 5.0'
5+
end
6+
7+
appraise '5.1' do
8+
gem 'activerecord', '~> 5.1'
9+
end
10+
11+
appraise '5.2' do
12+
gem 'activerecord', '~> 5.2'
13+
end

dbcop.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ Gem::Specification.new do |spec|
3535
spec.add_runtime_dependency 'pg'
3636
spec.add_runtime_dependency 'rainbow'
3737

38+
spec.add_development_dependency 'appraisal', '~> 2.2'
3839
spec.add_development_dependency 'bundler', '~> 1.16'
3940
spec.add_development_dependency 'combustion', '~> 1.0'
4041
spec.add_development_dependency 'rake', '~> 10.0'
@@ -44,5 +45,4 @@ Gem::Specification.new do |spec|
4445
spec.add_development_dependency 'rubocop-rspec'
4546

4647
spec.add_development_dependency 'byebug'
47-
spec.add_development_dependency 'dotenv'
4848
end

dip.yml

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
version: '2'
2+
3+
environment:
4+
BUNDLE_GEMFILE: /app/Gemfile
5+
6+
compose:
7+
files:
8+
- docker-compose.yml
9+
10+
interaction:
11+
bash:
12+
service: app
13+
compose_run_options: [no-deps]
14+
15+
app:
16+
service: app
17+
subcommands:
18+
console:
19+
command: ./bin/console
20+
clean:
21+
command: rm -rf Gemfile.lock gemfiles/*.gemfile.*
22+
23+
24+
bundle:
25+
service: app
26+
command: bundle
27+
compose_run_options: [no-deps]
28+
29+
appraisal:
30+
service: app
31+
command: bundle exec appraisal
32+
compose_run_options: [no-deps]
33+
34+
rspec:
35+
service: app
36+
command: bundle exec appraisal bundle exec rspec
37+
38+
rubocop:
39+
service: app
40+
command: bundle exec rubocop
41+
compose_run_options: [no-deps]
42+
43+
provision:
44+
- dip app clean
45+
- dip bundle install
46+
- dip appraisal install

docker-compose.yml

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
version: '3.4'
2+
3+
services:
4+
app:
5+
image: ruby:2.5.1
6+
environment:
7+
- BUNDLE_PATH=/bundle
8+
- BUNDLE_CONFIG=/app/.bundle/config
9+
- DB_HOST=db
10+
- DB_NAME=docker
11+
- DB_USERNAME=postgres
12+
command: bash
13+
working_dir: /app
14+
volumes:
15+
- .:/app:cached
16+
- bundler_data:/bundle
17+
tmpfs:
18+
- /tmp
19+
depends_on:
20+
- db
21+
22+
db:
23+
image: postgres:10
24+
environment:
25+
- POSTGRES_DB=docker
26+
27+
volumes:
28+
bundler_data:

spec/internal/config/database.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
test:
22
adapter: postgresql
3-
encoding: unicode
4-
database: <%= ENV.fetch("TEST_DATABASE") %>
3+
host: <%= ENV.fetch("DB_HOST") %>
4+
database: <%= ENV.fetch("DB_NAME") %>
5+
username: <%= ENV.fetch("DB_USERNAME") %>

spec/internal/config/environments/test.rb

-6
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,6 @@
1414
# preloads Rails for running tests, you may have to set it to true.
1515
config.eager_load = false
1616

17-
# Configure public file server for tests with Cache-Control for performance.
18-
config.public_file_server.enabled = true
19-
config.public_file_server.headers = {
20-
'Cache-Control' => "public, max-age=#{1.hour.to_i}"
21-
}
22-
2317
# Show full error reports and disable caching.
2418
config.consider_all_requests_local = true
2519
config.action_controller.perform_caching = false

0 commit comments

Comments
 (0)