guard-migrate 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fd638587e2b96584a057e8873cebf55c0da88f0
-  data.tar.gz: 4e5e7d7c1b183c2a740a3b600be1776eb67a6735
+  metadata.gz: 94e39e4669548c3a7a65480b567526254cf3dc56
+  data.tar.gz: 0d7f4d9854caed22c1ca0537ef79bed0ed37a026
 SHA512:
-  metadata.gz: dc9b23bfa2aae9a3ee9f0fdb927812983bdca5ab52d63e146c66593e791308f12588876bd3d75829327b82ed7e00e22dd2c6927a272b38c496e0d194b7b89987
-  data.tar.gz: b5ba9b3ba42cc9f73f1882eee89c5aca35dcce9427e26ccec1a8379b7fdd0ed99a26ec952cab3ecd40bf13fc56c284bb47a05c89bf96b8090f683198d7426dd1
+  metadata.gz: 1fe3e66b477a708630eb2c3e81f595fd0cbac696353c3dfdd6b657e03da28fa17f4b3a51841cee648d128d1b5a16cf5a1d17a97672d1b13d31f7353e1cf10ba4
+  data.tar.gz: b018ae5ef203ed064ca69d1a12b350e1918430c2b68f9a6efb5c94e768f8d9839427cfbaddd10714cb3d39ac5765fe05f867474533d9616374dfe98cb9a32fc4

data/lib/guard/migrate.rb

@@ -1,4 +1,4 @@
-require 'guard/plugin'
+require 'guard/compat/plugin'
 
 module Guard
   class Migrate < Plugin
@@ -6,7 +6,7 @@ module Guard
     autoload :Migration, 'guard/migrate/migration'
     attr_reader :seed, :rails_env
 
-    def initialize(options={})
+    def initialize(options = {})
       super
 
       @bundler = true unless options[:bundler] == false
@@ -70,10 +70,10 @@ module Guard
 
     # Called on file(s) modifications
     def run_on_changes(paths)
-      if paths.any?{|path| path.match(%r{^db/migrate/(\d+).+\.rb})} || reset?
-        migrations = paths.map {|path| Migration.new(path)}
+      if paths.any? { |path| path.match(%r{^db/migrate/(\d+).+\.rb}) } || reset?
+        migrations = paths.map { |path| Migration.new(path) }
         migrate(migrations)
-      elsif paths.any?{|path| path.match(%r{^db/seeds\.rb$})}
+      elsif paths.any? { |path| path.match(%r{^db/seeds\.rb$}) }
         seed_only
       end
     end
@@ -81,9 +81,9 @@ module Guard
     def migrate(migrations = [])
       return if !reset? && migrations.empty?
       if reset?
-        UI.info "Running #{rake_string}"
+        Compat::UI.info "Running #{rake_string}"
         result = system(rake_string)
-        result &&= "reset"
+        result &&= 'reset'
       else
         result = run_all_migrations(migrations)
       end
@@ -92,9 +92,9 @@ module Guard
     end
 
     def seed_only
-      UI.info "Running #{seed_only_string}"
+      Compat::UI.info "Running #{seed_only_string}"
       result = system(seed_only_string)
-      result &&= "seed"
+      result &&= 'seed'
       Notify.new(result).notify
     end
 
@@ -111,7 +111,7 @@ module Guard
         seed_string,
         clone_string,
         rails_env_string
-      ].compact.join(" ")
+      ].compact.join(' ')
     end
 
     def seed_only_string
@@ -122,7 +122,7 @@ module Guard
         seed_string,
         clone_string,
         rails_env_string
-      ].compact.join(" ")
+      ].compact.join(' ')
     end
 
     private
@@ -131,11 +131,11 @@ module Guard
       result = nil
       migrations.each do |migration|
         if migration.valid?
-          UI.info "Running #{rake_string(migration.version)}"
+          Compat::UI.info "Running #{rake_string(migration.version)}"
           result = system rake_string(migration.version)
           break unless result
         else
-          UI.info "Skip empty migration - #{migration.version}"
+          Compat::UI.info "Skip empty migration - #{migration.version}"
         end
       end
 
@@ -143,11 +143,11 @@ module Guard
     end
 
     def rake_command
-      "rake" unless custom_command.to_s.match(/rake/)
+      'rake' unless custom_command.to_s.match(/rake/)
     end
 
     def bundler_command
-      "bundle exec" if bundler?
+      'bundle exec' if bundler?
     end
 
     def custom_command
@@ -159,24 +159,21 @@ module Guard
     end
 
     def clone_string
-      if test_clone? and !custom_command.to_s.match(/db:test:clone/)
-        "db:test:clone"
-      end
+      return if !test_clone? || custom_command.to_s.match(/db:test:clone/)
+      'db:test:clone'
     end
 
     def seed_string
-      "db:seed" if @seed
+      'db:seed' if @seed
     end
 
     def migrate_string(version)
-      if !custom_command.to_s.match(/db:migrate/)
-        string = "db:migrate"
-        string += ":reset" if reset?
-        string += ":redo VERSION=#{version}" if run_redo?(version)
-        string
-      end
-    end
+      return if custom_command.to_s.match(/db:migrate/)
 
+      string = 'db:migrate'
+      string += ':reset' if reset?
+      string += ":redo VERSION=#{version}" if run_redo?(version)
+      string
+    end
   end
 end
-

data/lib/guard/migrate/migration.rb

@@ -1,7 +1,6 @@
 module Guard
   class Migrate
     class Migration
-
       attr_accessor :path
 
       def initialize(_path)
@@ -19,9 +18,8 @@ module Guard
       rescue Errno::ENOENT
         false
       ensure
-        begin; file.close; rescue; end      
-      end  
-
+        begin; file.close; rescue; end
+      end
     end
   end
-end
+end

data/lib/guard/migrate/notify.rb

@@ -6,10 +6,10 @@ module Guard
       end
 
       def notify
-        ::Guard::Notifier.notify(
+        Guard::Compat::UI.notify(
           message,
-          :title => "Database Migrations",
-          :image => image
+          title: 'Database Migrations',
+          image: image
         )
       end
 
@@ -17,10 +17,10 @@ module Guard
 
       def message
         case @result
-          when "reset" then "The database has been reset"
-          when "seed" then "The database has been seeded"
-          when true then "Migrations have been applied successfully"
-          else "There was an error running migrations"
+        when 'reset' then 'The database has been reset'
+        when 'seed' then 'The database has been seeded'
+        when true then 'Migrations have been applied successfully'
+        else 'There was an error running migrations'
         end
       end
 

data/lib/guard/migrate/templates/Guardfile

@@ -2,4 +2,3 @@ guard 'migrate' do
   watch(%r{^db/migrate/(\d+).+\.rb})
   watch('db/seeds.rb')
 end
-

data/lib/guard/migrate/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module MigrateVersion
-    VERSION = "1.2.0"
+    VERSION = '1.2.1'
   end
 end

data/spec/guard/migrate/template_spec.rb

@@ -1,50 +1,14 @@
-require 'spec_helper'
-require 'guard/guardfile'
-require 'files'
+require 'guard/compat/test/template'
 
-@current_dir = Dir.pwd
-GUARDFILE_TEMPLATE = "#{File.dirname(__FILE__)}/../../../Guardfile"
-GUARD_MIGRATE_GUARDFILE_TEMPLATE = 
-  "#{File.dirname(__FILE__)}/../../../lib/guard/migrate/templates/Guardfile"
+require 'guard/migrate'
 
-include Files
-working = nil
-files_dir = Files do
-  working = dir 'working'
-end
-
-describe 'templates' do
-
-  before(:each) do
-    FileUtils.cd(working)
-  end
+RSpec.describe Guard::Migrate do
+  describe 'template' do
+    subject { Guard::Compat::Test::Template.new(described_class) }
 
-  describe 'sample guardfile' do
-
-    specify { File.exists?(GUARDFILE_TEMPLATE).should be_true }
-
-    it 'is a sample Guardfile' do
-      expect { Guard::Guardfile.create_guardfile }.to_not raise_error
-      guardfile_contents = IO.read('Guardfile')
-      guardfile_contents.should include('sample Guardfile')
-      guardfile_contents.should_not include('db/migrate')
+    it 'works' do
+      expect(subject.changed('db/seeds.rb')).to eq(%w(db/seeds.rb))
+      expect(subject.changed('db/migrate/12345_add_some_field.rb')).to eq(%w(db/migrate/12345_add_some_field.rb))
     end
-
   end
-
-  describe 'Guard::Migrate guardfile template' do
-
-    specify { File.exists?(GUARD_MIGRATE_GUARDFILE_TEMPLATE).should be_true }
-
-    it 'successfully initializes a Guard::Migrate guard' do
-      expect { Guard::Guardfile.initialize_template('migrate') }.to_not raise_error
-      guardfile_contents = IO.read('Guardfile')
-      guardfile_contents.should include('sample Guardfile')
-      guardfile_contents.should include('db/migrate')
-    end
-
-  end
-
 end
-
-FileUtils.cd(@current_dir)

data/spec/guard/migrate_spec.rb

@@ -1,11 +1,14 @@
-require 'spec_helper'
 require 'tempfile'
 
-describe Guard::Migrate do
-  let(:options){ {watchers: paths}}
-  let(:paths){{}}
+require 'guard/compat/test/helper'
 
-  subject{ Guard::Migrate.new(options) }
+require 'guard/migrate'
+
+RSpec.describe Guard::Migrate do
+  let(:options) { { watchers: paths } }
+  let(:paths) { {} }
+
+  subject { Guard::Migrate.new(options) }
 
   before(:all) do
     FileUtils.mkdir_p('db/migrate')
@@ -15,70 +18,107 @@ describe Guard::Migrate do
     FileUtils.rm_rf('db')
   end
 
-  describe "options" do
-    context "bundler" do
-      context "with a gemfile found" do
-        before{File.stub(:exist?).and_return(true) }
-        its(:bundler?){should be_true}
-        its(:rake_string){should match(/^bundle exec rake/)}
+  describe 'options' do
+    context 'bundler' do
+      context 'with a gemfile found' do
+        before { allow(File).to receive(:exist?).and_return(true) }
 
-        context "with bunder set to false" do
-          let(:options){ { :bundler => false }}
+        describe '#bundler?' do
+          subject { super().bundler? }
+          it { is_expected.to be_truthy }
+        end
 
-          its(:bundler?){should be_false}
-          its(:rake_string){should match(/^rake/)}
+        describe '#rake_string' do
+          subject { super().rake_string }
+          it { is_expected.to match(/^bundle exec rake/) }
+        end
+
+        context 'with bunder set to false' do
+          let(:options) { { bundler: false } }
+
+          describe '#bundler?' do
+            subject { super().bundler? }
+            it { is_expected.to be_falsey }
+          end
+
+          describe '#rake_string' do
+            subject { super().rake_string }
+            it { is_expected.to match(/^rake/) }
+          end
         end
       end
-      context "with no gemfile found" do
-        before{File.stub(:exist?).and_return(false)}
-        its(:bundler?){should_not be_true}
-        its(:rake_string){should match(/^rake/)}
+      context 'with no gemfile found' do
+        before { allow(File).to receive(:exist?).and_return(false) }
+
+        describe '#bundler?' do
+          subject { super().bundler? }
+          it { is_expected.not_to be_truthy }
+        end
+
+        describe '#rake_string' do
+          subject { super().rake_string }
+          it { is_expected.to match(/^rake/) }
+        end
       end
     end
 
-    context "cmd" do
-      context "without command customization" do
-        its(:cmd?){should_not be_true}
+    context 'cmd' do
+      context 'without command customization' do
+        describe '#cmd?' do
+          subject { super().cmd? }
+          it { is_expected.not_to be_truthy }
+        end
       end
 
-      context "with command customization" do
-        before{File.stub(:exist?).and_return(false)}
-        let(:options){ { :cmd => "custom command rake" } }
+      context 'with command customization' do
+        before { allow(File).to receive(:exist?).and_return(false) }
+        let(:options) { { cmd: 'custom command rake' } }
+
+        describe '#cmd?' do
+          subject { super().cmd? }
+          it { is_expected.to be_truthy }
+        end
 
-        its(:cmd?){should be_true}
-        its(:rake_string){should match(/^custom command rake/)}
+        describe '#rake_string' do
+          subject { super().rake_string }
+          it { is_expected.to match(/^custom command rake/) }
+        end
 
         context "without presence of 'rake' keyword" do
-          let(:options){ { :cmd => "custom command" } }
+          let(:options) { { cmd: 'custom command' } }
 
-          it "should raise and error" do
+          it 'should raise and error' do
             pending
+            fail 'pending'
           end
         end
 
-        context "with Bundler" do
-          before{File.stub(:exist?).and_return(true)}
+        context 'with Bundler' do
+          before { allow(File).to receive(:exist?).and_return(true) }
 
-          its(:rake_string){should match(/^bundle exec custom command rake/)}
+          describe '#rake_string' do
+            subject { super().rake_string }
+            it { is_expected.to match(/^bundle exec custom command rake/) }
+          end
         end
 
-        context "with custom rake task specified" do
-          context "with duplication of db:migrate" do
-            let(:options){ { :cmd => "custom command rake db:migrate" } }
+        context 'with custom rake task specified' do
+          context 'with duplication of db:migrate' do
+            let(:options) { { cmd: 'custom command rake db:migrate' } }
 
-            context "rake_string" do
+            context 'rake_string' do
               it "should contains 'db:migrate' once" do
-                subject.rake_string.scan("db:migrate").size.should == 1
+                expect(subject.rake_string.scan('db:migrate').size).to eq(1)
               end
             end
           end
 
-          context "with duplication of db:test:clone" do
-            let(:options){ { :cmd => "custom command rake db:test:clone" } }
+          context 'with duplication of db:test:clone' do
+            let(:options) { { cmd: 'custom command rake db:test:clone' } }
 
-            context "rake_string" do
+            context 'rake_string' do
               it "should contains 'db:test:clone' once" do
-                subject.rake_string.scan("db:test:clone").size.should == 1
+                expect(subject.rake_string.scan('db:test:clone').size).to eq(1)
               end
             end
           end
@@ -86,202 +126,299 @@ describe Guard::Migrate do
       end
     end
 
-    context "test clone" do
-      context "with no options passed" do
-        its(:test_clone?){should be_false}
-        its(:rake_string){should match(/rake db:migrate/)}
-        its(:rake_string){should_not match(/db:test:clone/)}
+    context 'test clone' do
+      context 'with no options passed' do
+        describe '#test_clone?' do
+          subject { super().test_clone? }
+          it { is_expected.to be_falsey }
+        end
+
+        describe '#rake_string' do
+          subject { super().rake_string }
+          it { is_expected.to match(/rake db:migrate/) }
+        end
+
+        describe '#rake_string' do
+          subject { super().rake_string }
+          it { is_expected.not_to match(/db:test:clone/) }
+        end
       end
 
-      context "when passed false" do
-        let(:options){ {:test_clone => false} }
-        its(:test_clone?){should be_false}
-        its(:rake_string){should match(/rake db:migrate/)}
-        its(:rake_string){should_not match(/db:test:clone/)}
+      context 'when passed false' do
+        let(:options) { { test_clone: false } }
+
+        describe '#test_clone?' do
+          subject { super().test_clone? }
+          it { is_expected.to be_falsey }
+        end
+
+        describe '#rake_string' do
+          subject { super().rake_string }
+          it { is_expected.to match(/rake db:migrate/) }
+        end
+
+        describe '#rake_string' do
+          subject { super().rake_string }
+          it { is_expected.not_to match(/db:test:clone/) }
+        end
       end
 
-      context "when passed true" do
-        let(:options){ {:test_clone => true} }
-        its(:test_clone?){should be_true}
-        its(:rake_string){should match(/rake db:migrate/)}
-        its(:rake_string){should match(/db:test:clone/)}
+      context 'when passed true' do
+        let(:options) { { test_clone: true } }
+
+        describe '#test_clone?' do
+          subject { super().test_clone? }
+          it { is_expected.to be_truthy }
+        end
+
+        describe '#rake_string' do
+          subject { super().rake_string }
+          it { is_expected.to match(/rake db:migrate/) }
+        end
+
+        describe '#rake_string' do
+          subject { super().rake_string }
+          it { is_expected.to match(/db:test:clone/) }
+        end
       end
     end
 
-    context "reset" do
-      context "with no options passed" do
-        its(:reset?){should_not be_true}
+    context 'reset' do
+      context 'with no options passed' do
+        describe '#reset?' do
+          subject { super().reset? }
+          it { is_expected.not_to be_truthy }
+        end
 
-        context "with paths" do
-          let(:paths){ ['1234'] }
-          it "rake string should attempt redo of changed migration" do
-            subject.rake_string(paths.first).should match(/rake db:migrate:redo VERSION\=1234/)
+        context 'with paths' do
+          let(:paths) { ['1234'] }
+          it 'rake string should attempt redo of changed migration' do
+            expect(subject.rake_string(paths.first)).to match(/rake db:migrate:redo VERSION\=1234/)
           end
         end
       end
 
-      context "when passed true" do
-        let(:options){ {:reset => true} }
-        its(:reset?){should be_true}
-        its(:rake_string){should match(/rake db:migrate:reset/)}
+      context 'when passed true' do
+        let(:options) { { reset: true } }
+
+        describe '#reset?' do
+          subject { super().reset? }
+          it { is_expected.to be_truthy }
+        end
+
+        describe '#rake_string' do
+          subject { super().rake_string }
+          it { is_expected.to match(/rake db:migrate:reset/) }
+        end
       end
     end
 
-    context "run on start" do
-      context "with no options set" do
-        its(:run_on_start?){should_not be_true}
+    context 'run on start' do
+      context 'with no options set' do
+        describe '#run_on_start?' do
+          subject { super().run_on_start? }
+          it { is_expected.not_to be_truthy }
+        end
 
-        it "should not run on start" do
-          subject.should_receive(:migrate).never
+        it 'should not run on start' do
+          expect(subject).to receive(:migrate).never
           subject.start
         end
 
-        it "should not run migrate on the reload command" do
-          subject.should_receive(:migrate).never
+        it 'should not run migrate on the reload command' do
+          expect(subject).to receive(:migrate).never
           subject.reload
         end
 
-        it "should not run migrate on the run all command" do
-          subject.should_receive(:migrate).never
+        it 'should not run migrate on the run all command' do
+          expect(subject).to receive(:migrate).never
           subject.run_all
         end
       end
 
-      context "when passed true" do
-        let(:options){ {:run_on_start => true} }
-        its(:run_on_start?){should be_true}
+      context 'when passed true' do
+        let(:options) { { run_on_start: true } }
 
-        it "should run migrate on the start" do
-          subject.should_receive(:migrate)
+        describe '#run_on_start?' do
+          subject { super().run_on_start? }
+          it { is_expected.to be_truthy }
+        end
+
+        it 'should run migrate on the start' do
+          expect(subject).to receive(:migrate)
           subject.start
         end
 
-        it "should run migrate on the reload command" do
-          subject.should_receive(:migrate)
+        it 'should run migrate on the reload command' do
+          expect(subject).to receive(:migrate)
           subject.reload
         end
 
-        it "should run migrate on the run all command" do
-          subject.should_receive(:migrate)
+        it 'should run migrate on the run all command' do
+          expect(subject).to receive(:migrate)
           subject.run_all
         end
 
-        context "with reset set to true" do
-          let(:options){ {:run_on_start => true, :reset => true} }
-          it "should run a migrate reset on start" do
-            subject.rake_string.should match(/db:migrate:reset/)
+        context 'with reset set to true' do
+          let(:options) { { run_on_start: true, reset: true } }
+          it 'should run a migrate reset on start' do
+            expect(subject.rake_string).to match(/db:migrate:reset/)
           end
         end
 
-        context "with reset set to false" do
-          let(:options){ {:run_on_start => true, :reset => false} }
-          it "should run a regular migrate on start" do
-            subject.rake_string.should match(/db:migrate/)
-            subject.rake_string.should_not match(/db:migrate:reset/)
-            subject.rake_string.should_not match(/db:migrate:redo/)
+        context 'with reset set to false' do
+          let(:options) { { run_on_start: true, reset: false } }
+          it 'should run a regular migrate on start' do
+            expect(subject.rake_string).to match(/db:migrate/)
+            expect(subject.rake_string).not_to match(/db:migrate:reset/)
+            expect(subject.rake_string).not_to match(/db:migrate:redo/)
           end
         end
       end
     end
 
     context 'Rails Environment' do
-      context "when no option is passed" do
-        its(:rails_env){should be_nil}
+      context 'when no option is passed' do
+        describe '#rails_env' do
+          subject { super().rails_env }
+          it { is_expected.to be_nil }
+        end
       end
 
-      context "when a rails environment is passed" do
-        let(:options){ {:rails_env => 'development'}}
-        its(:rails_env){ should == 'development'}
+      context 'when a rails environment is passed' do
+        let(:options) { { rails_env: 'development' } }
 
-        its(:rake_string){ should match(/RAILS_ENV=development/)}
+        describe '#rails_env' do
+          subject { super().rails_env }
+          it { is_expected.to eq('development') }
+        end
+
+        describe '#rake_string' do
+          subject { super().rake_string }
+          it { is_expected.to match(/RAILS_ENV=development/) }
+        end
       end
     end
 
-    context "Seed the database" do
-      context "when no option is passed" do
-        its(:seed){ should be_nil }
+    context 'Seed the database' do
+      context 'when no option is passed' do
+        describe '#seed' do
+          subject { super().seed }
+          it { is_expected.to be_nil }
+        end
       end
 
-      context "when set to true" do
-        let(:options){ {:seed => true} }
-        its(:seed){ should be_true }
-        its(:rake_string){ should match(/db:seed/)}
+      context 'when set to true' do
+        let(:options) { { seed: true } }
+
+        describe '#seed' do
+          subject { super().seed }
+          it { is_expected.to be_truthy }
+        end
+
+        describe '#rake_string' do
+          subject { super().rake_string }
+          it { is_expected.to match(/db:seed/) }
+        end
       end
 
-      context "when seed is set to true and clone is set to true" do
-        let(:options){ {:seed => true, :test_clone => true} }
-        it "runs the seed option before the clone option" do
-          subject.rake_string.should match(/db:seed.*db:test:clone/)
+      context 'when seed is set to true and clone is set to true' do
+        let(:options) { { seed: true, test_clone: true } }
+        it 'runs the seed option before the clone option' do
+          expect(subject.rake_string).to match(/db:seed.*db:test:clone/)
         end
       end
     end
 
-    context "when the seeds file is passed as the paths" do
-      let(:paths){ ['db/seeds.rb'] }
-      let(:options){ {:seed => true, :test_clone => true} }
-      its(:seed_only_string){ should match(/db:seed db:test:clone/) }
+    context 'when the seeds file is passed as the paths' do
+      let(:paths) { ['db/seeds.rb'] }
+      let(:options) { { seed: true, test_clone: true } }
 
-      it "runs the rake command with seed only" do
-        subject.should_receive(:system).with(subject.seed_only_string)
+      describe '#seed_only_string' do
+        subject { super().seed_only_string }
+        it { is_expected.to match(/db:seed db:test:clone/) }
+      end
+
+      it 'runs the rake command with seed only' do
+        allow(Guard::Compat::UI).to receive(:info)
+        allow(Guard::Compat::UI).to receive(:notify)
+        expect(subject).to receive(:system).with(subject.seed_only_string)
         subject.run_on_changes paths
       end
 
-      context "When reset is set to true" do
-        let(:options){ {:seed => true, :reset => true} }
+      context 'When reset is set to true' do
+        let(:options) { { seed: true, reset: true } }
+
+        describe '#rake_string' do
+          subject { super().rake_string }
+          it { is_expected.to match(/db:seed/) }
+        end
 
-        its(:rake_string){ should match(/db:seed/)}
-        its(:rake_string){ should match(/db:migrate:reset/)}
+        describe '#rake_string' do
+          subject { super().rake_string }
+          it { is_expected.to match(/db:migrate:reset/) }
+        end
       end
     end
   end
 
-  context "run on change should fixup the path to only the version" do
-    ##I don't like this test much - consider refactoring
-    let(:paths){ [create_valid_up_and_down_migration('1234_i_like_cheese').path] }
-    it "should run the rake command" do
-      subject.should_receive(:system).with(subject.rake_string('1234'))
+  context 'run on change should fixup the path to only the version' do
+    # #I don't like this test much - consider refactoring
+    let(:paths) { [create_valid_up_and_down_migration('1234_i_like_cheese').path] }
+    it 'should run the rake command' do
+      allow(Guard::Compat::UI).to receive(:info)
+      allow(Guard::Compat::UI).to receive(:notify)
+      expect(subject).to receive(:system).with(subject.rake_string('1234'))
       subject.run_on_changes paths
     end
   end
 
-  context "run on change when set to reset should only run migrations one time" do
-    let(:paths){ [create_valid_up_and_down_migration('1234_i_like_cheese').path, create_valid_change_migration('1235_i_like_cheese').path] }
-    let(:options){ {:reset => true, :test_clone => true} }
-    it "should run the rake command" do
-      subject.should_receive(:system).with(subject.rake_string('1234'))
+  context 'run on change when set to reset should only run migrations one time' do
+    let(:paths) { [create_valid_up_and_down_migration('1234_i_like_cheese').path, create_valid_change_migration('1235_i_like_cheese').path] }
+    let(:options) { { reset: true, test_clone: true } }
+    it 'should run the rake command' do
+      expect(subject).to receive(:system).with(subject.rake_string('1234'))
+      allow(Guard::Compat::UI).to receive(:info)
+      allow(Guard::Compat::UI).to receive(:notify)
       subject.run_on_changes paths
     end
   end
 
-  context "valid/invalid migrations" do
-
-    it "should keep valid up/down migrations" do
+  context 'valid/invalid migrations' do
+    it 'should keep valid up/down migrations' do
       migration = create_valid_up_and_down_migration('1234_i_like_cheese')
 
-      subject.should_receive(:system).with(subject.rake_string('1234'))
+      allow(Guard::Compat::UI).to receive(:info)
+      allow(Guard::Compat::UI).to receive(:notify)
+      expect(subject).to receive(:system).with(subject.rake_string('1234'))
       subject.run_on_changes [migration.path]
     end
 
-    it "should keep valid change migrations" do
+    it 'should keep valid change migrations' do
       migration = create_valid_change_migration('1234_i_like_cheese')
 
-      subject.should_receive(:system).with(subject.rake_string('1234'))
+      allow(Guard::Compat::UI).to receive(:info)
+      allow(Guard::Compat::UI).to receive(:notify)
+      expect(subject).to receive(:system).with(subject.rake_string('1234'))
       subject.run_on_changes [migration.path]
     end
 
-    it "should remove empty up/down migrations" do
+    it 'should remove empty up/down migrations' do
       migration = create_invalid_up_and_down_migration('1234_i_like_cheese')
 
-      subject.should_not_receive(:system).with(subject.rake_string('1234'))
+      allow(Guard::Compat::UI).to receive(:info)
+      allow(Guard::Compat::UI).to receive(:notify)
+      expect(subject).not_to receive(:system).with(subject.rake_string('1234'))
       subject.run_on_changes [migration.path]
     end
 
-    it "should remove empty change migrations" do
+    it 'should remove empty change migrations' do
       migration = create_invalid_change_migration('1234_i_like_cheese')
 
-      subject.should_not_receive(:system).with(subject.rake_string('1234'))
+      allow(Guard::Compat::UI).to receive(:info)
+      allow(Guard::Compat::UI).to receive(:notify)
+      expect(subject).not_to receive(:system).with(subject.rake_string('1234'))
       subject.run_on_changes [migration.path]
     end
   end
-
 end

data/spec/spec_helper.rb

@@ -7,25 +7,33 @@ if RUBY_VERSION.to_f == 1.9
   end
 end
 
-require 'rspec'
-require 'guard/migrate'
-
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
-  config.color_enabled = true
-  config.filter_run :focus => true
-  config.run_all_when_everything_filtered = true
-
-  config.before(:each) do
-    ENV["GUARD_ENV"] = 'test'
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
   end
 
-  config.after(:each) do
-    ENV["GUARD_ENV"] = nil
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
   end
 
+  config.filter_run focus: (ENV['CI'] != 'true')
+  config.run_all_when_everything_filtered = true
+
+  config.disable_monkey_patching!
+
+  # config.warnings = true
+
+  config.default_formatter = 'doc' if config.files_to_run.one?
+
+  # config.profile_examples = 10
+
+  config.order = :random
+
+  Kernel.srand config.seed
+
   config.include MigrationFactory
 end

data/spec/support/migration_factory.rb

@@ -1,12 +1,11 @@
 module MigrationFactory
-
   def create_valid_up_and_down_migration(name)
     create_migration(name, valid_up_and_down_migration)
   end
 
   def create_valid_change_migration(name)
     create_migration(name, valid_change_migration)
-  end  
+  end
 
   def create_invalid_up_and_down_migration(name)
     create_migration(name, invalid_up_and_down_migration)
@@ -14,19 +13,19 @@ module MigrationFactory
 
   def create_invalid_change_migration(name)
     create_migration(name, invalid_change_migration)
-  end    
+  end
 
   private
 
-    def create_migration(name, content)
-      migration = File.new("db/migrate/#{name}.rb", 'w')
-      migration.write(content)
-      migration.close
-      migration      
-    end
+  def create_migration(name, content)
+    migration = File.new("db/migrate/#{name}.rb", 'w')
+    migration.write(content)
+    migration.close
+    migration
+  end
 
-    def valid_up_and_down_migration
-      <<-EOS
+  def valid_up_and_down_migration
+    <<-EOS
         class ILikeCheese < ActiveRecord::Migration
           def up
             add_column :my_table, :my_column, :string
@@ -36,23 +35,23 @@ module MigrationFactory
             remove_column :my_table, :my_column
           end
         end
-        
+
       EOS
-    end
+  end
 
-    def valid_change_migration
-      <<-EOS
+  def valid_change_migration
+    <<-EOS
         class ILikeCheese < ActiveRecord::Migration
           def change
             add_column :my_table, :my_column, :string
           end
         end
-        
+
       EOS
-    end    
+  end
 
-    def invalid_up_and_down_migration
-      <<-EOS
+  def invalid_up_and_down_migration
+    <<-EOS
         class ILikeCheese < ActiveRecord::Migration
           def up
           end
@@ -60,18 +59,17 @@ module MigrationFactory
           def down
           end
         end
-        
+
       EOS
-    end
+  end
 
-    def invalid_change_migration
-      <<-EOS
+  def invalid_change_migration
+    <<-EOS
         class ILikeCheese < ActiveRecord::Migration
           def change
           end
         end
-        
-      EOS
-    end  
 
-end
+      EOS
+  end
+end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: guard-migrate
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Geoff Lanotte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-06 00:00:00.000000000 Z
+date: 2014-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: guard-compat
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement