Reorganize Guardfile

Guardfile

@@ -1,23 +1,4 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
-# Run JS and CoffeeScript files in a typical Rails 3.1 fashion, placing Underscore templates in app/views/*.jst
-# Your spec files end with _spec.{js,coffee}.
-
-spec_location = "spec/javascripts/%s_spec"
-
-# uncomment if you use NerdCapsSpec.js
-# spec_location = "spec/javascripts/%sSpec"
-
-guard 'jasmine-headless-webkit', :notify => false do
-  watch(%r{^app/views/.*\.jst$})
-  watch(%r{^public/javascripts/(.*)\.js$}) { |m| newest_js_file(spec_location % m[1]) }
-  watch(%r{^app/assets/javascripts/(.*)\.js\.coffee$}) { |m| newest_js_file(spec_location % m[1]) }
-  watch(%r{^app/assets/javascripts/(.*)\.(js|coffee)$}) { |m| newest_js_file(spec_location % m[1]) }
-  watch(%r{^spec/javascripts/(.*)_spec\..*}) { |m| newest_js_file(spec_location % m[1]) }
-end
-
-guard 'rspec' do
+guard 'rspec', :cli => '--fail-fast --tag ~js' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
@@ -30,10 +11,23 @@ guard 'rspec' do
   watch('config/routes.rb')                           { "spec/routing" }
   watch('app/controllers/application_controller.rb')  { "spec/controllers" }
 
-  # Capybara request specs
+  # Capybara features specs
   watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/requests/#{m[1]}_spec.rb" }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| "spec/features/#{m[1]}/*_spec.rb" }
+  watch(%r{^spec/features/(.+)\.rb$})
 
   # Turnip features and steps
   watch(%r{^spec/acceptance/(.+)\.feature$})
   watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
 end
+
+group 'javascript' do
+  js_spec_location = "spec/javascripts/%s_spec"
+
+  guard 'jasmine-headless-webkit' do
+    watch(%r{^app/views/.*\.jst$})
+    watch(%r{^public/javascripts/(.*)\.js$}) { |m| newest_js_file(js_spec_location % m[1]) }
+    watch(%r{^app/assets/javascripts/(.*)\.(js|coffee)$}) { |m| newest_js_file(js_spec_location % m[1]) }
+    watch(%r{^spec/javascripts/(.*)_spec\..*}) { |m| newest_js_file(js_spec_location % m[1]) }
+  end
+end