schema_dev 3.11.2 → 3.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 652fc119d13b7ee12e638f950e780ab298bd13017b1be593ab12b248acad5e9f
-  data.tar.gz: 440be25e2636f2f586d5d3cbb512abe57db87e725c4490e45b9076fd22294993
+  metadata.gz: 46d7acb89a59d88b2f5c520b28a261f5fdb5f34efb8fccecc3df5d9882272dce
+  data.tar.gz: ec2e26f410f1cd95e6f320fe99d3c95ea88cfdbbb8c90fc61957774cce1bc6be
 SHA512:
-  metadata.gz: 25ec0da856bf81fd9d3eaa9e7095419647849fa92874ece1f441f6196df0c16c72be15378bdc5eba32ffc7df29dc0a56bf0acfab151d4b452192063b6dd6afc1
-  data.tar.gz: ed7be6ecba0c07c6c00e1a1700f2aa2d08cde25a2f3219a3fb48f42efbabd9edaca5c2b50e4824bd27ee41b95dad3ce95531ba687894533878f1edcbb626e1a2
+  metadata.gz: e2ad20c8bd112f6b2583625c10a126d3dd2b33b15bdb4b3d0be943c207cd8ff975b2db1145f0fc8e502bdc17c08c9ee22638931086eb6db1d1f386d58e9bafc9
+  data.tar.gz: 6d418e6261c8d0fb4ab4f0bc42661bb38a6c4fb6a669cd4991bc354c24c11bc8e72f7180aad90e1a8ca60b800f1b835fa241157f33d8021cc3b6e452654afe85

data/.travis.yml

@@ -1,3 +1,2 @@
-sudo: false
 rvm: 2.3.1
 script: bundle exec rake travis

data/README.md

@@ -137,6 +137,7 @@ Which defines the rake task `create_databases` and also a task for travis-ci
 
 Release notes for schema_dev versions:
 
+* **3.12.0** - support testing against multiple posrgresql versions
 * **3.11.2** - require tmpdir for access to mktmpdir
 * **3.11.1** - Lock pg version for older AR versions
 * **3.11.0** - Add support for AR 5.2

data/lib/schema_dev/config.rb

@@ -12,7 +12,7 @@ module SchemaDev
 
   class Config
 
-    attr_accessor :quick, :db, :ruby, :activerecord, :notify, :exclude
+    attr_accessor :quick, :db, :dbversions, :ruby, :activerecord, :notify, :exclude
 
     def self._reset ; @@config = nil end  # for use by rspec
 
@@ -25,10 +25,11 @@ module SchemaDev
     end
 
     def initialize(opts={}) # once we no longer support ruby 1.9.3, can switch to native keyword args
-      opts = opts.keyword_args(ruby: :required, activerecord: :required, db: :required, exclude: nil, notify: nil, quick: nil)
+      opts = opts.keyword_args(ruby: :required, activerecord: :required, db: :required, dbversions: nil, exclude: nil, notify: nil, quick: nil)
       @ruby = Array.wrap(opts.ruby)
       @activerecord = Array.wrap(opts.activerecord)
       @db = Array.wrap(opts.db)
+      @dbversions = (opts.dbversions || {}).symbolize_keys
       @exclude = Array.wrap(opts.exclude).map(&:symbolize_keys).map {|tuple| Tuple.new(tuple)}
       @notify = Array.wrap(opts.notify)
       @quick = Array.wrap(opts.quick || {ruby: @ruby.last, activerecord: @activerecord.last, db: @db.last})
