guard-rspec 0.3.1 → 0.4.0

data/{README.markdown → README.md}

@@ -1,12 +1,10 @@
-Guard::RSpec
+Guard::RSpec ![travis-ci](http://travis-ci.org/guard/guard-rspec.png)
 =============
 
-![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.6, 1.8.7, 1.9.2, JRuby & Rubinius.
+* Tested on Ruby 1.8.7, 1.9.2, JRuby & Rubinius.
 
 Install
 -------
@@ -66,7 +64,7 @@ Please read [Guard doc](https://github.com/guard/guard#readme) for more informat
 Options
 -------
 
-By default, Guard::RSpec automatically detect your RSpec version (with the <tt>spec_helper.rb</tt> syntax or with Bundler) but you can force the version with the <tt>:version</tt> option:
+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
@@ -74,7 +72,7 @@ guard 'rspec', :version => 2 do
 end
 ```
 
-You can pass any of the standard RSpec CLI options using the <tt>:cli</tt> option:
+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
@@ -82,7 +80,7 @@ guard 'rspec', :cli => "--color --format nested --fail-fast --drb" do
 end
 ```
 
-Former <tt>:color</tt>, <tt>:drb</tt>, <tt>:fail_fast</tt> and <tt>:formatter</tt> options are thus deprecated and have no effect anymore.
+Former `:color`, `:drb`, `:fail_fast` and `:formatter` options are thus deprecated and have no effect anymore.
 
 ### List of available options:
 
@@ -107,7 +105,7 @@ The best solution is still to update RSpec to the latest version!
 Formatters
 ----------
 
-The <tt>:formatter</tt> option has been removed since CLI arguments can be passed through the <tt>:cli</tt> option. If you want to use the former Instafail formatter, you need to use <tt>{rspec-instafail}[http://rubygems.org/gems/rspec-instafail]</tt> gem instead:
+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
@@ -119,7 +117,7 @@ guard 'rspec', :cli => '-r rspec/instafail -f RSpec::Instafail' do
 end
 ```
 
-Default formatter is the <tt>progress</tt> formatter (same as RSpec default).
+Default formatter is the `progress` formatter (same as RSpec default).
 
 Running a subset of all specs
 -----------
@@ -140,7 +138,7 @@ you make.
 Testing
 -------
 
-Please run <tt>rake spec:prepare_fixtures</tt> once before launching specs.
+Please run `rake spec:prepare_fixtures` once before launching specs.
 
 Author
 ------

data/lib/guard/rspec.rb

@@ -17,6 +17,7 @@ module Guard
       @failed_paths = []
 
       Runner.set_rspec_version(options)
+      Inspector.excluded = options[:exclude]
     end
 
     # Call once when guard starts

data/lib/guard/rspec/formatter.rb

@@ -22,8 +22,16 @@ module Formatter
     end
   end
 
+  def priority(image)
+    { :failed => 2,
+      :pending => -1,
+      :success => -2
+    }[image]
+  end
+
   def notify(message, image)
-    Guard::Notifier.notify(message, :title => "RSpec results", :image => image)
+    Guard::Notifier.notify(message, :title => "RSpec results", :image => image,
+      :priority => priority(image))
   end
 
 private

data/lib/guard/rspec/inspector.rb

@@ -2,18 +2,29 @@ module Guard
   class RSpec
     module Inspector
       class << self
+        def excluded
+          @excluded || []
+        end
+
+        def excluded=(glob)
+          @excluded = Dir[glob.to_s]
+        end
 
         def clean(paths)
           paths.uniq!
           paths.compact!
           clear_spec_files_list_after do
-            paths = paths.select { |p| spec_file?(p) || spec_folder?(p) }
+            paths = paths.select { |path| should_run_spec_file?(path) }
           end
           paths.reject { |p| included_in_other_path?(p, paths) }
         end
 
       private
 
+        def should_run_spec_file?(path)
+          (spec_file?(path) || spec_folder?(path)) && !excluded.include?(path)
+        end
+
         def spec_file?(path)
           spec_files.include?(path)
         end

data/lib/guard/rspec/templates/Guardfile

@@ -1,14 +1,17 @@
 guard 'rspec', :version => 2 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" }
 
   # Rails example
-  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(%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(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  watch('spec/spec_helper.rb')                        { "spec" }
+  watch('config/routes.rb')                           { "spec/routing" }
+  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+  # Capybara request specs
+  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/requests/#{m[1]}_spec.rb" }
 end

data/lib/guard/rspec/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module RSpecVersion
-    VERSION = "0.3.1"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: guard-rspec
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors: 
 - Thibaud Guillaume-Gentil
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-04 00:00:00 +02:00
-default_executable: 
+date: 2011-06-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: guard
@@ -21,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.2
+        version: 0.4.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -43,7 +42,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "2.5"
+        version: "2.6"
   type: :development
   version_requirements: *id003
 description: Guard::RSpec automatically run your specs (much like autotest).
@@ -65,8 +64,7 @@ files:
 - lib/guard/rspec/version.rb
 - lib/guard/rspec.rb
 - LICENSE
-- README.markdown
-has_rdoc: true
+- README.md
 homepage: http://rubygems.org/gems/guard-rspec
 licenses: []
 
@@ -90,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: guard-rspec
-rubygems_version: 1.6.2
+rubygems_version: 1.8.1
 signing_key: 
 specification_version: 3
 summary: Guard gem for RSpec