kosmas58-cucumber 0.3.9.4 → 0.3.11.3

data/features/junit_formatter.feature

@@ -58,5 +58,14 @@ Feature: JUnit output formatter
       """
     And "examples/junit/tmp/TEST-One_passing_scenario__one_failing_scenario.xml" should exist
     And "examples/junit/tmp/TEST-Pending_step.xml" should exist
-    
-    
+  
+  Scenario: show correct error message if no --out is passed
+    When I run cucumber --format junit features
+	  Then STDERR should not match 
+		  """
+can't convert .* into String \(TypeError\)
+		  """
+    And STDERR should match
+		  """
+You \*must\* specify \-\-out DIR for the junit formatter
+	    """

data/features/step_definitions/cucumber_steps.rb

@@ -31,6 +31,15 @@ Given /^the following profiles? (?:are|is) defined:$/ do |profiles|
   create_file('cucumber.yml', profiles)
 end
 
+Given /^I am running "([^\"]*)" in the background$/ do |command|
+  run_in_background command
+end
+
+Given /^I am not running (?:.*) in the background$/ do
+  # no-op
+end
+
+
 When /^I run cucumber (.*)$/ do |cucumber_opts|
   run "#{Cucumber::RUBY_BINARY} #{Cucumber::BINARY} --no-color #{cucumber_opts}"
 end
@@ -88,9 +97,9 @@ end
 
 Then /^"([^\"]*)" should have the same contents as "([^\"]*)"$/ do |actual_file, expected_file|
   actual = IO.read(actual_file)
-  # Comment out to replace expected file. Use with care! Remember to update duration afterwards.
-  # File.open(expected_file, "w"){|io| io.write(actual)}
   actual = replace_duration(actual, '0m30.005s')
+  # Comment out to replace expected file. Use with care! Remember to update duration afterwards.
+  # File.open(expected_file, "w") {|io| io.write(actual)}
   actual.should == IO.read(expected_file)
 end
 
@@ -98,6 +107,10 @@ Then /^STDERR should match$/ do |text|
   last_stderr.should =~ /#{text}/
 end
 
+Then /^STDERR should not match$/ do |text|
+  last_stderr.should_not =~ /#{text}/
+end
+
 Then /^STDERR should be empty$/ do
   last_stderr.should == ""
 end

data/features/support/env.rb

@@ -3,6 +3,11 @@ require 'tempfile'
 require 'spec/expectations'
 require 'fileutils'
 require 'forwardable'
+begin
+  gem "spork", ">= 0.5.1" # Ensure correct spork version number to avoid false-negatives.
+rescue Gem::LoadError => ex
+  warn "WARNING: #{ex.message} You need to have the spork gem installed to run the DRb feature properly!"
+end
 
 class CucumberWorld
   extend Forwardable
@@ -52,6 +57,10 @@ class CucumberWorld
     end
   end
 
+  def background_jobs
+    @background_jobs ||= []
+  end
+
   def in_current_dir(&block)
     Dir.chdir(@current_dir, &block)
   end
@@ -66,6 +75,27 @@ class CucumberWorld
     @last_stderr = IO.read(stderr_file.path)
   end
 
+  def run_in_background(command)
+    pid = fork
+    in_current_dir do
+      if pid
+        background_jobs << pid
+      else
+        #STDOUT.close
+        #STDERR.close
+        exec command
+      end
+    end
+  end
+
+  def terminate_background_jobs
+    if @background_jobs
+      @background_jobs.each do |pid|
+        Process.kill(Signal.list['TERM'], pid)
+      end
+    end
+  end
+
 end
 
 World do
@@ -77,7 +107,11 @@ Before do
   FileUtils.mkdir CucumberWorld.working_dir
 end
 
+After do
+  terminate_background_jobs
+end
+
 Before('@diffxml') do
   `diffxml --version`
   raise "Please install diffxml from http://diffxml.sourceforge.net/" if $? != 0
-end
+end

data/gem_tasks/features.rake

@@ -3,11 +3,16 @@ require 'cucumber/rake/task'
 
 namespace :features do
   Cucumber::Rake::Task.new(:all) do |t|
-    t.cucumber_opts = "--format pretty" 
+    t.cucumber_opts = %w{--format progress}
+  end
+  
+  Cucumber::Rake::Task.new(:pretty) do |t|
+    t.cucumber_opts = %w{--format pretty}
   end
 
   Cucumber::Rake::Task.new(:cruise) do |t|
-    t.cucumber_opts = "--format html --out=#{ENV['CC_BUILD_ARTIFACTS']}/CucumberFeatures.html" 
+    t.cucumber_opts = %w{--format html}
+    t.cucumber_opts << %[--out "#{ENV['CC_BUILD_ARTIFACTS']}/CucumberFeatures.html"]
     t.rcov = true
     t.rcov_opts = %w{--rails --exclude osx\/objc,gems\/,spec\/}
     t.rcov_opts << %[-o "#{ENV['CC_BUILD_ARTIFACTS']}/CucumberCoverage"]

data/lib/cucumber/ast/table.rb

@@ -62,7 +62,7 @@ module Cucumber
       def hashes
         @hashes ||= cells_rows[1..-1].map do |row|
           row.to_hash
-        end
+        end.freeze
       end
       
       # Converts this table into a Hash where the first column is
@@ -198,7 +198,7 @@ module Cucumber
       def cells_rows
         @rows ||= cell_matrix.map do |cell_row|
           @cells_class.new(self, cell_row)
-        end
+        end.freeze
       end
 
       def headers
@@ -230,7 +230,7 @@ module Cucumber
       def columns
         @columns ||= cell_matrix.transpose.map do |cell_row|
           @cells_class.new(self, cell_row)
-        end
+        end.freeze
       end
 
       def cell_matrix
@@ -243,7 +243,7 @@ module Cucumber
             col += 1
             @cell_class.new(raw_cell, self, row, col, line)
           end
-        end
+        end.freeze
       end
 
       # Represents a row of cells or columns of cells
@@ -268,7 +268,7 @@ module Cucumber
         end
 
         def to_hash #:nodoc:
-          @to_hash ||= @table.to_hash(self)
+          @to_hash ||= @table.to_hash(self).freeze
         end
 
         def value(n) #:nodoc:
@@ -326,7 +326,7 @@ module Cucumber
         private
 
         def col_width
-          @col_width ||= @table.__send__(:col_width, @col)
+          @col_width ||= @table.__send__(:col_width, @col).freeze
         end
       end
     end

data/lib/cucumber/cli/configuration.rb

@@ -13,6 +13,9 @@ module Cucumber
         'junit'    => 'Cucumber::Formatter::Junit'
       }
       DEFAULT_FORMAT = 'pretty'
+      DRB_FLAG = '--drb'
+      PROFILE_SHORT_FLAG = '-p'
+      PROFILE_LONG_FLAG = '--profile'
 
       attr_reader :paths
       attr_reader :options
@@ -28,8 +31,10 @@ module Cucumber
       end
 
       def parse!(args)
-        @args = args
-        return parse_args_from_profile('default') if @args.empty?
+        @args = args.empty? ? args_from_profile('default') : args
+        expand_profiles_into_args
+        return if parse_drb
+
         @args.extend(::OptionParser::Arguable)
 
         @args.options do |opts|
@@ -100,8 +105,8 @@ module Cucumber
           opts.on("-e", "--exclude PATTERN", "Don't run feature files or require ruby files matching PATTERN") do |v|
             @options[:excludes] << Regexp.new(v)
           end
-          opts.on("-p", "--profile PROFILE", "Pull commandline arguments from cucumber.yml.") do |v|
-            parse_args_from_profile(v)
+          opts.on(PROFILE_SHORT_FLAG, "#{PROFILE_LONG_FLAG} PROFILE", "Pull commandline arguments from cucumber.yml.") do |v|
+            # Processing of this is done previsouly so that the DRb flag can be detected within profiles.
           end
           opts.on("-c", "--[no-]color",
             "Whether or not to use ANSI color in the output. Cucumber decides",
@@ -158,6 +163,9 @@ module Cucumber
           opts.on("--no-diff", "Disable diff output on failing expectations.") do
             @options[:diff_enabled] = false
           end
+          opts.on(DRB_FLAG, "Run features against a DRb server. (i.e. with the spork gem)") do
+            # Processing of this is done previsouly in order to short circuit args from being lost.
+          end
           opts.on_tail("--version", "Show version.") do
             @out_stream.puts VERSION::STRING
             Kernel.exit
@@ -176,7 +184,7 @@ module Cucumber
         raise("You can't use both --strict and --wip") if @options[:strict] && @options[:wip]
 
         # Whatever is left after option parsing is the FILE arguments
-        @paths += args
+        @paths += @args
       end
 
       def verbose?
@@ -199,6 +207,10 @@ module Cucumber
         @options[:diff_enabled]
       end
 
+      def drb?
+        @drb
+      end
+
       def load_language
         if Cucumber.language_incomplete?(@options[:lang])
           list_keywords_and_exit(@options[:lang])
@@ -313,7 +325,15 @@ module Cucumber
           downcase
       end
 
-      def parse_args_from_profile(profile)
+      def expand_profiles_into_args
+        while (profile_index = @args.index(PROFILE_SHORT_FLAG) || @args.index(PROFILE_LONG_FLAG)) do
+          @args.delete_at(profile_index)
+          @args[profile_index] = args_from_profile(@args[profile_index])
+          @args.flatten!
+        end
+      end
+
+      def args_from_profile(profile)
         unless cucumber_yml.has_key?(profile)
           raise(<<-END_OF_ERROR)
 Could not find profile: '#{profile}'
@@ -334,7 +354,7 @@ Defined profiles in cucumber.yml:
           else
             raise "The '#{profile}' profile in cucumber.yml was a #{args_from_yml.class}. It must be a String or Array"
         end
-        parse!(args_from_yml)
+        args_from_yml
       end
 
       def cucumber_yml
@@ -346,7 +366,7 @@ Defined profiles in cucumber.yml:
         require 'yaml'
         begin
           @cucumber_yml = YAML::load(IO.read('cucumber.yml'))
-        rescue Exception => e
+        rescue StandardError => e
           raise(YmlLoadError,"cucumber.yml was found, but could not be parsed. Please refer to cucumber's documentation on correct profile usage.\n")
         end
 
@@ -370,6 +390,10 @@ Defined profiles in cucumber.yml:
         Kernel.exit
       end
 
+      def parse_drb
+        @drb = @args.delete(DRB_FLAG) ? true : false
+      end
+
       def default_options
         {
           :strict       => false,

data/lib/cucumber/cli/drb_client.rb

@@ -0,0 +1,20 @@
+require "drb/drb"
+# This code was taken from the RSpec project and slightly modified.
+
+module Cucumber
+  module Cli
+    class DRbClientError < StandardError
+    end
+    # Runs features on a DRB server, originally created with Spork compatibility in mind.
+    class DRbClient
+      def self.run(args, error_stream, out_stream)
+        # See http://redmine.ruby-lang.org/issues/show/496 as to why we specify localhost:0
+        DRb.start_service("druby://localhost:0")
+        feature_server = DRbObject.new_with_uri("druby://127.0.0.1:8990")
+        feature_server.run(args, error_stream, out_stream)
+      rescue DRb::DRbConnError
+        raise DRbClientError, "No DRb server is running."
+      end
+    end
+  end
+end

data/lib/cucumber/cli/main.rb

@@ -5,6 +5,7 @@ require 'cucumber/parser'
 require 'cucumber/formatter/color_io'
 require 'cucumber/cli/language_help_formatter'
 require 'cucumber/cli/configuration'
+require 'cucumber/cli/drb_client'
 
 module Cucumber
   module Cli
@@ -32,6 +33,14 @@ module Cucumber
       end
       
       def execute!(step_mother)
+        if configuration.drb?
+          begin
+            return DRbClient.run(@args, @error_stream, @out_stream)
+          rescue DRbClientError => e
+            @error_stream.puts "WARNING: #{e.message} Running features locally:"
+            configuration.parse!(@args)
+          end
+        end
         configuration.load_language
         step_mother.options = configuration.options
 

data/lib/cucumber/formatter/color_io.rb

@@ -6,7 +6,7 @@ module Cucumber
     class ColorIO
       extend Forwardable
       def_delegators :@kernel, :puts, :print # win32console colours only work when sent to Kernel
-      def_delegators :@stdout, :flush, :tty?
+      def_delegators :@stdout, :flush, :tty?, :write
 
       def initialize
         @kernel = Kernel
@@ -20,4 +20,4 @@ module Cucumber
       end
     end
   end
-end
+end

data/lib/cucumber/formatter/console.rb

@@ -53,6 +53,11 @@ module Cucumber
         end
       end
 
+      def print_counts
+        STDERR.puts("The #print_counts method is deprecated and will be removed in 0.4. Use #print_stats instead")
+        print_stats(nil)
+      end
+
       def print_stats(features)
         @io.print dump_count(step_mother.scenarios.length, "scenario")
         print_status_counts{|status| step_mother.scenarios(status)}
@@ -60,7 +65,7 @@ module Cucumber
         @io.print dump_count(step_mother.steps.length, "step")
         print_status_counts{|status| step_mother.steps(status)}
 
-        @io.puts(format_duration(features.duration))
+        @io.puts(format_duration(features.duration)) if features
 
         @io.flush
       end

data/lib/cucumber/formatter/cucumber.css

@@ -1,53 +1,38 @@
+
+
 .cucumber {
-  background: black;
-  color: white;
+  font-family: "Lucida Grande", Helvetica, sans-serif;
+  font-size: 0.7em;
+  background: white;
   padding: 1em;
 }
-.cucumber .passed {
-  color: #008800;
-}
-.cucumber .undefined {
-  color: #888800;
+.cucumber h1, .cucumber h2, .cucumber h3, .cucumber h4, .cucumber ol, .cucumber li, .cucumber pre, .cucumber p {
+  font-size: 1em;
+  padding: 0px;
+  margin: 0px;
 }
-.cucumber .pending {
-  color: #888800;
+.cucumber div.feature {
+  border: 1px solid;
+  padding: 2px;
+  margin: 4px;
 }
-.cucumber .failed {
-  color: #880000;
+.cucumber div.feature div.background, .cucumber div.feature div.scenario, .cucumber div.feature p {
+  padding: 0em 0em 0em 1em;
 }
-.cucumber .skipped {
-  color: #008888;
-}
-.cucumber .outline {
-  color: #008888;
-}
-
-.cucumber .passed_param {
-  font-weight: bold;
-  color: #00ff00;
-}
-.cucumber .undefined_param {
-  font-weight: bold;
-  color: #ffff00;
-}
-.cucumber .pending_param {
-  font-weight: bold;
-  color: #ffff00;
+.cucumber div.feature div.background div.examples, .cucumber div.feature div.scenario div.examples, .cucumber div.feature p div.examples {
+  padding: 0em 0em 0em 1em;
 }
-.cucumber .failed_param {
-  font-weight: bold;
-  font-weight: bold;
-  color: #ff0000;
+.cucumber .stats {
+  margin: 2em;
 }
-.cucumber .skipped_param {
-  font-weight: bold;
-  color: #00ffff;
+.cucumber .summary ul.features li {
+  display: inline;
 }
-.cucumber .outline_param {
-  font-weight: bold;
-  color: #00ffff;
+.cucumber .backtrace {
+  margin-top: 0;
+  margin-bottom: 0;
+  margin-left: 1em;
 }
-
 .cucumber a {
   text-decoration: none;
   color: inherit;
@@ -58,17 +43,90 @@
 .cucumber a:visited {
   font-weight: normal;
 }
+.cucumber a div.examples {
+  border: 1px solid;
+  padding: 2px;
+  margin: 4px;
+}
+.cucumber table {
+  border-collapse: collapse;
+}
+.cucumber table td, .cucumber table th {
+  font-size: 0.7em;
+  border: 1px solid #AAAAAA;
+}
+.cucumber table td.failed {
+  background: #FFC0CB;
+  color: #8B0000;
+}
+.cucumber table td.passed {
+  background: #98FB98;
+  color: #001111;
+}
+.cucumber table td.skipped {
+  background: #e0ffff;
+  color: #001111;
+}
+.cucumber table td.pending {
+  background: #FFFFE0;
+  color: #111100;
+}
+.cucumber table td.undefined {
+  background: #FFFFE0;
+  color: #111100;
+}
 .cucumber ol {
   list-style: none;
 }
-.cucumber .stats {
-  margin: 2em;
+.cucumber ol li {
+  margin: 0em 0em 0em 1em;
+  padding: 0em 0em 0em 0.2em;
 }
-.cucumber .summary ul.features li {
-  display: inline;
+.cucumber ol li span.param {
+  font-weight: bold;
 }
-.cucumber .backtrace {
-  margin-top: 0;
-  margin-bottom: 0;
-  margin-left: 1em;
+.cucumber ol li.failed {
+  border-left: 5px solid #ff0000;
+  border-bottom: 1px solid #ff0000;
+  background: #ffc0cb;
+  color: #8b0000;
+}
+.cucumber ol li.failed span.param {
+  background: !failed_dark;
+}
+.cucumber ol li.passed {
+  border-left: 5px solid #00ff00;
+  border-bottom: 1px solid #00ff00;
+  background: #98fb98;
+  color: #001111;
+}
+.cucumber ol li.passed span.param {
+  background: #00ff00;
+}
+.cucumber ol li.skipped {
+  border-left: 5px solid #00ffff;
+  border-bottom: 1px solid #00ffff;
+  background: #e0ffff;
+  color: #001111;
+}
+.cucumber ol li.skipped span.param {
+  background: #00ffff;
+}
+.cucumber ol li.pending {
+  border-left: 5px solid #ff8000;
+  border-bottom: 1px solid #ff8000;
+  background: #ffff00;
+  color: #2a1b0a;
+}
+.cucumber ol li.pending span.param {
+  background: #ff8000;
+}
+.cucumber ol li.undefined {
+  border-left: 5px solid #ff8000;
+  border-bottom: 1px solid #ff8000;
+  background: #ffff00;
+  color: #2a1b0a;
+}
+.cucumber ol li.undefined span.param {
+  background: #ff8000;
 }