guard-rspec 4.2.10 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f57a6766ffd007d4a2e7127e6af6980bf6de9913
-  data.tar.gz: 520368ee18516a03137dad77da4cd1793e1f2db0
+  metadata.gz: 00930069139ba2580eec04320eb269416d82eda6
+  data.tar.gz: 3a00495af182f78389eb1ed02b1650bc45529432
 SHA512:
-  metadata.gz: 456c281b2de5e96b79466a1f7d335521f34ab32994c4d4748567ac7f2e5a1672c3b016bf3c24acfe49f506850af2bf26a281b2460befc76f349745b080cc1722
-  data.tar.gz: dac1d282bf1987eb9231e69a852a31c5201dcfc6b2a5f58d081722bd2f417806f0ce79db9dd6d5ac310e2b06c989f0c837f0419e4f633f22260752c457eec1e5
+  metadata.gz: 27a9b85a443f667139c86d9f02dab969838615017714625e5f5612b98121e81e7b44a41a5b2a18c17ca5ed3556c0eff29d3b7cd2461b9ac5c2a797722bcd7e69
+  data.tar.gz: 3216abd7e0e2297f1d34a101f159af23859359405625c00aa14018bf52d8935fdcd0c09230bd5c125f6dbb24c2c36ac183d1b0d21465e841d25d8dc53dbea549

data/README.md

@@ -58,7 +58,7 @@ Please read [Guard doc](https://github.com/guard/guard#readme) for more informat
 
 ## Options
 
-Guard::RSpec 4.0 use now a more simple approach with the new `cmd` option that let you precisely define which rspec command will be launched on each run. As example if you want to support Spring with a custom formatter (progress by default) use:
+Guard::RSpec 4.0 now uses a simpler approach with the new `cmd` option that let you precisely define which rspec command will be launched on each run. This option is required due to the number of different ways possible to invoke rspec, the template now includes a default that should work for most applications but may not be optimal for all. As example if you want to support Spring with a custom formatter (progress by default) use:
 
 ``` ruby
 guard :rspec, cmd: 'spring rspec -f doc' do
@@ -83,9 +83,9 @@ cmd: 'zeus rspec'      # Specify a custom rspec command to run, default: 'rspec'
 spec_paths: ['spec']   # Specify a custom array of paths that contain spec files
 failed_mode: :focus    # What to do with failed specs
                        # Available values:
-                       #  :focus (default) - focus on the first 10 failed specs, rerun till they pass
+                       #  :focus - focus on the first 10 failed specs, rerun till they pass
                        #  :keep - keep failed specs until they pass (add them to new ones)
-                       #  :none - just report
+                       #  :none (default) - just report
 all_after_pass: true   # Run all specs after changed specs pass, default: false
 all_on_start: true     # Run all the specs at startup, default: false
 launchy: nil           # Pass a path to an rspec results file, e.g. ./tmp/spec_results.html

data/lib/guard/rspec/options.rb

@@ -5,9 +5,9 @@ module Guard
           all_on_start:    false,
           all_after_pass:  false,
           run_all:         { message: 'Running all specs' },
-          failed_mode:     :focus,  # :keep and :none are other posibilities
+          failed_mode:     :none,  # :keep and :focus are other posibilities
           spec_paths:      %w[spec],
-          cmd:             'rspec',
+          cmd:             nil,
           launchy:         nil,
           notification:    true
       }

data/lib/guard/rspec/runner.rb

@@ -36,6 +36,7 @@ module Guard
       private
 
       def _run(all, paths, options)
+        return unless _cmd_option_present(options)
         command = Command.new(paths, options)
         _without_bundler_env { Kernel.system(command) }.tap do |success|
           if _command_success?(success)
@@ -62,6 +63,13 @@ module Guard
         end
       end
 
+      def _cmd_option_present(options)
+        return true if options[:cmd]
+        Guard::UI.error('No cmd option specified, unable to run specs!')
+        notifier.notify_failure
+        false
+      end
+
       def _command_success?(success)
         return false if success.nil?
         [Command::FAILURE_EXIT_CODE, 0].include?($?.exitstatus)

data/lib/guard/rspec/templates/Guardfile

@@ -1,4 +1,12 @@
-guard :rspec do
+# Note: The cmd option is now required due to the increasing number of ways
+#       rspec may be run, below are examples of the most common uses.
+#  * bundler: 'bundle exec rspec'
+#  * bundler binstubs: 'bin/rspec'
+#  * spring: 'bin/rsspec' (This will use spring if running and you have
+#                          installed the spring binstubs per the docs)
+#  * zeus: 'zeus rspec' (requires the server to be started separetly)
+#  * 'just' rspec: 'rspec'
+guard :rspec, cmd: 'bundle exec rspec' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
@@ -10,6 +18,7 @@ guard :rspec do
   watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
   watch('config/routes.rb')                           { "spec/routing" }
   watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+  watch('spec/rails_helper.rb')                       { "spec" }
 
   # Capybara features specs
   watch(%r{^app/views/(.+)/.*\.(erb|haml|slim)$})     { |m| "spec/features/#{m[1]}_spec.rb" }

data/lib/guard/rspec/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module RSpecVersion
-    VERSION = '4.2.10'
+    VERSION = '4.3.0'
   end
 end

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

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'launchy'
 
 describe Guard::RSpec::Runner do
-  let(:options) { {} }
+  let(:options) { {cmd: 'rspec'} }
   let(:runner) { Guard::RSpec::Runner.new(options) }
   let(:inspector) { double(Guard::RSpec::Inspectors::SimpleInspector) }
   let(:notifier) { double(Guard::RSpec::Notifier) }
@@ -54,6 +54,7 @@ describe Guard::RSpec::Runner do
   describe '#run_all' do
     let(:options) { {
       spec_paths: %w[spec1 spec2],
+      cmd: 'rspec',
       run_all: { message: 'Custom message' }
     } }
     before { allow(inspector).to receive(:failed) }
@@ -89,6 +90,28 @@ describe Guard::RSpec::Runner do
         runner.run_all
       end
     end
+
+    context 'with no cmd' do
+      before {
+        options[:cmd] = nil
+        allow(Guard::RSpec::Command).to receive(:new)
+        allow(Guard::UI).to receive(:error).with(an_instance_of(String))
+        allow(notifier).to receive(:notify_failure)
+        runner.run_all
+      }
+
+      it 'does not build' do
+        expect(Guard::RSpec::Command).to_not have_received(:new)
+      end
+
+      it 'issues a warning to the user' do
+        expect(Guard::UI).to have_received(:error).with(an_instance_of(String))
+      end
+
+      it 'notifies the notifer of failure' do
+        expect(notifier).to have_received(:notify_failure)
+      end
+    end
   end
 
   describe '#run' do
@@ -121,7 +144,7 @@ describe Guard::RSpec::Runner do
     end
 
     context 'with all_after_pass option' do
-      let(:options) { { all_after_pass: true } }
+      let(:options) { { cmd: 'rspec', all_after_pass: true } }
 
       it 're-runs all if run is success' do
         expect(runner).to receive(:run_all)
@@ -130,7 +153,7 @@ describe Guard::RSpec::Runner do
     end
 
     context 'with launchy option' do
-      let(:options) { { launchy: 'launchy_path' } }
+      let(:options) { { cmd: 'rspec', launchy: 'launchy_path' } }
 
       before {
         allow(Pathname).to receive(:new).with('launchy_path') { double(exist?: true) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard-rspec
 version: !ruby/object:Gem::Version
-  version: 4.2.10
+  version: 4.3.0
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-09 00:00:00.000000000 Z
+date: 2014-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard