guard-rspec 2.3.3 → 2.4.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2012 Thibaud Guillaume-Gentil
+Copyright (c) 2010-2013 Thibaud Guillaume-Gentil
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -101,7 +101,12 @@ guard 'rspec', :turnip => true do
   # ...
 end
 ```
-
+[Spring](https://github.com/jonleighton/spring) is supported (Ruby 1.9.X / Rails 3.2+ only), but you must enable it:
+``` ruby
+guard 'rspec', :spring => true do
+  # ...
+end
+```
 
 Former `:color`, `:drb`, `:fail_fast` and `:formatter` options are deprecated and have no effect anymore.
 
@@ -118,6 +123,7 @@ Former `:color`, `:drb`, `:fail_fast` and `:formatter` options are deprecated an
 :keep_failed => false        # keep failed specs until they pass, default: true
 :run_all => { :cli => "-p" } # cli arguments to use when running all specs, default: same as :cli
 :spec_paths => ["spec"]      # specify an array of paths that contain spec files
+:spring => true              # enable spring support; default: false
 :turnip => true              # enable turnip support; default: false
 :zeus => true                # enable zeus support; default: false
 :focus_on_failed => false    # focus on the first 10 failed specs first, rerun till they pass
@@ -201,3 +207,9 @@ Author
 ------
 
 [Thibaud Guillaume-Gentil](https://github.com/thibaudgg)
+
+Contributors
+------------
+
+[https://github.com/guard/guard-rspec/contributors](https://github.com/guard/guard-rspec/contributors)
+

data/lib/guard/rspec/runner.rb

@@ -17,6 +17,7 @@ module Guard
           :cli          => nil,
           :env          => nil,
           :notification => true,
+          :spring       => false,
           :turnip       => false,
           :zeus         => false
         }.merge(options)
@@ -40,7 +41,7 @@ module Guard
       end
 
       def rspec_executable
-        @rspec_executable ||= binstubs? ? "#{binstubs}/rspec" : "rspec"
+        @rspec_executable ||= (binstubs? && !executable_prefix?) ? "#{binstubs}/rspec" : "rspec"
       end
 
       def failure_exit_code_supported?
@@ -92,7 +93,7 @@ module Guard
         cmd_parts << environment_variables
         cmd_parts << "rvm #{@options[:rvm].join(',')} exec" if @options[:rvm].respond_to?(:join)
         cmd_parts << "bundle exec" if bundle_exec?
-        cmd_parts << 'zeus' if zeus?
+        cmd_parts << executable_prefix if executable_prefix?
         cmd_parts << rspec_executable
         cmd_parts << rspec_arguments(paths, options)
         cmd_parts.compact.join(' ')
@@ -171,10 +172,30 @@ module Guard
         @binstubs ||= !!@options[:binstubs]
       end
 
+      def executable_prefix?
+        zeus? || spring?
+      end
+
+      def executable_prefix
+        prefix = binstubs? ? "#{binstubs}/" : ''
+        if zeus?
+          prefix << 'zeus'
+        elsif spring?
+          prefix << 'spring'
+        else
+          prefix = nil
+        end
+        return prefix
+      end
+
       def zeus?
         @options[:zeus] || false
       end
 
+      def spring?
+        @options[:spring] || false
+      end
+
       def binstubs
         @options[:binstubs] == true ? "bin" : @options[:binstubs]
       end

data/lib/guard/rspec/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module RSpecVersion
-    VERSION = "2.3.3"
+    VERSION = "2.4.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-rspec
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-19 00:00:00.000000000 Z
+date: 2013-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -86,6 +86,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 359439846919578835
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: