guard-cucumber 0.3.2 → 0.3.3

data/README.md

@@ -58,30 +58,51 @@ Former `:color`, `:drb`, `:port` and `:profile` options are thus deprecated and
 
 ### List of available options
 
-    :cli => '--profile guard -c'      # Pass arbitrary Cucumber CLI arguments, default: '--no-profile --color --format progress --strict'
-    :bundler => false                 # Don't use "bundle exec" to run the Cucumber command, default: true
-    :rvm => ['1.8.7', '1.9.2']        # Directly run your features on multiple ruby versions, default: nil
-    :notification => false            # Don't display Growl (or Libnotify) notification, default: true
-    :all_after_pass => false          # don't run all features after changed features pass, default: true
-    :all_on_start => false            # don't run all the features at startup, default: true
-    :keep_failed => false             # keep failed features until them pass, default: true
+    :cli => '--profile guard -c'      # Pass arbitrary Cucumber CLI arguments, 
+                                      # default: '--no-profile --color --format progress --strict'
+
+    :bundler => false                 # Don't use "bundle exec" to run the Cucumber command
+                                      # default: true
+
+    :rvm => ['1.8.7', '1.9.2']        # Directly run your features on multiple ruby versions
+                                      # default: nil
+
+    :notification => false            # Don't display Growl (or Libnotify) notification
+                                      # default: true
+
+    :all_after_pass => false          # don't run all features after changed features pass
+                                      # default: true
+
+    :all_on_start => false            # don't run all the features at startup
+                                      # default: true
+
+    :keep_failed => false             # keep failed features until them pass
+                                      # default: true
 
 ## Cucumber configuration
 
-It's **very important** that you understand how Cucumber get its configuration, because it's often the origin of
-strange behaviour of guard-cucumber, like running always all features instead of only the modified feature.
+It's **very important** that you understand how Cucumber gets configured, because it's often the origin of
+strange behavior of guard-cucumber.
 
 Cucumber uses [cucumber.yml](https://github.com/cucumber/cucumber/wiki/cucumber.yml) for defining profiles
-of specific run configurations. When you don't pass a specific profile to the `:cli` option, the configuration
-of the `default` profile is used.
+of specific run configurations. When you pass configurations through the `:cli` option but don't include a
+specific profile with `--profile`, then the configurations from the `default` profile are also used.
 
 For example, when you're using the default cucumber.yml generated by [cucumber-rails](https://github.com/cucumber/cucumber-rails),
 then the default profile forces guard-cucumber to always run all features, because it appends the `features` folder.
 
 ### Configure Cucumber solely from Guard
 
-If you want to configure Cucumber from Guard solely, then you should either pass `--no-profile` to the `:cli` option
-or remove cucumber.yml completely.
+If you want to configure Cucumber from Guard solely, then you should pass `--no-profile` to the `:cli` option.
+
+Since guard-cucumber version 0.3.2, the default `:cli` options are:
+
+    --no-profile --color --format progress --strict
+
+This default configuration has been chosen to avoid strange behavior when mixing configurations form
+the cucumber.yml default profile with the guard-cucumber `:cli` option.
+
+You can safely remove `config/cucumber.yml`, since all configuration is done in the `Guardfile`.
 
 ### Use a separate Guard profile
 

data/lib/guard/cucumber.rb

@@ -48,11 +48,24 @@ module Guard
         run_all if @last_failed && @options[:all_after_pass]
       else
         # remember failed paths for the next change
-        @failed_paths += paths if @options[:keep_failed]
+        @failed_paths += read_failed_features if @options[:keep_failed]
         # track whether the changed feature failed for the next change
         @last_failed = true
       end
     end
 
+    private
+
+    def read_failed_features
+      failed = []
+
+      if File.exist?('rerun.txt')
+        failed = File.open('rerun.txt').read.split(' ')
+        File.delete('rerun.txt')
+      end
+
+      failed
+    end
+
   end
 end

data/lib/guard/cucumber/notification_formatter.rb

@@ -1,5 +1,6 @@
 require 'guard'
 require 'cucumber/formatter/console'
+require 'cucumber/formatter/io'
 
 module Guard
   class Cucumber
@@ -9,13 +10,41 @@ module Guard
       attr_reader :step_mother
 
       def initialize(step_mother, path_or_io, options)
+        @options = options
+        @file_names = []
         @step_mother = step_mother
       end
 
       def after_features(features)
+        notify_summary
+        write_rerun_features
+      end
+
+      def before_feature_element(feature_element)
+        @rerun = false
+        @feature_name = feature_element.name
+      end
+
+      def after_feature_element(feature_element)
+        if @rerun
+          file, line = *feature_element.file_colon_line.split(':')
+          @file_names << file
+        end
+      end
+
+      def step_name(keyword, step_match, status, source_indent, background)
+        if [:failed, :pending, :undefined].index(status)
+          @rerun = true
+          step_name = step_match.format_args(lambda { |param| "*#{ param }*" })
+          ::Guard::Notifier.notify step_name, :title => @feature_name, :image => icon_for(status)
+        end
+      end
+
+      private
+
+      def notify_summary
         icon, messages = '', []
 
-        # summary of the run
         [:failed, :skipped, :undefined, :pending, :passed].reverse.each do |status|
           if step_mother.steps(status).any?
             icon = icon_for(status)
@@ -24,35 +53,25 @@ module Guard
         end
 
         ::Guard::Notifier.notify messages.reverse.join(', '), :title => 'Cucumber Results', :image => icon
+      end
 
-        # details about failures, what to work on
-        [:failed, :pending, :undefined].each do |status|
-          if step_mother.steps(status).any?
-            icon = icon_for(status)
-            step_mother.steps(status).each do |step|
-              ::Guard::Notifier.notify step.name, :title => "#{status} steps", :image => icon
-            end
-
-            break
-          end
+      def write_rerun_features
+        File.open('rerun.txt', 'w') do |f|
+          f.puts @file_names.join(' ')
         end
       end
 
-      private
-
       def icon_for(status)
         case status
-        when :passed
-          :success
-        when :pending, :undefined, :skipped
-          :pending
-        when :failed
-          :failed
+          when :passed
+            :success
+          when :pending, :undefined, :skipped
+            :pending
+          when :failed
+            :failed
         end
       end
 
     end
-
   end
-
 end

data/lib/guard/cucumber/templates/Guardfile

@@ -1,5 +1,5 @@
 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' }
+  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' }
 end

data/lib/guard/cucumber/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module CucumberVersion
-    VERSION = '0.3.2'
+    VERSION = '0.3.3'
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: guard-cucumber
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - Michael Kessler
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-19 00:00:00 +02:00
+date: 2011-06-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency