guard-cucumber 0.2.4 → 0.3.0

data/README.md

@@ -1,6 +1,7 @@
 # Guard::Cucumber
 
-Guard::Cucumber allows you to automatically run Cucumber features when files are modified. It is tested on Ruby 1.8.7 & 1.9.2.
+Guard::Cucumber allows you to automatically run Cucumber features when files are modified.
+It is tested on Ruby 1.8.7 & 1.9.2.
 
 ## Install
 
@@ -14,7 +15,7 @@ Add it to your `Gemfile`, preferably inside the test group:
 
     gem 'guard-cucumber'
 
-Add Guard definition to your `Guardfile` by running this command:
+Add the default Guard::Cucumber template to your `Guardfile` by running this command:
 
     guard init cucumber
 
@@ -24,26 +25,40 @@ Please read the [Guard usage documentation](http://github.com/guard/guard#readme
 
 ## Guardfile
 
-Guard::Cucumber can be adapted to all kind of projects. Please read the
-[Guard documentation](http://github.com/guard/guard#readme) for more information about the Guardfile DSL.
+Guard::Cucumber can be adapted to all kind of projects and comes with a default template that looks like this:
 
     guard 'cucumber' do
       watch(%r{features/.+\.feature})
-      watch(%r{features/support/.+})          { 'features' }
-      watch(%r{features/step_definitions/.+}) { 'features' }
+      watch(%r{features/support/.+})                      { 'features' }
+      watch(%r{features/step_definitions/(.+)_steps\.rb}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' }
     end
 
+Expressed in plain English, this configuration tells Guard::Cucumber:
+
+1. When a file within the features directory that ends in feature is modified, just run that single feature.
+2. When any file within features/support directory is modified, run all features.
+3. When a file within the features/step_definitions directory that ends in \_steps.rb is modified,
+run the first feature that matches the name (\_steps.rb replaced by .feature) and when no feature is found,
+then run all features.
+
+Please read the [Guard documentation](http://github.com/guard/guard#readme) for more information about the Guardfile DSL.
+
 ## Options
 
-There are several options you can pass to Guard::Cucumber to customize the arguments when calling Cucumber:
+You can pass any of the standard Cucumber CLI options using the :cli option:
+
+    guard 'cucumber', :cli => '-c --drb --port 1234 --profile custom' do
+      ...
+    end
+
+Former `:color`, `:drb`, `:port` and `:profile` options are thus deprecated and have no effect anymore.
+
+### List of available options
 
-    :color => false                        # Disable colored output
-    :drb => true                           # Enable Spork DRb server
-    :port => 1234                          # Set custom Spork port
-    :bundler => false                      # Don't use "bundle exec"
-    :rvm => ['1.8.7', '1.9.2']             # Directly run your specs on multiple ruby
-    :profile => 'cucumber_profile'         # Let cucumber use another profile than the default one
-    :command => 'whatever'                 # Pass any other command to cucumber
+    :cli => '-c -f pretty'            # Pass arbitrary Cucumber CLI arguments, default: nil
+    :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
 
 ## Development
 

data/lib/guard/cucumber/notification_formatter.rb

@@ -0,0 +1,44 @@
+require 'guard'
+require 'cucumber/formatter/console'
+
+module Guard
+  class Cucumber
+    class NotificationFormatter
+      include ::Cucumber::Formatter::Console
+
+      attr_reader :step_mother
+
+      def initialize(step_mother, path_or_io, options)
+        @step_mother = step_mother
+      end
+
+      def after_features(features)
+        icon, messages = '', []
+        [:failed, :skipped, :undefined, :pending, :passed].reverse.each do |status|
+          if step_mother.steps(status).any?
+            icon = icon_for(status)
+            messages << dump_count(step_mother.steps(status).length, 'step', status.to_s)
+          end
+        end
+
+        ::Guard::Notifier.notify messages.reverse.join(', '), :title => 'Cucumber Results', :image => icon
+      end
+
+      private
+
+      def icon_for(status)
+        case status
+        when :passed
+          :success
+        when :pending, :undefined, :skipped
+          :pending
+        when :failed
+          :failed
+        end
+      end
+
+    end
+
+  end
+
+end

data/lib/guard/cucumber/runners/preload_runner.rb

@@ -1,5 +1,6 @@
 require 'cucumber'
-require 'guard/cucumber/cucumber_formatter'
+require 'cucumber/formatter/progress'
+require 'guard/cucumber/notification_formatter'
 
 module Guard
   class Cucumber
@@ -28,8 +29,11 @@ module Guard
           message = options[:message] || run_message(features)
           UI.info message, :reset => true
 
-          formatter = CucumberFormatter.new(@runtime, $stdout, @configuration.instance_variable_get('@options'))
-          runner = ::Cucumber::Ast::TreeWalker.new(@runtime, [formatter], @configuration)
+          formatters = [
+            NotificationFormatter.new(@runtime, $stdout, @configuration.instance_variable_get('@options')),
+            ::Cucumber::Formatter::Progress.new(@runtime, $stdout, @configuration.instance_variable_get('@options'))
+          ]
+          runner = ::Cucumber::Ast::TreeWalker.new(@runtime, formatters, @configuration)
           @runtime.visitor = runner
           loader = ::Cucumber::Runtime::FeaturesLoader.new(features, @configuration.filters, @configuration.tag_expression)
           runner.visit_features(loader.features)

data/lib/guard/cucumber/runners/runner.rb

@@ -12,37 +12,26 @@ module Guard
 
         def cucumber_command(paths, options)
           cmd = []
-
           cmd << "rvm #{options[:rvm].join(',')} exec" if options[:rvm].is_a?(Array)
           cmd << 'bundle exec' if bundler? && options[:bundler] != false
 
           cmd << 'cucumber'
-          cmd << "--profile #{options[:profile]}" if options[:profile]
-          cmd << "--require #{ File.expand_path(File.join(File.dirname(__FILE__), '..', 'cucumber_formatter.rb')) } --format CucumberFormatter"
-          cmd << '--color' if options[:color] != false
-          cmd << "--drb" if options[:drb]
-          cmd << "--port #{ options[:port] }" if options[:port] && options[:drb]
-
-          if not require_command?(options)
-            if options[:drb]
-              cmd << "--require features/support"
-              cmd << "--require features/step_definitions"
-            else
-              cmd << "--require features"
-            end
+          cmd << options[:cli] if options[:cli]
+
+          if options[:notification] != false
+            cmd << "--require #{ File.expand_path(File.join(File.dirname(__FILE__), '..', 'notification_formatter.rb')) } --format Guard::Cucumber::NotificationFormatter --out #{ null_device }"
+            cmd << "--require features"
           end
 
-          cmd << options[:command] if options[:command]
-          cmd = cmd + paths
-          cmd.join(' ')
+          (cmd + paths).join(' ')
         end
 
         def bundler?
           @bundler ||= File.exist?("#{Dir.pwd}/Gemfile")
         end
 
-        def require_command?(options)
-          !options[:command].nil? && options[:command] =~ /^--require/
+        def null_device
+          RUBY_PLATFORM.index('mswin') ? 'NUL' : '/dev/null'
         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/.+}) { '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.2.4'
+    VERSION = '0.3.0'
   end
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: guard-cucumber
 version: !ruby/object:Gem::Version 
-  hash: 31
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 4
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors: 
 - Michael Kessler
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-14 00:00:00 +01:00
+date: 2011-03-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +21,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 3
-        - 0
         version: 0.3.0
   type: :runtime
   version_requirements: *id001
@@ -42,11 +32,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 0
-        - 10
-        - 0
         version: 0.10.0
   type: :runtime
   version_requirements: *id002
@@ -58,11 +43,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 0
-        - 10
         version: 1.0.10
   type: :development
   version_requirements: *id003
@@ -74,11 +54,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 5
-        - 0
         version: 2.5.0
   type: :development
   version_requirements: *id004
@@ -90,11 +65,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 2
-        - 0
         version: 0.2.0
   type: :development
   version_requirements: *id005
@@ -108,8 +78,8 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/guard/cucumber/cucumber_formatter.rb
 - lib/guard/cucumber/inspector.rb
+- lib/guard/cucumber/notification_formatter.rb
 - lib/guard/cucumber/runners/preload_runner.rb
 - lib/guard/cucumber/runners/runner.rb
 - lib/guard/cucumber/templates/Guardfile
@@ -131,25 +101,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: guard-cucumber
-rubygems_version: 1.6.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Guard gem for Cucumber

data/lib/guard/cucumber/cucumber_formatter.rb

@@ -1,33 +0,0 @@
-require 'guard'
-require 'cucumber/formatter/progress'
-
-class CucumberFormatter < Cucumber::Formatter::Progress
-
-  def print_stats(features, profiles = [])
-    super features, profiles
-
-    icon, messages = '', []
-    [:failed, :skipped, :undefined, :pending, :passed].reverse.each do |status|
-      if step_mother.steps(status).any?
-        icon = icon_for(status)
-        messages << dump_count(step_mother.steps(status).length, 'step', status.to_s)
-      end
-    end
-
-    ::Guard::Notifier.notify messages.reverse.join(', '), :title => 'Cucumber Results', :image => icon
-  end
-
-  private
-  
-  def icon_for(status)
-      case status
-      when :passed
-        :success
-      when :pending, :undefined, :skipped
-        :pending
-      when :failed
-        :failed
-      end
-  end
-
-end