guard-rspec 2.4.1 → 2.5.0

data/README.md

@@ -107,6 +107,12 @@ guard 'rspec', :spring => true do
   # ...
 end
 ```
+[ParallelTests](https://github.com/grosser/parallel_tests) is supported, but you must enable it:
+``` ruby
+guard 'rspec', :parallel => true, :parallel_cli => '-n 2' do
+  # ...
+end
+```
 
 Former `:color`, `:drb`, `:fail_fast` and `:formatter` options are deprecated and have no effect anymore.
 
@@ -127,6 +133,8 @@ Former `:color`, `:drb`, `:fail_fast` and `:formatter` options are deprecated an
 :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
+:parallel => true            # run all specs in parallel using [ParallelTests](https://github.com/grosser/parallel_tests) gem, default: false
+:parallel_cli => "-n 2"      # pass arbitrary Parallel Tests arguments, default: ""
 ```
 
 You can also use a custom binstubs directory using `:binstubs => 'some-dir'`.

data/lib/guard/rspec/runner.rb

@@ -24,7 +24,7 @@ module Guard
 
         unless ENV['SPEC_OPTS'].nil?
           UI.warning "The SPEC_OPTS environment variable is present. This can conflict with guard-rspec, particularly notifications."
-        end      
+        end
 
         deprecations_warnings
       end
@@ -45,7 +45,8 @@ module Guard
       end
 
       def rspec_executable
-        @rspec_executable ||= (binstubs? && !executable_prefix?) ? "#{binstubs}/rspec" : "rspec"
+        command = parallel? ? 'parallel_rspec' : 'rspec'
+        @rspec_executable ||= (binstubs? && !executable_prefix?) ? "#{binstubs}/#{command}" : command
       end
 
       def failure_exit_code_supported?
@@ -92,6 +93,21 @@ module Guard
         arg_parts.compact.join(' ')
       end
 
+      def parallel_rspec_arguments(paths, options)
+        arg_parts = []
+        arg_parts << options[:parallel_cli]
+        if @options[:notification]
+          arg_parts << parsed_or_default_formatter unless options[:cli] =~ formatter_regex
+          arg_parts << "-r #{File.dirname(__FILE__)}/formatter.rb"
+          arg_parts << "-f Guard::RSpec::Formatter"
+        end
+        arg_parts << "--failure-exit-code #{FAILURE_EXIT_CODE}" if failure_exit_code_supported?
+        #arg_parts << "-r turnip/rspec" if @options[:turnip]
+        arg_parts << paths.join(' ')
+
+        arg_parts.compact.join(' ')
+      end
+
       def rspec_command(paths, options)
         cmd_parts = []
         cmd_parts << environment_variables
@@ -99,7 +115,8 @@ module Guard
         cmd_parts << "bundle exec" if bundle_exec?
         cmd_parts << executable_prefix if executable_prefix?
         cmd_parts << rspec_executable
-        cmd_parts << rspec_arguments(paths, options)
+        cmd_parts << rspec_arguments(paths, options) if !parallel?
+        cmd_parts << parallel_rspec_arguments(paths, options) if parallel?
         cmd_parts.compact.join(' ')
       end
 
@@ -182,9 +199,9 @@ module Guard
 
       def executable_prefix
         prefix = binstubs? ? "#{binstubs}/" : ''
-        if zeus?
+        if zeus? && !parallel?
           prefix << 'zeus'
-        elsif spring?
+        elsif spring? && !parallel?
           prefix << 'spring'
         else
           prefix = nil
@@ -196,6 +213,10 @@ module Guard
         @options[:zeus] || false
       end
 
+      def parallel?
+        @options[:parallel] || false
+      end
+
       def spring?
         @options[:spring] || false
       end

data/lib/guard/rspec/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module RSpecVersion
-    VERSION = "2.4.1"
+    VERSION = "2.5.0"
   end
 end

metadata

@@ -2,63 +2,63 @@
 name: guard-rspec
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 2.4.1
+  version: 2.5.0
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-19 00:00:00.000000000 Z
+date: 2013-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
-  type: :runtime
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.1'
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.1'
+    none: false
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rspec
-  type: :runtime
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.11'
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.11'
+    none: false
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: bundler
-  type: :development
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
+    none: false
+  prerelease: false
+  type: :development
 description: Guard::RSpec automatically run your specs (much like autotest).
 email:
 - thibaud@thibaud.me
@@ -81,20 +81,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
+  none: false
 requirements: []
 rubyforge_project: guard-rspec
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Guard gem for RSpec