cucumber 0.9.4 → 0.10.0

data/lib/cucumber/formatter/json_pretty.rb

@@ -1,14 +1,13 @@
-require "cucumber/formatter/json"
+require 'cucumber/formatter/json'
 
 module Cucumber
   module Formatter
     # The formatter used for <tt>--format json_pretty</tt>
     class JsonPretty < Json
-
-      def json_string
-        JSON.pretty_generate @json
+      def after_features(features)
+        @io.write(JSON.pretty_generate(@obj))
       end
-
     end
   end
-end
+end
+

data/lib/cucumber/formatter/unicode.rb

@@ -5,14 +5,17 @@ require 'cucumber/formatter/ansicolor'
 $KCODE='u' unless Cucumber::RUBY_1_9
 
 if Cucumber::WINDOWS
-  require 'iconv'
+  require 'iconv' unless Cucumber::RUBY_1_9
 
   if ENV['CUCUMBER_OUTPUT_ENCODING']
     Cucumber::CODEPAGE = ENV['CUCUMBER_OUTPUT_ENCODING']
-  elsif Cucumber::WINDOWS_MRI
-    Cucumber::CODEPAGE = "cp#{Win32::Console::OutputCP()}"
   elsif `cmd /c chcp` =~ /(\d+)/
-    Cucumber::CODEPAGE = "cp#{$1.to_i}"
+    if [65000, 65001].include? $1.to_i
+      Cucumber::CODEPAGE = 'UTF-8'
+      ENV['ANSICON_API'] = 'ruby'
+    else
+      Cucumber::CODEPAGE = "cp#{$1.to_i}"
+    end
   else
     Cucumber::CODEPAGE = "cp1252"
     STDERR.puts("WARNING: Couldn't detect your output codepage. Assuming it is 1252. You may have to chcp 1252 or SET CUCUMBER_OUTPUT_ENCODING=cp1252.")
@@ -24,27 +27,45 @@ if Cucumber::WINDOWS
         o.instance_eval do
           alias cucumber_print print
           def print(*a)
-            begin
-              cucumber_print(*Iconv.iconv(Cucumber::CODEPAGE, "UTF-8", *a.map{|a|a.to_s}))
-            rescue Iconv::InvalidEncoding => e
-              STDERR.cucumber_puts("WARNING: #{e.message}")
-              cucumber_print(*a)
-            rescue Iconv::IllegalSequence => e
-              STDERR.cucumber_puts("WARNING: #{e.message}")
-              cucumber_print(*a)
+            if Cucumber::RUBY_1_9
+              begin
+                cucumber_print(*a.map{|arg| arg.to_s.encode(Encoding.default_external)})
+              rescue Encoding::UndefinedConversionError => e
+                STDERR.cucumber_puts("WARNING: #{e.message}")
+                cucumber_print(*a)
+              end
+            else
+              begin
+                cucumber_print(*Iconv.iconv(Cucumber::CODEPAGE, "UTF-8", *a.map{|a|a.to_s}))
+              rescue Iconv::InvalidEncoding => e
+                STDERR.cucumber_puts("WARNING: #{e.message}")
+                cucumber_print(*a)
+              rescue Iconv::IllegalSequence => e
+                STDERR.cucumber_puts("WARNING: #{e.message}")
+                cucumber_print(*a)
+              end
             end
           end
 
           alias cucumber_puts puts
           def puts(*a)
-            begin
-              cucumber_puts(*Iconv.iconv(Cucumber::CODEPAGE, "UTF-8", *a.map{|a|a.to_s}))
-            rescue Iconv::InvalidEncoding => e
-              STDERR.cucumber_print("WARNING: #{e.message}")
-              cucumber_print(*a)
-            rescue Iconv::IllegalSequence => e
-              STDERR.cucumber_puts("WARNING: #{e.message}")
-              cucumber_puts(*a)
+            if Cucumber::RUBY_1_9
+              begin
+                cucumber_puts(*a.map{|arg| arg.to_s.encode(Encoding.default_external)})
+              rescue Encoding::UndefinedConversionError => e
+                STDERR.cucumber_puts("WARNING: #{e.message}")
+                cucumber_puts(*a)
+              end
+            else
+              begin
+                cucumber_puts(*Iconv.iconv(Cucumber::CODEPAGE, "UTF-8", *a.map{|a|a.to_s}))
+              rescue Iconv::InvalidEncoding => e
+                STDERR.cucumber_print("WARNING: #{e.message}")
+                cucumber_print(*a)
+              rescue Iconv::IllegalSequence => e
+                STDERR.cucumber_puts("WARNING: #{e.message}")
+                cucumber_puts(*a)
+              end
             end
           end
         end

data/lib/cucumber/parser/gherkin_builder.rb

@@ -22,6 +22,8 @@ module Cucumber
           legacy_name_for(feature.name, feature.description),
           []
         )
+        @feature.gherkin_statement(feature)
+        @feature
       end
 
       def background(background)
@@ -35,6 +37,7 @@ module Cucumber
         @feature.background = @background
         @background.feature = @feature
         @step_container = @background
+        @background.gherkin_statement(background)
       end
 
       def scenario(statement)
@@ -50,6 +53,7 @@ module Cucumber
         @feature.add_feature_element(scenario)
         @background.feature_elements << scenario if @background
         @step_container = scenario
+        scenario.gherkin_statement(statement)
       end
 
       def scenario_outline(statement)
@@ -69,6 +73,7 @@ module Cucumber
           @background.feature_elements << scenario_outline
         end
         @step_container = scenario_outline
+        scenario_outline.gherkin_statement(statement)
       end
 
       def examples(examples)
@@ -79,11 +84,12 @@ module Cucumber
           legacy_name_for(examples.name, examples.description), 
           matrix(examples.rows)
         ]
-        @step_container.add_examples(examples_fields)
+        @step_container.add_examples(examples_fields, examples)
       end
 
       def step(step)
         @table_owner = Ast::Step.new(step.line, step.keyword, step.name)
+        @table_owner.gherkin_statement(step)
         multiline_arg = rubify(step.multiline_arg)
         case(multiline_arg)
         when Gherkin::Formatter::Model::PyString

data/lib/cucumber/platform.rb

@@ -4,7 +4,7 @@ require 'rbconfig'
 
 module Cucumber
 unless defined?(Cucumber::VERSION)
-  VERSION       = '0.9.4'
+  VERSION       = '0.10.0'
   BINARY        = File.expand_path(File.dirname(__FILE__) + '/../../bin/cucumber')
   LIBDIR        = File.expand_path(File.dirname(__FILE__) + '/../../lib')
   JRUBY         = defined?(JRUBY_VERSION)

data/lib/cucumber/step_match.rb

@@ -1,6 +1,6 @@
 module Cucumber
   class StepMatch #:nodoc:
-    attr_reader :step_definition
+    attr_reader :step_definition, :step_arguments
 
     # Creates a new StepMatch. The +name_to_report+ argument is what's reported, unless it's is,
     # in which case +name_to_report+ is used instead.
@@ -107,5 +107,9 @@ module Cucumber
     def text_length
       @step.text_length
     end
+
+    def step_arguments
+      []
+    end
   end
 end

data/spec/cucumber/ast/scenario_outline_spec.rb

@@ -40,15 +40,18 @@ module Cucumber
           ],
           [
             [
-              Comment.new("#Mmmm... cucumbers\n"),
-              24,
-              'Examples:',
-              'First table',
               [
-                %w{start eat left},
-                %w{12 5 7},
-                %w{20 6 14}
-              ]
+                Comment.new("#Mmmm... cucumbers\n"),
+                24,
+                'Examples:',
+                'First table',
+                [
+                  %w{start eat left},
+                  %w{12 5 7},
+                  %w{20 6 14}
+                ]
+              ],
+              Gherkin::Formatter::Model::Examples.new(nil, nil, nil, nil, nil, nil)
             ]
           ]
 

data/spec/cucumber/ast/table_spec.rb

@@ -45,11 +45,16 @@ module Cucumber
         @table.hashes.first[:one].should == '4444'
       end
 
-      it "should allow map'ing columns" do
+      it "should allow mapping columns" do
         @table.map_column!('one') { |v| v.to_i }
         @table.hashes.first['one'].should == 4444
       end
 
+      it "should allow mapping columns and take a symbol as the column name" do
+        @table.map_column!(:one) { |v| v.to_i }
+        @table.hashes.first['one'].should == 4444
+      end
+
       it "should pass silently if a mapped column does not exist in non-strict mode" do
         lambda {
           @table.map_column!('two', false) { |v| v.to_i }

data/spec/cucumber/cli/main_spec.rb

@@ -1,5 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'yaml'
+require 'cucumber/parser/gherkin_builder'
+require 'gherkin/formatter/model'
 
 module Cucumber
   module Cli
@@ -44,7 +46,8 @@ module Cucumber
       describe "verbose mode" do
 
         before(:each) do
-          @empty_feature = Cucumber::Ast::Feature.new(nil, Cucumber::Ast::Comment.new(''), Cucumber::Ast::Tags.new(2, []), "Feature", "Foo", [])
+          b = Cucumber::Parser::GherkinBuilder.new
+          @empty_feature = b.feature(Gherkin::Formatter::Model::Feature.new([], [], "Feature", "Foo", "", 99))
         end
 
         it "should show feature files parsed" do

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 9
-  - 4
-  version: 0.9.4
+  - 10
+  - 0
+  version: 0.10.0
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-07 00:00:00 +00:00
+date: 2010-12-07 00:00:00 +00:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,9 +26,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 2
+        - 3
         - 2
-        - 9
-        version: 2.2.9
+        version: 2.3.2
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -52,7 +52,7 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 2
@@ -116,9 +116,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 2
+        - 2
         - 0
-        - 1
-        version: 2.0.1
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: *id007
@@ -197,6 +197,36 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: aruba
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 2
+        - 7
+        version: 0.2.7
+  type: :development
+  prerelease: false
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  name: simplecov
+  requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 7
+        version: 0.3.7
+  type: :development
+  prerelease: false
+  version_requirements: *id014
 description: Behaviour Driven Development with elegance and joy
 email: cukes@googlegroups.com
 executables: 
@@ -467,67 +497,18 @@ files:
 - examples/watir/features/step_definitions/search_steps.rb
 - examples/watir/features/support/env.rb
 - examples/watir/features/support/screenshots.rb
-- features/announce.feature
-- features/api/list_step_defs_as_json.feature
-- features/api/run_cli_main_with_existing_runtime.feature
-- features/around_hooks.feature
 - features/background.feature
-- features/bug_371.feature
-- features/bug_464.feature
-- features/bug_475.feature
-- features/bug_585_tab_indentation.feature
-- features/bug_600.feature
-- features/call_steps_from_stepdefs.feature
-- features/cucumber_cli.feature
-- features/cucumber_cli_outlines.feature
 - features/custom_formatter.feature
-- features/default_snippets.feature
-- features/diffing.feature
-- features/drb_server_integration.feature
-- features/exception_in_after_block.feature
-- features/exception_in_after_step_block.feature
-- features/exception_in_before_block.feature
-- features/exclude_files.feature
-- features/expand.feature
-- features/html_formatter.feature
-- features/html_formatter/a.html
+- features/execute_with_tag_filter.feature
+- features/hooks.feature
 - features/json_formatter.feature
-- features/junit_formatter.feature
-- features/language_from_header.feature
-- features/language_help.feature
-- features/listener_debugger_formatter.feature
-- features/multiline_names.feature
-- features/negative_tagged_hooks.feature
-- features/post_configuration_hook.feature
-- features/profiles.feature
-- features/rake_task.feature
-- features/report_called_undefined_steps.feature
-- features/rerun_formatter.feature
-- features/simplest.feature
-- features/snippet.feature
-- features/snippets_when_using_star_keyword.feature
+- features/stats_formatters.feature
 - features/step_definitions/cucumber_steps.rb
-- features/step_definitions/extra_steps.rb
-- features/step_definitions/simplest_steps.rb
-- features/step_definitions/wire_steps.rb
 - features/support/env.rb
-- features/support/env.rb.simplest
-- features/support/fake_wire_server.rb
-- features/table_diffing.feature
-- features/table_mapping.feature
-- features/tag_logic.feature
-- features/transform.feature
-- features/unicode_table.feature
-- features/usage_and_stepdefs_formatter.feature
-- features/wire_protocol.feature
-- features/wire_protocol_table_diffing.feature
-- features/wire_protocol_tags.feature
-- features/wire_protocol_timeouts.feature
-- features/work_in_progress.feature
+- features/tagged_hooks.feature
 - fixtures/json/features/background.feature
 - fixtures/json/features/embed.feature
 - fixtures/json/features/one_passing_one_failing.feature
-- fixtures/json/features/pystring.feature
 - fixtures/json/features/step_definitions/steps.rb
 - fixtures/json/features/tables.feature
 - fixtures/junit/features/one_passing_one_failing.feature
@@ -536,15 +517,6 @@ files:
 - fixtures/self_test/.gitignore
 - fixtures/self_test/README.textile
 - fixtures/self_test/Rakefile
-- fixtures/self_test/features/background/background_tagged_before_on_outline.feature
-- fixtures/self_test/features/background/background_with_name.feature
-- fixtures/self_test/features/background/failing_background.feature
-- fixtures/self_test/features/background/failing_background_after_success.feature
-- fixtures/self_test/features/background/multiline_args_background.feature
-- fixtures/self_test/features/background/passing_background.feature
-- fixtures/self_test/features/background/pending_background.feature
-- fixtures/self_test/features/background/scenario_outline_failing_background.feature
-- fixtures/self_test/features/background/scenario_outline_passing_background.feature
 - fixtures/self_test/features/call_undefined_step_from_step_def.feature
 - fixtures/self_test/features/failing_expectation.feature
 - fixtures/self_test/features/lots_of_undefined.feature
@@ -599,14 +571,65 @@ files:
 - fixtures/tickets/features/table_diffing.feature
 - fixtures/tickets/features/tickets.feature
 - gem_tasks/contributors.rake
+- gem_tasks/cucumber.rake
 - gem_tasks/environment.rake
 - gem_tasks/examples.rake
-- gem_tasks/features.rake
 - gem_tasks/fix_cr_lf.rake
 - gem_tasks/flog.rake
 - gem_tasks/rspec.rake
 - gem_tasks/sass.rake
 - gem_tasks/sdoc.rake
+- legacy_features/announce.feature
+- legacy_features/api/list_step_defs_as_json.feature
+- legacy_features/api/run_cli_main_with_existing_runtime.feature
+- legacy_features/around_hooks.feature
+- legacy_features/bug_371.feature
+- legacy_features/bug_464.feature
+- legacy_features/bug_475.feature
+- legacy_features/bug_585_tab_indentation.feature
+- legacy_features/bug_600.feature
+- legacy_features/call_steps_from_stepdefs.feature
+- legacy_features/cucumber_cli.feature
+- legacy_features/cucumber_cli_outlines.feature
+- legacy_features/default_snippets.feature
+- legacy_features/diffing.feature
+- legacy_features/drb_server_integration.feature
+- legacy_features/exception_in_after_block.feature
+- legacy_features/exception_in_after_step_block.feature
+- legacy_features/exception_in_before_block.feature
+- legacy_features/exclude_files.feature
+- legacy_features/expand.feature
+- legacy_features/html_formatter.feature
+- legacy_features/html_formatter/a.html
+- legacy_features/junit_formatter.feature
+- legacy_features/language_from_header.feature
+- legacy_features/language_help.feature
+- legacy_features/listener_debugger_formatter.feature
+- legacy_features/multiline_names.feature
+- legacy_features/post_configuration_hook.feature
+- legacy_features/profiles.feature
+- legacy_features/rake_task.feature
+- legacy_features/report_called_undefined_steps.feature
+- legacy_features/rerun_formatter.feature
+- legacy_features/simplest.feature
+- legacy_features/snippet.feature
+- legacy_features/snippets_when_using_star_keyword.feature
+- legacy_features/step_definitions/cucumber_steps.rb
+- legacy_features/step_definitions/extra_steps.rb
+- legacy_features/step_definitions/simplest_steps.rb
+- legacy_features/step_definitions/wire_steps.rb
+- legacy_features/support/env.rb
+- legacy_features/support/env.rb.simplest
+- legacy_features/support/fake_wire_server.rb
+- legacy_features/table_diffing.feature
+- legacy_features/table_mapping.feature
+- legacy_features/transform.feature
+- legacy_features/unicode_table.feature
+- legacy_features/wire_protocol.feature
+- legacy_features/wire_protocol_table_diffing.feature
+- legacy_features/wire_protocol_tags.feature
+- legacy_features/wire_protocol_timeouts.feature
+- legacy_features/work_in_progress.feature
 - lib/README.rdoc
 - lib/autotest/cucumber.rb
 - lib/autotest/cucumber_mixin.rb
@@ -650,12 +673,13 @@ files:
 - lib/cucumber/errors.rb
 - lib/cucumber/feature_file.rb
 - lib/cucumber/formatter/ansicolor.rb
-- lib/cucumber/formatter/color_io.rb
 - lib/cucumber/formatter/console.rb
 - lib/cucumber/formatter/cucumber.css
 - lib/cucumber/formatter/cucumber.sass
 - lib/cucumber/formatter/debug.rb
 - lib/cucumber/formatter/duration.rb
+- lib/cucumber/formatter/gherkin_formatter_adapter.rb
+- lib/cucumber/formatter/gpretty.rb
 - lib/cucumber/formatter/html.rb
 - lib/cucumber/formatter/io.rb
 - lib/cucumber/formatter/jquery-min.js
@@ -670,7 +694,6 @@ files:
 - lib/cucumber/formatter/stepdefs.rb
 - lib/cucumber/formatter/steps.rb
 - lib/cucumber/formatter/summary.rb
-- lib/cucumber/formatter/tag_cloud.rb
 - lib/cucumber/formatter/unicode.rb
 - lib/cucumber/formatter/usage.rb
 - lib/cucumber/js_support/js_dsl.js
@@ -733,7 +756,6 @@ files:
 - spec/cucumber/configuration_spec.rb
 - spec/cucumber/core_ext/proc_spec.rb
 - spec/cucumber/formatter/ansicolor_spec.rb
-- spec/cucumber/formatter/color_io_spec.rb
 - spec/cucumber/formatter/duration_spec.rb
 - spec/cucumber/formatter/html_spec.rb
 - spec/cucumber/formatter/junit_spec.rb
@@ -760,7 +782,7 @@ licenses: []
 
 post_install_message: "\n\
   (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)\n\n\
-  Thank you for installing cucumber-0.9.4.\n\
+  Thank you for installing cucumber-0.10.0.\n\
   Please be sure to read http://wiki.github.com/aslakhellesoy/cucumber/upgrading\n\
   for important information about this release. Happy cuking!\n\n\
   (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)\n\n"
@@ -773,7 +795,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 95980206032165697
+      hash: -4492259644257557500
       segments: 
       - 0
       version: "0"
@@ -782,7 +804,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 95980206032165697
+      hash: -4492259644257557500
       segments: 
       - 0
       version: "0"
@@ -792,65 +814,17 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: cucumber-0.9.4
+summary: cucumber-0.10.0
 test_files: 
-- features/announce.feature
-- features/api/list_step_defs_as_json.feature
-- features/api/run_cli_main_with_existing_runtime.feature
-- features/around_hooks.feature
 - features/background.feature
-- features/bug_371.feature
-- features/bug_464.feature
-- features/bug_475.feature
-- features/bug_585_tab_indentation.feature
-- features/bug_600.feature
-- features/call_steps_from_stepdefs.feature
-- features/cucumber_cli.feature
-- features/cucumber_cli_outlines.feature
 - features/custom_formatter.feature
-- features/default_snippets.feature
-- features/diffing.feature
-- features/drb_server_integration.feature
-- features/exception_in_after_block.feature
-- features/exception_in_after_step_block.feature
-- features/exception_in_before_block.feature
-- features/exclude_files.feature
-- features/expand.feature
-- features/html_formatter.feature
-- features/html_formatter/a.html
+- features/execute_with_tag_filter.feature
+- features/hooks.feature
 - features/json_formatter.feature
-- features/junit_formatter.feature
-- features/language_from_header.feature
-- features/language_help.feature
-- features/listener_debugger_formatter.feature
-- features/multiline_names.feature
-- features/negative_tagged_hooks.feature
-- features/post_configuration_hook.feature
-- features/profiles.feature
-- features/rake_task.feature
-- features/report_called_undefined_steps.feature
-- features/rerun_formatter.feature
-- features/simplest.feature
-- features/snippet.feature
-- features/snippets_when_using_star_keyword.feature
+- features/stats_formatters.feature
 - features/step_definitions/cucumber_steps.rb
-- features/step_definitions/extra_steps.rb
-- features/step_definitions/simplest_steps.rb
-- features/step_definitions/wire_steps.rb
 - features/support/env.rb
-- features/support/env.rb.simplest
-- features/support/fake_wire_server.rb
-- features/table_diffing.feature
-- features/table_mapping.feature
-- features/tag_logic.feature
-- features/transform.feature
-- features/unicode_table.feature
-- features/usage_and_stepdefs_formatter.feature
-- features/wire_protocol.feature
-- features/wire_protocol_table_diffing.feature
-- features/wire_protocol_tags.feature
-- features/wire_protocol_timeouts.feature
-- features/work_in_progress.feature
+- features/tagged_hooks.feature
 - spec/cucumber/ast/background_spec.rb
 - spec/cucumber/ast/feature_factory.rb
 - spec/cucumber/ast/feature_spec.rb
@@ -870,7 +844,6 @@ test_files:
 - spec/cucumber/configuration_spec.rb
 - spec/cucumber/core_ext/proc_spec.rb
 - spec/cucumber/formatter/ansicolor_spec.rb
-- spec/cucumber/formatter/color_io_spec.rb
 - spec/cucumber/formatter/duration_spec.rb
 - spec/cucumber/formatter/html_spec.rb
 - spec/cucumber/formatter/junit_spec.rb