cucumber-wire 0.0.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 193ced89d633c8b78eee1a626af39e9f69a2dbc5
-  data.tar.gz: 42c38717dab358471f86f3f1085c186c2e9df3a6
+SHA256:
+  metadata.gz: 75471bc4f5662b423d400b2cd105d7cdcce04ded55cf82773e72885647d03f00
+  data.tar.gz: 032db46bd8e08ee87a2744f083ac99ac50e745960709d93c354e21951ef3fb9e
 SHA512:
-  metadata.gz: d48ac504abae09629fd5baca0dd4b1ef8488623b5da662a1cdfc7b2e8a1808420845f51d1a990def3ee625f211834236814d21f6aa9311d810a0b406031ed343
-  data.tar.gz: b131fcc0318fd1cadec22641e8fac0ab9575db479711a708508c2282b7ba73c2df7859ee3653285364f66daaccf97382dae3dfabc0bf1be1ca306f89ef9a742c
+  metadata.gz: 94b13b0ee96d03f9d9c42671411209579807477c2945f9c5602f9a96f25f17647af1e7b89df2732af54370721b40230b642a21ec34f2b30e89753d1836942a34
+  data.tar.gz: 16dd72d0f9c9c2db7da35b600d5ef981fc00e29efb1fc07fa54ff2b3cb940a0aa34b311a86675b65560d49dc059c5179983ae4d1676da595ec1f445189a5e14f

data/.travis.yml

@@ -1,9 +1,13 @@
 rvm:
+  - ruby-head
+  - 2.4.0
+  - 2.3.3
   - 2.2
-  - 2.1
-  - 2.0
-  - 1.9.3
-  - jruby-1.7.12
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+  fast_finish: true
 
 # whitelist
 branches:

data/CHANGELOG.md

@@ -0,0 +1,39 @@
+# CHANGE LOG
+
+All notable changes to this project will be documented in this file.
+
+This project adheres to [Semantic Versioning](http://semver.org).
+
+This document is formatted according to the principles of [Keep A CHANGELOG](http://keepachangelog.com).
+
+Please visit [cucumber/CONTRIBUTING.md](https://github.com/cucumber/cucumber/blob/master/CONTRIBUTING.md) for more info on how to contribute to Cucumber.
+
+----
+
+## [In Git](https://github.com/cucumber/cucumber-ruby-wire/compare/v1.0.0...master)
+
+### Removed
+
+### Added
+
+### Changed
+
+### Fixed
+
+## [1.0.0](https://github.com/cucumber/cucumber-ruby-wire/compare/v0.0.1...v1.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

data/CONTRIBUTING.md

@@ -0,0 +1,14 @@
+Release Process
+===============
+
+* Bump the version number in `lib/cucumber/wire/version`
+* Update `CHANGELOG.md` with the upcoming version number and create a new `In Git` section
+* Now release it:
+
+```
+bundle update
+bundle exec rake
+git commit -m "Release X.Y.Z"
+# Make sure you run gem signin as the cukebot@cucumber.io user before running the following step. Credentials can be found in 1Password
+rake release
+```

data/Gemfile

@@ -5,9 +5,9 @@ unless ENV['CUCUMBER_USE_RELEASED_GEMS']
   # cucumber gem
   cucumber_path = File.expand_path("../../cucumber-ruby", __FILE__)
   if File.exist?(cucumber_path) && !ENV['CUCUMBER_USE_GIT']
-    gem "cucumber", path: cucumber_path, branch: "remove-wire-protocol-to-plugin"
+    gem "cucumber", path: cucumber_path
   else
-    gem "cucumber", :git => "git://github.com/cucumber/cucumber-ruby.git", branch: "remove-wire-protocol-to-plugin"
+    gem "cucumber", :git => "git://github.com/cucumber/cucumber-ruby.git"
   end
 
   # cucumber-core gem

data/LICENSE

@@ -0,0 +1,22 @@
+The MIT License
+
+Copyright (c) 2015 Cucumber Ltd
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1 +1,3 @@
-Work in progress: See https://github.com/cucumber/cucumber-ruby/pull/878
+[![Build Status](https://travis-ci.org/cucumber/cucumber-ruby-wire.svg?branch=master)](https://travis-ci.org/cucumber/cucumber-ruby-wire)
+
+# cucumber-wire

data/cucumber-wire.gemspec

@@ -11,9 +11,12 @@ Gem::Specification.new do |s|
   s.homepage    = "http://cucumber.io"
   s.platform    = Gem::Platform::RUBY
   s.license     = "MIT"
-  s.required_ruby_version = ">= 1.9.3"
+  s.required_ruby_version = ">= 2.2"
 
-  s.add_development_dependency 'cucumber', '~> 2.1.0'
+  s.add_dependency 'cucumber-core', '~> 4.0'
+  s.add_dependency 'cucumber-expressions', '~> 6.0'
+
+  s.add_development_dependency 'cucumber', '~> 4.0'
 
   s.add_development_dependency 'bundler',   '>= 1.3.5'
   s.add_development_dependency 'rake',      '>= 0.9.2'

data/features/docstring.feature

@@ -0,0 +1,39 @@
+Feature: Wire protocol docstrings
+
+  In order to use docstrings as arguments to step definitions, we send them as
+  an additional argument after the arguments extracted by the wire server.
+
+  Background:
+    Given a file named "features/step_definitions/some_remote_place.wire" with:
+      """
+      host: localhost
+      port: 54321
+
+      """
+
+  Scenario: Run a scenario
+    Given a file named "features/wired.feature" with:
+      """
+      Feature: High strung
+        Scenario: Wired
+          Given we're all wired
+            \"\"\"
+            to want more
+            \"\"\"
+      """
+    And there is a wire server running on port 54321 which understands the following protocol:
+      | request                                              | response                            |
+      | ["step_matches",{"name_to_match":"we're all wired"}] | ["success",[{"id":"1", "args":[]}]] |
+      | ["begin_scenario"]                                   | ["success"]                         |
+      | ["invoke",{"id":"1","args":["to want more"]}]        | ["success"]                         |
+      | ["end_scenario"]                                     | ["success"]                         |
+    When I run `cucumber -f progress`
+    Then the stderr should not contain anything
+    And it should pass with:
+      """
+      .
+
+      1 scenario (1 passed)
+      1 step (1 passed)
+
+      """

data/features/invoke_message.feature

@@ -47,8 +47,6 @@ Feature: Invoke message
 
         Scenario: Wired
           Given we're all wired
-            I'll do it later (Cucumber::Pending)
-            features/wired.feature:3:in `Given we're all wired'
 
       1 scenario (1 pending)
       1 step (1 pending)
@@ -102,7 +100,7 @@ Feature: Invoke message
       (::) failed steps (::)
 
       The wires are down (Some.Foreign.ExceptionType from localhost:54321)
-      features/wired.feature:3:in `Given we're all wired'
+      features/wired.feature:3:in `we're all wired'
 
       Failing Scenarios:
       cucumber features/wired.feature:2 # Scenario: Wired

data/features/step_matches_message.feature

@@ -70,7 +70,7 @@ Feature: Step matches message
       """
       -
 
-      we.*   # MyApp.MyClass:123
+      "we.*"   # MyApp.MyClass:123
 
       1 scenario (1 skipped)
       1 step (1 skipped)

data/features/table_diffing.feature

@@ -39,7 +39,7 @@ Feature: Wire protocol table diffing
       Not same (DifferentException from localhost:54321)
       a.cs:12
       b.cs:34
-      features/wired.feature:3:in `Given we're all wired'
+      features/wired.feature:3:in `we're all wired'
 
       Failing Scenarios:
       cucumber features/wired.feature:2
@@ -84,7 +84,7 @@ Feature: Wire protocol table diffing
       (::) failed steps (::)
 
       I wanted things to be different for us (Cucumber::Wire::Exception)
-      features/wired.feature:3:in `Given we're all wired'
+      features/wired.feature:3:in `we're all wired'
 
       Failing Scenarios:
       cucumber features/wired.feature:2
@@ -113,7 +113,7 @@ Feature: Wire protocol table diffing
 
         | (-) a | (+) b |
        (Cucumber::MultilineArgument::DataTable::Different)
-      features/wired.feature:3:in `Given we're all wired'
+      features/wired.feature:3:in `we're all wired'
 
       Failing Scenarios:
       cucumber features/wired.feature:2

data/features/timeouts.feature

@@ -52,7 +52,7 @@ Feature: Wire protocol timeouts
         Scenario: Wired
           Given we're all wired
             Timed out calling wire server with message 'invoke' (Timeout::Error)
-            features/wired.feature:3:in `Given we're all wired'
+            features/wired.feature:3:in `we're all wired'
 
       Failing Scenarios:
       cucumber features/wired.feature:2

data/lib/cucumber/wire/add_hooks_filter.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 module Cucumber
   module Wire
     class AddHooksFilter < Core::Filter.new(:connections)
@@ -10,13 +11,13 @@ 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(test_case.source, Core::Ast::Location.new('TODO:wire')) do
+        Cucumber::Hooks.before_hook(Core::Test::Location.new('TODO:wire')) do
           connections.begin_scenario(test_case)
         end
       end
 
       def after_hook(test_case)
-        Cucumber::Hooks.after_hook(test_case.source, Core::Ast::Location.new('TODO:wire')) do
+        Cucumber::Hooks.after_hook(Core::Test::Location.new('TODO:wire')) do
           connections.end_scenario(test_case)
         end
       end

data/lib/cucumber/wire/connections.rb

@@ -16,10 +16,11 @@ module Cucumber
       attr_reader :connections
       private :connections
 
-      def initialize(connections, configuration)
+      def initialize(connections, configuration, registry)
         raise ArgumentError unless connections
         @connections = connections
         @configuration = configuration
+        @registry = registry
       end
 
       def find_match(test_step)
@@ -30,7 +31,7 @@ module Cucumber
       end
 
       def step_matches(step_name)
-        connections.map{ |c| c.step_matches(step_name)}.flatten
+        connections.map{ |c| c.step_matches(step_name, @registry)}.flatten
       end
 
       def begin_scenario(test_case)

data/lib/cucumber/wire/plugin.rb

@@ -5,15 +5,16 @@ require 'cucumber/step_match_search'
 module Cucumber
   module Wire
     class Plugin
-      attr_reader :config
-      private :config
+      attr_reader :config, :registry
+      private :config, :registry
 
-      def initialize(config)
+      def initialize(config, registry)
         @config = config
+        @registry = registry
       end
 
       def install
-        connections = Connections.new(wire_files.map { |f| create_connection(f) }, @config)
+        connections = Connections.new(wire_files.map { |f| create_connection(f) }, config, registry)
         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)

data/lib/cucumber/wire/protocol.rb

@@ -3,8 +3,8 @@ require 'cucumber/wire/protocol/requests'
 module Cucumber
   module Wire
     module Protocol
-      def step_matches(name_to_match)
-        handler = Requests::StepMatches.new(self)
+      def step_matches(name_to_match, registry)
+        handler = Requests::StepMatches.new(self, registry)
         handler.execute(name_to_match)
       end
 

data/lib/cucumber/wire/protocol/requests.rb

@@ -1,5 +1,6 @@
+# coding: utf-8
 require 'cucumber/wire/request_handler'
-require 'cucumber/step_argument'
+require 'cucumber/wire/step_argument'
 
 module Cucumber
   module Wire
@@ -25,7 +26,7 @@ module Cucumber
           private
 
           def create_step_match(raw_step_match)
-            step_definition = StepDefinition.new(@connection, raw_step_match)
+            step_definition = StepDefinition.new(@connection, raw_step_match, @registry)
             step_args = raw_step_match['args'].map do |raw_arg|
               StepArgument.new(raw_arg['pos'], raw_arg['val'])
             end
@@ -69,7 +70,7 @@ module Cucumber
 
           def handle_diff!(tables)
             # TODO: figure out if / how we could get a location for a table from the wire (or make a null location)
-            location = Core::Ast::Location.new(__FILE__, __LINE__)
+            location = Core::Test::Location.new(__FILE__, __LINE__)
             table1 = table(tables[0], location)
             table2 = table(tables[1], location)
             table1.diff!(table2)
@@ -89,7 +90,7 @@ module Cucumber
           private
 
           def table(data, location)
-            Cucumber::MultilineArgument.from_core(Core::Ast::DataTable.new(data, location))
+            Cucumber::MultilineArgument.from_core(Core::Test::DataTable.new(data, location))
           end
         end
 

data/lib/cucumber/wire/request_handler.rb

@@ -1,9 +1,10 @@
 module Cucumber
   module Wire
     class RequestHandler
-      def initialize(connection)
+      def initialize(connection, registry = nil)
         @connection = connection
         @message = underscore(self.class.name.split('::').last)
+        @registry = registry
       end
 
       def execute(request_params = nil)

data/lib/cucumber/wire/step_argument.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+require 'cucumber/cucumber_expressions/group'
+
+module Cucumber
+  module Wire
+    # Defines the location and value of a captured argument from the step
+    # text
+    class StepArgument
+      attr_reader :offset
+
+      def initialize(offset, val)
+        @offset, @value = offset, val
+      end
+
+      def value(_current_world)
+        @value
+      end
+
+      def group
+        CucumberExpressions::Group.new(@value, @offset, @offset + @value.length, [])
+      end
+    end
+  end
+end

data/lib/cucumber/wire/step_definition.rb

@@ -1,15 +1,17 @@
-require 'cucumber/core/ast/location'
+require 'cucumber/core/test/location'
 
 module Cucumber
   module Wire
     class StepDefinition
-      attr_reader :regexp_source, :location
+      attr_reader :regexp_source, :location, :registry, :expression
 
-      def initialize(connection, data)
+      def initialize(connection, data, registry)
         @connection = connection
+        @registry   = registry
         @id              = data['id']
         @regexp_source   = data['regexp'] || "Unknown"
-        @location        = Core::Ast::Location.from_file_colon_line(data['source'] || "unknown:0")
+        @expression      = registry.create_expression(@regexp_source)
+        @location        = Core::Test::Location.from_file_colon_line(data['source'] || "unknown:0")
       end
 
       def invoke(args)

data/lib/cucumber/wire/version

@@ -1 +1 @@
-0.0.1
+1.0.0

data/spec/cucumber/wire/connections_spec.rb

@@ -9,12 +9,12 @@ module Cucumber
           connection1 = double(step_matches: [:a, :b])
           connection2 = double(step_matches: [:c])
 
-          connections = Connections.new([connection1, connection2], double)
+          connections = Connections.new([connection1, connection2], double, double)
           expect(connections.step_matches('')).to eq [:a, :b, :c]
         end
 
         it "copes with no connections" do
-          connections = Connections.new([], double)
+          connections = Connections.new([], double, double)
           expect(connections.step_matches('')).to eq []
         end
       end

metadata

@@ -1,29 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-wire
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Matt Wynne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-23 00:00:00.000000000 Z
+date: 2018-09-29 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: cucumber-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: cucumber-expressions
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -88,10 +116,14 @@ extra_rdoc_files: []
 files:
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - cucumber-wire.gemspec
+- features/docstring.feature
 - features/erb_configuration.feature
 - features/handle_unexpected_response.feature
 - features/invoke_message.feature
@@ -116,6 +148,7 @@ files:
 - lib/cucumber/wire/protocol/requests.rb
 - lib/cucumber/wire/request_handler.rb
 - lib/cucumber/wire/snippet.rb
+- lib/cucumber/wire/step_argument.rb
 - lib/cucumber/wire/step_definition.rb
 - lib/cucumber/wire/version
 - spec/cucumber/wire/configuration_spec.rb
@@ -136,7 +169,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -144,14 +177,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
-summary: cucumber-wire-0.0.1
+summary: cucumber-wire-1.0.0
 test_files:
 - spec/cucumber/wire/configuration_spec.rb
 - spec/cucumber/wire/connection_spec.rb
 - spec/cucumber/wire/connections_spec.rb
 - spec/cucumber/wire/data_packet_spec.rb
 - spec/cucumber/wire/exception_spec.rb
-has_rdoc: