guard-rspec 0.4.1 → 0.4.2

data/README.md

@@ -4,7 +4,7 @@ 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 on Ruby 1.8.7, 1.9.2, JRuby & Rubinius.
+* Tested against Ruby 1.8.7, 1.9.2, REE, JRuby & Rubinius.
 
 Install
 -------
@@ -39,9 +39,9 @@ RSpec guard can be really adapted to all kind of projects.
 
 ``` 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" }
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
 end
 ```
 
@@ -49,13 +49,13 @@ end
 
 ``` 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{^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"] }
+  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{^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
 ```
 
@@ -80,6 +80,14 @@ 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
+```
+
 Former `:color`, `:drb`, `:fail_fast` and `:formatter` options are thus deprecated and have no effect anymore.
 
 ### List of available options:
@@ -94,6 +102,7 @@ Former `:color`, `:drb`, `:fail_fast` and `:formatter` options are thus deprecat
 :all_on_start => false       # don't run all the specs at startup, default: true
 :keep_failed => false        # keep failed specs until them 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
@@ -144,5 +153,4 @@ Please run `rake spec:prepare_fixtures` once before launching specs.
 Author
 ------
 
-[Thibaud Guillaume-Gentil](https://github.com/thibaudgg)
-
+[Thibaud Guillaume-Gentil](https://github.com/thibaudgg)

data/lib/guard/rspec.rb

@@ -11,13 +11,15 @@ module Guard
       @options = {
         :all_after_pass => true,
         :all_on_start   => true,
-        :keep_failed    => true
+        :keep_failed    => true,
+        :spec_paths     => ["spec/"]
       }.update(options)
       @last_failed  = false
       @failed_paths = []
 
       Runner.set_rspec_version(options)
-      Inspector.excluded = options[:exclude]
+      Inspector.excluded = @options[:exclude]
+      Inspector.spec_paths = @options[:spec_paths]
     end
 
     # Call once when guard starts
@@ -27,7 +29,7 @@ module Guard
     end
 
     def run_all
-      passed = Runner.run(["spec/"], options.merge(options[:run_all] || {}).merge(:message => "Running all specs"))
+      passed = Runner.run(options[:spec_paths], options.merge(options[:run_all] || {}).merge(:message => "Running all specs"))
 
       @failed_paths = [] if passed
       @last_failed  = !passed

data/lib/guard/rspec/inspector.rb

@@ -9,6 +9,14 @@ module Guard
         def excluded=(glob)
           @excluded = Dir[glob.to_s]
         end
+        
+        def spec_paths
+          @spec_paths || []
+        end
+        
+        def spec_paths=(path_array)
+          @spec_paths = path_array
+        end
 
         def clean(paths)
           paths.uniq!
@@ -30,11 +38,12 @@ module Guard
         end
 
         def spec_folder?(path)
-          path.match(%r{^spec[^\.]*$})
+          path.match(%r{^(#{spec_paths.join("|")})[^\.]*$})
+          # path.match(%r{^spec[^\.]*$})
         end
 
         def spec_files
-          @spec_files ||= Dir["spec/**/*_spec.rb"]
+          @spec_files ||= spec_paths.collect { |path| Dir[File.join(path, "**", "*_spec.rb")] }.flatten
         end
 
         def clear_spec_files_list_after

data/lib/guard/rspec/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module RSpecVersion
-    VERSION = "0.4.1"
+    VERSION = "0.4.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-rspec
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-10 00:00:00.000000000Z
+date: 2011-08-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70328300041900 !ruby/object:Gem::Requirement
+  requirement: &70211257686060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70328300041900
+  version_requirements: *70211257686060
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70328300041340 !ruby/object:Gem::Requirement
+  requirement: &70211257685480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70328300041340
+  version_requirements: *70211257685480
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70328300040300 !ruby/object:Gem::Requirement
+  requirement: &70211257684920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70328300040300
+  version_requirements: *70211257684920
 description: Guard::RSpec automatically run your specs (much like autotest).
 email:
 - thibaud@thibaud.me