guard-rails 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95174474f7158b781f56e351d7069b1d89ac7d94
-  data.tar.gz: 9d2ad0756d2e990cf619a093bf72ce687a6723ec
+  metadata.gz: 67204488cf9dc70a5f92d1f1cca1ff87b0936a2c
+  data.tar.gz: d3375c351092f169bc3a3a57e67f670ef91367e4
 SHA512:
-  metadata.gz: 2ce575bea742462c421ec00c2675bcabd303a64148cf644189ee1f1fc70382183102443bd8be5f0bfdbc38f1cc8877d5e4f5dbe98fb2eceb4baa9e34c04a9be4
-  data.tar.gz: d851c55f50720226db322ca3c1914610e30d3f9bf7a454751c314230326541b1e01720532029083707dfe06f75135eea9dc47d761dabec3b3d65192ca90d4624
+  metadata.gz: 965491b5a14754d3ca52255568edd514970979a3c08c5309a3c748c0c2fcd067c733a29396ef231b19159709e95f61878bb2be54b2cb81ccec4282cc3575b8af
+  data.tar.gz: 09845a32d24d05b0aa25905453489888d6bdab523bd90b0d76b6afc430004e7f1f411767a66d9de373a17c5d477cc5e7dec77e4da6b2567a5d1e75b8a5b35450

data/.travis.yml

@@ -4,3 +4,6 @@ rvm:
   - 2.1.0
   - jruby
 script: "bundle exec rake spec"
+addons:
+  code_climate:
+    repo_token: 2188902454f0733604836cd02e84f17634b7a49e337269905e0757051db2e3ca

data/Gemfile

@@ -1,17 +1,18 @@
 source "http://rubygems.org"
-# source 'http://ruby.taobao.org'
 
-# Specify your gem's dependencies in guard-rails.gemspec
 gemspec
-gem 'rake'
-gem 'fakefs', :require => nil
-gem 'guard'
-gem 'guard-bundler'
-gem 'guard-rspec'
 
-gem 'rb-fsevent', '>= 0.3.9'
-gem 'rb-inotify', '>= 0.5.1'
+# Development tools
+group :development do
+  gem 'rake'
+  gem 'guard'
+  gem 'guard-bundler'
+  gem 'guard-rspec'
 
-# Notification System
-gem 'terminal-notifier-guard', :require => RUBY_PLATFORM.downcase.include?("darwin") ? 'terminal-notifier-guard' : nil
-gem 'libnotify', :require => RUBY_PLATFORM.downcase.include?("linux") ? 'libnotify' : nil
+  # Notification System
+  gem 'terminal-notifier-guard', require: RUBY_PLATFORM.downcase.include?("darwin") ? 'terminal-notifier-guard' : nil
+  gem 'libnotify', require: RUBY_PLATFORM.downcase.include?("linux") ? 'libnotify' : nil
+end
+
+# Test Coverage
+gem "codeclimate-test-reporter", group: :test, require: nil

data/Gemfile.lock

@@ -1,17 +1,20 @@
 PATH
   remote: .
   specs:
-    guard-rails (0.5.2)
+    guard-rails (0.6.0)
       guard (~> 2.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    celluloid (0.15.2)
-      timers (~> 1.1.0)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    codeclimate-test-reporter (0.4.0)
+      simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.0)
     diff-lcs (1.2.5)
-    fakefs (0.5.2)
+    docile (1.1.5)
+    fakefs (0.5.3)
     ffi (1.9.3)
     ffi (1.9.3-java)
     formatador (0.2.5)
@@ -24,9 +27,11 @@ GEM
     guard-bundler (2.0.0)
       bundler (~> 1.0)
       guard (~> 2.2)
-    guard-rspec (4.2.10)
+    guard-rspec (4.3.1)
       guard (~> 2.1)
       rspec (>= 2.14, < 4.0)
+    hitimes (1.2.2)
+    hitimes (1.2.2-java)
     libnotify (0.8.3)
       ffi (>= 1.0.11)
     listen (2.7.9)
@@ -34,15 +39,13 @@ GEM
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     lumberjack (1.0.9)
-    metaclass (0.0.4)
     method_source (0.8.2)
-    mocha (1.1.0)
-      metaclass (~> 0.0.1)
-    pry (0.10.0)
+    multi_json (1.10.1)
+    pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry (0.10.0-java)
+    pry (0.10.1-java)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
@@ -51,20 +54,31 @@ GEM
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rspec (2.99.0)
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
-    rspec-core (2.99.1)
-    rspec-expectations (2.99.1)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.1)
-    slop (3.5.0)
+    rr (1.1.2)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.2)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.0)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.0)
+    simplecov (0.9.0)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    slop (3.6.0)
     spoon (0.0.4)
       ffi
     terminal-notifier-guard (1.5.3)
     thor (0.19.1)
-    timers (1.1.0)
+    timers (4.0.1)
+      hitimes
     version (1.0.0)
 
 PLATFORMS
@@ -72,16 +86,15 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  fakefs
+  codeclimate-test-reporter
+  fakefs (~> 0.5)
   guard
   guard-bundler
   guard-rails!
   guard-rspec
   libnotify
-  mocha (~> 1.0)
   rake
-  rb-fsevent (>= 0.3.9)
-  rb-inotify (>= 0.5.1)
-  rspec (~> 2.6)
+  rr (~> 1.0)
+  rspec (~> 3.0)
   terminal-notifier-guard
   version (>= 1.0.0)

data/README.md

