guard-rspec 0.5.5 → 0.5.6

data/README.md

@@ -1,184 +1,185 @@
-Guard::RSpec ![travis-ci](http://travis-ci.org/guard/guard-rspec.png)
-=============
-
-RSpec guard allows to automatically & intelligently launch specs when files are modified.
-
-* Compatible with RSpec 1.x & RSpec 2.x (>= 2.4 needed for the notification feature)
-* Tested against Ruby 1.8.7, 1.9.2, REE, JRuby & Rubinius.
-
-Install
--------
-
-Please be sure to have [Guard](https://github.com/guard/guard) installed before continue.
-
-Install the gem:
-
-    $ gem install guard-rspec
-
-Add it to your Gemfile (inside development group):
-
-``` ruby
-gem 'guard-rspec'
-```
-
-Add guard definition to your Guardfile by running this command:
-
-    $ guard init rspec
-
-Usage
------
-
-Please read [Guard usage doc](https://github.com/guard/guard#readme)
-
-Guardfile
----------
-
-RSpec guard can be really adapted to all kind of projects.
-
-### Standard RubyGem project
-
-``` ruby
-guard 'rspec' do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
-end
-```
-
-### Typical Rails app
-
-``` ruby
-guard 'rspec' do
-  watch('spec/spec_helper.rb')                        { "spec" }
-  watch('config/routes.rb')                           { "spec/routing" }
-  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^app/(.*)(\.erb|\.haml)$})                 { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
-  watch(%r{^lib/(.+)\.rb$})                           { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
-end
-```
-
-Please read [Guard doc](https://github.com/guard/guard#readme) for more information about the Guardfile DSL.
-
-Options
--------
-
-By default, Guard::RSpec automatically detect your RSpec version (with the `spec_helper.rb` syntax or with Bundler) but you can force the version with the `:version` option:
-
-``` ruby
-guard 'rspec', :version => 2 do
-  # ...
-end
-```
-
-You can pass any of the standard RSpec CLI options using the `:cli` option:
-
-``` ruby
-guard 'rspec', :cli => "--color --format nested --fail-fast --drb" do
-  # ...
-end
-```
-
-By default, Guard::RSpec will only look for spec files within `spec` in your project root. You can configure Guard::RSpec to look in additional paths by using the `:spec_paths` option:
-
-``` ruby
-guard 'rspec', :spec_paths => ["spec", "vendor/engines/reset/spec"] do
-  # ...
-end
-```
-If you have only one path to look, you can configure `:spec_paths` option with a string:
-
-``` ruby
-guard 'rspec', :spec_paths => "test" do
-  # ...
-end
-```
-
-
-Former `:color`, `:drb`, `:fail_fast` and `:formatter` options are thus deprecated and have no effect anymore.
-
-### List of available options:
-
-``` 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
-: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
-:all_on_start => false       # run all the specs at startup, default: true
-:keep_failed => false        # keep failed specs until they pass, default: true
-:run_all => { :cli => "-p" } # override any option when running all specs
-:spec_paths => ["spec"]      # specify an array of paths that contain spec files
-```
-
-Notification
-------------
-
-The notification feature is only available for RSpec < 2, and RSpec >= 2.4 (due to the multiple-formatters feature that was present in RSpec 1, was removed in RSpec 2 and reintroduced in RSpec 2.4). So if you are using a version between 2 and 2.4, you should disable the notification with <tt>:notification => false</tt>. Otherwise, nothing will be displayed in the terminal when your specs will run.
-
-The best solution is still to update RSpec to the latest version!
-
-Formatters
-----------
-
-The `:formatter` option has been removed since CLI arguments can be passed through the `:cli` option. If you want to use the former Instafail formatter, you need to use [rspec-instafail](http://rubygems.org/gems/rspec-instafail) gem instead:
-
-``` ruby
-# in your Gemfile
-gem 'rspec-instafail'
-
-# in your Guardfile
-guard 'rspec', :cli => '-r rspec/instafail -f RSpec::Instafail' do
-  # ...
-end
-```
-
-Default formatter is the `progress` formatter (same as RSpec default).
-
-Running a subset of all specs
------------
-
-The `:all_on_start` and `:all_after_pass` options cause all specs located in the `spec` directory to be run.  If there
-are some specs you want to skip, you can tag them with RSpec metadata (such as `:slow => true`)
-and skip them with the cli `--tag` option (i.e. `--tag ~slow`).
-
-You can also use option :spec_paths to override paths used when running all specs.
-You can use this feature to create multiple groups of guarded specs with distinct paths, and execute each in own process:
-
-``` ruby
-# in your Guardfile
-group 'acceptance-tests' do
-  guard 'rspec', :spec_paths => ['spec/acceptance'] do
-    # ...
-  end
-end
-
-group 'unit-tests' do
-  guard 'rspec', :spec_paths => ['spec/models', 'spec/controllers', 'spec/routing'] do
-    # ...
-  end
-end
-```
-
-
-Development
------------
-
-* Source hosted at [GitHub](https://github.com/guard/guard-rspec)
-* Report issues/Questions/Feature requests on [GitHub Issues](https://github.com/guard/guard-rspec/issues)
-
-Pull requests are very welcome! Make sure your patches are well tested. Please create a topic branch for every separate change
-you make.
-
-Testing
--------
-
-Please run `rake spec:prepare_fixtures` once before launching specs.
-
-Author
-------
-
-[Thibaud Guillaume-Gentil](https://github.com/thibaudgg)
+Guard::RSpec ![travis-ci](http://travis-ci.org/guard/guard-rspec.png)
+=============
+
+RSpec guard allows to automatically & intelligently launch specs when files are modified.
+
+* Compatible with RSpec 1.x & RSpec 2.x (>= 2.4 needed for the notification feature)
+* Tested against Ruby 1.8.7, 1.9.2, REE, JRuby & Rubinius.
+
+Install
+-------
+
+Please be sure to have [Guard](https://github.com/guard/guard) installed before continue.
+
+Install the gem:
+
+    $ gem install guard-rspec
+
+Add it to your Gemfile (inside development group):
+
+``` ruby
+gem 'guard-rspec'
+```
+
+Add guard definition to your Guardfile by running this command:
+
+    $ guard init rspec
+
+Usage
+-----
+
+Please read [Guard usage doc](https://github.com/guard/guard#readme)
+
+Guardfile
+---------
+
+RSpec guard can be really adapted to all kind of projects.
+
+### Standard RubyGem project
+
+``` ruby
+guard 'rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end
+```
+
+### Typical Rails app
+
+``` ruby
+guard 'rspec' do
+  watch('spec/spec_helper.rb')                        { "spec" }
+  watch('config/routes.rb')                           { "spec/routing" }
+  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^app/(.*)(\.erb|\.haml)$})                 { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r{^lib/(.+)\.rb$})                           { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+end
+```
+
+Please read [Guard doc](https://github.com/guard/guard#readme) for more information about the Guardfile DSL.
+
+Options
+-------
+
+By default, Guard::RSpec automatically detect your RSpec version (with the `spec_helper.rb` syntax or with Bundler) but you can force the version with the `:version` option:
+
+``` ruby
+guard 'rspec', :version => 2 do
+  # ...
+end
+```
+
+You can pass any of the standard RSpec CLI options using the `:cli` option:
+
+``` ruby
+guard 'rspec', :cli => "--color --format nested --fail-fast --drb" do
+  # ...
+end
+```
+
+By default, Guard::RSpec will only look for spec files within `spec` in your project root. You can configure Guard::RSpec to look in additional paths by using the `:spec_paths` option:
+
+``` ruby
+guard 'rspec', :spec_paths => ["spec", "vendor/engines/reset/spec"] do
+  # ...
+end
+```
+If you have only one path to look, you can configure `:spec_paths` option with a string:
+
+``` ruby
+guard 'rspec', :spec_paths => "test" do
+  # ...
+end
+```
+
+
+Former `:color`, `:drb`, `:fail_fast` and `:formatter` options are thus deprecated and have no effect anymore.
+
+### List of available options:
+
+``` 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
+: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
+:all_on_start => false       # run all the specs at startup, default: true
+:keep_failed => false        # keep failed specs until they pass, default: true
+:run_all => { :cli => "-p" } # override any option when running all specs
+:spec_paths => ["spec"]      # specify an array of paths that contain spec files
+```
+
+Notification
+------------
+
+The notification feature is only available for RSpec < 2, and RSpec >= 2.4 (due to the multiple-formatters feature that was present in RSpec 1, was removed in RSpec 2 and reintroduced in RSpec 2.4). So if you are using a version between 2 and 2.4, you should disable the notification with <tt>:notification => false</tt>. Otherwise, nothing will be displayed in the terminal when your specs will run.
+
+The best solution is still to update RSpec to the latest version!
+
+Formatters
+----------
+
+The `:formatter` option has been removed since CLI arguments can be passed through the `:cli` option. If you want to use the former Instafail formatter, you need to use [rspec-instafail](http://rubygems.org/gems/rspec-instafail) gem instead:
+
+``` ruby
+# in your Gemfile
+gem 'rspec-instafail'
+
+# in your Guardfile
+guard 'rspec', :cli => '-r rspec/instafail -f RSpec::Instafail' do
+  # ...
+end
+```
+
+Default formatter is the `progress` formatter (same as RSpec default).
+
+Running a subset of all specs
+-----------
+
+The `:all_on_start` and `:all_after_pass` options cause all specs located in the `spec` directory to be run.  If there
+are some specs you want to skip, you can tag them with RSpec metadata (such as `:slow => true`)
+and skip them with the cli `--tag` option (i.e. `--tag ~slow`).
+
+You can also use option :spec_paths to override paths used when running all specs.
+You can use this feature to create multiple groups of guarded specs with distinct paths, and execute each in own process:
+
+``` ruby
+# in your Guardfile
+group 'acceptance-tests' do
+  guard 'rspec', :spec_paths => ['spec/acceptance'] do
+    # ...
+  end
+end
+
+group 'unit-tests' do
+  guard 'rspec', :spec_paths => ['spec/models', 'spec/controllers', 'spec/routing'] do
+    # ...
+  end
+end
+```
+
+
+Development
+-----------
+
+* Source hosted at [GitHub](https://github.com/guard/guard-rspec)
+* Report issues/Questions/Feature requests on [GitHub Issues](https://github.com/guard/guard-rspec/issues)
+
+Pull requests are very welcome! Make sure your patches are well tested. Please create a topic branch for every separate change
+you make.
+
+Testing
+-------
+
+Please run `rake spec:prepare_fixtures` once before launching specs.
+
+Author
+------
+
+[Thibaud Guillaume-Gentil](https://github.com/thibaudgg)

data/lib/guard/rspec/runner.rb

@@ -28,11 +28,11 @@ module Guard
 
           cmd_parts = []
           cmd_parts << "rvm #{options[:rvm].join(',')} exec" if options[:rvm].is_a?(Array)
-          cmd_parts << "bundle exec" if bundler? && options[:bundler] != false
-          cmd_parts << rspec_exec.downcase
+          cmd_parts << "bundle exec" if (bundler? && options[:binstubs] == true && options[:bundler] != false) || (bundler? && options[:bundler] != false)
+          cmd_parts << rspec_exec(options)
           cmd_parts << options[:cli] if options[:cli]
           cmd_parts << "-f progress" if options[:cli].nil? || !options[:cli].split(' ').any? { |w| %w[-f --format].include?(w) }
-          cmd_parts << "-r #{File.dirname(__FILE__)}/formatters/notification_#{rspec_exec.downcase}.rb -f Guard::RSpec::Formatter::Notification#{rspec_exec}#{rspec_version == 1 ? ":" : " --out "}/dev/null" if options[:notification] != false
+          cmd_parts << "-r #{File.dirname(__FILE__)}/formatters/notification_#{rspec_class.downcase}.rb -f Guard::RSpec::Formatter::Notification#{rspec_class}#{rspec_version == 1 ? ":" : " --out "}/dev/null" if options[:notification] != false
           cmd_parts << "--failure-exit-code #{failure_exit_code}" if failure_exit_code_supported?(options)
           cmd_parts << paths.join(' ')
 
@@ -51,9 +51,11 @@ module Guard
           return @failure_exit_code_supported if defined?(@failure_exit_code_supported)
           @failure_exit_code_supported ||= begin
             cmd_parts = []
-            cmd_parts << "bundle exec" if bundler? && options[:bundler] != false
-            cmd_parts << rspec_exec.downcase
+            cmd_parts << "bundle exec" if (bundler? && options[:bundler] != false) || (bundler? && options[:binstubs] == true)
+            options[:binstubs] = false if options[:binstubs] # failure exit code support is independent of rspec location
+            cmd_parts << rspec_exec(options)
             cmd_parts << "--help"
+            $stdout.puts "#{cmd_parts.join(' ')}"
             `#{cmd_parts.join(' ')}`.include? "--failure-exit-code"
           end
         end
@@ -74,7 +76,7 @@ module Guard
           end
         end
 
-        def rspec_exec
+        def rspec_class
           case rspec_version
           when 1
             "Spec"
@@ -83,6 +85,15 @@ module Guard
           end
         end
 
+        def rspec_exec(options = {})
+          case rspec_version
+          when 1
+            options[:binstubs] == true && options[:bundler] != false ? "bin/spec" : "spec"
+          when 2
+            options[:binstubs] == true && options[:bundler] != false ? "bin/rspec" : "rspec"
+          end
+        end
+
         def warn_deprectation(options={})
           [:color, :drb, :fail_fast, [:formatter, "format"]].each do |option|
             key, value = option.is_a?(Array) ? option : [option, option.to_s.gsub('_', '-')]

data/lib/guard/rspec/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module RSpecVersion
-    VERSION = "0.5.5"
+    VERSION = "0.5.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-rspec
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-20 00:00:00.000000000Z
+date: 2011-11-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70348587279100 !ruby/object:Gem::Requirement
+  requirement: &70263691911840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.8.4
   type: :runtime
   prerelease: false
-  version_requirements: *70348587279100
+  version_requirements: *70263691911840
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70348587278420 !ruby/object:Gem::Requirement
+  requirement: &70263691911220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70348587278420
+  version_requirements: *70263691911220
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70348587277740 !ruby/object:Gem::Requirement
+  requirement: &70263691910540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70348587277740
+  version_requirements: *70263691910540
 description: Guard::RSpec automatically run your specs (much like autotest).
 email:
 - thibaud@thibaud.me
@@ -75,7 +75,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1754443213103131612
+      hash: 103946227407915062
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: