chutney 3.1.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9a4331eb00fea09babefa186ea7d1e51f13bacbd56cf381cf3fb3d58f293346
-  data.tar.gz: 16b169146ac5034d46eee9d6858a6b219d854b00d71445a5baca5d6532340b4a
+  metadata.gz: 364df4d2dc550c7ee5dbd99b93301c2a83a281b1bf83cc9a00ed201635a919f6
+  data.tar.gz: 97e765ad65d122ed5771cbf87e30a774a200b6a03bdc6b7c22c5b515562f8377
 SHA512:
-  metadata.gz: 2a8000d183486b9c3201ff22e43fbcfc316d5117b68539aae88b0d22ec2d9d549fdd945c8a4a15393f14d147e53c038923be3aa1dda3483a6066fb58a48ff50f
-  data.tar.gz: a9a32669fb7ddfd30e742647883a079b654e570b2e6653996a8c9ea26fe1601a402148aabf357e6a79f9150d9f747c8ce6fc80b8036180e3a5b53b3096930950
+  metadata.gz: 6821d88c15aa693efff3a4bcde58357a6a066791b39c0354667fc4f6a66d58c607a502e7c97c47df8e286fedf5d5a2d2c8447eab25e2335a75521fca837c9990
+  data.tar.gz: 16700a464d8c6700e8d88e83ae387d05502eba187fd281cb0f391fd306155c1cdf118d76eaf0f9f32bfb03a48caf39d79b76031c7ff5a43e0789fe7167f3625a

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

@@ -56,7 +56,7 @@ Gem::Specification.new do |spec|
 
 
   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'

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.1'
+  VERSION = '3.2.0'
 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.1
+  version: 3.2.0
 platform: ruby
 authors:
 - Nigel Brookes-Thomas
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-12 00:00:00.000000000 Z
+date: 2021-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amatch
@@ -103,14 +103,14 @@ dependencies:
     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
@@ -277,6 +277,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
@@ -303,7 +304,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: A linter for multi-lingual Gherkin