standalone_migrations 5.2.2 → 5.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e707261fb4b628e32065379304891e6bbbe761f
-  data.tar.gz: 776e76013024050a1d696d58e5dce28b3aed2d7b
+  metadata.gz: 219a7433481076edbe318711aa0c867f957876fa
+  data.tar.gz: 4b0dee79a2d43daa7b49829438e04b5670767fe7
 SHA512:
-  metadata.gz: f49cd0a5a1346d8c02c8f24598518953611877c75a57729b5458c669c084d6df06fe2f90f1f4a16937952d1316640b670a8e2f1b0561170425cd4b7b824a581a
-  data.tar.gz: d94be5c7712032ec2206fff1a0155f87791d88fa52dc30d50acf9433296877a1c567d91b430df2808bfb45b2054925493c8508ea77d16275278dfedc49a797e1
+  metadata.gz: 155dfb9ca6c264fc2b23c72f7d9aaada1097640eb7206cc01b3b1ca4cde2aa09d6631ef03b0cd4e4c85442ea720cbffb7fb6a06ec9429ba6cdb52dcd69afc86d
+  data.tar.gz: 1a3eab8e50448b2ac611b1af4224905929f3825321d9116344d1dad269eb8250468745637bfa8c41d7aa385ecec890ccde18f34db1cdc640d6493af45c85c0ca

data/Gemfile

@@ -1,11 +1,11 @@
 source 'https://rubygems.org'
 
-gem 'rake', '~> 10.0'
+gem 'rake', '>= 10.0'
 gem 'activerecord', ENV['AR'] ? ENV['AR'].split(",") : [">= 4.2.7", "< 5.2.0"]
 gem 'railties', ENV['AR'] ? ENV['AR'].split(",") : [">= 4.2.7", "< 5.2.0"]
 
 group :dev do
   gem 'sqlite3'
-  gem 'rspec', '~> 2.0'
+  gem 'rspec', '>= 2.99.0'
   gem 'jeweler'
 end

data/README.markdown

@@ -263,3 +263,4 @@ Contributors
  - [Eric Hayes](http://ejhay.es)
  - [Yi Wen](https://github.com/ywen)
  - [Jonathan Rochkind](https://github.com/jrochkind)
+ - [Michael Mikhailov](https://github.com/yohanson)

data/VERSION

@@ -1 +1 @@
-5.2.2
+5.2.3

data/spec/standalone_migrations/callbacks_spec.rb

@@ -7,11 +7,11 @@ module StandaloneMigrations
     describe ".on_loaded" do
 
       it "responds to on_loaded" do
-        StandaloneMigrations.should respond_to :on_loaded
+        expect(StandaloneMigrations).to respond_to :on_loaded
       end
 
       it "responds to run_on_load_callbacks" do
-        StandaloneMigrations.should respond_to :run_on_load_callbacks
+        expect(StandaloneMigrations).to respond_to :run_on_load_callbacks
       end
 
       it "can pass a block do on_loaded" do
@@ -24,7 +24,7 @@ module StandaloneMigrations
         # invoke the callbacks
         StandaloneMigrations.run_on_load_callbacks
 
-        callback_was_called.should be true
+        expect(callback_was_called).to be true
       end
 
       it "can pass multiple blocks to on_loaded" do
@@ -38,7 +38,7 @@ module StandaloneMigrations
 
         StandaloneMigrations.run_on_load_callbacks
 
-        callback_count.should == 4
+        expect(callback_count).to eq(4)
       end
 
     end

data/spec/standalone_migrations/configurator_spec.rb

@@ -6,13 +6,6 @@ module StandaloneMigrations
 
     describe "environment yaml configuration loading" do
 
-      let(:env_hash) do
-        {
-          "development" => { "adapter" => "sqlite3", "database" => "db/development.sql" },
-          "test" => { "adapter" => "sqlite3", "database" => "db/test.sql" },
-          "production" => {"adapter" => "sqlite3", "database" => ":memory:" }
-        }
-      end
 
       let(:env_hash_other_db) do
         {
@@ -23,44 +16,49 @@ module StandaloneMigrations
       end
 
       before(:all) do
+        @env_hash = {
+          "development" => { "adapter" => "sqlite3", "database" => "db/development.sql" },
+          "test" => { "adapter" => "sqlite3", "database" => "db/test.sql" },
+          "production" => {"adapter" => "sqlite3", "database" => ":memory:" }
+        }
         @original_dir = Dir.pwd
         Dir.chdir( File.expand_path("../../", __FILE__) )
         FileUtils.mkdir_p "tmp/db"
         Dir.chdir "tmp"
         File.open("db/config.yml", "w") do |f|
-          f.write env_hash.to_yaml
+          f.write @env_hash.to_yaml
         end
       end
 
       it "load the specific environment config" do
         config = Configurator.new.config_for(:development)
-        config.should == env_hash["development"]
+        expect(config).to eq(@env_hash["development"])
       end
 
       it "load the yaml with environment configurations" do
         config = Configurator.new.config_for(:development)
-        config["database"].should == "db/development.sql"
+        expect(config["database"]).to eq("db/development.sql")
       end
 
       it "allow access the original configuration hash (for all environments)" do
-        Configurator.new.config_for_all.should == env_hash
+        expect(Configurator.new.config_for_all).to eq(@env_hash)
       end
 
       context "customizing the environments configuration dynamically" do
 
         let(:configurator) { Configurator.new }
-        let(:new_config) { { 'sbrobous' => 'test' } }
 
         before(:all) do
+          @new_config = { 'sbrobous' => 'test' }
           Configurator.environments_config do |env|
             env.on "production" do
-              new_config
+              @new_config
             end
           end
         end
 
         it "allow changes on the configuration hashes" do
-          configurator.config_for("production").should == new_config
+          expect(configurator.config_for("production")).to eq(@new_config)
         end
 
         it "return current configuration if block yielding returns nil" do
@@ -69,13 +67,13 @@ module StandaloneMigrations
               nil
             end
           end
-          configurator.config_for("production").should == new_config
+          expect(configurator.config_for("production")).to eq(@new_config)
         end
 
         it "pass the current configuration as block argument" do
           Configurator.environments_config do |env|
             env.on "production" do |current_config|
-              current_config.should == new_config
+              expect(current_config).to eq(@new_config)
             end
           end
         end
@@ -95,19 +93,19 @@ module StandaloneMigrations
       end
 
       it "use config/database.yml" do
-        configurator.config.should == 'db/config.yml'
+        expect(configurator.config).to eq('db/config.yml')
       end
 
       it "use db/migrate dir" do
-        configurator.migrate_dir.should == 'db/migrate'
+        expect(configurator.migrate_dir).to eq('db/migrate')
       end
 
       it "use db/seeds.rb" do
-        configurator.seeds.should == "db/seeds.rb"
+        expect(configurator.seeds).to eq("db/seeds.rb")
       end
 
       it "use db/schema.rb" do
-        configurator.schema.should == "db/schema.rb"
+        expect(configurator.schema).to eq("db/schema.rb")
       end
 
     end
@@ -127,19 +125,19 @@ module StandaloneMigrations
       end
 
       it "use custom config" do
-        configurator.config.should == args[:config]
+        expect(configurator.config).to eq(args[:config])
       end
 
       it "use custom migrate dir" do
-        configurator.migrate_dir.should == args[:migrate_dir]
+        expect(configurator.migrate_dir).to eq(args[:migrate_dir])
       end
 
       it "use custom seeds" do
-        configurator.seeds.should == args[:seeds]
+        expect(configurator.seeds).to eq(args[:seeds])
       end
 
       it "use custom schema" do
-        configurator.schema.should == args[:schema]
+        expect(configurator.schema).to eq(args[:schema])
       end
 
     end
@@ -196,11 +194,11 @@ module StandaloneMigrations
         end
 
         it "look up named dot file" do
-          other_configurator.config.should == yaml_hash_other_db['config']['database']
+          expect(other_configurator.config).to eq(yaml_hash_other_db['config']['database'])
         end
 
         it "load config from named dot file" do
-          other_configurator.migrate_dir.should == 'db2/migrate'
+          expect(other_configurator.migrate_dir).to eq('db2/migrate')
         end
 
         after(:all) do
@@ -224,33 +222,33 @@ module StandaloneMigrations
         end
 
         it "use default values for the missing configurations" do
-          configurator.migrate_dir.should == 'db/migrate'
+          expect(configurator.migrate_dir).to eq('db/migrate')
         end
 
         it "use custom config from file" do
-          configurator.config.should == yaml_hash["config"]["database"]
+          expect(configurator.config).to eq(yaml_hash["config"]["database"])
         end
 
         it "use custom config value from partial configuration" do
-          configurator.seeds.should == yaml_hash["db"]["seeds"]
+          expect(configurator.seeds).to eq(yaml_hash["db"]["seeds"])
         end
 
       end
 
       it "use custom config from file" do
-        configurator.config.should == yaml_hash["config"]["database"]
+        expect(configurator.config).to eq(yaml_hash["config"]["database"])
       end
 
       it "use custom migrate dir from file" do
-        configurator.migrate_dir.should == yaml_hash["db"]["migrate"]
+        expect(configurator.migrate_dir).to eq(yaml_hash["db"]["migrate"])
       end
 
       it "use custom seeds from file" do
-        configurator.seeds.should == yaml_hash["db"]["seeds"]
+        expect(configurator.seeds).to eq(yaml_hash["db"]["seeds"])
       end
 
       it "use custom schema from file" do
-        configurator.schema.should == yaml_hash["db"]["schema"]
+        expect(configurator.schema).to eq(yaml_hash["db"]["schema"])
       end
 
       after(:all) do

data/spec/standalone_migrations_spec.rb

@@ -103,9 +103,9 @@ test:
 
   it "warns of deprecated folder structure" do
     warning = /DEPRECATED.* db\/migrate/
-    run("rake db:create").should_not =~ warning
+    expect(run("rake db:create")).not_to match(warning)
     write('db/migrations/fooo.rb', 'xxx')
-    run("rake db:create --trace").should =~ warning
+    expect(run("rake db:create --trace")).to match(warning)
   end
 
   describe 'db:create and drop' do
@@ -117,14 +117,14 @@ test:
 
   describe 'callbacks' do
     it 'runs the callbacks' do
-      StandaloneMigrations::Tasks.should_receive(:configure)
+      expect(StandaloneMigrations::Tasks).to receive(:configure)
 
       connection_established = false
-      ActiveRecord::Base.should_receive(:establish_connection) do
+      expect(ActiveRecord::Base).to receive(:establish_connection) do
         connection_established = true
       end
-      StandaloneMigrations.should_receive(:run_on_load_callbacks) do
-        connection_established.should be true
+      expect(StandaloneMigrations).to receive(:run_on_load_callbacks) do
+        expect(connection_established).to be true
       end
 
       Dir.chdir(File.join(File.dirname(__FILE__), "tmp")) do
@@ -136,56 +136,56 @@ test:
 
   describe 'db:new_migration' do
     it "fails if i do not add a name" do
-      lambda{ run("rake db:new_migration") }.should raise_error(/name=/)
+      expect(lambda{ run("rake db:new_migration") }).to raise_error(/name=/)
     end
 
     it "generates a new migration with this name from ENV and timestamp" do
-      run("rake db:new_migration name=test_abc_env").should =~ %r{create(.*)db/migrate/\d+_test_abc_env\.rb}
-      run("ls db/migrate").should =~ /^\d+_test_abc_env.rb$/
+      expect(run("rake db:new_migration name=test_abc_env")).to match(%r{create(.*)db/migrate/\d+_test_abc_env\.rb})
+      expect(run("ls db/migrate")).to match(/^\d+_test_abc_env.rb$/)
     end
 
     it "generates a new migration with this name from args and timestamp" do
-      run("rake db:new_migration[test_abc_args]").should =~ %r{create(.*)db/migrate/\d+_test_abc_args\.rb}
-      run("ls db/migrate").should =~ /^\d+_test_abc_args.rb$/
+      expect(run("rake db:new_migration[test_abc_args]")).to match(%r{create(.*)db/migrate/\d+_test_abc_args\.rb})
+      expect(run("ls db/migrate")).to match(/^\d+_test_abc_args.rb$/)
     end
 
     it "generates a new migration with the name converted to the Rails migration format" do
-      run("rake db:new_migration name=MyNiceModel").should =~ %r{create(.*)db/migrate/\d+_my_nice_model\.rb}
-      read(migration('my_nice_model')).should =~ /class MyNiceModel/
-      run("ls db/migrate").should =~ /^\d+_my_nice_model.rb$/
+      expect(run("rake db:new_migration name=MyNiceModel")).to match(%r{create(.*)db/migrate/\d+_my_nice_model\.rb})
+      expect(read(migration('my_nice_model'))).to match(/class MyNiceModel/)
+      expect(run("ls db/migrate")).to match(/^\d+_my_nice_model.rb$/)
     end
 
     it "generates a new migration with name and options from ENV" do
       run("rake db:new_migration name=add_name_and_email_to_users options='name:string email:string'")
-      read(migration('add_name_and_email_to_users')).should =~ /add_column :users, :name, :string\n\s*add_column :users, :email, :string/
+      expect(read(migration('add_name_and_email_to_users'))).to match(/add_column :users, :name, :string\n\s*add_column :users, :email, :string/)
     end
 
     it "generates a new migration with name and options from args" do
       run("rake db:new_migration[add_website_and_username_to_users,website:string/username:string]")
-      read(migration('add_website_and_username_to_users')).should =~ /add_column :users, :website, :string\n\s*add_column :users, :username, :string/
+      expect(read(migration('add_website_and_username_to_users'))).to match(/add_column :users, :website, :string\n\s*add_column :users, :username, :string/)
     end
   end
 
   describe 'db:version' do
     it "should start with a new database version" do
-      run("rake db:version").should =~ /Current version: 0/
+      expect(run("rake db:version")).to match(/Current version: 0/)
     end
 
     it "should display the current version" do
       run("rake db:new_migration name=test_abc")
       run("rake --trace db:migrate")
-      run("rake db:version").should =~ /Current version: #{Time.now.year}/
+      expect(run("rake db:version")).to match(/Current version: #{Time.now.year}/)
     end
   end
 
   describe 'db:migrate' do
     it "does nothing when no migrations are present" do
-      run("rake db:migrate").should_not =~ /Migrating/
+      expect(run("rake db:migrate")).not_to match(/Migrating/)
     end
 
     it "migrates if i add a migration" do
       run("rake db:new_migration name=xxx")
-      run("rake db:migrate").should =~ /Xxx: Migrating/i
+      expect(run("rake db:migrate")).to match(/Xxx: Migrating/i)
     end
   end
 
@@ -197,15 +197,15 @@ test:
       run 'rake db:migrate'
 
       result = run("rake db:migrate:down VERSION=#{version}")
-      result.should_not =~ /Xxx: reverting/
-      result.should =~ /Yyy: reverting/
+      expect(result).not_to match(/Xxx: reverting/)
+      expect(result).to match(/Yyy: reverting/)
     end
 
     it "fails without version" do
       make_migration('yyy')
       # Rails has a bug where it's sending a bad failure exception
       # https://github.com/rails/rails/issues/28905
-      lambda{ run("rake db:migrate:down") }.should raise_error(/VERSION|version/)
+      expect(lambda{ run("rake db:migrate:down") }).to raise_error(/VERSION|version/)
     end
   end
 
@@ -216,39 +216,39 @@ test:
       sleep 1
       version = make_migration('yyy')
       result = run("rake db:migrate:up VERSION=#{version}")
-      result.should_not =~ /Xxx: migrating/
-      result.should =~ /Yyy: migrating/
+      expect(result).not_to match(/Xxx: migrating/)
+      expect(result).to match(/Yyy: migrating/)
     end
 
     it "fails without version" do
       make_migration('yyy')
       # Rails has a bug where it's sending a bad failure exception
       # https://github.com/rails/rails/issues/28905
-      lambda{ run("rake db:migrate:up") }.should raise_error(/VERSION|version/)
+      expect(lambda{ run("rake db:migrate:up") }).to raise_error(/VERSION|version/)
     end
   end
 
   describe 'db:rollback' do
     it "does nothing when no migrations have been run" do
-      run("rake db:version").should =~ /version: 0/
-      run("rake db:rollback").should == ''
-      run("rake db:version").should =~ /version: 0/
+      expect(run("rake db:version")).to match(/version: 0/)
+      expect(run("rake db:rollback")).to eq('')
+      expect(run("rake db:version")).to match(/version: 0/)
     end
 
     it "rolls back the last migration if one has been applied" do
       write_multiple_migrations
       run("rake db:migrate")
-      run("rake db:version").should =~ /version: 20100509095816/
-      run("rake db:rollback").should =~ /revert/
-      run("rake db:version").should =~ /version: 20100509095815/
+      expect(run("rake db:version")).to match(/version: 20100509095816/)
+      expect(run("rake db:rollback")).to match(/revert/)
+      expect(run("rake db:version")).to match(/version: 20100509095815/)
     end
 
     it "rolls back multiple migrations if the STEP argument is given" do
       write_multiple_migrations
       run("rake db:migrate")
-      run("rake db:version").should =~ /version: 20100509095816/
+      expect(run("rake db:version")).to match(/version: 20100509095816/)
       run("rake db:rollback STEP=2") =~ /revert/
-      run("rake db:version").should =~ /version: 0/
+      expect(run("rake db:version")).to match(/version: 0/)
     end
   end
 
@@ -256,7 +256,7 @@ test:
     it "dumps the schema" do
       write('db/schema.rb', '')
       run('rake db:schema:dump')
-      read('db/schema.rb').should =~ /ActiveRecord/
+      expect(read('db/schema.rb')).to match(/ActiveRecord/)
     end
   end
 
@@ -266,7 +266,7 @@ test:
       schema = "db/schema.rb"
       write(schema, read(schema)+"\nputs 'LOADEDDD'")
       result = run('rake db:schema:load')
-      result.should =~ /LOADEDDD/
+      expect(result).to match(/LOADEDDD/)
     end
 
     it "loads all migrations" do
@@ -275,29 +275,29 @@ test:
       run "rake db:drop"
       run "rake db:create"
       run "rake db:schema:load"
-      run( "rake db:migrate").strip.should == ''
+      expect(run( "rake db:migrate").strip).to eq('')
     end
   end
 
   describe 'db:abort_if_pending_migrations' do
     it "passes when no migrations are pending" do
-      run("rake db:abort_if_pending_migrations").strip.should == ''
+      expect(run("rake db:abort_if_pending_migrations").strip).to eq('')
     end
 
     it "fails when migrations are pending" do
       make_migration('yyy')
-      lambda{ run("rake db:abort_if_pending_migrations") }.should raise_error(/1 pending migration/)
+      expect(lambda{ run("rake db:abort_if_pending_migrations") }).to raise_error(/1 pending migration/)
     end
   end
 
   describe 'db:test:load' do
     it 'loads' do
       write("db/schema.rb", "puts 'LOADEDDD'")
-      run("rake db:test:load").should =~ /LOADEDDD/
+      expect(run("rake db:test:load")).to match(/LOADEDDD/)
     end
 
     it "fails without schema" do
-      lambda{ run("rake db:test:load") }.should raise_error(/try again/)
+      expect(lambda{ run("rake db:test:load") }).to raise_error(/try again/)
     end
   end
 
@@ -310,7 +310,7 @@ test:
   describe "db:seed" do
     it "loads" do
       write("db/seeds.rb", "puts 'LOADEDDD'")
-      run("rake db:seed").should =~ /LOADEDDD/
+      expect(run("rake db:seed")).to match(/LOADEDDD/)
     end
 
     describe 'with non-default seed file' do
@@ -329,13 +329,13 @@ test:
 
       it "loads" do
         write("db/seeds2.rb", "puts 'LOADEDDD'")
-        run("rake db:seed").should =~ /LOADEDDD/
+        expect(run("rake db:seed")).to match(/LOADEDDD/)
       end
     end
 
 
     it "does nothing without seeds" do
-      run("rake db:seed").length.should == 0
+      expect(run("rake db:seed").length).to eq(0)
     end
   end
 
@@ -343,7 +343,7 @@ test:
     it "should not error when a seeds file does not exist" do
       make_migration('yyy')
       run('rake db:migrate DB=test')
-      lambda{ run("rake db:reset") }.should_not raise_error
+      expect(lambda{ run("rake db:reset") }).not_to raise_error
     end
   end
 
@@ -351,12 +351,12 @@ test:
     it "runs when using the DB environment variable", :travis_error => true do
       make_migration('yyy')
       run('rake db:migrate RAILS_ENV=test')
-      run('rake db:version RAILS_ENV=test').should_not =~ /version: 0/
-      run('rake db:version').should =~ /version: 0/
+      expect(run('rake db:version RAILS_ENV=test')).not_to match(/version: 0/)
+      expect(run('rake db:version')).to match(/version: 0/)
     end
 
     it "should error on an invalid database", :travis_error => true do
-      lambda{ run("rake db:create RAILS_ENV=nonexistent")}.should raise_error(/rake aborted/)
+      expect(lambda{ run("rake db:create RAILS_ENV=nonexistent")}).to raise_error(/rake aborted/)
     end
   end
 end

data/standalone_migrations.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: standalone_migrations 5.2.2 ruby lib
+# stub: standalone_migrations 5.2.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "standalone_migrations"
-  s.version = "5.2.2"
+  s.version = "5.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Todd Huss", "Michael Grosser"]
-  s.date = "2017-06-08"
+  s.date = "2017-06-10"
   s.email = "thuss@gabrito.com"
   s.extra_rdoc_files = [
     "LICENSE",
@@ -58,16 +58,16 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rake>, ["~> 10.0"])
+      s.add_runtime_dependency(%q<rake>, [">= 10.0"])
       s.add_runtime_dependency(%q<activerecord>, ["< 5.2.0", ">= 4.2.7"])
       s.add_runtime_dependency(%q<railties>, ["< 5.2.0", ">= 4.2.7"])
     else
-      s.add_dependency(%q<rake>, ["~> 10.0"])
+      s.add_dependency(%q<rake>, [">= 10.0"])
       s.add_dependency(%q<activerecord>, ["< 5.2.0", ">= 4.2.7"])
       s.add_dependency(%q<railties>, ["< 5.2.0", ">= 4.2.7"])
     end
   else
-    s.add_dependency(%q<rake>, ["~> 10.0"])
+    s.add_dependency(%q<rake>, [">= 10.0"])
     s.add_dependency(%q<activerecord>, ["< 5.2.0", ">= 4.2.7"])
     s.add_dependency(%q<railties>, ["< 5.2.0", ">= 4.2.7"])
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: standalone_migrations
 version: !ruby/object:Gem::Version
-  version: 5.2.2
+  version: 5.2.3
 platform: ruby
 authors:
 - Todd Huss
@@ -9,20 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-08 00:00:00.000000000 Z
+date: 2017-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency