cucumber-wire 6.0.1 → 6.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7d2a2aeb865c32194912665576088fab76df7772561da4c66af1978008cf68f
-  data.tar.gz: 01a2a485c0c20386fa2bd66ec6c50e06ccaffb53a40718dcf5ec715eab7f7d93
+  metadata.gz: 130cb3e95181e3075510187b0744f75c054ee7262cd959d702cf46530b933ea3
+  data.tar.gz: 80ca9b30f9a5eab812757808107fdb84560538fb96cc896c7b70278038f95a4d
 SHA512:
-  metadata.gz: 5af0c11dde0ee5ecbeef2a93e7fe42744218db0771022e6a5f816a46fa0a3eb15cb53ca3fdecea0ffe8ef4fd171543f588b08ff43366837d9438d58953f283b3
-  data.tar.gz: f0ebdb2446ad4f392b8ba11888b6820772345776bf6e17fbf9881f8677102d2a326b2dc82f9b086c320f5eb58d221f1e994500ca18e712d9fd8df96ab5af83e8
+  metadata.gz: a4071edb6e2ee0ebafee6ed6be51ab2d5c04683ce1eaacd475c0f4db55ee6a18a16cf13b5e6f7e44a70c8969de4e30fbd9a872f8124bc280c94be274fc06bf9d
+  data.tar.gz: 3010136c5cda24d87f1bca45e8d13a0839505d5e74f8a66df6b63e0318ac79d816f30c4a11b94665182e399107b5476bb5ba4b2375419e5c0e6a1852375e055b

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-# CHANGE LOG
+# Changelog
 
 All notable changes to this project will be documented in this file.
 
@@ -8,126 +8,132 @@ This document is formatted according to the principles of [Keep A CHANGELOG](htt
 
 Please visit [cucumber/CONTRIBUTING.md](https://github.com/cucumber/cucumber/blob/master/CONTRIBUTING.md) for more info on how to contribute to Cucumber.
 
----
+## [Unreleased]
 
-## [In GIT](https://github.com/cucumber/cucumber-ruby-wire/compare/v6.0.1...main)
+### Changed
 
 ### Added
 
-### Changed
-
-### Deprecated
+### Fixed
 
 ### Removed
 
-### Fixed
+## [6.2.1]
 
-### Dependencies
+### Fixed
 
-## [6.0.1](https://github.com/cucumber/cucumber-ruby-wire/compare/v6.0.0...v6.0.1)
+- Fix usage with message-related formatters like the html formatter
+  ([PR#57](https://github.com/cucumber/cucumber-ruby-wire/pull/57)
+   [Issue#56](https://github.com/cucumber/cucumber-ruby-wire/issues/56))
 
-### Dependencies
+- Removed dependency to cucumber-messages
 
-- Patched `cucumber-core` and `cucumber-messages`
+## [6.2.0]
 
-## [6.0.0](https://github.com/cucumber/cucumber-ruby-wire/compare/v5.0.1...v6.0.0)
+### Changed
 
-### Dependencies
+- Patched `cucumber-core`, `cucumber-expressions` and `cucumber-messages`
 
-- Updated `cucumber-core` ~> 10.0.0 and `cucumber-messages` ~> 17.0.0
-  This brings breaking changes because of internal changes in Cucumber::Messages.
-  ([#44](https://github.com/cucumber/cucumber-ruby-wire/pull/44))
+## [6.1.1]
 
-## [5.0.1](https://github.com/cucumber/cucumber-ruby-wire/compare/v5.0.0...v5.0.1)
+### Changed
 
-### Dependencies
+- Use the new `InstallPlugin` hook rather than `AfterConfiguration`.
+  ([#52](https://github.com/cucumber/cucumber-ruby-wire/pull/52))
 
-- Updated `cucumber-core` ~> 9.0.1
+## [6.1.0]
+### Added
+- The possibility to verify if the plugin has already been installed or not. To
+do so, use `Cucumber::Wire::Plugin.installed?`.
+([46](https://github.com/cucumber/cucumber-ruby-wire/pull/46))
 
-## [5.0.0](https://github.com/cucumber/cucumber-ruby-wire/compare/v4.0.1...v5.0.0)
+### Changed
+- `cucumber-wire` is now able to install itself as a plugin into `cucumber-ruby`.
+([46](https://github.com/cucumber/cucumber-ruby-wire/pull/46))
 
+## [6.0.1]
 ### Changed
+- Patched `cucumber-core` and `cucumber-messages`
 
-- Update from cucumber-expressions 10 to 12 introduces significant underlying changes
-  in how step definitions are matched. This should be backward compatible but there
-  is a risk of regressions.
+## [6.0.0]
+### Changed
+- Updated `cucumber-core` ~> 10.0.0 and `cucumber-messages` ~> 17.0.0
+This brings breaking changes because of internal changes in Cucumber::Messages.
+([#44](https://github.com/cucumber/cucumber-ruby-wire/pull/44))
 
-### Dependencies
+## [5.0.1]
+### Changed
+- Updated `cucumber-core` ~> 9.0.1
 
+## [5.0.0]
+### Changed
+- Update from cucumber-expressions 10 to 12 introduces significant underlying changes
+in how step definitions are matched. This should be backward compatible but there
+is a risk of regressions.
 - Updated dependencies (look at the diff for details)
 
-## [4.0.1](https://github.com/cucumber/cucumber-ruby-wire/compare/v4.0.0...v4.0.1)
-
-### Dependencies
-
+## [4.0.1]
+### Changed
 - Updated dependencies (look at the diff for details)
 
-## [4.0.0](https://github.com/cucumber/cucumber-ruby-wire/compare/v3.1.0...v4.0.0)
-
-- Release failed
-
-## [3.1.0](https://github.com/cucumber/cucumber-ruby-wire/compare/v3.0.0...v3.1.0)
-
+## [3.1.0]
 ### Changed
-
+- `cucumber-core` ~> 7.1.0
+- `cucumber-messages` ~> 12.2.0
 - Updated gems:
-  - `cucumber-core` ~> 7.1.0
-  - `cucumber-messages` ~> 12.2.0
-
-## [3.0.0](https://github.com/cucumber/cucumber-ruby-wire/compare/v2.0.1...v3.0.0)
 
+## [3.0.0]
 ### Changed
-
 - Use `cucumber-ruby-core` 7.0.0
-
+- cucumber-cucumber-expressions ~> 10
+- cucumber-messages ~> 12
 - Updated monorepo libraries:
-  - cucumber-cucumber-expressions ~> 10
-  - cucumber-messages ~> 12
-
-## [2.0.1](https://github.com/cucumber/cucumber-ruby-wire/compare/v2.0.0...v2.0.1)
 
+## [2.0.1]
 ### Removed
-
 - Replace use of `MultiJSON` to use native JSON gem
 
-## [2.0.0](https://github.com/cucumber/cucumber-ruby-wire/compare/v1.2.0...v2.0.0)
-
+## [2.0.0]
 ### Changed
-
 - Use `cucumber-ruby-core` 6.0.0
 
-## [1.2.0](https://github.com/cucumber/cucumber-ruby-wire/compare/v1.1.0...v1.2.0)
-
-### Removed
-
-- Multiline arguments do not need `Location` anymore
-
+## [1.2.0]
 ### Added
-
 - Use `Cucumber:Messages::IdGenerator::UUID` to provide ids for `Hooks`
 
-## [1.1.0](https://github.com/cucumber/cucumber-ruby-wire/compare/v1.0.0...v1.1.0)
+### Removed
+- Multiline arguments do not need `Location` anymore
 
+## [1.1.0]
 ### Changed
-
 - Update to cucumber-expressions 8.0.2
 - Update to cucumber 4.0.0
 
-## [1.0.0](https://github.com/cucumber/cucumber-ruby-wire/compare/v0.0.1...v1.0.0)
-
+## [1.0.0]
 ### Added
-
 - Added this CHANGELOG.md file per [cucumber/cucumber #251](https://github.com/cucumber/cucumber/issues/251) ([#13](https://github.com/cucumber/cucumber-ruby-wire/pull/13) [jaysonesmith](https://github.com/jaysonesmith))
 
 ### Changed
-
 - Changes to work with a modern Cucumber-Ruby ([#14](https://github.com/cucumber/cucumber-ruby-wire/pull/14) [brasmusson](https://github.com/brasmusson))
 - Adapt to the move of Location to Cucumber::Core::Test ([#14](https://github.com/cucumber/cucumber-ruby-wire/pull/14) [brasmusson](https://github.com/brasmusson))
 
-<!-- Contributors -->
-
-[brasmusson]: https://github.com/brasmusson
-[jaysonesmith]: https://github.com/jaysonesmith
-[junaruga]: https://github.com/junaruga
-[mattwynne]: https://github.com/mattwynne
-[olleolleolle]: https://github.com/olleolleolle
+[Unreleased]: https://github.com/cucumber/cucumber-ruby-wire/compare/v6.2.1...main
+[6.2.1]: https://github.com/cucumber/cucumber-ruby-wire/compare/v6.2.0...v6.2.1
+[6.2.0]: https://github.com/cucumber/cucumber-ruby-wire/compare/v6.1.1...v6.2.0
+[6.1.1]: https://github.com/cucumber/cucumber-ruby-wire/compare/v6.1.0...v6.1.1
+[6.1.0]: https://github.com/cucumber/cucumber-ruby-wire/compare/v6.0.1...v6.1.0
+[6.0.1]: https://github.com/cucumber/cucumber-ruby-wire/compare/v6.0.0...v6.0.1
+[6.0.0]: https://github.com/cucumber/cucumber-ruby-wire/compare/v5.0.1...v6.0.0
+[5.0.1]: https://github.com/cucumber/cucumber-ruby-wire/compare/v5.0.0...v5.0.1
+[5.0.0]: https://github.com/cucumber/cucumber-ruby-wire/compare/v4.0.1...v5.0.0
+[4.0.1]: https://github.com/cucumber/cucumber-ruby-wire/compare/v4.0.0...v4.0.1
+[3.1.0]: https://github.com/cucumber/cucumber-ruby-wire/compare/v3.0.0...v3.1.0
+[3.0.0]: https://github.com/cucumber/cucumber-ruby-wire/compare/v2.0.1...v3.0.0
+[2.0.1]: https://github.com/cucumber/cucumber-ruby-wire/compare/v2.0.0...v2.0.1
+[2.0.0]: https://github.com/cucumber/cucumber-ruby-wire/compare/v1.2.0...v2.0.0
+[1.2.0]: https://github.com/cucumber/cucumber-ruby-wire/compare/v1.1.0...v1.2.0
+[1.1.0]: https://github.com/cucumber/cucumber-ruby-wire/compare/v1.0.0...v1.1.0
+[1.0.0]: https://github.com/cucumber/cucumber-ruby-wire/compare/v0.0.1...v1.0.0
+ire/compare/v6.1.0...main
+[6.1.0]: https://github.com/cucumber/cucumber-ruby-wire/compare/v6.0.1...v6.1.0
+[6.0.1]: https://github.com/cucumber/cucumber-ruby-wire/compare/v6.0.0...v6.0.1

data/CONTRIBUTING.md

@@ -1,13 +1,2 @@
-Release Process
-===============
-
-* Upgrade gems with `scripts/update-gemspec`
-* Bump the version number in `lib/cucumber/wire/version`
-* Update `CHANGELOG.md` with the upcoming version number and create a new `In Git` section
-* Remove empty sections from `CHANGELOG.md`
-* Now release it:
-
-```
-git commit -am "Release X.Y.Z"
-make release
-```
+Please see https://github.com/cucumber/cucumber-ruby/blob/main/CONTRIBUTING.md for
+more info about how to contribute to cucumber

data/lib/cucumber/wire/add_hooks_filter.rb

@@ -1,5 +1,4 @@
 # coding: utf-8
-require 'cucumber/messages'
 
 module Cucumber
   module Wire
@@ -13,19 +12,45 @@ module Cucumber
       def before_hook(test_case)
         # TODO: is this dependency on Cucumber::Hooks OK? Feels a bit internal..
         # TODO: how do we express the location of the hook? Should we create one hook per connection so we can use the host:port of the connection?
-        Cucumber::Hooks.before_hook(id_generator.new_id, Core::Test::Location.new('TODO:wire')) do
-          connections.begin_scenario(test_case)
-        end
+
+        hook = instanciate_wire_hook(:begin_scenario)
+        action = ->(result) { hook.invoke('Before', [Cucumber::RunningTestCase.new(test_case).with_result(result), connections]) }
+
+        hook_step = Cucumber::Hooks.before_hook(id_generator.new_id, Core::Test::Location.new('wire'), &action)
+
+        configuration.event_bus.hook_test_step_created(hook_step, hook)
+
+        hook_step
       end
 
       def after_hook(test_case)
-        Cucumber::Hooks.after_hook(id_generator.new_id, Core::Test::Location.new('TODO:wire')) do
-          connections.end_scenario(test_case)
-        end
+        hook = instanciate_wire_hook(:end_scenario)
+        action = ->(result) { hook.invoke('After', [Cucumber::RunningTestCase.new(test_case).with_result(result), connections]) }
+
+        hook_step = Cucumber::Hooks.after_hook(id_generator.new_id, Core::Test::Location.new('wire'), &action)
+
+        configuration.event_bus.hook_test_step_created(hook_step, hook)
+
+        hook_step
       end
 
       def id_generator
-        @id_generator ||= Cucumber::Messages::IdGenerator::UUID.new
+        @id_generator ||= connections.configuration.id_generator
+      end
+
+      def configuration
+        @configuration ||= connections.configuration
+      end
+
+      private
+
+      def instanciate_wire_hook(hook_method)
+        Cucumber::Glue::Hook.new(
+          id_generator.new_id,
+          connections.registry,
+          [],
+          ->(test_case, connections) { connections.send(hook_method, test_case) }
+        )
       end
     end
   end

data/lib/cucumber/wire/connections.rb

@@ -13,7 +13,7 @@ module Cucumber
   module Wire
 
     class Connections
-      attr_reader :connections
+      attr_reader :connections, :configuration, :registry
       private :connections
 
       def initialize(connections, configuration, registry)
@@ -45,7 +45,6 @@ module Cucumber
       def snippets(code_keyword, step_name, multiline_arg_class_name)
         connections.map { |c| c.snippet_text(code_keyword, step_name, multiline_arg_class_name) }.flatten
       end
-
     end
   end
 end

data/lib/cucumber/wire/plugin.rb

@@ -8,6 +8,10 @@ module Cucumber
       attr_reader :config, :registry
       private :config, :registry
 
+      def self.installed?
+        @@installed ||= false
+      end
+
       def initialize(config, registry)
         @config = config
         @registry = registry
@@ -18,6 +22,8 @@ module Cucumber
         config.filters << Filters::ActivateSteps.new(StepMatchSearch.new(connections.method(:step_matches), @config), @config)
         config.filters << AddHooksFilter.new(connections) unless @config.dry_run?
         config.register_snippet_generator Snippet::Generator.new(connections)
+
+        @@installed = true
       end
 
       def create_connection(wire_file)

data/lib/cucumber/wire/step_definition.rb

@@ -3,7 +3,7 @@ require 'cucumber/core/test/location'
 module Cucumber
   module Wire
     class StepDefinition
-      attr_reader :regexp_source, :location, :registry, :expression
+      attr_reader :id, :regexp_source, :location, :registry, :expression
 
       def initialize(connection, data, registry)
         @connection = connection

data/lib/cucumber/wire/version

@@ -1 +1 @@
-6.0.1
+6.2.1

data/lib/cucumber/wire.rb

@@ -1,5 +1,7 @@
 require 'cucumber/wire/plugin'
 
-AfterConfiguration do |config|
-  Cucumber::Wire::Plugin.new(config).install
+return unless respond_to?(:InstallPlugin)
+
+InstallPlugin do |config, registry|
+  Cucumber::Wire::Plugin.new(config, registry).install
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-wire
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.2.1
 platform: ruby
 authors:
 - Matt Wynne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-19 00:00:00.000000000 Z
+date: 2022-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber-core
@@ -16,100 +16,80 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.0.1
+        version: 10.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.0.1
+        version: 10.1.0
 - !ruby/object:Gem::Dependency
   name: cucumber-cucumber-expressions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.1'
+        version: '14.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.1.1
+        version: 14.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.1'
+        version: '14.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.1.1
-- !ruby/object:Gem::Dependency
-  name: cucumber-messages
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '17.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 17.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '17.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 17.0.1
+        version: 14.0.0
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -203,10 +183,10 @@ requirements: []
 rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: cucumber-wire-6.0.1
+summary: cucumber-wire-6.2.1
 test_files:
-- spec/cucumber/wire/connection_spec.rb
 - spec/cucumber/wire/configuration_spec.rb
 - spec/cucumber/wire/connections_spec.rb
+- spec/cucumber/wire/connection_spec.rb
 - spec/cucumber/wire/data_packet_spec.rb
 - spec/cucumber/wire/exception_spec.rb