schema_dev 3.13.0 → 3.13.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (80) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +4 -3
  3. data/lib/schema_dev/travis.rb +28 -7
  4. data/lib/schema_dev/version.rb +1 -1
  5. data/schema_dev.gemspec +2 -0
  6. data/spec/gemfiles_spec.rb +2 -4
  7. data/spec/runner_spec.rb +11 -11
  8. data/spec/travis_spec.rb +127 -33
  9. data/templates/gem/schema_dev.yml.erb +2 -2
  10. data/templates/gemfiles/Gemfile.base.erb +1 -1
  11. data/templates/gemfiles/activerecord-5.0/Gemfile.base.erb +2 -1
  12. data/templates/gemfiles/activerecord-5.0/Gemfile.mysql2.erb +2 -2
  13. data/templates/gemfiles/activerecord-5.0/Gemfile.postgresql.erb +2 -2
  14. data/templates/gemfiles/activerecord-5.0/Gemfile.sqlite3.erb +3 -3
  15. data/templates/gemfiles/activerecord-5.1/Gemfile.base.erb +2 -1
  16. data/templates/gemfiles/activerecord-5.1/Gemfile.mysql2.erb +2 -2
  17. data/templates/gemfiles/activerecord-5.1/Gemfile.postgresql.erb +2 -2
  18. data/templates/gemfiles/activerecord-5.1/Gemfile.sqlite3.erb +3 -3
  19. data/templates/gemfiles/activerecord-5.2/Gemfile.base.erb +2 -1
  20. data/templates/gemfiles/activerecord-5.2/Gemfile.mysql2.erb +2 -2
  21. data/templates/gemfiles/activerecord-5.2/Gemfile.postgresql.erb +2 -2
  22. data/templates/gemfiles/activerecord-5.2/Gemfile.sqlite3.erb +3 -3
  23. metadata +3 -60
  24. data/templates/gemfiles/activerecord-3.2/Gemfile.base.erb +0 -3
  25. data/templates/gemfiles/activerecord-3.2/Gemfile.mysql.erb +0 -10
  26. data/templates/gemfiles/activerecord-3.2/Gemfile.mysql2.erb +0 -10
  27. data/templates/gemfiles/activerecord-3.2/Gemfile.postgresql.erb +0 -10
  28. data/templates/gemfiles/activerecord-3.2/Gemfile.sqlite3.erb +0 -10
  29. data/templates/gemfiles/activerecord-4.0/Gemfile.base.erb +0 -3
  30. data/templates/gemfiles/activerecord-4.0/Gemfile.mysql2.erb +0 -10
  31. data/templates/gemfiles/activerecord-4.0/Gemfile.postgresql.erb +0 -10
  32. data/templates/gemfiles/activerecord-4.0/Gemfile.sqlite3.erb +0 -10
  33. data/templates/gemfiles/activerecord-4.1/Gemfile.base.erb +0 -3
  34. data/templates/gemfiles/activerecord-4.1/Gemfile.mysql2.erb +0 -10
  35. data/templates/gemfiles/activerecord-4.1/Gemfile.postgresql.erb +0 -10
  36. data/templates/gemfiles/activerecord-4.1/Gemfile.sqlite3.erb +0 -10
  37. data/templates/gemfiles/activerecord-4.2/Gemfile.base.erb +0 -3
  38. data/templates/gemfiles/activerecord-4.2/Gemfile.mysql2.erb +0 -10
  39. data/templates/gemfiles/activerecord-4.2/Gemfile.postgresql.erb +0 -10
  40. data/templates/gemfiles/activerecord-4.2/Gemfile.sqlite3.erb +0 -10
  41. data/templates/gemfiles/activerecord-4.2.0/Gemfile.base.erb +0 -3
  42. data/templates/gemfiles/activerecord-4.2.0/Gemfile.mysql2.erb +0 -10
  43. data/templates/gemfiles/activerecord-4.2.0/Gemfile.postgresql.erb +0 -10
  44. data/templates/gemfiles/activerecord-4.2.0/Gemfile.sqlite3.erb +0 -10
  45. data/templates/gemfiles/activerecord-4.2.1/Gemfile.base.erb +0 -3
  46. data/templates/gemfiles/activerecord-4.2.1/Gemfile.mysql2.erb +0 -10
  47. data/templates/gemfiles/activerecord-4.2.1/Gemfile.postgresql.erb +0 -10
  48. data/templates/gemfiles/activerecord-4.2.1/Gemfile.sqlite3.erb +0 -10
  49. data/templates/gemfiles/activerecord-4.2.6/Gemfile.base.erb +0 -3
  50. data/templates/gemfiles/activerecord-4.2.6/Gemfile.mysql2.erb +0 -10
  51. data/templates/gemfiles/activerecord-4.2.6/Gemfile.postgresql.erb +0 -10
  52. data/templates/gemfiles/activerecord-4.2.6/Gemfile.sqlite3.erb +0 -10
  53. data/templates/gemfiles/activerecord-5.0.0/Gemfile.base.erb +0 -3
  54. data/templates/gemfiles/activerecord-5.0.0/Gemfile.mysql2.erb +0 -10
  55. data/templates/gemfiles/activerecord-5.0.0/Gemfile.postgresql.erb +0 -10
  56. data/templates/gemfiles/activerecord-5.0.0/Gemfile.sqlite3.erb +0 -10
  57. data/templates/gemfiles/activerecord-5.0.1/Gemfile.base.erb +0 -3
  58. data/templates/gemfiles/activerecord-5.0.1/Gemfile.mysql2.erb +0 -10
  59. data/templates/gemfiles/activerecord-5.0.1/Gemfile.postgresql.erb +0 -10
  60. data/templates/gemfiles/activerecord-5.0.1/Gemfile.sqlite3.erb +0 -10
  61. data/templates/gemfiles/activerecord-5.0.2/Gemfile.base.erb +0 -3
  62. data/templates/gemfiles/activerecord-5.0.2/Gemfile.mysql2.erb +0 -10
  63. data/templates/gemfiles/activerecord-5.0.2/Gemfile.postgresql.erb +0 -10
  64. data/templates/gemfiles/activerecord-5.0.2/Gemfile.sqlite3.erb +0 -10
  65. data/templates/gemfiles/activerecord-5.0.3/Gemfile.base.erb +0 -3
  66. data/templates/gemfiles/activerecord-5.0.3/Gemfile.mysql2.erb +0 -10
  67. data/templates/gemfiles/activerecord-5.0.3/Gemfile.postgresql.erb +0 -10
  68. data/templates/gemfiles/activerecord-5.0.3/Gemfile.sqlite3.erb +0 -10
  69. data/templates/gemfiles/activerecord-5.1.0/Gemfile.base.erb +0 -3
  70. data/templates/gemfiles/activerecord-5.1.0/Gemfile.mysql2.erb +0 -10
  71. data/templates/gemfiles/activerecord-5.1.0/Gemfile.postgresql.erb +0 -10
  72. data/templates/gemfiles/activerecord-5.1.0/Gemfile.sqlite3.erb +0 -10
  73. data/templates/gemfiles/activerecord-5.1.1/Gemfile.base.erb +0 -3
  74. data/templates/gemfiles/activerecord-5.1.1/Gemfile.mysql2.erb +0 -10
  75. data/templates/gemfiles/activerecord-5.1.1/Gemfile.postgresql.erb +0 -10
  76. data/templates/gemfiles/activerecord-5.1.1/Gemfile.sqlite3.erb +0 -10
  77. data/templates/gemfiles/activerecord-edge/Gemfile.base.erb +0 -3
  78. data/templates/gemfiles/activerecord-edge/Gemfile.mysql2.erb +0 -10
  79. data/templates/gemfiles/activerecord-edge/Gemfile.postgresql.erb +0 -10
  80. data/templates/gemfiles/activerecord-edge/Gemfile.sqlite3.erb +0 -10
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 90ab78fd21ab9a8ae12692239c87be54a75f5f8c50389059810909e3d215f8d4
4
- data.tar.gz: 34c994d368566f17cfe8956a7823bd0f386d913ae36298e59c32465825b1f848
3
+ metadata.gz: a1dd1ad18ee3bd79338a12319be3d4043903608e154520d5d1468d985db25a30
4
+ data.tar.gz: 43a014eceb5f62fc5495b489e094b657af32c07a85b776ec676a970654f0160b
5
5
  SHA512:
6
- metadata.gz: acc82f9f47a8325b17219c20a91930a9650e1259ae133b9fb20449151b5134ff3074401405ec9274be7f7826e66cca8030031b66cbb90f496b2c5bb31e52d5e4
7
- data.tar.gz: ffe5d72d51599a4656c1cc58a5daecf8ba8363d055ed0cdc297e7cec531d228651aaac46e89c60b7caf5ac8effcc39effd7972d4608fe1f395fe839dd0f24fd3
6
+ metadata.gz: a19343d80ea0f349413b12314171258d9d63f900eb44865aa03989849d0703d0b37132305b1c323c4a25e9d42943ed02ae152d62bbee4eb3522444fe9bc7c398
7
+ data.tar.gz: 05515375fa3d318134b0a4536f4f922e27e822ffad4cef6d11b65796019cf7c161c48f673b977bf3a228652f1241af0e6e3047a9b2881f3f2d41b44cb014db8c
data/README.md CHANGED
@@ -71,14 +71,14 @@ For interactive debugging you may want to run rspec directly from the shell rath
71
71
 
72
72
  $ schema_dev rspec --quick -- -e 'select which spec' -n
73
73
 
74
- *** ruby 2.7.3 - activerecord 5.2 - db postgresql [1 of 1]
74
+ *** ruby 2.7.4 - activerecord 5.2 - db postgresql [1 of 1]
75
75
 
76
- * /usr/bin/env BUNDLE_GEMFILE=gemfiles/activerecord-4.2/Gemfile.postgresql SHELL=`which bash` chruby-exec ruby-2.1.5 -- bundle exec rspec -e select\ which\ spec
76
+ * /usr/bin/env BUNDLE_GEMFILE=gemfiles/activerecord-4.2/Gemfile.postgresql SHELL=`which bash` chruby-exec ruby-2.7.4 -- bundle exec rspec -e select\ which\ spec
77
77
 
78
78
 
79
79
  There's no hidden environment setup; so you can copy and paste the command line into a shell:
80
80
 
81
- $ /usr/bin/env BUNDLE_GEMFILE=gemfiles/activerecord-4.2/Gemfile.postgresql SHELL=`which bash` chruby-exec ruby-2.1.5 -- bundle exec rspec -e select\ which\ spec
81
+ $ /usr/bin/env BUNDLE_GEMFILE=gemfiles/activerecord-4.2/Gemfile.postgresql SHELL=`which bash` chruby-exec ruby-2.7.4 -- bundle exec rspec -e select\ which\ spec
82
82
 
83
83
 
84
84
  For more info, see
@@ -137,6 +137,7 @@ Which defines the rake task `create_databases` and also a task for travis-ci
137
137
 
138
138
  Release notes for schema_dev versions:
139
139
 
140
+ * **3.13.1** - Adjust travis.yml generation to work with mysql again
140
141
  * **3.13.0** - Change coveralls gem and test against newer ruby versions
141
142
  * **3.12.1** - fix simple case when only one postgresql version
142
143
  * **3.12.0** - support testing against multiple postgresql versions
@@ -42,9 +42,11 @@ module SchemaDev
42
42
  env = []
43
43
  include = []
44
44
  addons = {}
45
+ services = []
46
+ skip_gemfiles = []
45
47
  if config.dbms.include?(:postgresql)
46
- versions = config.dbms_versions_for(:postgresql, ['9.4'])
47
- if config.dbms.count == 1
48
+ versions = config.dbms_versions_for(:postgresql, ['9.6'])
49
+ if config.db.count == 1
48
50
  if versions.count == 1
49
51
  # only PG and only 1 DB do it globally
50
52
  template = template_for_db(:postgresql, versions.first)
@@ -58,21 +60,39 @@ module SchemaDev
58
60
  end
59
61
  else
60
62
  # we need to include against the various gemfiles so we only use PG for PG tests (and not other DBs)
61
- config.matrix(db: 'postgresql', ruby: 'ignore').map { |entry|
63
+ config.matrix(db: 'postgresql').map { |entry|
64
+ gemfile = GemfileSelector.gemfile(entry.slice(:activerecord, :db)).to_s
65
+ skip_gemfiles << gemfile
62
66
  include.concat versions.map {|version|
63
67
  {
64
- "gemfile" => GemfileSelector.gemfile(entry.slice(:activerecord, :db)).to_s,
68
+ "gemfile" => gemfile,
69
+ "rvm" => entry[:ruby],
65
70
  }.merge(template_for_db(:postgresql, version))
66
71
  }
67
72
  }
68
73
  end
69
74
  end
70
75
  if config.dbms.include?(:mysql)
71
- env << 'MYSQL_DB_USER=travis'
76
+ if config.db.count == 1
77
+ env << 'MYSQL_DB_USER=travis'
78
+ services << 'mysql'
79
+ else
80
+ config.matrix(db: 'mysql2').map do |entry|
81
+ gemfile = GemfileSelector.gemfile(entry.slice(:activerecord, :db)).to_s
82
+ skip_gemfiles << gemfile
83
+ include << {
84
+ "gemfile" => gemfile,
85
+ "rvm" => entry[:ruby],
86
+ "services" => ['mysql'],
87
+ "env" => 'MYSQL_DB_USER=travis',
88
+ }
89
+ end
90
+ end
72
91
  end
73
92
  env = env.join(' ')
74
93
 
75
94
  gemfiles = config.matrix.map{|entry| GemfileSelector.gemfile(entry.slice(:activerecord, :db)).to_s}.uniq
95
+ gemfiles.reject! { |gemfile| skip_gemfiles.include?(gemfile) }
76
96
 
77
97
  exclude = config.matrix(excluded: :only).map { |entry| {}.tap {|ex|
78
98
  ex["rvm"] = entry[:ruby]
@@ -81,9 +101,10 @@ module SchemaDev
81
101
 
82
102
  {}.tap { |travis|
83
103
  travis["rvm"] = config.ruby.sort
84
- travis["gemfile"] = gemfiles.sort
104
+ travis["gemfile"] = gemfiles.sort unless gemfiles.empty?
85
105
  travis["env"] = env unless env.empty?
86
106
  travis["addons"] = addons unless addons.empty?
107
+ travis["services"] = services unless services.empty?
87
108
  if config.dbms.any?
88
109
  travis["before_script"] = 'bundle exec rake create_databases'
89
110
  travis["after_script"] = 'bundle exec rake drop_databases'
@@ -93,7 +114,7 @@ module SchemaDev
93
114
  travis["jobs"] = {}
94
115
  travis["jobs"]["exclude"] = exclude.sort_by{|ex| [ex["rvm"], ex["gemfile"]]} if exclude.any?
95
116
  if include.any?
96
- travis["jobs"]["include"] = include.sort_by{|ex| [ex["rvm"], ex["gemfile"]]}
117
+ travis["jobs"]["include"] = include.sort_by{|ex| [ex.fetch('rvm', ''), ex.fetch('gemfile', '')]}
97
118
  end
98
119
  travis.delete("jobs") if travis["jobs"].empty?
99
120
  }
@@ -1,3 +1,3 @@
1
1
  module SchemaDev
2
- VERSION = "3.13.0"
2
+ VERSION = "3.13.1"
3
3
  end
data/schema_dev.gemspec CHANGED
@@ -18,6 +18,8 @@ Gem::Specification.new do |gem|
18
18
  gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
19
19
  gem.require_paths = ["lib"]
20
20
 
21
+ gem.required_ruby_version = ">= 2.5.0"
22
+
21
23
  gem.add_dependency "activesupport", "~> 5.0"
22
24
  gem.add_dependency "coveralls_reborn", "~> 0.23"
23
25
  gem.add_dependency "faraday", "~> 0.9"
@@ -3,7 +3,7 @@ require 'schema_dev/gemfiles'
3
3
  describe SchemaDev::Gemfiles do
4
4
 
5
5
  it "copies listed files" do
6
- config = get_config(ruby: %W[1.9.3 2.1.5], activerecord: %W[4.0 4.1], db: %W[sqlite3 postgresql])
6
+ config = get_config(ruby: %W[1.9.3 2.1.5], activerecord: %W[5.1 5.2], db: %W[sqlite3 postgresql])
7
7
  in_tmpdir do
8
8
  expect(SchemaDev::Gemfiles.build(config)).to be_truthy
9
9
  expect(relevant_diff(config, "gemfiles")).to be_empty
@@ -11,7 +11,7 @@ describe SchemaDev::Gemfiles do
11
11
  end
12
12
 
13
13
  it "only copies files once" do
14
- config = get_config(ruby: %W[1.9.3 2.1.5], activerecord: %W[4.0 4.1], db: %W[sqlite3 postgresql])
14
+ config = get_config(ruby: %W[1.9.3 2.1.5], activerecord: %W[5.1 5.2], db: %W[sqlite3 postgresql])
15
15
  in_tmpdir do
16
16
  expect(SchemaDev::Gemfiles.build(config)).to be_truthy
17
17
  expect(SchemaDev::Gemfiles.build(config)).to be_falsey
@@ -39,5 +39,3 @@ describe SchemaDev::Gemfiles do
39
39
  end
40
40
 
41
41
  end
42
-
43
-
data/spec/runner_spec.rb CHANGED
@@ -5,7 +5,7 @@ require 'pathname'
5
5
  describe SchemaDev::Runner do
6
6
 
7
7
  it "creates gemfiles" do
8
- config = get_config(ruby: "2.1.3", activerecord: "4.0", db: "sqlite3")
8
+ config = get_config(ruby: "2.1.3", activerecord: "5.2", db: "sqlite3")
9
9
  runner = SchemaDev::Runner.new(config)
10
10
  in_tmpdir do
11
11
  expect{ runner.gemfiles }.to output("* Updated gemfiles\n").to_stdout
@@ -14,7 +14,7 @@ describe SchemaDev::Runner do
14
14
  end
15
15
 
16
16
  it "creates travis" do
17
- config = get_config(ruby: "2.1.3", activerecord: "4.0", db: "sqlite3")
17
+ config = get_config(ruby: "2.1.3", activerecord: "5.2", db: "sqlite3")
18
18
  runner = SchemaDev::Runner.new(config)
19
19
  in_tmpdir do
20
20
  expect{ runner.travis }.to output("* Updated .travis.yml\n").to_stdout
@@ -54,7 +54,7 @@ describe SchemaDev::Runner do
54
54
  }
55
55
  end
56
56
 
57
- let(:config) { get_config(ruby: RUBY_VERSION, activerecord: "4.0", db: %W[sqlite3 postgresql]) }
57
+ let(:config) { get_config(ruby: RUBY_VERSION, activerecord: "5.2", db: %W[sqlite3 postgresql]) }
58
58
  let(:runner) { SchemaDev::Runner.new(config) }
59
59
 
60
60
 
@@ -63,14 +63,14 @@ describe SchemaDev::Runner do
63
63
  * Updated gemfiles
64
64
 
65
65
 
66
- *** ruby #{RUBY_VERSION} - activerecord 4.0 - db sqlite3 [1 of 2]
66
+ *** ruby #{RUBY_VERSION} - activerecord 5.2 - db sqlite3 [1 of 2]
67
67
 
68
- * /usr/bin/env BUNDLE_GEMFILE=gemfiles/activerecord-4.0/Gemfile.sqlite3 #{selection_command} %{cmd}
68
+ * /usr/bin/env BUNDLE_GEMFILE=gemfiles/activerecord-5.2/Gemfile.sqlite3 #{selection_command} %{cmd}
69
69
  %{output}
70
70
 
71
- *** ruby #{RUBY_VERSION} - activerecord 4.0 - db postgresql [2 of 2]
71
+ *** ruby #{RUBY_VERSION} - activerecord 5.2 - db postgresql [2 of 2]
72
72
 
73
- * /usr/bin/env BUNDLE_GEMFILE=gemfiles/activerecord-4.0/Gemfile.postgresql #{selection_command} %{cmd}
73
+ * /usr/bin/env BUNDLE_GEMFILE=gemfiles/activerecord-5.2/Gemfile.postgresql #{selection_command} %{cmd}
74
74
  %{output}
75
75
  ENDOUTPUT
76
76
 
@@ -85,8 +85,8 @@ ENDOUTPUT
85
85
  expect{ runner.run("false") }.to output(expected_output % {cmd: 'false', output: nil} + <<-ENDERR).to_stdout
86
86
 
87
87
  *** 2 failures:
88
- \truby #{RUBY_VERSION} - activerecord 4.0 - db sqlite3
89
- \truby #{RUBY_VERSION} - activerecord 4.0 - db postgresql
88
+ \truby #{RUBY_VERSION} - activerecord 5.2 - db sqlite3
89
+ \truby #{RUBY_VERSION} - activerecord 5.2 - db postgresql
90
90
  ENDERR
91
91
  end
92
92
  end
@@ -96,8 +96,8 @@ ENDOUTPUT
96
96
  expect{ runner.run("echo", "LoadError") }.to output(expected_output % {cmd: 'echo LoadError', output: "LoadError\n"} + <<-ENDERR).to_stdout
97
97
 
98
98
  *** 2 failures:
99
- \truby #{RUBY_VERSION} - activerecord 4.0 - db sqlite3
100
- \truby #{RUBY_VERSION} - activerecord 4.0 - db postgresql
99
+ \truby #{RUBY_VERSION} - activerecord 5.2 - db sqlite3
100
+ \truby #{RUBY_VERSION} - activerecord 5.2 - db postgresql
101
101
  ENDERR
102
102
  end
103
103
  end
data/spec/travis_spec.rb CHANGED
@@ -5,8 +5,11 @@ describe SchemaDev::Travis do
5
5
  it "creates travis file" do
6
6
  config = get_config(ruby: %W[1.9.3 2.1.5],
7
7
  activerecord: %W[4.0 4.1],
8
- db: %W[mysql2 postgresql],
9
- exclude: { ruby: "1.9.3", db: "postgresql" },
8
+ db: %W[mysql2 postgresql sqlite3],
9
+ exclude: [
10
+ { ruby: "1.9.3", db: "postgresql" },
11
+ { ruby: "1.9.3", db: "sqlite3" },
12
+ ],
10
13
  notify: 'me@example.com')
11
14
  in_tmpdir do
12
15
  SchemaDev::Travis.update(config)
@@ -20,11 +23,8 @@ rvm:
20
23
  - 1.9.3
21
24
  - 2.1.5
22
25
  gemfile:
23
- - gemfiles/activerecord-4.0/Gemfile.mysql2
24
- - gemfiles/activerecord-4.0/Gemfile.postgresql
25
- - gemfiles/activerecord-4.1/Gemfile.mysql2
26
- - gemfiles/activerecord-4.1/Gemfile.postgresql
27
- env: MYSQL_DB_USER=travis
26
+ - gemfiles/activerecord-4.0/Gemfile.sqlite3
27
+ - gemfiles/activerecord-4.1/Gemfile.sqlite3
28
28
  before_script: bundle exec rake create_databases
29
29
  after_script: bundle exec rake drop_databases
30
30
  script: bundle exec rake travis
@@ -34,17 +34,39 @@ notifications:
34
34
  jobs:
35
35
  exclude:
36
36
  - rvm: 1.9.3
37
- gemfile: gemfiles/activerecord-4.0/Gemfile.postgresql
37
+ gemfile: gemfiles/activerecord-4.0/Gemfile.sqlite3
38
38
  - rvm: 1.9.3
39
- gemfile: gemfiles/activerecord-4.1/Gemfile.postgresql
39
+ gemfile: gemfiles/activerecord-4.1/Gemfile.sqlite3
40
40
  include:
41
+ - gemfile: gemfiles/activerecord-4.0/Gemfile.mysql2
42
+ rvm: 1.9.3
43
+ services:
44
+ - mysql
45
+ env: MYSQL_DB_USER=travis
46
+ - gemfile: gemfiles/activerecord-4.1/Gemfile.mysql2
47
+ rvm: 1.9.3
48
+ services:
49
+ - mysql
50
+ env: MYSQL_DB_USER=travis
51
+ - gemfile: gemfiles/activerecord-4.0/Gemfile.mysql2
52
+ rvm: 2.1.5
53
+ services:
54
+ - mysql
55
+ env: MYSQL_DB_USER=travis
41
56
  - gemfile: gemfiles/activerecord-4.0/Gemfile.postgresql
57
+ rvm: 2.1.5
42
58
  addons:
43
- postgresql: '9.4'
59
+ postgresql: '9.6'
44
60
  env: POSTGRESQL_DB_USER=postgres
61
+ - gemfile: gemfiles/activerecord-4.1/Gemfile.mysql2
62
+ rvm: 2.1.5
63
+ services:
64
+ - mysql
65
+ env: MYSQL_DB_USER=travis
45
66
  - gemfile: gemfiles/activerecord-4.1/Gemfile.postgresql
67
+ rvm: 2.1.5
46
68
  addons:
47
- postgresql: '9.4'
69
+ postgresql: '9.6'
48
70
  env: POSTGRESQL_DB_USER=postgres
49
71
  ENDTRAVIS
50
72
  end
@@ -69,7 +91,7 @@ gemfile:
69
91
  - gemfiles/activerecord-4.1/Gemfile.postgresql
70
92
  env: POSTGRESQL_DB_USER=postgres
71
93
  addons:
72
- postgresql: '9.4'
94
+ postgresql: '9.6'
73
95
  before_script: bundle exec rake create_databases
74
96
  after_script: bundle exec rake drop_databases
75
97
  script: bundle exec rake travis
@@ -82,7 +104,7 @@ ENDTRAVIS
82
104
  it "creates travis file using that as the PG version" do
83
105
  config = get_config(ruby: %W[2.4.0],
84
106
  activerecord: %W[4.1],
85
- db: %W[mysql2 postgresql],
107
+ db: %W[postgresql sqlite3],
86
108
  dbversions: {postgresql: %W[9.6]})
87
109
  in_tmpdir do
88
110
  SchemaDev::Travis.update(config)
@@ -95,15 +117,14 @@ ENDTRAVIS
95
117
  rvm:
96
118
  - 2.4.0
97
119
  gemfile:
98
- - gemfiles/activerecord-4.1/Gemfile.mysql2
99
- - gemfiles/activerecord-4.1/Gemfile.postgresql
100
- env: MYSQL_DB_USER=travis
120
+ - gemfiles/activerecord-4.1/Gemfile.sqlite3
101
121
  before_script: bundle exec rake create_databases
102
122
  after_script: bundle exec rake drop_databases
103
123
  script: bundle exec rake travis
104
124
  jobs:
105
125
  include:
106
126
  - gemfile: gemfiles/activerecord-4.1/Gemfile.postgresql
127
+ rvm: 2.4.0
107
128
  addons:
108
129
  postgresql: '9.6'
109
130
  env: POSTGRESQL_DB_USER=postgres
@@ -116,7 +137,7 @@ ENDTRAVIS
116
137
  it "creates travis file including those variants for postgresql versions" do
117
138
  config = get_config(ruby: %W[1.9.3 2.1.5 2.4.0],
118
139
  activerecord: %W[4.0 4.1],
119
- db: %W[mysql2 postgresql],
140
+ db: %W[sqlite3 postgresql],
120
141
  dbversions: {postgresql: %W[9.6 10 11]},
121
142
  exclude: [{ ruby: "1.9.3", db: "postgresql" }])
122
143
  in_tmpdir do
@@ -132,26 +153,66 @@ rvm:
132
153
  - 2.1.5
133
154
  - 2.4.0
134
155
  gemfile:
135
- - gemfiles/activerecord-4.0/Gemfile.mysql2
136
- - gemfiles/activerecord-4.0/Gemfile.postgresql
137
- - gemfiles/activerecord-4.1/Gemfile.mysql2
138
- - gemfiles/activerecord-4.1/Gemfile.postgresql
139
- env: MYSQL_DB_USER=travis
156
+ - gemfiles/activerecord-4.0/Gemfile.sqlite3
157
+ - gemfiles/activerecord-4.1/Gemfile.sqlite3
140
158
  before_script: bundle exec rake create_databases
141
159
  after_script: bundle exec rake drop_databases
142
160
  script: bundle exec rake travis
143
161
  jobs:
144
- exclude:
145
- - rvm: 1.9.3
146
- gemfile: gemfiles/activerecord-4.0/Gemfile.postgresql
147
- - rvm: 1.9.3
148
- gemfile: gemfiles/activerecord-4.1/Gemfile.postgresql
149
162
  include:
150
163
  - gemfile: gemfiles/activerecord-4.0/Gemfile.postgresql
164
+ rvm: 2.1.5
165
+ addons:
166
+ postgresql: '9.6'
167
+ env: POSTGRESQL_DB_USER=postgres
168
+ - gemfile: gemfiles/activerecord-4.0/Gemfile.postgresql
169
+ rvm: 2.1.5
170
+ addons:
171
+ postgresql: '10'
172
+ apt:
173
+ packages:
174
+ - postgresql-10
175
+ - postgresql-client-10
176
+ env: POSTGRESQL_DB_USER=postgres
177
+ - gemfile: gemfiles/activerecord-4.0/Gemfile.postgresql
178
+ rvm: 2.1.5
179
+ addons:
180
+ postgresql: '11'
181
+ apt:
182
+ packages:
183
+ - postgresql-11
184
+ - postgresql-client-11
185
+ env: POSTGRESQL_DB_USER=travis PGPORT=5433
186
+ - gemfile: gemfiles/activerecord-4.1/Gemfile.postgresql
187
+ rvm: 2.1.5
188
+ addons:
189
+ postgresql: '9.6'
190
+ env: POSTGRESQL_DB_USER=postgres
191
+ - gemfile: gemfiles/activerecord-4.1/Gemfile.postgresql
192
+ rvm: 2.1.5
193
+ addons:
194
+ postgresql: '10'
195
+ apt:
196
+ packages:
197
+ - postgresql-10
198
+ - postgresql-client-10
199
+ env: POSTGRESQL_DB_USER=postgres
200
+ - gemfile: gemfiles/activerecord-4.1/Gemfile.postgresql
201
+ rvm: 2.1.5
202
+ addons:
203
+ postgresql: '11'
204
+ apt:
205
+ packages:
206
+ - postgresql-11
207
+ - postgresql-client-11
208
+ env: POSTGRESQL_DB_USER=travis PGPORT=5433
209
+ - gemfile: gemfiles/activerecord-4.0/Gemfile.postgresql
210
+ rvm: 2.4.0
151
211
  addons:
152
212
  postgresql: '9.6'
153
213
  env: POSTGRESQL_DB_USER=postgres
154
214
  - gemfile: gemfiles/activerecord-4.0/Gemfile.postgresql
215
+ rvm: 2.4.0
155
216
  addons:
156
217
  postgresql: '10'
157
218
  apt:
@@ -160,6 +221,7 @@ jobs:
160
221
  - postgresql-client-10
161
222
  env: POSTGRESQL_DB_USER=postgres
162
223
  - gemfile: gemfiles/activerecord-4.0/Gemfile.postgresql
224
+ rvm: 2.4.0
163
225
  addons:
164
226
  postgresql: '11'
165
227
  apt:
@@ -168,10 +230,12 @@ jobs:
168
230
  - postgresql-client-11
169
231
  env: POSTGRESQL_DB_USER=travis PGPORT=5433
170
232
  - gemfile: gemfiles/activerecord-4.1/Gemfile.postgresql
233
+ rvm: 2.4.0
171
234
  addons:
172
235
  postgresql: '9.6'
173
236
  env: POSTGRESQL_DB_USER=postgres
174
237
  - gemfile: gemfiles/activerecord-4.1/Gemfile.postgresql
238
+ rvm: 2.4.0
175
239
  addons:
176
240
  postgresql: '10'
177
241
  apt:
@@ -180,6 +244,7 @@ jobs:
180
244
  - postgresql-client-10
181
245
  env: POSTGRESQL_DB_USER=postgres
182
246
  - gemfile: gemfiles/activerecord-4.1/Gemfile.postgresql
247
+ rvm: 2.4.0
183
248
  addons:
184
249
  postgresql: '11'
185
250
  apt:
@@ -243,7 +308,7 @@ ENDTRAVIS
243
308
  it "creates travis file including those variants for postgresql versions" do
244
309
  config = get_config(ruby: %W[2.1.5 2.4.0],
245
310
  activerecord: %W[4.0 4.1],
246
- db: %W[mysql2 postgresql],
311
+ db: %W[sqlite3 postgresql],
247
312
  dbversions: {postgresql: %W[9.6 10]})
248
313
  in_tmpdir do
249
314
  SchemaDev::Travis.update(config)
@@ -257,21 +322,48 @@ rvm:
257
322
  - 2.1.5
258
323
  - 2.4.0
259
324
  gemfile:
260
- - gemfiles/activerecord-4.0/Gemfile.mysql2
261
- - gemfiles/activerecord-4.0/Gemfile.postgresql
262
- - gemfiles/activerecord-4.1/Gemfile.mysql2
263
- - gemfiles/activerecord-4.1/Gemfile.postgresql
264
- env: MYSQL_DB_USER=travis
325
+ - gemfiles/activerecord-4.0/Gemfile.sqlite3
326
+ - gemfiles/activerecord-4.1/Gemfile.sqlite3
265
327
  before_script: bundle exec rake create_databases
266
328
  after_script: bundle exec rake drop_databases
267
329
  script: bundle exec rake travis
268
330
  jobs:
269
331
  include:
270
332
  - gemfile: gemfiles/activerecord-4.0/Gemfile.postgresql
333
+ rvm: 2.1.5
334
+ addons:
335
+ postgresql: '9.6'
336
+ env: POSTGRESQL_DB_USER=postgres
337
+ - gemfile: gemfiles/activerecord-4.0/Gemfile.postgresql
338
+ rvm: 2.1.5
339
+ addons:
340
+ postgresql: '10'
341
+ apt:
342
+ packages:
343
+ - postgresql-10
344
+ - postgresql-client-10
345
+ env: POSTGRESQL_DB_USER=postgres
346
+ - gemfile: gemfiles/activerecord-4.1/Gemfile.postgresql
347
+ rvm: 2.1.5
348
+ addons:
349
+ postgresql: '9.6'
350
+ env: POSTGRESQL_DB_USER=postgres
351
+ - gemfile: gemfiles/activerecord-4.1/Gemfile.postgresql
352
+ rvm: 2.1.5
353
+ addons:
354
+ postgresql: '10'
355
+ apt:
356
+ packages:
357
+ - postgresql-10
358
+ - postgresql-client-10
359
+ env: POSTGRESQL_DB_USER=postgres
360
+ - gemfile: gemfiles/activerecord-4.0/Gemfile.postgresql
361
+ rvm: 2.4.0
271
362
  addons:
272
363
  postgresql: '9.6'
273
364
  env: POSTGRESQL_DB_USER=postgres
274
365
  - gemfile: gemfiles/activerecord-4.0/Gemfile.postgresql
366
+ rvm: 2.4.0
275
367
  addons:
276
368
  postgresql: '10'
277
369
  apt:
@@ -280,10 +372,12 @@ jobs:
280
372
  - postgresql-client-10
281
373
  env: POSTGRESQL_DB_USER=postgres
282
374
  - gemfile: gemfiles/activerecord-4.1/Gemfile.postgresql
375
+ rvm: 2.4.0
283
376
  addons:
284
377
  postgresql: '9.6'
285
378
  env: POSTGRESQL_DB_USER=postgres
286
379
  - gemfile: gemfiles/activerecord-4.1/Gemfile.postgresql
380
+ rvm: 2.4.0
287
381
  addons:
288
382
  postgresql: '10'
289
383
  apt:
@@ -1,7 +1,7 @@
1
1
  ruby:
2
- - 2.1.5
2
+ - 2.7.4
3
3
  activerecord:
4
- - 4.2
4
+ - 5.2
5
5
  db:
6
6
  - mysql2
7
7
  - sqlite3
@@ -1,4 +1,4 @@
1
1
  source 'https://rubygems.org'
2
- gemspec :path => File.expand_path('..', __FILE__)
2
+ gemspec path: File.expand_path('..', __FILE__)
3
3
 
4
4
  File.exist?(gemfile_local = File.expand_path('../Gemfile.local', __FILE__)) and eval File.read(gemfile_local), binding, gemfile_local
@@ -1,3 +1,4 @@
1
- eval File.read File.expand_path('../../Gemfile.base', __FILE__)
1
+ base_gemfile = File.expand_path('../../Gemfile.base', __FILE__)
2
+ eval File.read(base_gemfile)
2
3
 
3
4
  gem "activerecord", "~> 5.0.1"
@@ -1,5 +1,5 @@
1
- require "pathname"
2
- eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
1
+ base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
2
+ eval File.read(base_gemfile), binding, base_gemfile
3
3
 
4
4
  platform :ruby do
5
5
  gem "mysql2"
@@ -1,5 +1,5 @@
1
- require "pathname"
2
- eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
1
+ base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
2
+ eval File.read(base_gemfile), binding, base_gemfile
3
3
 
4
4
  platform :ruby do
5
5
  gem "pg", "< 1"
@@ -1,5 +1,5 @@
1
- require "pathname"
2
- eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
1
+ base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
2
+ eval File.read(base_gemfile), binding, base_gemfile
3
3
 
4
4
  platform :ruby do
5
5
  gem "sqlite3"
@@ -7,4 +7,4 @@ end
7
7
 
8
8
  platform :jruby do
9
9
  gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
10
- end
10
+ end
@@ -1,3 +1,4 @@
1
- eval File.read File.expand_path('../../Gemfile.base', __FILE__)
1
+ base_gemfile = File.expand_path('../../Gemfile.base', __FILE__)
2
+ eval File.read(base_gemfile)
2
3
 
3
4
  gem "activerecord", "~> 5.1.0"
@@ -1,5 +1,5 @@
1
- require "pathname"
2
- eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
1
+ base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
2
+ eval File.read(base_gemfile), binding, base_gemfile
3
3
 
4
4
  platform :ruby do
5
5
  gem "mysql2"
@@ -1,5 +1,5 @@
1
- require "pathname"
2
- eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
1
+ base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
2
+ eval File.read(base_gemfile), binding, base_gemfile
3
3
 
4
4
  platform :ruby do
5
5
  gem "pg", "< 1"
@@ -1,5 +1,5 @@
1
- require "pathname"
2
- eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
1
+ base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
2
+ eval File.read(base_gemfile), binding, base_gemfile
3
3
 
4
4
  platform :ruby do
5
5
  gem "sqlite3"
@@ -7,4 +7,4 @@ end
7
7
 
8
8
  platform :jruby do
9
9
  gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
10
- end
10
+ end
@@ -1,3 +1,4 @@
1
- eval File.read File.expand_path('../../Gemfile.base', __FILE__)
1
+ base_gemfile = File.expand_path('../../Gemfile.base', __FILE__)
2
+ eval File.read(base_gemfile)
2
3
 
3
4
  gem "activerecord", ">= 5.2.0.beta0", "< 5.3"
@@ -1,5 +1,5 @@
1
- require "pathname"
2
- eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
1
+ base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
2
+ eval File.read(base_gemfile), binding, base_gemfile
3
3
 
4
4
  platform :ruby do
5
5
  gem "mysql2"
@@ -1,5 +1,5 @@
1
- require "pathname"
2
- eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
1
+ base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
2
+ eval File.read(base_gemfile), binding, base_gemfile
3
3
 
4
4
  platform :ruby do
5
5
  gem "pg"
@@ -1,5 +1,5 @@
1
- require "pathname"
2
- eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
1
+ base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
2
+ eval File.read(base_gemfile), binding, base_gemfile
3
3
 
4
4
  platform :ruby do
5
5
  gem "sqlite3"
@@ -7,4 +7,4 @@ end
7
7
 
8
8
  platform :jruby do
9
9
  gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
10
- end
10
+ end