chutney 3.1.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad89ad439835c7acb1f2d3d0b4ee44895f714c7b6fc4f1a07f68e23594384979
-  data.tar.gz: c8eb1551cd49f668882ccbf047f65403e6f5724d8193c483d5fd16c14e456747
+  metadata.gz: cc456f7ef0c0788108026c08c161d0883fdf046b87d3851901eb3cabf80bbde3
+  data.tar.gz: fdd038b05c9650b1a785175f633397eb5bb00640ae82d9169f04f43e45c5fa42
 SHA512:
-  metadata.gz: 4a1a21294785d98f9e1997eb02547ddc6556200d0d3261d0e57ee2586725808aa2221452b341a7f9badb9ed3fdf9784b185a552ef15fa7f9c30e4c50cee99190
-  data.tar.gz: ffc03086fba54bdd0747593170f33e696d009241778d6794392517d3541aa45fe20d20bd64aab41fbbdbb4382d47c47832f3d17762f316a8f6e11d245558fbb9
+  metadata.gz: 423221898076fd513aa1dd07eb7778660b89ee615f814dca871b08cc700f1080190f37c72440cba8a4d6524ecc9ac6cb5b656d1983a8eae1e1bfac4a13805a38
+  data.tar.gz: feea3300f389e31739e184f60e6226ab3586f438da71ccfcfaa9edc355d673059e2a06469ded959c718ef4b6dd7c2f2c14ae9a6e36fa8614839a58e91044b873

data/.rubocop.yml

@@ -63,3 +63,4 @@ Style/StringConcatenation:
 
 AllCops:
   NewCops: enable
+  SuggestExtensions: false

data/Rakefile

@@ -27,7 +27,7 @@ rescue RuntimeError => e
 end
 
 task :spec do
-  sh 'rspec'
+  sh 'bundle exec rspec'
 end
 
 task :cucumber do

data/chutney.gemspec

@@ -50,19 +50,19 @@ Gem::Specification.new do |spec|
   
   spec.add_runtime_dependency 'amatch', '~> 0.4.0'
   spec.add_runtime_dependency 'cuke_modeler', '~> 3.3'
-  spec.add_runtime_dependency 'i18n', '~> 1.8.2'
+  spec.add_runtime_dependency 'i18n', '>= 1.8.2', '< 1.12.0'
   spec.add_runtime_dependency 'pastel', '~> 0.7'
   spec.add_runtime_dependency 'tty-pie', '~> 0.3'
 
 
   spec.add_development_dependency 'coveralls', '~> 0.8'
-  spec.add_development_dependency 'cucumber', '~> 6.0'
+  spec.add_development_dependency 'cucumber', '>= 7.0'
   spec.add_development_dependency 'pry-byebug', '~> 3.0'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rerun', '~> 0.13'
   spec.add_development_dependency 'rspec-expectations', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 1.14.0'
+  spec.add_development_dependency 'rubocop', '~> 1.31.2'
   spec.add_development_dependency 'rspec', '~> 3.8'
   
-  spec.required_ruby_version = '~> 2.6'
+  spec.required_ruby_version = '>= 2.6'
 end

data/config/cucumber.yml

@@ -1 +1 @@
-default: --publish-quiet
+default: --publish-quiet

data/lib/chutney/linter.rb

@@ -66,7 +66,14 @@ module Chutney
     end
 
     def dialect
-      @content.feature&.parsing_data&.dig(:language) || 'en'
+      parsing_data = @content.feature&.parsing_data
+      if !parsing_data.nil? && parsing_data.respond_to?(:language)
+        parsing_data.language
+      elsif parsing_data
+        parsing_data[:language]
+      else
+        raise UnsupportedCucumberError, 'This version of cucumber is unsupported (langauge detection)'
+      end
     end
 
     def tags_for(element)
@@ -79,19 +86,12 @@ module Chutney
         gherkin_type: type(feature, scenario, item),
         location: location(feature, scenario, item),
         feature: feature&.name,
-        scenario: scenario&.name,
-        step: item&.parsing_data&.dig(:name)
+        scenario: scenario&.name
       ).to_h
     end
 
     def location(feature, scenario, step)
-      if step
-        step.parsing_data[:location]
-      elsif scenario
-        scenario.parsing_data.dig(:scenario, :location) || scenario.parsing_data.dig(:background, :location)
-      else
-        feature ? feature.parsing_data[:location] : { line: 0, column: 0 }
-      end
+      Locator.locate(feature, scenario, step)
     end
 
     def type(_feature, scenario, step)

data/lib/chutney/locator.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Chutney
+  # Utility module to assist in locating the source of parts of a gherkin specification
+  module Locator
+    module_function
+
+    def locate(feature, scenario, step)
+      if step
+        locate_step(step)
+      elsif scenario
+        locate_scenario(scenario)
+      elsif feature
+        locate_feature(feature)
+      else
+        feature
+      end
+    end
+
+    def locate_step(step)
+      return step.parsing_data.location.to_h if step.parsing_data.respond_to?(:location)
+      return step.parsing_data[:location] if step.parsing_data.is_a?(Hash)
+
+      raise UnsupportedCucumberError, 'This version of cucumber is unsupported (step location)'
+    end
+
+    def locate_scenario(scenario)
+      parsing_data = scenario.parsing_data
+
+      if parsing_data.is_a?(Hash)
+        parsing_data.dig(:scenario, :location) || parsing_data.dig(:background, :location)
+      elsif parsing_data.respond_to?(:scenario)
+        (parsing_data.scenario || parsing_data.background).location.to_h
+      else
+        raise UnsupportedCucumberError, 'This version of cucumber is unsupported (scenario location)'
+      end
+    end
+
+    def locate_feature(feature)
+      return feature.parsing_data.location.to_h if feature.parsing_data.respond_to?(:location)
+      return feature.parsing_data[:location] if feature.parsing_data.is_a?(Hash)
+
+      raise UnsupportedCucumberError, 'This version of cucumber is unsupported (feature location)'
+    end
+  end
+end

data/lib/chutney/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Chutney
-  VERSION = '3.1.0'
+  VERSION = '3.2.1'
 end

data/lib/chutney.rb

@@ -37,6 +37,7 @@ require 'chutney/linter/unknown_variable'
 require 'chutney/linter/unused_variable'
 require 'chutney/linter/use_background'
 require 'chutney/linter/use_outline'
+require 'chutney/locator'
 require 'chutney/version'
 
 require 'cuke_modeler'
@@ -48,6 +49,8 @@ require 'set'
 require 'yaml'
 
 module Chutney
+  class UnsupportedCucumberError < StandardError; end
+
   # gherkin linter
   class ChutneyLint
     extend Forwardable

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chutney
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Nigel Brookes-Thomas
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-05 00:00:00.000000000 Z
+date: 2022-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amatch
@@ -45,16 +45,22 @@ dependencies:
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: pastel
   requirement: !ruby/object:Gem::Requirement
@@ -101,16 +107,16 @@ dependencies:
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -173,14 +179,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.31.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.31.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -277,6 +283,7 @@ files:
 - lib/chutney/linter/unused_variable.rb
 - lib/chutney/linter/use_background.rb
 - lib/chutney/linter/use_outline.rb
+- lib/chutney/locator.rb
 - lib/chutney/version.rb
 - lib/config/locales/en.yml
 - spec/chutney_spec.rb
@@ -294,7 +301,7 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -303,7 +310,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: A linter for multi-lingual Gherkin