cucumber 1.0.0 → 1.0.1

data/lib/cucumber/ast/tree_walker.rb

@@ -158,7 +158,6 @@ module Cucumber
       def broadcast(*args, &block)
         message = extract_method_name_from(caller)
         message.gsub!('visit_', '')
-        
         if block_given?
           send_to_all("before_#{message}", *args)
           yield if block_given?

data/lib/cucumber/formatter/console.rb

@@ -87,7 +87,8 @@ module Cucumber
       end
 
       def print_exception(e, status, indent)
-        @io.puts(format_string("#{e.message} (#{e.class})\n#{e.backtrace.join("\n")}".indent(indent), status))
+        string = "#{e.message} (#{e.class})\n#{e.backtrace.join("\n")}".indent(indent)
+        @io.puts(format_string(string, status))
       end
 
       def print_snippets(options)

data/lib/cucumber/formatter/gherkin_formatter_adapter.rb

@@ -11,9 +11,6 @@ module Cucumber
         @print_emtpy_match = print_emtpy_match
       end
 
-      def before_features(features)
-      end
-
       def before_feature(feature)
         @gf.uri(feature.file)
         @gf.feature(feature.gherkin_statement)
@@ -21,12 +18,10 @@ module Cucumber
 
       def before_background(background)
         @outline = false
-        @gf.steps(background.raw_steps)
         @gf.background(background.gherkin_statement)
       end
 
       def before_feature_element(feature_element)
-        @gf.steps(feature_element.raw_steps)
         case(feature_element)
         when Ast::Scenario
           @outline = false
@@ -77,7 +72,11 @@ module Cucumber
       end
 
       def embed(file, mime_type, label)
-        @gf.embedding(mime_type, File.read(file))
+        data = File.read(file)
+        if defined?(JRUBY_VERSION)
+          data = data.to_java_bytes
+        end
+        @gf.embedding(mime_type, data)
       end
     end
   end

data/lib/cucumber/formatter/html.rb

@@ -291,7 +291,7 @@ module Cucumber
       def doc_string(string)
         return if @hide_this_step
         @builder.pre(:class => 'val') do |pre|
-          @builder << string.gsub("\n", '&#x000A;')
+          @builder << h(string.gsub("\n", '&#x000A;'))
         end
       end
   
@@ -373,8 +373,8 @@ module Cucumber
         @builder.div(:class => 'message') do
           message = exception.message
           if defined?(RAILS_ROOT) && message.include?('Exception caught')
-            matches = message.match(/Showing <i>(.+)<\/i>(?:.+)#(\d+)/)
-            backtrace += ["#{RAILS_ROOT}/#{matches[1]}:#{matches[2]}"]
+            matches = message.match(/Showing <i>(.+)<\/i>(?:.+) #(\d+)/)
+            backtrace += ["#{RAILS_ROOT}/#{matches[1]}:#{matches[2]}"] if matches
             message = message.match(/<code>([^(\/)]+)<\//m)[1]
           end
           @builder.pre do 

data/lib/cucumber/formatter/json.rb

@@ -11,17 +11,19 @@ module Cucumber
 
       def initialize(step_mother, io, options)
         @io = ensure_io(io, "json")
-        @obj = {'features' => []}
-        super(Gherkin::Formatter::JSONFormatter.new(nil), false)
+        @io.write('{"features":[')
+        super(Gherkin::Formatter::JSONFormatter.new(@io), false)
       end
 
-      def after_feature(feature)
+      def before_feature(feature)
         super
-        @obj['features'] << @gf.gherkin_object
+        @io.write(',') if @one
+        @one = true
       end
 
       def after_features(features)
-        @io.write(@obj.to_json)
+        @io.write(']}')
+        @io.flush
       end
     end
   end

data/lib/cucumber/formatter/junit.rb

@@ -144,8 +144,7 @@ module Cucumber
       end
       
       def basename(feature_file)
-        ext_length = File.extname(feature_file).length
-        feature_file.gsub('features/', '').gsub(File::SEPARATOR, '_')[0...-ext_length]
+        File.basename(feature_file.gsub(/[\\\/]/, '-'), '.feature')
       end
       
       def write_file(feature_filename, data)

data/lib/cucumber/formatter/rerun.rb

@@ -28,11 +28,13 @@ module Cucumber
       end
       
       def after_feature(*)
-        after_first_time do
-          @io.print ' '
+        unless @lines.empty?
+          after_first_time do
+            @io.print ' '
+          end
+          @io.print "#{@file}:#{@lines.join(':')}"
+          @io.flush
         end
-        @io.print "#{@file}:#{@lines.join(':')}"
-        @io.flush
       end
 
       def after_features(features)

data/lib/cucumber/platform.rb

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

data/spec/cucumber/ast/scenario_outline_spec.rb

@@ -52,7 +52,7 @@ module Cucumber
                   %w{20 6 14}
                 ]
               ],
-              Gherkin::Formatter::Model::Examples.new(nil, nil, nil, nil, nil, nil)
+              Gherkin::Formatter::Model::Examples.new(nil, nil, nil, nil, nil, nil, nil)
             ]
           ]
 

data/spec/cucumber/formatter/junit_spec.rb

@@ -61,7 +61,7 @@ module Cucumber::Formatter
         }, File.join('features', 'some', 'path', 'spec.feature')
 
         it 'writes the filename including the subdirectory' do
-          @formatter.written_files.keys.first.should == File.join('', 'TEST-some_path_spec.xml')
+          @formatter.written_files.keys.first.should == File.join('', 'TEST-features-some-path-spec.xml')
         end
       end
       

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 0
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -15,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-20 00:00:00 +01:00
-default_executable: 
+date: 2011-07-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: gherkin
@@ -26,12 +20,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 2
-        - 4
-        - 1
-        version: 2.4.1
+        version: 2.4.5
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,11 +31,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 0
-        - 5
         version: 1.0.5
   type: :runtime
   version_requirements: *id002
@@ -58,11 +42,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 1
-        - 2
         version: 2.1.2
   type: :runtime
   version_requirements: *id003
@@ -74,11 +53,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 1
-        - 2
         version: 1.1.2
   type: :runtime
   version_requirements: *id004
@@ -90,11 +64,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 4
-        - 6
         version: 1.4.6
   type: :runtime
   version_requirements: *id005
@@ -106,11 +75,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 4
-        - 2
         version: 0.4.2
   type: :development
   version_requirements: *id006
@@ -122,11 +86,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
         version: 0.9.2
   type: :development
   version_requirements: *id007
@@ -138,11 +97,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
         version: 2.6.0
   type: :development
   version_requirements: *id008
@@ -154,11 +108,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 4
-        - 4
         version: 1.4.4
   type: :development
   version_requirements: *id009
@@ -170,11 +119,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 0
-        - 8
-        - 4
         version: 0.8.4
   type: :development
   version_requirements: *id010
@@ -186,11 +130,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 0
-        - 8
-        - 4
         version: 0.8.4
   type: :development
   version_requirements: *id011
@@ -202,11 +141,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
   type: :development
   version_requirements: *id012
@@ -218,13 +152,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15424139
-        segments: 
-        - 0
-        - 9
-        - 0
-        - rc
-        - 7
         version: 0.9.0.rc7
   type: :development
   version_requirements: *id013
@@ -236,11 +163,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 4
-        - 2
         version: 0.4.2
   type: :development
   version_requirements: *id014
@@ -252,11 +174,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 7
-        - 1
         version: 0.7.1
   type: :development
   version_requirements: *id015
@@ -268,11 +185,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 6
-        - 8
         version: 1.6.8
   type: :development
   version_requirements: *id016
@@ -284,11 +196,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 6
-        - 1
         version: 0.6.1
   type: :development
   version_requirements: *id017
@@ -300,9 +207,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id018
@@ -314,11 +218,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 5
-        - 7
         version: 0.5.7
   type: :development
   version_requirements: *id019
@@ -330,11 +229,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 7
-        - 3
         version: 0.7.3
   type: :development
   version_requirements: *id020
@@ -346,11 +240,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 2
-        - 6
         version: 1.2.6
   type: :development
   version_requirements: *id021
@@ -362,11 +251,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
   type: :development
   version_requirements: *id022
@@ -650,7 +534,7 @@ files:
 - features/iso-8859-1.feature
 - features/json_formatter.feature
 - features/stats_formatters.feature
-- features/step_definitions/cucumber-features/core_steps.rb
+- features/step_definitions/cucumber-features/cucumber_ruby_mappings.rb
 - features/step_definitions/cucumber_steps.rb
 - features/step_definitions/iso-8859-1_steps.rb
 - features/support/env.rb
@@ -907,7 +791,6 @@ files:
 - spec/cucumber/ast/feature_spec.rb
 - spec/cucumber/ast/outline_table_spec.rb
 - spec/cucumber/ast/scenario_outline_spec.rb
-- spec/cucumber/ast/scenario_spec.rb
 - spec/cucumber/ast/step_spec.rb
 - spec/cucumber/ast/table_spec.rb
 - spec/cucumber/ast/tree_walker_spec.rb
@@ -943,20 +826,15 @@ files:
 - spec/cucumber/wire_support/wire_step_definition_spec.rb
 - spec/cucumber/world/pending_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://cukes.info
 licenses: []
 
-post_install_message: |+
-  
-  (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)
-  
-  Thank you for installing cucumber-1.0.0.
-  Please be sure to read http://wiki.github.com/cucumber/cucumber/upgrading
-  for important information about this release. Happy cuking!
-  
-  (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)
-  
+post_install_message: "\n\
+  (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)\n\n\
+  Thank you for installing cucumber-1.0.1.\n\
+  Please be sure to read http://wiki.github.com/cucumber/cucumber/upgrading\n\
+  for important information about this release. Happy cuking!\n\n\
+  (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)\n\n"
 rdoc_options: 
 - --charset=UTF-8
 require_paths: 
@@ -966,26 +844,20 @@ 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: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
-summary: cucumber-1.0.0
+summary: cucumber-1.0.1
 test_files: 
 - features/background.feature
 - features/bootstrap.feature
@@ -995,7 +867,7 @@ test_files:
 - features/iso-8859-1.feature
 - features/json_formatter.feature
 - features/stats_formatters.feature
-- features/step_definitions/cucumber-features/core_steps.rb
+- features/step_definitions/cucumber-features/cucumber_ruby_mappings.rb
 - features/step_definitions/cucumber_steps.rb
 - features/step_definitions/iso-8859-1_steps.rb
 - features/support/env.rb
@@ -1007,7 +879,6 @@ test_files:
 - spec/cucumber/ast/feature_spec.rb
 - spec/cucumber/ast/outline_table_spec.rb
 - spec/cucumber/ast/scenario_outline_spec.rb
-- spec/cucumber/ast/scenario_spec.rb
 - spec/cucumber/ast/step_spec.rb
 - spec/cucumber/ast/table_spec.rb
 - spec/cucumber/ast/tree_walker_spec.rb