@@ -4,6 +4,7 @@
 [![Build Status](https://travis-ci.org/ranmocy/guard-rails.png)](https://travis-ci.org/ranmocy/guard-rails)
 [![Dependency Status](https://gemnasium.com/ranmocy/guard-rails.png)](https://gemnasium.com/ranmocy/guard-rails)
 [![Code Climate](https://codeclimate.com/github/ranmocy/guard-rails.png)](https://codeclimate.com/github/ranmocy/guard-rails)
+[![Test Coverage](https://codeclimate.com/github/ranmocy/guard-rails/badges/coverage.svg)](https://codeclimate.com/github/ranmocy/guard-rails)
 
 ## Main repository
 Currently, the official fork repository is at [ranmocy/guard-rails][ranmocy-guard-rails].

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.6.0

data/guard-rails.gemspec

@@ -11,16 +11,17 @@ Gem::Specification.new do |s|
   s.description = %q{Restart Rails when things change in your app}
   s.license     = 'MIT'
 
-  s.rubyforge_project = "guard-rails"
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.required_ruby_version = '>= 1.9'
+
   s.add_dependency 'guard', '~> 2.0'
 
-  s.add_development_dependency 'rspec', '~> 2.6'
-  s.add_development_dependency 'mocha', '~> 1.0'
+  s.add_development_dependency 'rspec', '~> 3.0'
+  s.add_development_dependency 'rr', '~> 1.0'
+  s.add_development_dependency 'fakefs', '~> 0.5'
   s.add_development_dependency 'version', '>= 1.0.0'
 end

data/lib/guard/rails/runner.rb

@@ -103,7 +103,11 @@ module Guard
     end
 
     def run_rails_command!
-      without_bundler_env { system(environment, build_command) }
+      if options[:CLI] || options[:zeus]
+        without_bundler_env { system(environment, build_command) }
+      else
+        system(environment, build_command)
+      end
     end
 
     def has_pid?

data/spec/lib/guard/rails/runner_spec.rb

@@ -13,7 +13,7 @@ describe Guard::RailsRunner do
   describe '#pid' do
     include FakeFS::SpecHelpers
 
-    context 'pid file exists' do
+    context 'when pid file exists' do
       let(:pid) { 12345 }
 
       before do
@@ -21,18 +21,18 @@ describe Guard::RailsRunner do
         File.open(runner.pid_file, 'w') { |fh| fh.print pid }
       end
 
-      it "should read the pid" do
-        runner.pid.should == pid
+      it "reads the pid" do
+        expect(runner.pid).to eq(pid)
       end
     end
 
-    context 'pid file does not exist' do
-      it "should return nil" do
-        runner.pid.should be_nil
+    context 'when pid file does not exist' do
+      it "returns nil" do
+        expect(runner.pid).to be nil
       end
     end
 
-    context 'custom rails root given' do
+    context 'when custom rails root given' do
       let(:options) { default_options.merge(:root => 'spec/dummy') }
       let(:pid) { 12345 }
 
@@ -41,194 +41,258 @@ describe Guard::RailsRunner do
         File.open(runner.pid_file, 'w') { |fh| fh.print pid }
       end
 
-      it "should point to the right pid file" do
-        runner.pid_file.should match %r{spec/dummy/tmp/pids/development.pid}
+      it "points to the right pid file" do
+        expect(runner.pid_file).to match %r{spec/dummy/tmp/pids/development.pid}
       end
     end
 
   end
 
   describe '#build_command' do
-    context "CLI" do
+    context "with options[:CLI]" do
       let(:custom_cli) { 'custom_CLI_command' }
       let(:options) { default_options.merge(:CLI => custom_cli) }
-      it "should have only custom CLI" do
-        runner.build_command.should match(%r{#{custom_cli} --pid })
+      it "has customized CLI" do
+        expect(runner.build_command).to match(%r{#{custom_cli} --pid })
       end
 
       let(:custom_pid_file) { "tmp/pids/rails_dev.pid" }
       let(:options) { default_options.merge(:CLI => custom_cli, :pid_file => custom_pid_file) }
-      it "should use custom pid_file" do
+      it "uses customized pid_file" do
         pid_file_path = File.expand_path custom_pid_file
-        runner.build_command.should match(%r{#{custom_cli} --pid \"#{pid_file_path}\"})
+        expect(runner.build_command).to match(%r{#{custom_cli} --pid \"#{pid_file_path}\"})
       end
     end
 
-    context "daemon" do
-      it "should should not have daemon switch" do
-        runner.build_command.should_not match(%r{ -d})
+    context "without options[:daemon]" do
+      it "doesn't have daemon switch" do
+        expect(runner.build_command).not_to match(%r{ -d})
       end
     end
 
-    context "no daemon" do
+    context "with options[:daemon]" do
       let(:options) { default_options.merge(:daemon => true) }
-      it "should have a daemon switch" do
-        runner.build_command.should match(%r{ -d})
+      it "has a daemon switch" do
+        expect(runner.build_command).to match(%r{ -d})
       end
     end
 
-    context "development" do
-      it "should have environment switch to development" do
-        runner.build_command.should match(%r{ -e development})
+    context "without options[:env]" do
+      it "has environment switch to development" do
+        expect(runner.build_command).to match(%r{ -e development})
       end
     end
 
-    context "test" do
+    context "with options[:environment] as test" do
       let(:options) { default_options.merge(:environment => 'test') }
-      it "should have environment switch to test" do
-        runner.build_command.should match(%r{ -e test})
+      it "has environment switch to test" do
+        expect(runner.build_command).to match(%r{ -e test})
       end
     end
 
-    context 'debugger' do
+    context 'with options[:debugger]' do
       let(:options) { default_options.merge(:debugger => true) }
 
-      it "should have a debugger switch" do
-        runner.build_command.should match(%r{ -u})
+      it "has a debugger switch" do
+        expect(runner.build_command).to match(%r{ -u})
       end
     end
 
-    context 'custom server' do
+    context 'with options[:server] as thin' do
       let(:options) { default_options.merge(:server => 'thin') }
 
-      it "should have the server name" do
-        runner.build_command.should match(%r{thin})
+      it "has the server name thin" do
+        expect(runner.build_command).to match(%r{thin})
       end
     end
 
-    context "no pid_file" do
-      it "should use default pid_file" do
+    context "without options[:pid_file]" do
+      it "uses default pid_file" do
         pid_file_path = File.expand_path "tmp/pids/development.pid"
-        runner.build_command.should match(%r{ --pid \"#{pid_file_path}\"})
+        expect(runner.build_command).to match(%r{ --pid \"#{pid_file_path}\"})
       end
     end
 
-    context "custom pid_file" do
+    context "with options[:pid_file]" do
       let(:custom_pid_file) { "tmp/pids/rails_dev.pid" }
       let(:options) { default_options.merge(:pid_file => custom_pid_file) }
 
-      it "should use custom pid_file" do
+      it "uses customized pid_file" do
         pid_file_path = File.expand_path custom_pid_file
-        runner.build_command.should match(%r{ --pid \"#{pid_file_path}\"})
+        expect(runner.build_command).to match(%r{ --pid \"#{pid_file_path}\"})
       end
     end
 
-    context "zeus enabled" do
+    context "with options[:zeus]" do
       let(:options) { default_options.merge(:zeus => true) }
-      it "should have zeus in command" do
-        runner.build_command.should match(%r{zeus server })
+      it "has zeus" do
+        expect(runner.build_command).to match(%r{zeus server })
       end
 
-      context "custom zeus plan" do
+      context "with options[:zeus_plan]" do
         let(:options) { default_options.merge(:zeus => true, :zeus_plan => 'test_server') }
-        it "should use custom zeus plan" do
-          runner.build_command.should match(%r{zeus test_server})
+        it "uses customized zeus plan" do
+          expect(runner.build_command).to match(%r{zeus test_server})
         end
 
-        context "custom server" do
+        context "with options[:server]" do
           let(:options) { default_options.merge(:zeus => true, :zeus_plan => 'test_server', :server => 'thin') }
-          it "should use custom server" do
-            runner.build_command.should match(%r{zeus test_server .* thin})
+          it "uses customized server" do
+            expect(runner.build_command).to match(%r{zeus test_server .* thin})
           end
         end
       end
     end
 
-    context "zeus disabled" do
-      it "should not have zeus in command" do
-        runner.build_command.should_not match(%r{zeus server })
+    context "without options[:zeus]" do
+      it "doesn't have zeus" do
+        expect(runner.build_command).to_not match(%r{zeus server })
       end
 
       let(:options) { default_options.merge(:zeus_plan => 'test_server') }
-      it "should have no effect of command" do
-        runner.build_command.should_not match(%r{test_server})
+      it "doesnt' have test_server" do
+        expect(runner.build_command).to_not match(%r{test_server})
       end
     end
 
-    context 'custom rails root' do
+    context 'with options[:root]' do
       let(:options) { default_options.merge(:root => 'spec/dummy') }
 
-      it "should have a cd with the custom rails root" do
-        runner.build_command.should match(%r{cd .*/spec/dummy\" &&})
+      it "has `cd` command with customized rails root" do
+        expect(runner.build_command).to match(%r{cd .*/spec/dummy\" &&})
       end
     end
   end
 
   describe '#environment' do
-    it "defaults RAILS_ENV to development" do
-      runner.environment["RAILS_ENV"].should == "development"
+    it "sets RAILS_ENV to development" do
+      expect(runner.environment["RAILS_ENV"]).to eq "development"
     end
 
-    context "with options[:environment]" do
-      let(:options) { default_options.merge(:environment => 'bob') }
+    context "with options[:environment] as test" do
+      let(:options) { default_options.merge(:environment => 'test') }
 
-      it "defaults RAILS_ENV to nil" do
-        runner.environment["RAILS_ENV"].should == "bob"
+      it "sets RAILS_ENV to test" do
+        expect(runner.environment["RAILS_ENV"]).to eq "test"
       end
 
-      context "zeus enabled" do
+      context "with options[:zeus]" do
         let(:options) { default_options.merge(:zeus => true) }
 
-        it "should set RAILS_ENV to nil" do
-          runner.environment["RAILS_ENV"].should be_nil
+        it "sets RAILS_ENV to nil" do
+          expect(runner.environment["RAILS_ENV"]).to be nil
         end
       end
     end
   end
 
+  describe '#run_rails_command' do
+    before do
+      @bundler_env = ENV['BUNDLE_GEMFILE']
+      stub(runner).build_command.returns("printenv BUNDLE_GEMFILE > /dev/null")
+    end
+    after do
+      ENV['BUNDLE_GEMFILE'] = @bundler_env
+    end
+
+    shared_examples "inside of bundler" do
+      it 'runs rails inside of bundler' do
+        expect(runner.send(:run_rails_command!)).to be true
+      end
+    end
+
+    shared_examples "outside of bundler" do
+      it 'runs rails outside of bundler' do
+        expect(runner.send(:run_rails_command!)).to be false
+      end
+    end
+
+    context 'when guard-rails is outside of bundler' do
+      before do
+        ENV['BUNDLE_GEMFILE'] = 'Gemfile'
+      end
+
+      context 'with default env' do
+        it_behaves_like "inside of bundler"
+      end
+
+      context 'with zeus' do
+        let(:options) { default_options.merge(:zeus => true) }
+        it_behaves_like "outside of bundler"
+      end
+
+      context 'with CLI' do
+        let(:custom_cli) { 'custom_CLI_command' }
+        let(:options) { default_options.merge(:CLI => custom_cli) }
+        it_behaves_like "outside of bundler"
+      end
+    end
+
+    context 'when guard-rails is outside of bundler' do
+      before do
+        ENV['BUNDLE_GEMFILE'] = nil
+      end
+
+      context 'with default env' do
+        it_behaves_like "outside of bundler"
+      end
+
+      context 'with zeus' do
+        let(:options) { default_options.merge(:zeus => true) }
+        it_behaves_like "outside of bundler"
+      end
+
+      context 'with CLI' do
+        let(:custom_cli) { 'custom_CLI_command' }
+        let(:options) { default_options.merge(:CLI => custom_cli) }
+        it_behaves_like "outside of bundler"
+      end
+    end
+  end
+
   describe '#start' do
-    let(:kill_expectation) { runner.expects(:kill_unmanaged_pid!) }
-    let(:pid_stub) { runner.stubs(:has_pid?) }
+    let(:kill_expectation) { mock(runner).kill_unmanaged_pid! }
+    let(:pid_stub) { stub(runner).has_pid? }
 
     before do
-      runner.expects(:run_rails_command!).once
+      mock(runner).run_rails_command!.once
     end
 
-    context 'do not force run' do
+    context 'without options[:force_run]' do
       before do
         pid_stub.returns(true)
         kill_expectation.never
-        runner.expects(:wait_for_pid_action).never
+        mock(runner).wait_for_pid_action.never
       end
 
-      it "should act properly" do
-        runner.start.should be_true
+      it "starts as normal" do
+        expect(runner.start).to be true
       end
     end
 
-    context 'force run' do
+    context 'with options[:force_run]' do
       let(:options) { default_options.merge(:force_run => true) }
 
       before do
         pid_stub.returns(true)
         kill_expectation.once
-        runner.expects(:wait_for_pid_action).never
+        mock(runner).wait_for_pid_action.never
       end
 
-      it "should act properly" do
-        runner.start.should be_true
+      it "starts as normal" do
+        expect(runner.start).to be true
       end
     end
 
-    context "don't write the pid" do
+    context "doesn't write the pid" do
       before do
         pid_stub.returns(false)
         kill_expectation.never
-        runner.expects(:wait_for_pid_action).times(Guard::RailsRunner::MAX_WAIT_COUNT)
+        mock(runner).wait_for_pid_action.times(Guard::RailsRunner::MAX_WAIT_COUNT)
       end
 
-      it "should act properly" do
-        runner.start.should be_false
+      it "doesn't start" do
+        expect(runner.start).to be false
       end
     end
   end
@@ -237,8 +301,8 @@ describe Guard::RailsRunner do
     let(:timeout) { 30 }
     let(:options) { default_options.merge(:timeout => timeout) }
 
-    it "should adjust the sleep time as necessary" do
-      runner.sleep_time.should == (timeout.to_f / Guard::RailsRunner::MAX_WAIT_COUNT.to_f)
+    it "adjusts the sleep time as necessary" do
+      expect(runner.sleep_time).to eq (timeout.to_f / Guard::RailsRunner::MAX_WAIT_COUNT.to_f)
     end
   end
 end

data/spec/lib/guard/rails_spec.rb

@@ -5,30 +5,30 @@ describe Guard::Rails do
   let(:guard) { Guard::Rails.new(options) }
   let(:options) { {} }
 
-  describe '#initialize' do
-    it "should initialize with options" do
+  describe "#initialize" do
+    it "initializes with options" do
       guard
 
-      guard.runner.options[:port].should == 3000
+      expect(guard.runner.options[:port]).to eq 3000
     end
   end
 
-  describe '#start' do
-    let(:ui_expectation) { Guard::UI.expects(:info).with(regexp_matches(/#{Guard::Rails::DEFAULT_OPTIONS[:port]}/)) }
+  describe "#start" do
+    let(:ui_expectation) { mock(Guard::UI).info.with(/#{Guard::Rails::DEFAULT_OPTIONS[:port]}/) }
 
-    context 'start on start' do
-      it "should show the right message and run startup" do
-        guard.expects(:reload).once
+    context "starts when Guard starts" do
+      it "shows the right message and runs startup" do
+        mock(guard).reload.with("start").once
         ui_expectation
         guard.start
       end
     end
 
-    context 'no start on start' do
+    context "doesn't start when Guard starts" do
       let(:options) { { :start_on_start => false } }
 
-      it "should show the right message and not run startup" do
-        guard.expects(:reload).never
+      it "shows the right message and doesn't run startup" do
+        mock(guard).reload.never
         ui_expectation
         guard.start
       end
@@ -39,55 +39,53 @@ describe Guard::Rails do
     let(:pid) { '12345' }
 
     before do
-      Guard::RailsRunner.any_instance.stubs(:pid).returns(pid)
+      any_instance_of(Guard::RailsRunner, pid: pid)
     end
 
-    let(:runner_stub) { Guard::RailsRunner.any_instance.stubs(:restart) }
-
     context 'at start' do
       before do
-        Guard::UI.expects(:info).with('Starting Rails...')
-        Guard::Notifier.expects(:notify).with(regexp_matches(/Rails starting/), has_entry(:image => :pending))
-        runner_stub.returns(true)
+        mock(Guard::UI).info.with('Starting Rails...')
+        mock(Guard::Notifier).notify.with(/Rails starting/, hash_including(:image => :pending))
+        any_instance_of(Guard::RailsRunner, restart: true)
       end
 
-      it "should start and show the pid file" do
-        Guard::UI.expects(:info).with(regexp_matches(/#{pid}/))
-        Guard::Notifier.expects(:notify).with(regexp_matches(/Rails started/), has_entry(:image => :success))
+      it "starts and shows the pid file" do
+        mock(Guard::UI).info.with(/#{pid}/)
+        mock(Guard::Notifier).notify.with(/Rails started/, hash_including(:image => :success))
 
         guard.reload("start")
       end
     end
 
-    context 'after start' do
+    context "after start" do
       before do
-        Guard::RailsRunner.any_instance.stubs(:pid).returns(pid)
-        Guard::UI.expects(:info).with('Restarting Rails...')
-        Guard::Notifier.expects(:notify).with(regexp_matches(/Rails restarting/), has_entry(:image => :pending))
+        any_instance_of(Guard::RailsRunner, pid: pid)
+        mock(Guard::UI).info.with('Restarting Rails...')
+        mock(Guard::Notifier).notify.with(/Rails restarting/, hash_including(:image => :pending))
       end
 
-      context 'with pid file' do
+      context "with pid file" do
         before do
-          runner_stub.returns(true)
+          any_instance_of(Guard::RailsRunner, restart: true)
         end
 
-        it "should restart and show the pid file" do
-          Guard::UI.expects(:info).with(regexp_matches(/#{pid}/))
-          Guard::Notifier.expects(:notify).with(regexp_matches(/Rails restarted/), has_entry(:image => :success))
+        it "restarts and shows the pid file" do
+          mock(Guard::UI).info.with(/#{pid}/)
+          mock(Guard::Notifier).notify.with(/Rails restarted/, hash_including(:image => :success))
 
           guard.reload
         end
       end
 
-      context 'no pid file' do
+      context "without pid file" do
         before do
-          runner_stub.returns(false)
+          any_instance_of(Guard::RailsRunner, restart: false)
         end
 
-        it "should restart and show the pid file" do
-          Guard::UI.expects(:info).with(regexp_matches(/#{pid}/)).never
-          Guard::UI.expects(:info).with(regexp_matches(/Rails NOT restarted/))
-          Guard::Notifier.expects(:notify).with(regexp_matches(/Rails NOT restarted/), has_entry(:image => :failed))
+        it "restarts and shows the pid file" do
+          mock(Guard::UI).info.with(/#{pid}/).never
+          mock(Guard::UI).info.with(/Rails NOT restarted/)
+          mock(Guard::Notifier).notify.with(/Rails NOT restarted/, hash_including(:image => :failed))
 
           guard.reload
         end
@@ -95,16 +93,16 @@ describe Guard::Rails do
     end
   end
 
-  describe '#stop' do
-    it "should stop correctly" do
-      Guard::Notifier.expects(:notify).with('Until next time...', anything)
+  describe "#stop" do
+    it "stops with correct message" do
+      mock(Guard::Notifier).notify.with('Until next time...', anything)
       guard.stop
     end
   end
 
   describe '#run_on_change' do
-    it "should reload on change" do
-      guard.expects(:reload).once
+    it "reloads on change" do
+      mock(guard).reload.once
       guard.run_on_change([])
     end
   end

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
-require 'mocha/api'
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
 
 RSpec.configure do |c|
-  c.mock_with :mocha
+  c.mock_with :rr
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - John Bintz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2014-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -31,16 +31,16 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -53,6 +53,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: version
   requirement: !ruby/object:Gem::Requirement
@@ -104,14 +118,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: guard-rails
+rubyforge_project: 
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4