cucumber 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a8c84c24005a3a9e0b4f434206b98e3c1d2125b
-  data.tar.gz: 8b96677e8af4daa48cc8d2df36e371a93f4831e4
+  metadata.gz: 54a19c3d70484ac7ded68c6ccf6a9b3b482598cc
+  data.tar.gz: 359760639e06c251399202275219bb763b2de0b9
 SHA512:
-  metadata.gz: 6a1786e8f0a9773428a3cc9abbb7c7c5a1d8b8a6251976d80ad741ac822615c023fe565ad65c363ab00833993c9dc63c91977dbfdf1f1324a3777e48086285fc
-  data.tar.gz: 19108ede29917929398c580c3a83d88471654baae66a26de7cdc58aec09aed1fa00df33214bbe77579ec2fc41bd408e21c36c06d1b310d58a1924efb6edc0313
+  metadata.gz: 4737148210ae32c40a5bba409f85cf4bf6c4312d2d2ddfc8812aae0476d14e0423271ed72ef35e6ad8e4ad93273f05acd915155d4e161c775ae6e71ed92819fe
+  data.tar.gz: ef7867ae75f81da2e36ca1c45d5d27b24520ca176685532c64c5e8cc74933a700711e4ec3fb64313b194011bb8aa206f454fb22011a6a1aeef22b86ab819432e

data/History.md

@@ -1,8 +1,14 @@
-## [In Git](https://github.com/cucumber/cucumber-ruby/compare/v2.0.1...master)
+## [In Git](https://github.com/cucumber/cucumber-ruby/compare/v2.0.2...master)
 
-...
 
-## [In Git](https://github.com/cucumber/cucumber-ruby/compare/v2.0.0...v2.0.1)
+## [v2.0.2](https://github.com/cucumber/cucumber-ruby/compare/v2.0.1...v2.0.2)
+
+### Bugfixes
+
+* Revert interface change in Cucumber::Formatter::Console (which can break custom formatters in v2.0.1) ([893](https://github.com/cucumber/cucumber-ruby/issues/893) @brasmusson).
+* Calculate the locations of hooks properly (so it also work between drives on Windows) ([885](https://github.com/cucumber/cucumber-ruby/issues/885) @brasmusson).
+
+## [v2.0.1](https://github.com/cucumber/cucumber-ruby/compare/v2.0.0...v2.0.1)
 
 ### New Features
 

data/features/docs/gherkin/doc_strings.feature

@@ -1,31 +1,31 @@
 Feature: Doc strings
 
-  If you need to specify information in a scenario that won't fit on a single line, 
+  If you need to specify information in a scenario that won't fit on a single line,
   you can use a DocString.
-  
+
   A DocString follows a step, and starts and ends with three double quotes, like this:
-  
+
   ```gherkin
   When I ask to reset my password
   Then I should receive an email with:
     """
     Dear bozo,
-    
+
     Please click this link to reset your password
     """
   ```
-  
+
   It's possible to annotate the DocString with the type of content it contains. This is used by
   formatting tools like http://relishapp.com which will render the contents of the DocString
   appropriately. You specify the content type after the triple quote, like this:
-  
+
   ```gherkin
   Given there is some Ruby code:
     """ruby
     puts "hello world"
     """
   ```
-  
+
   You can read the content type from the argument passed into your step definition, as shown
   in the example below.
 
@@ -33,11 +33,11 @@ Feature: Doc strings
     Given a scenario with a step that looks like this:
       """gherkin
       Given I have a lot to say:
-       \"\"\"
-       One
-       Two
-       Three
-       \"\"\"
+        \"\"\"
+        One
+        Two
+        Three
+        \"\"\"
       """
     And a step definition that looks like this:
       """ruby
@@ -57,9 +57,9 @@ Feature: Doc strings
     Given a scenario with a step that looks like this:
       """gherkin
       Given I have some code for you:
-       \"\"\"ruby
-       # hello
-       \"\"\"
+        \"\"\"ruby
+        # hello
+        \"\"\"
       """
     And a step definition that looks like this:
       """ruby

data/lib/cucumber/filters/prepare_world.rb

@@ -1,6 +1,6 @@
 require 'cucumber/core/filter'
+require 'cucumber/core/ast/location'
 require 'cucumber/running_test_case'
-require 'cucumber/hooks'
 
 module Cucumber
   module Filters
@@ -25,7 +25,8 @@ module Cucumber
           around_hooks = [init_scenario] + @original_test_case.around_hooks
 
           empty_hook = proc {} #no op - legacy format adapter expects a before hooks
-          default_hook = Cucumber::Hooks.before_hook(@original_test_case.source, Cucumber::Hooks.location(empty_hook), &empty_hook)
+          file, line = *empty_hook.source_location
+          default_hook = Cucumber::Hooks.before_hook(@original_test_case.source, Cucumber::Core::Ast::Location.new(file, line), &empty_hook)
           steps = [default_hook] + @original_test_case.test_steps
 
           @original_test_case.with_around_hooks(around_hooks).with_steps(steps)

data/lib/cucumber/formatter/console.rb

@@ -76,7 +76,12 @@ module Cucumber
         end
       end
 
-      def print_stats(duration, options)
+      def print_stats(features, options)
+        duration = features ? features.duration : nil
+        print_statistics(duration, options)
+      end
+
+      def print_statistics(duration, options)
         failures = collect_failing_scenarios(runtime)
         if !failures.empty?
           print_failing_scenarios(failures, options.custom_profiles, options[:source])

data/lib/cucumber/formatter/pretty.rb

@@ -240,8 +240,7 @@ module Cucumber
       end
 
       def print_summary(features)
-        duration = features ? features.duration : nil
-        print_stats(duration, @options)
+        print_stats(features, @options)
         print_snippets(@options)
         print_passing_wip(@options)
       end

data/lib/cucumber/formatter/progress.rb

@@ -46,7 +46,7 @@ module Cucumber
       def print_summary
         print_steps(:pending)
         print_steps(:failed)
-        print_stats(@total_duration, @options)
+        print_statistics(@total_duration, @options)
         print_snippets(@options)
         print_passing_wip(@options)
       end

data/lib/cucumber/hooks.rb

@@ -26,13 +26,6 @@ module Cucumber
         Core::Test::AroundHook.new(&block)
       end
 
-      def location(hook)
-        filepath, line = *hook.source_location
-        Core::Ast::Location.new(
-          Pathname.new(filepath).relative_path_from(Pathname.new(Dir.pwd)).to_path,
-          line)
-      end
-
       private
 
       def build_hook_step(source, location, block, hook_type, action_type)

data/lib/cucumber/platform.rb

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

data/lib/cucumber/rb_support/rb_hook.rb

@@ -2,12 +2,14 @@ module Cucumber
   module RbSupport
     # Wrapper for Before, After and AfterStep hooks
     class RbHook
-      attr_reader :tag_expressions
+      attr_reader :tag_expressions, :location
 
       def initialize(rb_language, tag_expressions, proc)
         @rb_language = rb_language
         @tag_expressions = tag_expressions
         @proc = proc
+        file, line = @proc.file_colon_line.match(/(.*):(\d+)/)[1..2]
+        @location = Core::Ast::Location.new(file, line)
       end
 
       def source_location

data/lib/cucumber/rb_support/rb_step_definition.rb

@@ -51,10 +51,16 @@ module Cucumber
         end
 
         def patch_location_onto(block)
-          file, line = caller[5].split(':')[0..1]
-          location = Core::Ast::Location.new(
-            Pathname.new(file).relative_path_from(Pathname.new(Dir.pwd)),
-            line)
+          file, line = caller[5].match(/(.*):(\d+)/)[1..2]
+          file = File.expand_path(file)
+          pwd = File.expand_path(Dir.pwd)
+          pwd.force_encoding(file.encoding)
+          if file.index(pwd)
+            file = file[pwd.length+1..-1]
+          elsif file =~ /.*\/gems\/(.*\.rb)$/
+            file = $1
+          end
+          location = Core::Ast::Location.new(file, line)
           block.define_singleton_method(:file_colon_line) { location.to_s }
           block
         end

data/lib/cucumber/runtime/after_hooks.rb

@@ -17,7 +17,7 @@ module Cucumber
       def after_hooks(source)
         @hooks.map do |hook|
           action = ->(result) { hook.invoke('After', @scenario.with_result(result)) }
-          Hooks.after_hook(source, Hooks.location(hook), &action)
+          Hooks.after_hook(source, hook.location, &action)
         end          
       end
     end

data/lib/cucumber/runtime/before_hooks.rb

@@ -19,7 +19,7 @@ module Cucumber
       def before_hooks(source)
         @hooks.map do |hook|
           action_block = ->(result) { hook.invoke('Before', @scenario.with_result(result)) }
-          Hooks.before_hook(source, Hooks.location(hook), &action_block)
+          Hooks.before_hook(source, hook.location, &action_block)
         end
       end
     end

data/lib/cucumber/runtime/step_hooks.rb

@@ -15,7 +15,7 @@ module Cucumber
       def after_step_hooks(test_step)
         @hooks.map do |hook|
           action = ->(*args) { hook.invoke('AfterStep', args) }
-          Hooks.after_step_hook(test_step.source, Hooks.location(hook), &action)
+          Hooks.after_step_hook(test_step.source, hook.location, &action)
         end
       end
     end

data/spec/cucumber/formatter/legacy_api/adapter_spec.rb

@@ -51,6 +51,10 @@ module Cucumber
           @proc.source_location
         end
 
+        def location
+          source_location
+        end
+
         def invoke(pseudo_method, arguments, &block)
           @proc.call
         end
@@ -70,13 +74,13 @@ module Cucumber
           # The adapter is built on the assumption that each test case will have at least one step. This is annoying
           # for tests, but a safe assumption for production use as we always add one hook to initialize the world.
           hook = proc {}
-          [ Hooks.before_hook(source, Hooks.location(hook), &hook) ]
+          [ Hooks.before_hook(source, hook.source_location, &hook) ]
         end
 
         def after_hooks(source)
           # We add an after hook to make sure the adapter can cope with it
           hook = proc {}
-          [ Hooks.after_hook(source, Hooks.location(hook), &hook) ]
+          [ Hooks.after_hook(source, hook.source_location, &hook) ]
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Aslak Hellesøy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-08 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber-core
@@ -838,7 +838,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: cucumber-2.0.1
+summary: cucumber-2.0.2
 test_files:
 - features/docs/api/list_step_defs_as_json.feature
 - features/docs/api/run_cli_main_with_existing_runtime.feature