guard-rspec 1.1.0 → 1.2.0

data/README.md

@@ -111,8 +111,8 @@ Former `:color`, `:drb`, `:fail_fast` and `:formatter` options are deprecated an
 ``` ruby
 :version => 1                # force use RSpec version 1, default: 2
 :cli => "-c -f doc"          # pass arbitrary RSpec CLI arguments, default: "-f progress"
-:bundler => false            # don't use "bundle exec" to run the RSpec command, default: true
-:binstubs => true            # use "bin/rspec" to run the RSpec command (implies :bundler => true), default: false
+:bundler => false            # use "bundle exec" to run the RSpec command, default: true
+:binstubs => true            # use "bin/rspec" to run the RSpec command (takes precedence over :bundle), default: false
 :rvm => ['1.8.7', '1.9.2']   # directly run your specs on multiple Rubies, default: nil
 :notification => false       # display Growl (or Libnotify) notification after the specs are done running, default: true
 :all_after_pass => false     # run all specs after changed specs pass, default: true
@@ -123,6 +123,8 @@ Former `:color`, `:drb`, `:fail_fast` and `:formatter` options are deprecated an
 :turnip => true              # enable turnip support; default: false
 ```
 
+You can also use a custom binstubs directory using `:binstubs => 'some-dir'`.
+
 ### DRb mode
 
 When you specify `--drb` within `:cli`, guard-rspec will circumvent the `rspec` command line tool by

data/lib/guard/rspec/runner.rb

@@ -40,14 +40,14 @@ module Guard
       def rspec_executable
         @rspec_executable ||= begin
           exec = rspec_class.downcase
-          binstubs? ? "bin/#{exec}" : exec
+          binstubs? ? "#{binstubs}/#{exec}" : exec
         end
       end
 
       def failure_exit_code_supported?
         @failure_exit_code_supported ||= begin
           cmd_parts = []
-          cmd_parts << "bundle exec" if bundler?
+          cmd_parts << "bundle exec" if bundle_exec?
           cmd_parts << rspec_executable
           cmd_parts << "--help"
           `#{cmd_parts.join(' ')}`.include? "--failure-exit-code"
@@ -95,7 +95,7 @@ module Guard
       def rspec_command(paths, options)
         cmd_parts = []
         cmd_parts << "rvm #{@options[:rvm].join(',')} exec" if @options[:rvm].respond_to?(:join)
-        cmd_parts << "bundle exec" if bundler?
+        cmd_parts << "bundle exec" if bundle_exec?
         cmd_parts << rspec_executable
         cmd_parts << rspec_arguments(paths, options)
         cmd_parts.compact.join(' ')
@@ -185,12 +185,24 @@ module Guard
 
       def binstubs?
         if @binstubs.nil?
-          @binstubs = bundler? && @options[:binstubs]
+          @binstubs = !!@options[:binstubs]
         else
           @binstubs
         end
       end
 
+      def binstubs
+        if @options[:binstubs] == true
+          "bin"
+        else
+          @options[:binstubs]
+        end
+      end
+
+      def bundle_exec?
+        bundler? && !binstubs?
+      end
+
       def determine_rspec_version
         if File.exist?("#{Dir.pwd}/spec/spec_helper.rb")
           File.new("#{Dir.pwd}/spec/spec_helper.rb").read.include?("Spec::Runner") ? 1 : 2

data/lib/guard/rspec/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module RSpecVersion
-    VERSION = "1.1.0"
+    VERSION = "1.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-rspec
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-18 00:00:00.000000000 Z
+date: 2012-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '2.11'
 description: Guard::RSpec automatically run your specs (much like autotest).
 email:
 - thibaud@thibaud.me
@@ -90,7 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2822986214998298860
+      hash: -112407457923736045
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: