install guard-spinach

3 files changed, 11 insertions, 10 deletions

diff --git a/Gemfile b/Gemfile
index 0609f6fdb2e..0a5f730dfb3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -119,6 +119,7 @@ group :development, :test do
 
   # Guard
   gem 'guard-rspec'
+  gem 'guard-spinach'
 
   # Notification
   gem 'rb-fsevent', :require => darwin_only('rb-fsevent')
diff --git a/Gemfile.lock b/Gemfile.lock
index 3809451883e..8046b92b8fa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -178,6 +178,9 @@ GEM
       thor (>= 0.14.6)
     guard-rspec (1.2.1)
       guard (>= 1.1)
+    guard-spinach (0.0.2)
+      guard (>= 1.1)
+      spinach
     haml (3.1.6)
     haml-rails (0.3.4)
       actionpack (~> 3.0)
@@ -405,6 +408,7 @@ DEPENDENCIES
   grit!
   growl
   guard-rspec
+  guard-spinach
   haml-rails
   headless
   httparty
diff --git a/Guardfile b/Guardfile
index ed38f548d6e..6ed414bc4c5 100644
--- a/Guardfile
+++ b/Guardfile
@@ -13,18 +13,14 @@ guard 'rspec', :version => 2 do
   watch(%r{^spec/support/(.+)\.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" }
-  
-  # 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
 
-
-guard 'cucumber' do
-  watch(%r{^features/.+\.feature$})
-  watch(%r{^features/support/.+$})          { 'features' }
-  watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' }
+guard 'spinach' do
+  watch(%r|^features/(.*)\.feature|)
+  watch(%r|^features/steps/(.*)([^/]+)\.rb|) do |m|
+    "features/#{m[1]}#{m[2]}.feature"
+  end
 end