cucumber 1.0.1 → 1.0.2

data/Gemfile

@@ -1,7 +1,2 @@
 source "http://rubygems.org"
-
-group :development do
-  # gem 'gherkin', :path => '../gherkin'
-end
-
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cucumber (1.0.0)
+    cucumber (1.0.1)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
       gherkin (~> 2.4.5)

data/History.md

@@ -1,3 +1,14 @@
+## [v1.0.2](https://github.com/cucumber/cucumber/compare/v1.0.1...v1.0.2)
+
+### Bugfixes
+* Cucumber 1.0.1 breaks cuke4duke ([#104](https://github.com/cucumber/cucumber/issues/104) Aslak Hellesøy)
+
+### New Features
+* Better line truncation if $CUCUMBER_TRUNCATE_OUTPUT has a max line length value. (Aslak Hellesøy)
+
+### Changes Features
+* --no-source also excludes location from the summary. (Aslak Hellesøy)
+
 ## [v1.0.1](https://github.com/cucumber/cucumber/compare/v1.0.0...v1.0.1)
 
 ### Bugfixes

data/features/background.feature

@@ -299,7 +299,7 @@ Feature: Background
         Then I should have '10' cukes
 
     Failing Scenarios:
-    cucumber features/failing_background.feature:7 # Scenario: failing background
+    cucumber features/failing_background.feature:7
     
     2 scenarios (1 failed, 1 skipped)
     6 steps (1 failed, 5 skipped)
@@ -335,7 +335,7 @@ Feature: Background
           | 10    |
 
     Failing Scenarios:
-    cucumber features/scenario_outline_failing_background.feature:6 # Scenario: failing background
+    cucumber features/scenario_outline_failing_background.feature:6
 
     2 scenarios (1 failed, 1 skipped)
     4 steps (1 failed, 3 skipped)
@@ -386,7 +386,7 @@ Feature: Background
         Then I should have '10' global cukes
 
     Failing Scenarios:
-    cucumber features/failing_background_after_success.feature:10 # Scenario: failing background
+    cucumber features/failing_background_after_success.feature:10
 
     2 scenarios (1 failed, 1 passed)
     6 steps (1 failed, 1 skipped, 4 passed)

data/features/tagged_hooks.feature

@@ -58,9 +58,9 @@ Feature: Tag logic
         Scenario: And yet another Example
 
       Failing Scenarios:
-      cucumber features/tagulicious.feature:4 # Scenario: Example
-      cucumber features/tagulicious.feature:8 # Scenario: Another Example
-      cucumber features/tagulicious.feature:12 # Scenario: Yet another Example
+      cucumber features/tagulicious.feature:4
+      cucumber features/tagulicious.feature:8
+      cucumber features/tagulicious.feature:12
 
       4 scenarios (3 failed, 1 passed)
       3 steps (3 undefined)
@@ -97,7 +97,7 @@ Feature: Tag logic
         Scenario: And yet another Example
 
       Failing Scenarios:
-      cucumber features/tagulicious.feature:4 # Scenario: Example
+      cucumber features/tagulicious.feature:4
 
       4 scenarios (1 failed, 2 undefined, 1 passed)
       3 steps (3 undefined)
@@ -170,9 +170,9 @@ Feature: Tag logic
         Scenario: And yet another Example
 
       Failing Scenarios:
-      cucumber features/tagulicious.feature:4 # Scenario: Example
-      cucumber features/tagulicious.feature:8 # Scenario: Another Example
-      cucumber features/tagulicious.feature:12 # Scenario: Yet another Example
+      cucumber features/tagulicious.feature:4
+      cucumber features/tagulicious.feature:8
+      cucumber features/tagulicious.feature:12
 
       4 scenarios (3 failed, 1 passed)
       3 steps (3 undefined)
@@ -209,7 +209,7 @@ Feature: Tag logic
         Scenario: And yet another Example
 
       Failing Scenarios:
-      cucumber features/tagulicious.feature:4 # Scenario: Example
+      cucumber features/tagulicious.feature:4
 
       4 scenarios (1 failed, 2 undefined, 1 passed)
       3 steps (3 undefined)

data/legacy_features/cucumber_cli.feature

@@ -82,7 +82,7 @@ Feature: Cucumber command line
             features/sample.feature:18:in `Given failing'
       
       Failing Scenarios:
-      cucumber features/sample.feature:17 # Scenario: Failing
+      cucumber features/sample.feature:17
       
       2 scenarios (1 failed, 1 undefined)
       2 steps (1 failed, 1 undefined)
@@ -160,7 +160,7 @@ Feature: Cucumber command line
       features/sample.feature:18:in `Given failing'
 
       Failing Scenarios:
-      cucumber features/sample.feature:17 # Scenario: Failing
+      cucumber features/sample.feature:17
 
       3 scenarios (1 failed, 1 undefined, 1 passed)
       3 steps (1 failed, 1 undefined, 1 passed)
@@ -464,7 +464,7 @@ Feature: Cucumber command line
             features/sample.feature:18:in `Given failing'
 
       Failing Scenarios:
-      cucumber features/sample.feature:17 # Scenario: Failing
+      cucumber features/sample.feature:17
 
       3 scenarios (1 failed, 1 undefined, 1 passed)
       3 steps (1 failed, 1 undefined, 1 passed)

data/legacy_features/cucumber_cli_outlines.feature

@@ -27,7 +27,7 @@ Feature: Cucumber command line
             | passing | passing     |
 
       Failing Scenarios:
-      cucumber features/outline_sample.feature:5 # Scenario: Test state
+      cucumber features/outline_sample.feature:5
 
       4 scenarios (1 failed, 1 undefined, 2 passed)
       8 steps (1 failed, 2 skipped, 1 undefined, 4 passed)
@@ -59,7 +59,7 @@ Feature: Cucumber command line
             | passing | passing     |
 
       Failing Scenarios:
-      cucumber features/outline_sample.feature:5 # Scenario: Test state
+      cucumber features/outline_sample.feature:5
 
       4 scenarios (1 failed, 1 undefined, 2 passed)
       8 steps (1 failed, 2 skipped, 1 undefined, 4 passed)
@@ -108,7 +108,7 @@ Feature: Cucumber command line
       features/outline_sample.feature:6:in `Given <state> without a table'
 
       Failing Scenarios:
-      cucumber features/outline_sample.feature:5 # Scenario: Test state
+      cucumber features/outline_sample.feature:5
 
       5 scenarios (1 failed, 1 undefined, 3 passed)
       8 steps (1 failed, 2 skipped, 1 undefined, 4 passed)

data/legacy_features/diffing.feature

@@ -17,7 +17,7 @@ Feature: Cucumber command line
             features/failing_expectation.feature:4:in `Given failing expectation'
       
       Failing Scenarios:
-      cucumber features/failing_expectation.feature:3 # Scenario: Failing expectation
+      cucumber features/failing_expectation.feature:3
       
       1 scenario (1 failed)
       1 step (1 failed)

data/legacy_features/profiles.feature

@@ -118,7 +118,7 @@ Feature: Profiles
     Then it should fail
     And the output should contain
        """
-       cucumber -p super features/sample.feature:2 # Scenario: this is a test
+       cucumber -p super features/sample.feature:2
        """
     Examples:
       | format  |

data/legacy_features/work_in_progress.feature

@@ -64,7 +64,7 @@ Feature: Cucumber --work-in-progress switch
             features/wip.feature:4:in `Given a failing step'
       
       Failing Scenarios:
-      cucumber features/wip.feature:3 # Scenario: Failing
+      cucumber features/wip.feature:3
 
       1 scenario (1 failed)
       1 step (1 failed)

data/lib/cucumber/ast/step_invocation.rb

@@ -118,21 +118,23 @@ module Cucumber
         end
       end
 
+      # This constant is appended to by Cuke4Duke. Do not change its name
+      BACKTRACE_FILTER_PATTERNS = [/vendor\/rails|lib\/cucumber|bin\/cucumber:|lib\/rspec|gems\/|minitest|test\/unit/]
       PWD_PATTERN = /#{Regexp.escape(Dir.pwd)}\//m
-      BACKTRACE_FILTER_PATTERN = /vendor\/rails|lib\/cucumber|bin\/cucumber:|lib\/rspec|gems\/|minitest|test\/unit/
-      IN_PATTERN = /(.*):in `/
 
+      # This is to work around double ":in " segments in JRuby backtraces. JRuby bug?
       def filter_backtrace(e)
         return e if Cucumber.use_full_backtrace
         e.backtrace.each{|line| line.gsub!(PWD_PATTERN, "./")}
         
         filtered = (e.backtrace || []).reject do |line|
-          line =~ BACKTRACE_FILTER_PATTERN
+          BACKTRACE_FILTER_PATTERNS.detect { |p| line =~ p }
         end
 
         if ENV['CUCUMBER_TRUNCATE_OUTPUT']
+          # Strip off file locations
           filtered = filtered.map do |line|
-            line =~ IN_PATTERN ? $1 : line
+            line =~ /(.*):in `/ ? $1 : line
           end
         end
 

data/lib/cucumber/formatter/console.rb

@@ -59,21 +59,16 @@ 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, profiles = [])
+      def print_stats(features, options)
         @failures = step_mother.scenarios(:failed).select { |s| s.is_a?(Cucumber::Ast::Scenario) || s.is_a?(Cucumber::Ast::OutlineTable::ExampleRow) }
         @failures.collect! { |s| (s.is_a?(Cucumber::Ast::OutlineTable::ExampleRow)) ? s.scenario_outline : s }
 
         if !@failures.empty?          
           @io.puts format_string("Failing Scenarios:", :failed)
           @failures.each do |failure|
-            profiles_string = profiles.empty? ? '' : (profiles.map{|profile| "-p #{profile}" }).join(' ') + ' '
-            @io.puts format_string("cucumber #{profiles_string}" + failure.file_colon_line, :failed) +
-            format_string(" # Scenario: " + failure.name, :comment)
+            profiles_string = options.custom_profiles.empty? ? '' : (options.custom_profiles.map{|profile| "-p #{profile}" }).join(' ') + ' '
+            source = options[:source] ? format_string(" # Scenario: " + failure.name, :comment) : ''
+            @io.puts format_string("cucumber #{profiles_string}" + failure.file_colon_line, :failed) + source
           end
           @io.puts
         end
@@ -87,9 +82,19 @@ module Cucumber
       end
 
       def print_exception(e, status, indent)
-        string = "#{e.message} (#{e.class})\n#{e.backtrace.join("\n")}".indent(indent)
+        message = "#{e.message} (#{e.class})"
+        if ENV['CUCUMBER_TRUNCATE_OUTPUT']
+          message = linebreaks(message, ENV['CUCUMBER_TRUNCATE_OUTPUT'].to_i)
+        end
+
+        string = "#{message}\n#{e.backtrace.join("\n")}".indent(indent)
         @io.puts(format_string(string, status))
       end
+      
+      # http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-talk/10655 
+      def linebreaks(s, max)
+        s.gsub(/.{1,#{max}}(?:\s|\Z)/){($& + 5.chr).gsub(/\n\005/,"\n").gsub(/\005/,"\n")}.rstrip
+      end
 
       def print_snippets(options)
         return unless options[:snippets]

data/lib/cucumber/formatter/pretty.rb

@@ -228,7 +228,7 @@ module Cucumber
       end
 
       def print_summary(features)
-        print_stats(features, @options.custom_profiles)
+        print_stats(features, @options)
         print_snippets(@options)
         print_passing_wip(@options)
       end

data/lib/cucumber/formatter/progress.rb

@@ -65,7 +65,7 @@ module Cucumber
       def print_summary(features)
         print_steps(:pending)
         print_steps(:failed)
-        print_stats(features, @options.custom_profiles)
+        print_stats(features, @options)
         print_snippets(@options)
         print_passing_wip(@options)
       end

data/lib/cucumber/platform.rb

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

metadata

@@ -2,7 +2,7 @@
 name: cucumber
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-10 00:00:00 Z
+date: 2011-07-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: gherkin
@@ -831,7 +831,7 @@ licenses: []
 
 post_install_message: "\n\
   (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)\n\n\
-  Thank you for installing cucumber-1.0.1.\n\
+  Thank you for installing cucumber-1.0.2.\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"
@@ -857,7 +857,7 @@ rubyforge_project:
 rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
-summary: cucumber-1.0.1
+summary: cucumber-1.0.2
 test_files: 
 - features/background.feature
 - features/bootstrap.feature