cucumber_priority 0.3.1 → 0.3.2

data/.gitignore

@@ -6,3 +6,4 @@ pkg
 .rvmrc
 log/*.log
 .byebug_history
+/tmp

data/Gemfile

@@ -0,0 +1,13 @@
+source 'https://rubygems.org'
+
+# Runtime dependencies
+gem 'cucumber', '~> 2.4.0'
+
+# Development dependencies
+gem 'rspec', '~> 3.0'
+gem 'gemika'
+gem 'rake'
+gem 'aruba', '<0.7'
+
+# Gem under test
+gem 'cucumber_priority', :path => '..'

data/Gemfile.lock

@@ -0,0 +1,61 @@
+PATH
+  remote: ..
+  specs:
+    cucumber_priority (0.3.2)
+      cucumber
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    aruba (0.6.2)
+      childprocess (>= 0.3.6)
+      cucumber (>= 1.1.1)
+      rspec-expectations (>= 2.7.0)
+    builder (3.2.3)
+    childprocess (0.9.0)
+      ffi (~> 1.0, >= 1.0.11)
+    cucumber (2.4.0)
+      builder (>= 2.1.2)
+      cucumber-core (~> 1.5.0)
+      cucumber-wire (~> 0.0.1)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 4.0)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.2)
+    cucumber-core (1.5.0)
+      gherkin (~> 4.0)
+    cucumber-wire (0.0.1)
+    diff-lcs (1.3)
+    ffi (1.9.23)
+    gemika (0.3.2)
+    gherkin (4.1.3)
+    multi_json (1.13.1)
+    multi_test (0.1.2)
+    rake (10.1.0)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.3)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  aruba (< 0.7)
+  cucumber (~> 2.4.0)
+  cucumber_priority!
+  gemika
+  rake
+  rspec (~> 3.0)
+
+BUNDLED WITH
+   1.16.1

data/cucumber_priority.gemspec

@@ -12,9 +12,11 @@ Gem::Specification.new do |s|
   s.description = %q{cucumber_priority provides a way to mark step definitions as overridable, meaning that they can always be overshadowed by a more specific version without raising an error.}
   s.license = 'MIT'
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(gemfiles|bin|test|spec|features)/})
+  end
+  s.bindir        = "exe"
+  s.executables   = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
   s.add_dependency('cucumber')

data/lib/cucumber_priority/resolve_ambiguous_error.rb

@@ -44,13 +44,15 @@ if Cucumber::VERSION >= '3'
 
 elsif Cucumber::VERSION >= '2.3'
 
+
+  # Cucumber 2.3 or higher has methods that return an array of Cucumber::StepMatch objects.
+  # These methods raise Cucumber::Ambiguous if the array has more than one element.
+  # Why this is implemented twice, noone knows...
+  #
   module Cucumber
+
     class Runtime
       class SupportCode
-
-        # Cucumber 2.3 or higher has a single method #step_matches which returns an
-        # array of Cucumber::StepMatch objects.
-        # This method raises Cucumber::Ambiguous if the array has more than one element.
         def step_matches_with_priority(*args)
           step_matches_without_priority(*args)
         rescue Ambiguous => e
@@ -60,6 +62,21 @@ elsif Cucumber::VERSION >= '2.3'
         CucumberPriority::Util.alias_chain self, :step_matches, :priority
       end
     end
+
+    module StepMatchSearch
+      class AssertUnambiguousMatch
+
+        def call_with_priority(*args)
+          call_without_priority(*args)
+        rescue Ambiguous => e
+          [CucumberPriority::Resolver.resolve_ambiguity_through_priority(e)]
+        end
+
+        CucumberPriority::Util.alias_chain self, :call, :priority
+
+      end
+    end
+
   end
 
 else

data/lib/cucumber_priority/version.rb

@@ -1,3 +1,3 @@
 module CucumberPriority
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

metadata

@@ -1,27 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: cucumber_priority
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
+  prerelease: 
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2018-02-28 00:00:00.000000000 Z
+date: 2018-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: cucumber_priority provides a way to mark step definitions as overridable,
@@ -32,24 +35,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".ruby-version"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .ruby-version
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - cucumber_priority.gemspec
-- gemfiles/Gemfile.cucumber-1.3
-- gemfiles/Gemfile.cucumber-1.3.lock
-- gemfiles/Gemfile.cucumber-2.4
-- gemfiles/Gemfile.cucumber-2.4.lock
-- gemfiles/Gemfile.cucumber-3.0
-- gemfiles/Gemfile.cucumber-3.0.lock
-- gemfiles/Gemfile.cucumber-3.1
-- gemfiles/Gemfile.cucumber-3.1.lock
 - lib/cucumber_priority.rb
 - lib/cucumber_priority/ambiguous_error_ext.rb
 - lib/cucumber_priority/require_cucumber.rb
@@ -57,32 +52,29 @@ files:
 - lib/cucumber_priority/step_definition_ext.rb
 - lib/cucumber_priority/util.rb
 - lib/cucumber_priority/version.rb
-- spec/cucumber_priority/support_code_ext_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
-- spec/support/cucumber_helper.rb
 homepage: http://github.com/makandra/cucumber_priority
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Overridable step definitions for Cucumber
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA256:
-  metadata.gz: a079b181ab4eaea2b39c27db2fda7c8f299821de5f56bfcb49207e3f77fd32a1
-  data.tar.gz: 7f32402851987a27f43b15ab21bad90aa689de363ea0985fa177ceb2590d70ae
-SHA512:
-  metadata.gz: 4c92ea01431f7327765bc948447d6418718156214982a058249974391634820e90d8d60a59adb06347f6023c074fa3d53c35206c934fe16866ea1ca8426047fe
-  data.tar.gz: 21330e0c5712f14db7e4a63c5768580e26c12522abc9b27418014982f1a439a45ceac16e08ff749bc38e567efd7700ac29634add935c46e64299ba1bd102e851

data/Gemfile

@@ -1 +0,0 @@
-./gemfiles/Gemfile.cucumber-2.4

data/Gemfile.lock

@@ -1 +0,0 @@
-./gemfiles/Gemfile.cucumber-2.4.lock

data/gemfiles/Gemfile.cucumber-1.3

@@ -1,12 +0,0 @@
-source 'https://rubygems.org'
-
-# Runtime dependencies
-gem 'cucumber', '~> 1.3.20'
-
-# Development dependencies
-gem 'rspec', '~> 1.0'
-gem 'gemika'
-gem 'rake', '=10.0.4'
-
-# Gem under test
-gem 'cucumber_priority', :path => '..'

data/gemfiles/Gemfile.cucumber-1.3.lock

@@ -1,37 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    cucumber_priority (0.2.0)
-      cucumber
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    builder (3.2.2)
-    cucumber (1.3.20)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.2)
-    diff-lcs (1.2.5)
-    gemika (0.3.2)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
-    multi_json (1.11.2)
-    multi_test (0.1.2)
-    rake (10.0.4)
-    rspec (1.3.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  cucumber (~> 1.3.20)
-  cucumber_priority!
-  gemika
-  rake (= 10.0.4)
-  rspec (~> 1.0)
-
-BUNDLED WITH
-   1.16.1

data/gemfiles/Gemfile.cucumber-2.4

@@ -1,12 +0,0 @@
-source 'https://rubygems.org'
-
-# Runtime dependencies
-gem 'cucumber', '~> 2.4.0'
-
-# Development dependencies
-gem 'rspec', '~> 3.0'
-gem 'gemika'
-gem 'rake'
-
-# Gem under test
-gem 'cucumber_priority', :path => '..'

data/gemfiles/Gemfile.cucumber-2.4.lock

@@ -1,53 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    cucumber_priority (0.2.0)
-      cucumber
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    builder (3.2.3)
-    cucumber (2.4.0)
-      builder (>= 2.1.2)
-      cucumber-core (~> 1.5.0)
-      cucumber-wire (~> 0.0.1)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 4.0)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.2)
-    cucumber-core (1.5.0)
-      gherkin (~> 4.0)
-    cucumber-wire (0.0.1)
-    diff-lcs (1.3)
-    gemika (0.3.2)
-    gherkin (4.1.3)
-    multi_json (1.13.1)
-    multi_test (0.1.2)
-    rake (10.1.0)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.3)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  cucumber (~> 2.4.0)
-  cucumber_priority!
-  gemika
-  rake
-  rspec (~> 3.0)
-
-BUNDLED WITH
-   1.16.1

data/gemfiles/Gemfile.cucumber-3.0

@@ -1,12 +0,0 @@
-source 'https://rubygems.org'
-
-# Runtime dependencies
-gem 'cucumber', '~> 3.0.0'
-
-# Development dependencies
-gem 'rspec', '~> 3.0'
-gem 'gemika'
-gem 'rake'
-
-# Gem under test
-gem 'cucumber_priority'

data/gemfiles/Gemfile.cucumber-3.0.lock

@@ -1,67 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (5.0.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    backports (3.11.1)
-    builder (3.2.3)
-    concurrent-ruby (1.0.3)
-    cucumber (3.0.2)
-      builder (>= 2.1.2)
-      cucumber-core (~> 3.0.0)
-      cucumber-expressions (~> 4.0.3)
-      cucumber-wire (~> 0.0.1)
-      diff-lcs (~> 1.3)
-      gherkin (~> 4.0)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.2)
-    cucumber-core (3.0.0)
-      backports (>= 3.8.0)
-      cucumber-tag_expressions (>= 1.0.1)
-      gherkin (>= 4.1.3)
-    cucumber-expressions (4.0.4)
-    cucumber-tag_expressions (1.1.1)
-    cucumber-wire (0.0.1)
-    cucumber_priority (0.1.2)
-      activesupport
-      cucumber
-    diff-lcs (1.3)
-    gemika (0.3.2)
-    gherkin (4.1.3)
-    i18n (0.7.0)
-    minitest (5.10.1)
-    multi_json (1.13.1)
-    multi_test (0.1.2)
-    rake (10.4.2)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  cucumber (~> 3.0.0)
-  cucumber_priority
-  gemika
-  rake
-  rspec (~> 3.0)
-
-BUNDLED WITH
-   1.16.1

data/gemfiles/Gemfile.cucumber-3.1

@@ -1,12 +0,0 @@
-source 'https://rubygems.org'
-
-# Runtime dependencies
-gem 'cucumber', '~> 3.1.0'
-
-# Development dependencies
-gem 'rspec', '~> 3.0'
-gem 'gemika'
-gem 'rake'
-
-# Gem under test
-gem 'cucumber_priority'

data/gemfiles/Gemfile.cucumber-3.1.lock

@@ -1,67 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (5.0.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    backports (3.11.1)
-    builder (3.2.3)
-    concurrent-ruby (1.0.3)
-    cucumber (3.1.0)
-      builder (>= 2.1.2)
-      cucumber-core (~> 3.1.0)
-      cucumber-expressions (~> 5.0.4)
-      cucumber-wire (~> 0.0.1)
-      diff-lcs (~> 1.3)
-      gherkin (~> 5.0)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.2)
-    cucumber-core (3.1.0)
-      backports (>= 3.8.0)
-      cucumber-tag_expressions (~> 1.1.0)
-      gherkin (>= 5.0.0)
-    cucumber-expressions (5.0.13)
-    cucumber-tag_expressions (1.1.1)
-    cucumber-wire (0.0.1)
-    cucumber_priority (0.1.2)
-      activesupport
-      cucumber
-    diff-lcs (1.3)
-    gemika (0.3.2)
-    gherkin (5.0.0)
-    i18n (0.7.0)
-    minitest (5.10.1)
-    multi_json (1.13.1)
-    multi_test (0.1.2)
-    rake (10.4.2)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  cucumber (~> 3.1.0)
-  cucumber_priority
-  gemika
-  rake
-  rspec (~> 3.0)
-
-BUNDLED WITH
-   1.16.1

data/spec/cucumber_priority/support_code_ext_spec.rb

@@ -1,39 +0,0 @@
-require 'spec_helper'
-
-describe Cucumber::Runtime, 'extended with cucumber_priority' do
-
-  before(:each) do
-    prepare_cucumber_example
-  end
-
-  describe '#step_matches' do
-
-    it 'returns an overriding step if the only other match is a overridable step' do
-      overridable_step = @main.Given(/^there is a movie with a (.*?) tone$/){ }.overridable
-      overriding_step = @main.Given(/^there is a movie with a funny tone$/){ }
-      match = first_step_match('there is a movie with a funny tone')
-      match.step_definition.should == overriding_step
-      match.should be_a(Cucumber::StepMatch)
-    end
-
-    it 'raises Cucumber::Ambiguous if more than two overriding steps match' do
-      @main.Given(/^there is a movie with (.*?) tone$/){}.overridable(:priority => 1000)
-      @main.Given(/^there is a movie with a [^ ]+ tone$/){}
-      @main.Given(/^there is a movie with a funny tone$/){}
-      expect do
-        first_step_match('there is a movie with a funny tone')
-      end.to raise_error(Cucumber::Ambiguous)
-    end
-
-    it 'returns the overridable step with the highest priority if no overriding steps match' do
-      overridable_step = @main.Given(/^there is a movie with a (.*?) tone$/){ }.overridable
-      higher_overridable_step = @main.Given(/^there is a movie with a [^ ]+ tone$/){ }.overridable(:priority => 5)
-      lower_overridable_step = @main.Given(/^there is a movie with a [^ ]+ tone$/){ }.overridable(:priority => -5)
-      match = first_step_match('there is a movie with a funny tone')
-      match.step_definition.should == higher_overridable_step
-      match.should be_a(Cucumber::StepMatch)
-    end
-    
-  end
-
-end

data/spec/spec.opts

@@ -1 +0,0 @@
---colour

data/spec/spec_helper.rb

@@ -1,7 +0,0 @@
-$: << File.join(File.dirname(__FILE__), "/../../lib" )
-require 'cucumber_priority'
-require 'gemika'
-
-Dir["#{File.dirname(__FILE__)}/support/*.rb"].sort.each {|f| require f}
-
-Gemika::RSpec.configure_should_syntax

data/spec/support/cucumber_helper.rb

@@ -1,31 +0,0 @@
-def prepare_cucumber_example
-  if Cucumber::VERSION >= '3'
-    @runtime = Cucumber::Runtime.new
-    scenario = double('scenario', :language => 'en', :accept_hook? => true)
-    @runtime.send(:begin_scenario, scenario)
-    @main = Object.new
-    @main.extend(Cucumber::Glue::Dsl)
-  else
-    @runtime = Cucumber::Runtime.new
-    language = support_code.ruby if support_code.respond_to?(:ruby)
-    language ||= support_code.load_programming_language('rb')
-    language
-    scenario = double('scenario', :language => 'en', :accept_hook? => true)
-    language.send(:begin_scenario, scenario)
-    @world = language.current_world
-    @main = Object.new
-    @main.extend(Cucumber::RbSupport::RbDsl)
-  end
-end
-
-def invoke_cucumber_step(step)
-  first_step_match(step).invoke(nil) # nil means no multiline args
-end
-
-def support_code
-  @runtime.instance_variable_get(:@support_code)
-end
-
-def first_step_match(*args)
-  support_code.send(:step_matches, *args).first
-end