@@ -38,6 +39,10 @@ module SchemaDev
       @dbms ||= [:postgresql, :mysql].select{|dbm| @db.grep(/^#{dbm}/).any?}
     end
 
+    def dbms_versions_for(db, default = [])
+      @dbversions.fetch(db, default)
+    end
+
     def matrix(opts={}) # once we no longer support ruby 1.9.3, can switch to native keyword args
       opts = opts.keyword_args(quick: false, ruby: nil, activerecord: nil, db: nil, excluded: nil)
       use_ruby = @ruby

data/lib/schema_dev/travis.rb

@@ -9,12 +9,63 @@ module SchemaDev
 
     TRAVIS_FILE = ".travis.yml"
 
+    CONFIG_TEMPLATES = {
+      postgresql: {
+        default: {
+          env: 'POSTGRESQL_DB_USER=postgres'
+        },
+        '10' => {
+          addons: { apt: { packages: %w[postgresql-10 postgresql-client-10] } },
+          env: 'POSTGRESQL_DB_USER=postgres'
+        },
+        '11' => {
+          addons: { apt: { packages: %w[postgresql-11 postgresql-client-11] } },
+          env: 'POSTGRESQL_DB_USER=travis PGPORT=5433'
+        },
+        '12' => {
+          addons: { apt: { packages: %w[postgresql-12 postgresql-client-12] } },
+          env: 'POSTGRESQL_DB_USER=travis PGPORT=5433'
+        },
+      }
+    }.freeze
+
+    def template_for_db(db, version)
+      {
+        addons: {
+          db => version
+        }
+      }.deep_merge(CONFIG_TEMPLATES[db][version] || CONFIG_TEMPLATES[db][:default])
+       .deep_stringify_keys
+    end
+
     def build(config)
       env = []
+      include = []
       addons = {}
       if config.dbms.include?(:postgresql)
-        env << 'POSTGRESQL_DB_USER=postgres'
-        addons['postgresql'] = "9.4"
+        versions = config.dbms_versions_for(:postgresql, ['9.4'])
+        if config.dbms.count == 1
+          if versions.count == 1
+            # only PG and only 1 DB do it globally
+            template = template_for_db(:postgresql, versions.first)
+            env << template['env']
+            addons.merge(template['addons'])
+          else
+            # we only have one DB so we can greatly simplify our include matrix
+            include.concat versions.map {|version|
+              {}.merge(template_for_db(:postgresql, version))
+            }
+          end
+        else
+          # we need to include against the various gemfiles so we only use PG for PG tests (and not other DBs)
+          config.matrix(db: 'postgresql', ruby: 'ignore').map { |entry|
+            include.concat versions.map {|version|
+              {
+                "gemfile" => GemfileSelector.gemfile(entry.slice(:activerecord, :db)).to_s,
+              }.merge(template_for_db(:postgresql, version))
+            }
+          }
+        end
       end
       if config.dbms.include?(:mysql)
         env << 'MYSQL_DB_USER=travis'
@@ -26,11 +77,9 @@ module SchemaDev
       exclude = config.matrix(excluded: :only).map { |entry| {}.tap {|ex|
         ex["rvm"] = entry[:ruby]
         ex["gemfile"] = GemfileSelector.gemfile(entry.slice(:activerecord, :db)).to_s
-        ex["env"] = env unless env.empty?
       }}.reject{|ex| not gemfiles.include? ex["gemfile"]}
 
       {}.tap { |travis|
-        travis["sudo"] = false
         travis["rvm"] = config.ruby.sort
         travis["gemfile"] = gemfiles.sort
         travis["env"] = env unless env.empty?
@@ -41,7 +90,12 @@ module SchemaDev
         end
         travis["script"] = "bundle exec rake travis"
         travis["notifications"] = { "email" => config.notify } if config.notify.any?
-        travis["matrix"] = { "exclude" => exclude.sort_by{|ex| [ex["rvm"], ex["gemfile"]]} } if exclude.any?
+        travis["jobs"] = {}
+        travis["jobs"]["exclude"] = exclude.sort_by{|ex| [ex["rvm"], ex["gemfile"]]} if exclude.any?
+        if include.any?
+          travis["jobs"]["include"] = include.sort_by{|ex| [ex["rvm"], ex["gemfile"]]}
+        end
+        travis.delete("jobs") if travis["jobs"].empty?
       }
     end
 

data/lib/schema_dev/version.rb

@@ -1,3 +1,3 @@
 module SchemaDev
-  VERSION = "3.11.2"
+  VERSION = "3.12.0"
 end

data/spec/travis_spec.rb

@@ -16,7 +16,6 @@ describe SchemaDev::Travis do
 # Please do not edit this file; any changes will be overwritten next time
 # schema_dev gets run.
 ---
-sudo: false
 rvm:
 - 1.9.3
 - 2.1.5
@@ -25,24 +24,247 @@ gemfile:
 - gemfiles/activerecord-4.0/Gemfile.postgresql
 - gemfiles/activerecord-4.1/Gemfile.mysql2
 - gemfiles/activerecord-4.1/Gemfile.postgresql
-env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
-addons:
-  postgresql: '9.4'
+env: MYSQL_DB_USER=travis
 before_script: bundle exec rake create_databases
 after_script: bundle exec rake drop_databases
 script: bundle exec rake travis
 notifications:
   email:
   - me@example.com
-matrix:
+jobs:
   exclude:
   - rvm: 1.9.3
     gemfile: gemfiles/activerecord-4.0/Gemfile.postgresql
-    env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
   - rvm: 1.9.3
     gemfile: gemfiles/activerecord-4.1/Gemfile.postgresql
-    env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
+  include:
+  - gemfile: gemfiles/activerecord-4.0/Gemfile.postgresql
+    addons:
+      postgresql: '9.4'
+    env: POSTGRESQL_DB_USER=postgres
+  - gemfile: gemfiles/activerecord-4.1/Gemfile.postgresql
+    addons:
+      postgresql: '9.4'
+    env: POSTGRESQL_DB_USER=postgres
 ENDTRAVIS
     end
   end
+
+  context 'when specifying a single postgresql version' do
+    it "creates travis file using that as the PG version" do
+      config = get_config(ruby: %W[2.4.0],
+                          activerecord: %W[4.1],
+                          db: %W[mysql2 postgresql],
+                          dbversions: {postgresql: %W[9.6]})
+      in_tmpdir do
+        SchemaDev::Travis.update(config)
+        expect(Pathname.new(".travis.yml").read).to eq <<ENDTRAVIS
+# This file was auto-generated by the schema_dev tool, based on the data in
+#                 ./schema_dev.yml
+# Please do not edit this file; any changes will be overwritten next time
+# schema_dev gets run.
+---
+rvm:
+- 2.4.0
+gemfile:
+- gemfiles/activerecord-4.1/Gemfile.mysql2
+- gemfiles/activerecord-4.1/Gemfile.postgresql
+env: MYSQL_DB_USER=travis
+before_script: bundle exec rake create_databases
+after_script: bundle exec rake drop_databases
+script: bundle exec rake travis
+jobs:
+  include:
+  - gemfile: gemfiles/activerecord-4.1/Gemfile.postgresql
+    addons:
+      postgresql: '9.6'
+    env: POSTGRESQL_DB_USER=postgres
+ENDTRAVIS
+      end
+    end
+  end
+
+  context 'when specifying multiple postgresql versions with excludes' do
+    it "creates travis file including those variants for postgresql versions" do
+      config = get_config(ruby: %W[1.9.3 2.1.5 2.4.0],
+                          activerecord: %W[4.0 4.1],
+                          db: %W[mysql2 postgresql],
+                          dbversions: {postgresql: %W[9.6 10 11]},
+                          exclude: [{ ruby: "1.9.3", db: "postgresql" }])
+      in_tmpdir do
+        SchemaDev::Travis.update(config)
+        expect(Pathname.new(".travis.yml").read).to eq <<ENDTRAVIS
+# This file was auto-generated by the schema_dev tool, based on the data in
+#                 ./schema_dev.yml
+# Please do not edit this file; any changes will be overwritten next time
+# schema_dev gets run.
+---
+rvm:
+- 1.9.3
+- 2.1.5
+- 2.4.0
+gemfile:
+- gemfiles/activerecord-4.0/Gemfile.mysql2
+- gemfiles/activerecord-4.0/Gemfile.postgresql
+- gemfiles/activerecord-4.1/Gemfile.mysql2
+- gemfiles/activerecord-4.1/Gemfile.postgresql
+env: MYSQL_DB_USER=travis
+before_script: bundle exec rake create_databases
+after_script: bundle exec rake drop_databases
+script: bundle exec rake travis
+jobs:
+  exclude:
+  - rvm: 1.9.3
+    gemfile: gemfiles/activerecord-4.0/Gemfile.postgresql
+  - rvm: 1.9.3
+    gemfile: gemfiles/activerecord-4.1/Gemfile.postgresql
+  include:
+  - gemfile: gemfiles/activerecord-4.0/Gemfile.postgresql
+    addons:
+      postgresql: '9.6'
+    env: POSTGRESQL_DB_USER=postgres
+  - gemfile: gemfiles/activerecord-4.0/Gemfile.postgresql
+    addons:
+      postgresql: '10'
+      apt:
+        packages:
+        - postgresql-10
+        - postgresql-client-10
+    env: POSTGRESQL_DB_USER=postgres
+  - gemfile: gemfiles/activerecord-4.0/Gemfile.postgresql
+    addons:
+      postgresql: '11'
+      apt:
+        packages:
+        - postgresql-11
+        - postgresql-client-11
+    env: POSTGRESQL_DB_USER=travis PGPORT=5433
+  - gemfile: gemfiles/activerecord-4.1/Gemfile.postgresql
+    addons:
+      postgresql: '9.6'
+    env: POSTGRESQL_DB_USER=postgres
+  - gemfile: gemfiles/activerecord-4.1/Gemfile.postgresql
+    addons:
+      postgresql: '10'
+      apt:
+        packages:
+        - postgresql-10
+        - postgresql-client-10
+    env: POSTGRESQL_DB_USER=postgres
+  - gemfile: gemfiles/activerecord-4.1/Gemfile.postgresql
+    addons:
+      postgresql: '11'
+      apt:
+        packages:
+        - postgresql-11
+        - postgresql-client-11
+    env: POSTGRESQL_DB_USER=travis PGPORT=5433
+ENDTRAVIS
+      end
+    end
+  end
+
+  context 'when specifying only postgresql as the db with versions' do
+    it "creates travis file including only addon variants" do
+      config = get_config(ruby: %W[2.1.5 2.4.0],
+                          activerecord: %W[4.0 4.1],
+                          db: %W[postgresql],
+                          dbversions: {postgresql: %W[9.6 10 11]})
+      in_tmpdir do
+        SchemaDev::Travis.update(config)
+        expect(Pathname.new(".travis.yml").read).to eq <<ENDTRAVIS
+# This file was auto-generated by the schema_dev tool, based on the data in
+#                 ./schema_dev.yml
+# Please do not edit this file; any changes will be overwritten next time
+# schema_dev gets run.
+---
+rvm:
+- 2.1.5
+- 2.4.0
+gemfile:
+- gemfiles/activerecord-4.0/Gemfile.postgresql
+- gemfiles/activerecord-4.1/Gemfile.postgresql
+before_script: bundle exec rake create_databases
+after_script: bundle exec rake drop_databases
+script: bundle exec rake travis
+jobs:
+  include:
+  - addons:
+      postgresql: '9.6'
+    env: POSTGRESQL_DB_USER=postgres
+  - addons:
+      postgresql: '10'
+      apt:
+        packages:
+        - postgresql-10
+        - postgresql-client-10
+    env: POSTGRESQL_DB_USER=postgres
+  - addons:
+      postgresql: '11'
+      apt:
+        packages:
+        - postgresql-11
+        - postgresql-client-11
+    env: POSTGRESQL_DB_USER=travis PGPORT=5433
+ENDTRAVIS
+      end
+    end
+  end
+
+  context 'when specifying multiple postgresql versions' do
+    it "creates travis file including those variants for postgresql versions" do
+      config = get_config(ruby: %W[2.1.5 2.4.0],
+                          activerecord: %W[4.0 4.1],
+                          db: %W[mysql2 postgresql],
+                          dbversions: {postgresql: %W[9.6 10]})
+      in_tmpdir do
+        SchemaDev::Travis.update(config)
+        expect(Pathname.new(".travis.yml").read).to eq <<ENDTRAVIS
+# This file was auto-generated by the schema_dev tool, based on the data in
+#                 ./schema_dev.yml
+# Please do not edit this file; any changes will be overwritten next time
+# schema_dev gets run.
+---
+rvm:
+- 2.1.5
+- 2.4.0
+gemfile:
+- gemfiles/activerecord-4.0/Gemfile.mysql2
+- gemfiles/activerecord-4.0/Gemfile.postgresql
+- gemfiles/activerecord-4.1/Gemfile.mysql2
+- gemfiles/activerecord-4.1/Gemfile.postgresql
+env: MYSQL_DB_USER=travis
+before_script: bundle exec rake create_databases
+after_script: bundle exec rake drop_databases
+script: bundle exec rake travis
+jobs:
+  include:
+  - gemfile: gemfiles/activerecord-4.0/Gemfile.postgresql
+    addons:
+      postgresql: '9.6'
+    env: POSTGRESQL_DB_USER=postgres
+  - gemfile: gemfiles/activerecord-4.0/Gemfile.postgresql
+    addons:
+      postgresql: '10'
+      apt:
+        packages:
+        - postgresql-10
+        - postgresql-client-10
+    env: POSTGRESQL_DB_USER=postgres
+  - gemfile: gemfiles/activerecord-4.1/Gemfile.postgresql
+    addons:
+      postgresql: '9.6'
+    env: POSTGRESQL_DB_USER=postgres
+  - gemfile: gemfiles/activerecord-4.1/Gemfile.postgresql
+    addons:
+      postgresql: '10'
+      apt:
+        packages:
+        - postgresql-10
+        - postgresql-client-10
+    env: POSTGRESQL_DB_USER=postgres
+ENDTRAVIS
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_dev
 version: !ruby/object:Gem::Version
-  version: 3.11.2
+  version: 3.12.0
 platform: ruby
 authors:
 - ronen barzel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-04 00:00:00.000000000 Z
+date: 2021-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -367,7 +367,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key:
 specification_version: 4
 summary: SchemaPlus development tools