schema_dev 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9f90059fcb7c1988ac49bab9ce3ef9533d429b8
-  data.tar.gz: cd263a6bf93f7b999995c045b8a37fe55175d43c
+  metadata.gz: 2cb7062449c508b64eba10f96d4654c25c01b1e7
+  data.tar.gz: bc5dbd89355222666cd98f462e7740348be9be82
 SHA512:
-  metadata.gz: daa5d2797c86906c01b25636bfb75c58f06a0aee7056b505f76466a9bff948a43f882142d60ffcfc10ae38f6d4c7abaeff13b9dcb9d57dc1df63769c72880b44
-  data.tar.gz: 24fe7d3ebc7b35a6ba166c9266e3acac6d249b1de647cac6de859c6a7c92df372c549cade7c655f89405722e91128433c117c08f9274e786d6d4a5a402753769
+  metadata.gz: 4f126d36df88514c8760faca2fb606797a7e039d6f04369ef381558ee0d14183f85c37598b12c252a14f274369e246e97087fe914fb9e39151c8147d46601bb3
+  data.tar.gz: 395d6081c0853eda0f040fcf16352918a11d5204e8e72e6cb55f0be053f873b4e4316a05f292d83ad9b8f7c1193036b895043d5dd408d0b0653ef97fba16cf3c

data/lib/schema_dev/travis.rb

@@ -11,22 +11,31 @@ module SchemaDev
 
     def build(config)
       env = []
-      env << 'POSTGRESQL_DB_USER=postgres' if config.dbms.include? :postgresql
-      env << 'MYSQL_DB_USER=travis' if config.dbms.include? :mysql
+      addons = {}
+      if config.dbms.include?(:postgresql)
+        env << 'POSTGRESQL_DB_USER=postgres'
+        addons['postgresql'] = "9.3"
+      end
+      if config.dbms.include?(:mysql)
+        env << 'MYSQL_DB_USER=travis'
+      end
       env = env.join(' ')
+
       gemfiles = config.matrix.map{|entry| GemfileSelector.gemfile(entry.slice(:rails, :db)).to_s}.uniq
+
       exclude = config.matrix(excluded: :only).map { |entry| {}.tap {|ex|
         ex["rvm"] = entry[:ruby]
         ex["gemfile"] = GemfileSelector.gemfile(entry.slice(:rails, :db)).to_s
-        ex["env"] = env if config.dbms.any?
+        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?
+        travis["addons"] = addons unless addons.empty?
         if config.dbms.any?
-          travis["env"] = env
           travis["before_script"] = 'bundle exec rake create_databases'
           travis["after_script"] = 'bundle exec rake drop_databases'
         end

data/lib/schema_dev/version.rb

@@ -1,3 +1,3 @@
 module SchemaDev
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

data/spec/travis_spec.rb

@@ -5,7 +5,7 @@ describe SchemaDev::Travis do
   it "creates travis file" do
     config = get_config(ruby: %W[1.9.3 2.1.5],
                         rails: %W[4.0 4.1],
-                        db: %W[sqlite3 postgresql],
+                        db: %W[mysql2 postgresql],
                         exclude: { ruby: "1.9.3", db: "postgresql" },
                         notify: 'me@example.com')
     in_tmpdir do
@@ -21,11 +21,13 @@ rvm:
 - 1.9.3
 - 2.1.5
 gemfile:
+- gemfiles/rails-4.0/Gemfile.mysql2
 - gemfiles/rails-4.0/Gemfile.postgresql
-- gemfiles/rails-4.0/Gemfile.sqlite3
+- gemfiles/rails-4.1/Gemfile.mysql2
 - gemfiles/rails-4.1/Gemfile.postgresql
-- gemfiles/rails-4.1/Gemfile.sqlite3
-env: POSTGRESQL_DB_USER=postgres
+env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
+addons:
+  postgresql: '9.3'
 before_script: bundle exec rake create_databases
 after_script: bundle exec rake drop_databases
 script: bundle exec rake travis
@@ -36,10 +38,10 @@ matrix:
   exclude:
   - rvm: 1.9.3
     gemfile: gemfiles/rails-4.0/Gemfile.postgresql
-    env: POSTGRESQL_DB_USER=postgres
+    env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
   - rvm: 1.9.3
     gemfile: gemfiles/rails-4.1/Gemfile.postgresql
-    env: POSTGRESQL_DB_USER=postgres
+    env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
 ENDTRAVIS
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_dev
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - ronen barzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-04 00:00:00.000000000 Z
+date: 2015-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport