cucumber 0.3.3 → 0.3.4

data/lib/cucumber/rake/task.rb

@@ -14,7 +14,7 @@ module Cucumber
     # To further configure the task, you can pass a block:
     #
     #   Cucumber::Rake::Task.new do |t|
-    #     t.cucumber_opts = "--format progress"
+    #     t.cucumber_opts = %w{--format progress}
     #   end
     #
     # This task can also be configured to be run with RCov:
@@ -25,7 +25,62 @@ module Cucumber
     # 
     # See the attributes for additional configuration possibilities.
     class Task
-      LIB    = File.expand_path(File.dirname(__FILE__) + '/../..') # :nodoc:
+      class InProcessCucumberRunner #:nodoc:
+        attr_reader :args
+        
+        def initialize(libs, cucumber_opts, feature_files)
+          libs.reverse.each{|lib| $:.unshift(lib)}
+          @args = (
+            cucumber_opts + 
+            feature_files
+          ).flatten.compact
+        end
+        
+        def run
+          require 'cucumber/cli/main'
+          Cucumber::Cli::Main.execute(args)
+        end
+      end
+      
+      class ForkedCucumberRunner #:nodoc:
+        attr_reader :args
+        
+        def initialize(libs, cucumber_bin, cucumber_opts, feature_files)
+          @args = (
+            ['-I'] + load_path(libs) + 
+            quoted_binary(cucumber_bin) + 
+            cucumber_opts + 
+            feature_files
+          ).flatten
+        end
+
+        def load_path(libs)
+          ['"%s"' % libs.join(File::PATH_SEPARATOR)]
+        end
+
+        def quoted_binary(cucumber_bin)
+          ['"%s"' % cucumber_bin]
+        end
+
+        def run
+          ruby(args.join(" ")) # ruby(*args) is broken on Windows
+        end
+      end
+
+      class RCovCucumberRunner < ForkedCucumberRunner #:nodoc:
+        def initialize(libs, cucumber_bin, cucumber_opts, feature_files, rcov_opts)
+          @args = (
+            ['-I'] + load_path(libs) + 
+            ['-S', 'rcov'] + rcov_opts +
+            quoted_binary(cucumber_bin) + 
+            ['--'] + 
+            cucumber_opts + 
+            feature_files
+          ).flatten
+        end
+      end
+
+      LIB = File.expand_path(File.dirname(__FILE__) + '/../..') # :nodoc:
 
       # TODO: remove depreated accessors for 0.4.0
       def self.deprecate_accessor(attribute) # :nodoc:
@@ -40,24 +95,45 @@ module Cucumber
 
       # Directories to add to the Ruby $LOAD_PATH
       attr_accessor :libs
+
       # Name of the cucumber binary to use for running features. Defaults to Cucumber::BINARY
       attr_accessor :binary
+
       # Array of paths to specific step definition files to use
       deprecate_accessor :step_list
+
       # File pattern for finding step definitions. Defaults to 
       # 'features/**/*.rb'.
       deprecate_accessor :step_pattern
+
       # Array of paths to specific features to run. 
       deprecate_accessor :feature_list
+
       # File pattern for finding features to run. Defaults to 
       # 'features/**/*.feature'. Can be overridden by the FEATURE environment variable.
       deprecate_accessor :feature_pattern
+
       # Extra options to pass to the cucumber binary. Can be overridden by the CUCUMBER_OPTS environment variable.
+      # It's recommended to pass an Array, but if it's a String it will be #split by ' '.
       attr_accessor :cucumber_opts
-      # Run cucumber with RCov?
+      def cucumber_opts=(opts) #:nodoc:
+        @cucumber_opts = String === opts ? opts.split(' ') : opts
+      end
+
+      # Run cucumber with RCov? Defaults to false. If you set this to
+      # true, +fork+ is implicit.
       attr_accessor :rcov
-      # Extra options to pass to rcov
+
+      # Extra options to pass to rcov.
+      # It's recommended to pass an Array, but if it's a String it will be #split by ' '.
       attr_accessor :rcov_opts
+      def rcov_opts=(opts) #:nodoc:
+        @rcov_opts = String === opts ? opts.split(' ') : opts
+      end
+
+      # Whether or not to fork a new ruby interpreter. Defaults to false.
+      attr_accessor :fork
+
       # Define what profile to be used.  When used with cucumber_opts it is simply appended to it. Will be ignored when CUCUMBER_OPTS is used.
       def profile=(profile)
         @profile = profile
@@ -69,13 +145,14 @@ module Cucumber
       end
       attr_reader :profile
 
-      # Define a Rake
+      # Define Cucumber Rake task
       def initialize(task_name = "features", desc = "Run Features with Cucumber")
         @task_name, @desc = task_name, desc
         @libs = ['lib']
         @rcov_opts = %w{--rails --exclude osx\/objc,gems\/}
 
         yield self if block_given?
+        @fork = true if @rcov
 
         @feature_pattern = "features/**/*.feature" if feature_pattern.nil? && feature_list.nil?
         @step_pattern    = "features/**/*.rb"      if step_pattern.nil? && step_list.nil?
@@ -89,32 +166,23 @@ module Cucumber
       def define_task # :nodoc:
         desc @desc
         task @task_name do
-          ruby(arguments_for_ruby_execution.join(" ")) # ruby(*args) is broken on Windows
+          runner.run
         end
       end
 
-      def arguments_for_ruby_execution(task_args = nil) # :nodoc:
-        lib_args     = ['"%s"' % libs.join(File::PATH_SEPARATOR)]
-        cucumber_bin = ['"%s"' % binary]
-        cuc_opts     = [(ENV['CUCUMBER_OPTS'] || cucumber_opts_with_profile)]
-
-        step_files(task_args).each do |step_file|
-          cuc_opts << '--require'
-          cuc_opts << step_file
-        end
-
-        if rcov
-          args = (['-I'] + lib_args + ['-S', 'rcov'] + rcov_opts +
-            cucumber_bin + ['--'] + cuc_opts + feature_files(task_args)).flatten
+      def runner(task_args = nil) # :nodoc:
+        cucumber_opts = [(ENV['CUCUMBER_OPTS'] || cucumber_opts_with_profile)]
+        if(@rcov)
+          RCovCucumberRunner.new(libs, binary, cucumber_opts, feature_files(task_args), rcov_opts)
+        elsif(@fork)
+          ForkedCucumberRunner.new(libs, binary, cucumber_opts, feature_files(task_args))
         else
-          args = (['-I'] + lib_args + cucumber_bin + cuc_opts + feature_files(task_args)).flatten
+          InProcessCucumberRunner.new(libs, cucumber_opts, feature_files(task_args))
         end
-
-        args
       end
 
       def cucumber_opts_with_profile # :nodoc:
-        @profile ? "#{cucumber_opts} --profile #{@profile}" : cucumber_opts
+        @profile ? [cucumber_opts, '--profile', @profile] : cucumber_opts
       end
 
       def feature_files(task_args = nil) # :nodoc:
@@ -149,7 +217,7 @@ module Cucumber
       def define_task # :nodoc:
         desc @desc
         task @task_name, :feature_name do |t, args|
-          ruby(arguments_for_ruby_execution(args).join(" ")) # ruby(*args) is broken on Windows
+          runner(args).run
         end
       end
 

data/lib/cucumber/step_mother.rb

@@ -262,6 +262,7 @@ module Cucumber
 
     # Creates a new world instance
     def new_world!
+      return if options[:dry_run]
       create_world!
       extend_world
       connect_world
@@ -309,12 +310,14 @@ module Cucumber
     end
 
     def execute_before(scenario)
+      return if options[:dry_run]
       hooks_for(:before, scenario).each do |hook|
         hook.execute_in(@current_world, scenario, 'Before')
       end
     end
 
     def execute_after(scenario)
+      return if options[:dry_run]
       hooks_for(:after, scenario).each do |hook|
         hook.execute_in(@current_world, scenario, 'After')
       end

data/lib/cucumber/version.rb

@@ -2,7 +2,7 @@ module Cucumber #:nodoc:
   class VERSION #:nodoc:
     MAJOR = 0
     MINOR = 3
-    TINY  = 3
+    TINY  = 4
     PATCH = nil # Set to nil for official release
 
     STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')

data/rails_generators/cucumber/templates/cucumber.rake

@@ -4,7 +4,8 @@ begin
   require 'cucumber/rake/task'
 
   Cucumber::Rake::Task.new(:features) do |t|
-    t.cucumber_opts = "--format pretty"
+    t.fork = true
+    t.cucumber_opts = %w{--format pretty}
   end
   task :features => 'db:test:prepare'
 rescue LoadError

data/spec/cucumber/cli/configuration_spec.rb

@@ -107,8 +107,6 @@ module Cli
       given_cucumber_yml_defined_as({'default' => '--require from/yml', 'html_report' =>  '--format html'})
 
       config = Configuration.new(StringIO.new, error = StringIO.new)
-      config.parse!(%w{--profile i_do_not_exist})
-
       expected_message = <<-END_OF_MESSAGE
 Could not find profile: 'i_do_not_exist'
 
@@ -117,16 +115,15 @@ Defined profiles in cucumber.yml:
   * html_report
 END_OF_MESSAGE
 
-      error.string.should == expected_message
+      lambda{config.parse!(%w{--profile i_do_not_exist})}.should raise_error(expected_message)
     end
 
-    it "should provide a helpful error message when a specified profile is not a String" do
+    it "should allow array as profile" do
       given_cucumber_yml_defined_as({'foo' => [1,2,3]})
 
       config = Configuration.new(StringIO.new, error = StringIO.new)
       config.parse!(%w{--profile foo})
-
-      error.string.should == "Profiles must be defined as a String.  The 'foo' profile was [1, 2, 3] (Array).\n"
+      config.paths.should == [1,2,3]
     end
 
     it "should provide a helpful error message when a specified profile exists but is nil or blank" do
@@ -134,9 +131,8 @@ END_OF_MESSAGE
         given_cucumber_yml_defined_as({'foo' => bad_input})
 
         config = Configuration.new(StringIO.new, error = StringIO.new)
-        config.parse!(%w{--profile foo})
-
-        error.string.should match(/The 'foo' profile in cucumber.yml was blank.  Please define the command line arguments for the 'foo' profile in cucumber.yml./)
+        expected_error = /The 'foo' profile in cucumber.yml was blank.  Please define the command line arguments for the 'foo' profile in cucumber.yml./
+        lambda{config.parse!(%w{--profile foo})}.should raise_error(expected_error)
       end
     end
 
@@ -144,9 +140,8 @@ END_OF_MESSAGE
       File.should_receive(:exist?).with('cucumber.yml').and_return(false)
 
       config = Configuration.new(StringIO.new, error = StringIO.new)
-      config.parse!(%w{--profile i_do_not_exist})
-
-      error.string.should match(/cucumber.yml was not found.  Please refer to cucumber's documentation on defining profiles in cucumber.yml./)
+      expected_error = /cucumber.yml was not found.  Please refer to cucumber's documentation on defining profiles in cucumber.yml./
+      lambda{config.parse!(%w{--profile i_do_not_exist})}.should raise_error(expected_error)
     end
 
     it "should provide a helpful error message when cucumber.yml is blank or malformed" do
@@ -156,9 +151,7 @@ END_OF_MESSAGE
         given_cucumber_yml_defined_as(bad_input)
 
         config = Configuration.new(StringIO.new, error = StringIO.new)
-        config.parse!([])
-
-        error.string.should match(expected_error_message)
+        lambda{config.parse!([])}.should raise_error(expected_error_message)
       end
     end
 
@@ -169,9 +162,7 @@ END_OF_MESSAGE
       YAML.should_receive(:load).and_raise Exception
 
       config = Configuration.new(StringIO.new, error = StringIO.new)
-      config.parse!([])
-
-      error.string.should match(expected_error_message)
+      lambda{config.parse!([])}.should raise_error(expected_error_message)
     end
 
     it "should accept --dry-run option" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-10 00:00:00 +02:00
+date: 2009-05-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -106,6 +106,10 @@ files:
 - examples/i18n/bg/features/support/env.rb
 - examples/i18n/bg/features/support/world.rb
 - examples/i18n/bg/lib/calculator.rb
+- examples/i18n/cat/Rakefile
+- examples/i18n/cat/features/step_definitons/calculator_steps.rb
+- examples/i18n/cat/features/suma.feature
+- examples/i18n/cat/lib/calculadora.rb
 - examples/i18n/da/Rakefile
 - examples/i18n/da/features/step_definitons/kalkulator_steps.rb
 - examples/i18n/da/features/summering.feature
@@ -191,6 +195,7 @@ files:
 - examples/i18n/pt/Rakefile
 - examples/i18n/pt/features/adicao.feature
 - examples/i18n/pt/features/step_definitions/calculadora_steps.rb
+- examples/i18n/pt/features/support/env.rb
 - examples/i18n/pt/lib/calculadora.rb
 - examples/i18n/ro/Rakefile
 - examples/i18n/ro/features/step_definitons/calculator_steps.rb
@@ -223,12 +228,15 @@ files:
 - examples/i18n/zh-TW/features/step_definitons/calculator_steps.rb
 - examples/i18n/zh-TW/lib/calculator.rb
 - examples/java/README.textile
-- examples/java/Rakefile
+- examples/java/build.xml
 - examples/java/features/hello.feature
 - examples/java/features/step_definitons/hello_steps.rb
 - examples/java/features/step_definitons/tree_steps.rb
 - examples/java/features/tree.feature
 - examples/java/src/cucumber/demo/Hello.java
+- examples/junit/features/one_passing_one_failing.feature
+- examples/junit/features/pending.feature
+- examples/junit/features/step_definitions/steps.rb
 - examples/pure_java/README.textile
 - examples/selenium/Rakefile
 - examples/selenium/features/search.feature
@@ -313,6 +321,7 @@ files:
 - features/cucumber_cli_outlines.feature
 - features/custom_formatter.feature
 - features/exclude_files.feature
+- features/junit_formatter.feature
 - features/multiline_names.feature
 - features/rake_task.feature
 - features/report_called_undefined_steps.feature
@@ -368,6 +377,7 @@ files:
 - lib/cucumber/formatter/cucumber.css
 - lib/cucumber/formatter/cucumber.sass
 - lib/cucumber/formatter/html.rb
+- lib/cucumber/formatter/junit.rb
 - lib/cucumber/formatter/pretty.rb
 - lib/cucumber/formatter/profile.rb
 - lib/cucumber/formatter/progress.rb

data/examples/java/Rakefile

@@ -1,12 +0,0 @@
-$:.unshift(File.dirname(__FILE__) + '/../../lib')
-require 'cucumber/rake/task'
-
-Cucumber::Rake::Task.new(:features) do |t|
-  t.cucumber_opts = "--format pretty"
-end
-
-task :features => :compile
-
-task :compile do
-  sh "javac src/cucumber/demo/Hello.java && jar cf src/cucumber_demo.jar -C src cucumber/demo/Hello.class"
-end