guard-rspec 2.6.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b05dac5d61c3b5485d893327c8c6c03c80cf25b
-  data.tar.gz: f2e183903733e7513e95b8f1bbc200c0b99ea848
+  metadata.gz: dbb56ed9604ac21d3cae7a6c7beaf37d20c3beab
+  data.tar.gz: 53990653ab1d6803a35b335af297437b40340826
 SHA512:
-  metadata.gz: e2002ac0ca7798d31c05a6e7c37199ff0817fbdaf33e7ed836f50433aac1e9fdb3282018bd7bf84cbc9f7952aa0e4a744bab29e97ec4c222f2206df5522dcde5
-  data.tar.gz: 7896a5a2a10d5742ed22e32958ff08eb15f5151da43f10283ccce7dc00c773c993ee3809bd1df651f48b30c308ef4a77c52c7d93ad8323b2c49149932738760a
+  metadata.gz: f26e6c5fa2e01614e6020568bd95465422a72ee498435b323fe88e4f4d0c150e661e627936aacea3534f9419dd45357bda79dc6a553a7bb56de34758d9b1b478
+  data.tar.gz: f93d9d5d4edf51fb289c57f56c2d706860b0b107973d95f962a69abc67842713077ccd8cd08f2e6365445b65f5de59af9572ed3b4ba6cf0b4095af9c4abc7a3f

data/README.md

@@ -2,8 +2,8 @@
 
 RSpec guard allows to automatically & intelligently launch specs when files are modified.
 
-* Compatible with RSpec >= 2.11 (use guard-rspec 1.2.x for older release, including RSpec 1.x)
-* Tested against Ruby 1.8.7, 1.9.2, 1.9.3, REE and the latest versions of JRuby & Rubinius.
+* Compatible with RSpec >= 2.13 (use guard-rspec 1.2.x for older release, including RSpec 1.x)
+* Tested against Ruby 1.8.7, 1.9.3, 2.0.0, REE and the latest versions of JRuby & Rubinius.
 
 ## Install
 
@@ -40,7 +40,7 @@ RSpec guard can be adapted to all kinds of projects.
 ### Standard RubyGem project
 
 ``` ruby
-guard 'rspec' do
+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" }
@@ -50,7 +50,7 @@ end
 ### Typical Rails app
 
 ``` ruby
-guard 'rspec' do
+guard :rspec do
   watch('spec/spec_helper.rb')                        { "spec" }
   watch('config/routes.rb')                           { "spec/routing" }
   watch('app/controllers/application_controller.rb')  { "spec/controllers" }
@@ -113,6 +113,12 @@ guard 'rspec', :parallel => true, :parallel_cli => '-n 2' do
   # ...
 end
 ```
+[Foreman](https://github.com/ddollar/foreman) is supported, but you must enable it:
+``` ruby
+guard 'rspec', :foreman => true do
+  # ...
+end
+```
 
 Former `:color`, `:drb`, `:fail_fast` and `:formatter` options are deprecated and no longer have effect.
 
@@ -124,15 +130,16 @@ Former `:color`, `:drb`, `:fail_fast` and `:formatter` options are deprecated an
 :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
-:all_on_start => false       # run all the specs at startup, default: true
-:keep_failed => false        # keep failed specs until they pass, default: true
+: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
+:keep_failed => true        # keep failed specs until they pass, default: false
 :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
 :exclude => "spec/foo/**/*"  # exclude files based on glob
 :spring => true              # enable spring support; default: false
 :turnip => true              # enable turnip support; default: false
 :zeus => true                # enable zeus support; default: false
+:foreman => true             # enable foreman 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: ""

data/lib/guard/rspec.rb

@@ -12,9 +12,9 @@ module Guard
       super
       @options = {
         :focus_on_failed => false,
-        :all_after_pass => true,
-        :all_on_start   => true,
-        :keep_failed    => true,
+        :all_after_pass => false,
+        :all_on_start   => false,
+        :keep_failed    => false,
         :spec_paths     => ["spec"],
         :run_all        => {}
       }.merge(options)
@@ -61,9 +61,9 @@ module Guard
           if single_spec && @inspector.clean([single_spec]).length == 1
             failed_specs = failed_specs.select{|p| p.include? single_spec}
           end
-          
+
           if failed_specs.any?
-            # some sane limit, stuff will explode if all tests fail 
+            # some sane limit, stuff will explode if all tests fail
             #   ... cap at 10
 
             paths = failed_specs[0..10]
@@ -118,7 +118,7 @@ module Guard
 
     def add_failed(paths)
       if @options[:keep_failed]
-        @failed_paths += paths 
+        @failed_paths += paths
         @failed_paths.uniq!
       end
     end

data/lib/guard/rspec/inspector.rb

@@ -2,23 +2,17 @@ module Guard
   class RSpec
     class Inspector
 
-      def initialize(options = {})
-        self.excluded   = options[:exclude]
-        self.spec_paths = options[:spec_paths]
-      end
+      attr_accessor :excluded, :spec_paths
 
-      def excluded
-        @excluded || []
+      def initialize(options = {})
+        self.excluded   = options.fetch(:exclude, [])
+        self.spec_paths = options.fetch(:spec_paths, [])
       end
 
       def excluded=(pattern)
         @excluded = Dir[pattern.to_s]
       end
 
-      def spec_paths
-        @spec_paths || []
-      end
-
       def spec_paths=(paths)
         @spec_paths = Array(paths)
       end

data/lib/guard/rspec/runner.rb

@@ -19,15 +19,20 @@ module Guard
           :notification => true,
           :spring       => false,
           :turnip       => false,
-          :zeus         => false
+          :zeus         => false,
+          :foreman      => false
         }.merge(options)
 
         unless ENV['SPEC_OPTS'].nil?
           UI.warning "The SPEC_OPTS environment variable is present. This can conflict with guard-rspec, particularly notifications."
         end
 
-        if @options[:bundler] && @options[:zeus] && !@options[:binstubs]
-          UI.warning "Running Zeus within bundler is waste of time. It is recommended to set bundler option to false, when using zeus."
+        if options[:bundler] && !options[:binstubs]
+          if options[:zeus]
+            UI.warning "Running Zeus within bundler is waste of time. Bundler option is set to false, when using Zeus."
+          elsif options[:spring]
+            UI.warning "Running Spring within bundler is waste of time. Bundler option is set to false, when using Spring."
+          end
         end
 
         deprecations_warnings
@@ -78,20 +83,20 @@ module Guard
     private
 
       def environment_variables
-        return if @options[:env].nil?
-        "export " + @options[:env].map {|key, value| "#{key}=#{value}"}.join(' ') + ';'
+        return if options[:env].nil?
+        "export " + options[:env].map {|key, value| "#{key}=#{value}"}.join(' ') + ';'
       end
 
       def rspec_arguments(paths, options)
         arg_parts = []
         arg_parts << options[:cli]
-        if @options[:notification]
+        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 << "-r turnip/rspec" if options[:turnip]
         arg_parts << paths.join(' ')
 
         arg_parts.compact.join(' ')
@@ -109,7 +114,8 @@ module Guard
       def rspec_command(paths, options)
         cmd_parts = []
         cmd_parts << environment_variables
-        cmd_parts << "rvm #{@options[:rvm].join(',')} exec" if @options[:rvm].respond_to?(:join)
+        cmd_parts << "rvm #{options[:rvm].join(',')} exec" if options[:rvm].respond_to?(:join)
+        cmd_parts << bin_command('foreman run') if foreman?
         cmd_parts << "bundle exec" if bundle_exec?
         cmd_parts << executable_prefix if executable_prefix?
         cmd_parts << rspec_executable
@@ -121,7 +127,7 @@ module Guard
       def run_via_shell(paths, options)
         success = system(rspec_command(paths, options))
 
-        if @options[:notification] && !drb_used? && !success && rspec_command_exited_with_an_exception?
+        if options[:notification] && !drb_used? && !success && rspec_command_exited_with_an_exception?
           Notifier.notify("Failed", :title => "RSpec results", :image => :failed, :priority => 2)
         end
 
@@ -152,7 +158,7 @@ module Guard
       end
 
       def drb_used?
-        @drb_used ||= @options[:cli] && @options[:cli].include?('--drb')
+        @drb_used ||= options[:cli] && options[:cli].include?('--drb')
       end
 
       # W we can avoid loading a large chunk of rspec
@@ -180,7 +186,7 @@ module Guard
       end
 
       def bundler_allowed?
-        @bundler_allowed ||= File.exist?("#{Dir.pwd}/Gemfile")
+        @bundler_allowed ||= (File.exist?("#{Dir.pwd}/Gemfile") && !zeus? && !spring?)
       end
 
       def bundler?
@@ -192,35 +198,39 @@ module Guard
       end
 
       def executable_prefix?
-        zeus? || spring?
+        zeus? || spring? || foreman?
       end
 
       def executable_prefix
-        prefix = binstubs? ? "#{binstubs}/" : ''
         if zeus?
-          prefix << 'zeus'
+          bin_command('zeus')
         elsif spring? && !parallel?
-          prefix << 'spring'
-        else
-          prefix = nil
+          bin_command('spring')
         end
-        return prefix
       end
 
       def zeus?
-        @options[:zeus] || false
+        options.fetch(:zeus, false)
       end
 
       def parallel?
-        @options[:parallel] || false
+        options.fetch(:parallel, false)
       end
 
       def spring?
-        @options[:spring] || false
+        options.fetch(:spring, false)
+      end
+
+      def foreman?
+        options.fetch(:foreman, false)
       end
 
       def binstubs
-        @options[:binstubs] == true ? "bin" : @options[:binstubs]
+        options[:binstubs] == true ? "bin" : options[:binstubs]
+      end
+
+      def bin_command(command)
+        binstubs? ? "#{binstubs}/#{command}" : command
       end
 
       def bundle_exec?
@@ -230,12 +240,12 @@ module Guard
       def deprecations_warnings
         [:color, :drb, [:fail_fast, "fail-fast"], [:formatter, "format"]].each do |option|
           key, value = option.is_a?(Array) ? option : [option, option.to_s]
-          if @options.key?(key)
+          if options.key?(key)
             @options.delete(key)
             UI.info %{DEPRECATION WARNING: The :#{key} option is deprecated. Pass standard command line argument "--#{value}" to RSpec with the :cli option.}
           end
         end
-        if @options.key?(:version)
+        if options.key?(:version)
             @options.delete(:version)
             UI.info %{DEPRECATION WARNING: The :version option is deprecated. Only RSpec 2 is now supported.}
         end

data/lib/guard/rspec/templates/Guardfile

@@ -1,4 +1,4 @@
-guard 'rspec' do
+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" }

data/lib/guard/rspec/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module RSpecVersion
-    VERSION = "2.6.0"
+    VERSION = "3.0.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard-rspec
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-30 00:00:00.000000000 Z
+date: 2013-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard