cucumber 0.10.0 → 0.10.1

data/lib/cucumber/formatter/gherkin_formatter_adapter.rb

@@ -64,7 +64,7 @@ module Cucumber
 
         error_message = exception ? "#{exception.message} (#{exception.class})\n#{exception.backtrace.join("\n")}" : nil
         unless @outline
-          @gf.result(Gherkin::Formatter::Model::Result.new(status, error_message))
+          @gf.result(Gherkin::Formatter::Model::Result.new(status, nil, error_message))
         end
       end
 
@@ -76,7 +76,7 @@ module Cucumber
         @gf.eof
       end
 
-      def embed(file, mime_type)
+      def embed(file, mime_type, label)
         @gf.embedding(mime_type, File.read(file))
       end
     end

data/lib/cucumber/formatter/html.rb

@@ -23,17 +23,17 @@ module Cucumber
         @delayed_announcements = []
       end
 
-      def embed(file, mime_type)
+      def embed(file, mime_type, label)
         case(mime_type)
         when /^image\/(png|gif|jpg|jpeg)/
-          embed_image(file)
+          embed_image(file, label)
         end
       end
 
-      def embed_image(file)
+      def embed_image(file, label)
         id = file.hash
         @builder.span(:class => 'embed') do |pre|
-          pre << %{<a href="" onclick="img=document.getElementById('#{id}'); img.style.display = (img.style.display == 'none' ? 'block' : 'none');return false">Screenshot</a><br>&nbsp;
+          pre << %{<a href="" onclick="img=document.getElementById('#{id}'); img.style.display = (img.style.display == 'none' ? 'block' : 'none');return false">#{label}</a><br>&nbsp;
           <img id="#{id}" style="display: none" src="#{file}"/>}
         end
       end
@@ -164,6 +164,9 @@ module Cucumber
       end
 
       def scenario_name(keyword, name, file_colon_line, source_indent)
+        @builder.span(:class => 'scenario_file') do
+          @builder << file_colon_line
+        end
         @listing_background = false
         @builder.h3(:id => "scenario_#{@scenario_number}") do
           @builder.span(keyword + ':', :class => 'keyword')
@@ -553,7 +556,7 @@ module Cucumber
       end
 
       def backtrace_line(line)
-        line.gsub(/^([^:]*\.(?:rb|feature|haml)):(\d*)/) do
+        line.gsub(/\A([^:]*\.(?:rb|feature|haml)):(\d*).*\z/) do
           if ENV['TM_PROJECT_DIRECTORY']
             "<a href=\"txmt://open?url=file://#{File.expand_path($1)}&line=#{$2}\">#{$1}:#{$2}</a> "
           else

data/lib/cucumber/platform.rb

@@ -4,7 +4,7 @@ require 'rbconfig'
 
 module Cucumber
 unless defined?(Cucumber::VERSION)
-  VERSION       = '0.10.0'
+  VERSION       = '0.10.1'
   BINARY        = File.expand_path(File.dirname(__FILE__) + '/../../bin/cucumber')
   LIBDIR        = File.expand_path(File.dirname(__FILE__) + '/../../lib')
   JRUBY         = defined?(JRUBY_VERSION)
@@ -20,8 +20,8 @@ unless defined?(Cucumber::VERSION)
   class << self
     attr_accessor :use_full_backtrace
 
-    def file_mode(m) #:nodoc:
-      RUBY_1_9 ? "#{m}:UTF-8" : m
+    def file_mode(m, encoding="UTF-8") #:nodoc:
+      RUBY_1_9 ? "#{m}:#{encoding}" : m
     end
   end
   self.use_full_backtrace = false

data/lib/cucumber/rake/task.rb

@@ -1,5 +1,12 @@
 require 'cucumber/platform'
 
+begin
+  # Support Rake > 0.8.7
+  require 'rake/dsl_definition'
+  include Rake::DSL
+rescue LoadError
+end
+
 module Cucumber
   module Rake
     # Defines a Rake task for running features.
@@ -8,7 +15,7 @@ module Cucumber
     #
     #   Cucumber::Rake::Task.new
     #
-    # This will define a task named <tt>cucumber</tt> described as 'Run Cucumber features'. 
+    # This will define a task named <tt>cucumber</tt> described as 'Run Cucumber features'.
     # It will use steps from 'features/**/*.rb' and features in 'features/**/*.feature'.
     #
     # To further configure the task, you can pass a block:
@@ -22,36 +29,36 @@ module Cucumber
     #   Cucumber::Rake::Task.new do |t|
     #     t.rcov = true
     #   end
-    # 
+    #
     # See the attributes for additional configuration possibilities.
     class Task
       class InProcessCucumberRunner #:nodoc:
         attr_reader :args
-        
+
         def initialize(libs, cucumber_opts, feature_files)
           raise "libs must be an Array when running in-process" unless Array === libs
           libs.reverse.each{|lib| $LOAD_PATH.unshift(lib)}
           @args = (
-            cucumber_opts + 
+            cucumber_opts +
             feature_files
           ).flatten.compact
         end
-        
+
         def run
           require 'cucumber/cli/main'
           failure = Cucumber::Cli::Main.execute(args)
           raise "Cucumber failed" if failure
         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 + 
+            ['-I'] + load_path(libs) +
+            quoted_binary(cucumber_bin) +
+            cucumber_opts +
             feature_files
           ).flatten
         end
@@ -76,11 +83,11 @@ module Cucumber
       class RCovCucumberRunner < ForkedCucumberRunner #:nodoc:
         def initialize(libs, cucumber_bin, cucumber_opts, feature_files, rcov_opts)
           @args = (
-            ['-I'] + load_path(libs) + 
+            ['-I'] + load_path(libs) +
             ['-S', 'rcov'] + rcov_opts +
-            quoted_binary(cucumber_bin) + 
-            ['--'] + 
-            cucumber_opts + 
+            quoted_binary(cucumber_bin) +
+            ['--'] +
+            cucumber_opts +
             feature_files
           ).flatten
         end
@@ -117,7 +124,7 @@ module Cucumber
       # your load path and gems.
       attr_accessor :fork
 
-      # Define what profile to be used.  When used with cucumber_opts it is simply appended 
+      # 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.
       attr_accessor :profile
 

data/lib/cucumber/rb_support/rb_transform.rb

@@ -32,6 +32,23 @@ module Cucumber
           @rb_language.current_world.cucumber_instance_exec(true, @regexp.inspect, *args, &@proc)
         end
       end
+    
+      def to_s
+        strip_captures(strip_anchors(@regexp.source))
+      end
+    
+    private
+
+      def strip_captures(regexp_source)
+        regexp_source.
+          gsub(/(\()/, '').
+          gsub(/(\))/, '')
+      end
+
+      def strip_anchors(regexp_source)
+        regexp_source.
+          gsub(/(^\^|\$$)/, '')
+      end
     end
   end
 end

data/lib/cucumber/rb_support/rb_world.rb

@@ -48,8 +48,8 @@ module Cucumber
       end
 
       # See StepMother#embed
-      def embed(file, mime_type)
-        @__cucumber_step_mother.embed(file, mime_type)
+      def embed(file, mime_type, label='Screenshot')
+        @__cucumber_step_mother.embed(file, mime_type, label)
       end
 
       # Prints out the world class, followed by all included modules.

data/lib/cucumber/runtime/for_programming_languages.rb

@@ -16,7 +16,9 @@ module Cucumber
       def_delegators :@user_interface,
         :embed,
         :ask,
-        :announce
+        :announce,
+        :features_paths,
+        :step_match
     
       def_delegators :@support_code,
         :invoke_steps,

data/lib/cucumber/runtime/user_interface.rb

@@ -49,8 +49,8 @@ module Cucumber
       # Embed +file+ of MIME type +mime_type+ into the output. This may or may
       # not be ignored, depending on what kind of formatter(s) are active.
       #
-      def embed(file, mime_type)
-        @visitor.embed(file, mime_type)
+      def embed(file, mime_type, label)
+        @visitor.embed(file, mime_type, label)
       end
 
     private

data/lib/cucumber/wire_support/configuration.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'erb'
 
 module Cucumber
   module WireSupport
@@ -6,7 +7,7 @@ module Cucumber
       attr_reader :host, :port
       
       def initialize(wire_file)
-        params = YAML.load_file(wire_file)
+        params = YAML.load(ERB.new(File.read(wire_file)).result)
         @host = params['host']
         @port = params['port']
         @timeouts = default_timeouts.merge(params['timeout'] || {})

data/spec/cucumber/ast/table_spec.rb

@@ -55,6 +55,12 @@ module Cucumber
         @table.hashes.first['one'].should == 4444
       end
 
+      it "should allow mapping columns and modify the rows as well" do
+        @table.map_column!(:one) { |v| v.to_i }
+        @table.rows.first.should include(4444)
+        @table.rows.first.should_not include('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 }
@@ -67,6 +73,10 @@ module Cucumber
         }.should raise_error('The column named "two" does not exist')
       end
 
+      it "should return the table" do
+        (@table.map_column!(:one) { |v| v.to_i }).should == @table
+      end
+
       describe "#match" do
         before(:each) do
           @table = Table.new([

data/spec/cucumber/cli/options_spec.rb

@@ -112,6 +112,13 @@ module Cli
         end
       end
 
+      context '-l LINES or --lines LINES' do
+        it "adds line numbers to args" do
+          options.parse!(%w{-l24 FILE})
+          options.instance_variable_get(:@args).should == ['FILE:24']
+        end
+      end
+
       context '-p PROFILE or --profile PROFILE' do
 
         it "notifies the user that an individual profile is being used" do

data/spec/cucumber/formatter/html_spec.rb

@@ -11,9 +11,7 @@ module Cucumber
       extend SpecHelperDsl
       include SpecHelper
 
-      matcher = defined?(Spec::Matchers) ? Spec::Matchers : RSpec::Matchers
-
-      matcher.define :have_css_node do |css, regexp|
+      RSpec::Matchers.define :have_css_node do |css, regexp|
         match do |doc|
           nodes = doc.css(css)
           nodes.detect{ |node| node.text =~ regexp }

data/spec/cucumber/rb_support/rb_transform_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+require 'cucumber/rb_support/rb_transform'
+
+module Cucumber
+  module RbSupport
+    describe RbTransform do
+      def transform(regexp)
+        RbTransform.new(nil, regexp, lambda { |a| })
+      end
+      describe "#to_s" do
+        it "removes the capture group parentheses" do
+          transform(/(a)bc/).to_s.should == "abc"
+        end
+        
+        it "strips away anchors" do
+          transform(/^xyz$/).to_s.should == "xyz"
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 10
-  - 0
-  version: 0.10.0
+  prerelease: 
+  version: 0.10.1
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-07 00:00:00 +00:00
+date: 2011-03-20 00:00:00 +00:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,13 +18,9 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        - 2
-        version: 2.3.2
+        version: 2.3.5
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -37,12 +29,8 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 5
         version: 1.0.5
   type: :runtime
   prerelease: false
@@ -54,10 +42,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 1
-        - 2
         version: 2.1.2
   type: :runtime
   prerelease: false
@@ -67,12 +51,8 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        - 2
         version: 1.1.2
   type: :runtime
   prerelease: false
@@ -82,133 +62,97 @@ dependencies:
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 6
         version: 1.4.6
   type: :runtime
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: aruba
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 8
-        - 7
-        version: 0.8.7
+        version: 0.3.4
   type: :development
   prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rake
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 2
-        - 0
-        version: 2.2.0
+        version: 0.8.7
   type: :development
   prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
+  name: rspec
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 3
-        version: 1.4.3
+        version: 2.5.0
   type: :development
   prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: prawn
+  name: nokogiri
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 8
-        - 4
-        version: 0.8.4
+        version: 1.4.4
   type: :development
   prerelease: false
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: prawn-layout
+  name: prawn
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 8
-        - 4
         version: 0.8.4
   type: :development
   prerelease: false
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: syntax
+  name: prawn-layout
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+        version: 0.8.4
   type: :development
   prerelease: false
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: spork
+  name: syntax
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 8
-        - 4
-        version: 0.8.4
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: aruba
+  name: spork
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        - 7
-        version: 0.2.7
+        version: 0.8.4
   type: :development
   prerelease: false
   version_requirements: *id013
@@ -217,16 +161,67 @@ dependencies:
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 7
-        version: 0.3.7
+        version: 0.4.1
   type: :development
   prerelease: false
   version_requirements: *id014
+- !ruby/object:Gem::Dependency 
+  name: ramaze
+  requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id015
+- !ruby/object:Gem::Dependency 
+  name: rack-test
+  requirement: &id016 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.5.7
+  type: :development
+  prerelease: false
+  version_requirements: *id016
+- !ruby/object:Gem::Dependency 
+  name: webrat
+  requirement: &id017 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.7.3
+  type: :development
+  prerelease: false
+  version_requirements: *id017
+- !ruby/object:Gem::Dependency 
+  name: sinatra
+  requirement: &id018 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.0
+  type: :development
+  prerelease: false
+  version_requirements: *id018
+- !ruby/object:Gem::Dependency 
+  name: capybara
+  requirement: &id019 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.4.1
+  type: :development
+  prerelease: false
+  version_requirements: *id019
 description: Behaviour Driven Development with elegance and joy
 email: cukes@googlegroups.com
 executables: 
@@ -380,8 +375,8 @@ files:
 - examples/i18n/pt/features/support/env.rb
 - examples/i18n/pt/lib/calculadora.rb
 - examples/i18n/ro/Rakefile
+- examples/i18n/ro/features/adunare.feature
 - examples/i18n/ro/features/step_definitons/calculator_steps.rb
-- examples/i18n/ro/features/suma.feature
 - examples/i18n/ro/lib/calculator.rb
 - examples/i18n/ru/Rakefile
 - examples/i18n/ru/features/addition.feature
@@ -498,14 +493,18 @@ files:
 - examples/watir/features/support/env.rb
 - examples/watir/features/support/screenshots.rb
 - features/background.feature
+- features/bootstrap.feature
 - features/custom_formatter.feature
 - features/execute_with_tag_filter.feature
 - features/hooks.feature
+- features/iso-8859-1.feature
 - features/json_formatter.feature
 - features/stats_formatters.feature
 - features/step_definitions/cucumber_steps.rb
+- features/step_definitions/iso-8859-1_steps.rb
 - features/support/env.rb
 - features/tagged_hooks.feature
+- features/transforms.feature
 - fixtures/json/features/background.feature
 - fixtures/json/features/embed.feature
 - fixtures/json/features/one_passing_one_failing.feature
@@ -626,6 +625,7 @@ files:
 - legacy_features/transform.feature
 - legacy_features/unicode_table.feature
 - legacy_features/wire_protocol.feature
+- legacy_features/wire_protocol_erb.feature
 - legacy_features/wire_protocol_table_diffing.feature
 - legacy_features/wire_protocol_tags.feature
 - legacy_features/wire_protocol_timeouts.feature
@@ -763,6 +763,7 @@ files:
 - spec/cucumber/formatter/spec_helper.rb
 - spec/cucumber/rb_support/rb_language_spec.rb
 - spec/cucumber/rb_support/rb_step_definition_spec.rb
+- spec/cucumber/rb_support/rb_transform_spec.rb
 - spec/cucumber/rb_support/regexp_argument_matcher_spec.rb
 - spec/cucumber/runtime/support_code_spec.rb
 - spec/cucumber/runtime_spec.rb
@@ -782,7 +783,7 @@ licenses: []
 
 post_install_message: "\n\
   (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)\n\n\
-  Thank you for installing cucumber-0.10.0.\n\
+  Thank you for installing cucumber-0.10.1.\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"
@@ -795,7 +796,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4492259644257557500
+      hash: -4213399443349988344
       segments: 
       - 0
       version: "0"
@@ -804,27 +805,31 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4492259644257557500
+      hash: -4213399443349988344
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: cucumber-0.10.0
+summary: cucumber-0.10.1
 test_files: 
 - features/background.feature
+- features/bootstrap.feature
 - features/custom_formatter.feature
 - features/execute_with_tag_filter.feature
 - features/hooks.feature
+- features/iso-8859-1.feature
 - features/json_formatter.feature
 - features/stats_formatters.feature
 - features/step_definitions/cucumber_steps.rb
+- features/step_definitions/iso-8859-1_steps.rb
 - features/support/env.rb
 - features/tagged_hooks.feature
+- features/transforms.feature
 - spec/cucumber/ast/background_spec.rb
 - spec/cucumber/ast/feature_factory.rb
 - spec/cucumber/ast/feature_spec.rb
@@ -851,6 +856,7 @@ test_files:
 - spec/cucumber/formatter/spec_helper.rb
 - spec/cucumber/rb_support/rb_language_spec.rb
 - spec/cucumber/rb_support/rb_step_definition_spec.rb
+- spec/cucumber/rb_support/rb_transform_spec.rb
 - spec/cucumber/rb_support/regexp_argument_matcher_spec.rb
 - spec/cucumber/runtime/support_code_spec.rb
 - spec/cucumber/runtime_spec.rb