standard-performance 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3313cb1b98296491d99d1c41ba34d8fb1d23554a3db84466c38a74bba905762
-  data.tar.gz: 0fde13d39f95f79376ae9c848a180661f708168033395cb0d66bb3a04ef57aba
+  metadata.gz: 930070f7d659e1940012562f63b84b5ed14c00c3e35d3d7e06319d0a9be44f21
+  data.tar.gz: cf9d413e889ff09bf457903083f807bfe4f9c91e920024db8ba6fb70fbc5be8f
 SHA512:
-  metadata.gz: 6c0e97d9db245d0a97e1a4cb35cd2835de358b98d973056a8c6e2f0f4353e6fbf7d935f8c7da9d8d6667d7f7a4e0e4bafffc17f49e627b41ffb9051c4fc1b567
-  data.tar.gz: bdf5658c49bfb5e21c58c22dc00db7e335217eab5c8cbd0afbf4779aab2421b2e8acba81ef7ed316b1160b9b4cb03b613f8988b89923d80b8df745fb31e8a240
+  metadata.gz: 516ddf177823b318787c6522f36a88e9321bab42c3965cbcf6283549fddab75ae8073615d4044788110e9aadeac61a0ce842a959b33a20ec6a27f73f9eda2050
+  data.tar.gz: 8d23940d46563584f6c24870f1483c724fe94efb9d46555a0c602c2f592e8730702060cd9cb0d970b8a4f5e5650433c0f789448a6d91dd694bee69583eda7021

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [1.1.2]
+
+- Fix inheritance of YAML files when specifying an unsupported Ruby
+[standard#573](https://github.com/standardrb/standard/issues/573)
+
 ## [1.1.1]
 
 - Preserve metadata from rubocop-performance by merging it

data/Gemfile

@@ -5,3 +5,4 @@ gem "rake"
 gem "minitest"
 gem "standard"
 gem "m"
+gem "mocktail"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    standard-performance (1.1.1)
+    standard-performance (1.1.2)
       lint_roller (~> 1.1)
       rubocop-performance (~> 1.18.0)
 
@@ -17,6 +17,7 @@ GEM
       rake (>= 0.9.2.2)
     method_source (1.0.0)
     minitest (5.18.1)
+    mocktail (1.2.2)
     parallel (1.23.0)
     parser (3.2.2.3)
       ast (~> 2.4.1)
@@ -60,6 +61,7 @@ PLATFORMS
 DEPENDENCIES
   m
   minitest
+  mocktail
   rake
   standard
   standard-performance!

data/lib/standard/performance/builds_ruleset.rb

@@ -0,0 +1,21 @@
+require_relative "determines_yaml_path"
+require_relative "loads_yaml_with_inheritance"
+
+module Standard
+  module Performance
+    class BuildsRuleset
+      def initialize
+        @determines_yaml_path = DeterminesYamlPath.new
+        @loads_yaml_with_inheritance = LoadsYamlWithInheritance.new
+        @merges_upstream_metadata = LintRoller::Support::MergesUpstreamMetadata.new
+      end
+
+      def build(target_ruby_version)
+        @merges_upstream_metadata.merge(
+          @loads_yaml_with_inheritance.load(@determines_yaml_path.determine(target_ruby_version)),
+          @loads_yaml_with_inheritance.load(Pathname.new(Gem.loaded_specs["rubocop-performance"].full_gem_path).join("config/default.yml"))
+        )
+      end
+    end
+  end
+end

data/lib/standard/performance/loads_yaml_with_inheritance.rb

@@ -0,0 +1,31 @@
+require "yaml"
+
+module Standard
+  module Performance
+    class LoadsYamlWithInheritance
+      def load(path)
+        yaml = YAML.load_file(path)
+        if (parent_path = yaml.delete("inherit_from"))
+          base_path = File.dirname(path)
+          parent_yaml = load(File.join(base_path, parent_path))
+
+          two_layer_merge(parent_yaml, yaml)
+        else
+          yaml
+        end
+      end
+
+      private
+
+      def two_layer_merge(parent, base)
+        parent.merge(base) do |key, parent_value, base_value|
+          if parent_value.is_a?(Hash) && base_value.is_a?(Hash)
+            parent_value.merge(base_value)
+          else
+            base_value
+          end
+        end
+      end
+    end
+  end
+end

data/lib/standard/performance/plugin.rb

@@ -1,11 +1,10 @@
-require_relative "determines_yaml_path"
+require_relative "builds_ruleset"
 
 module Standard::Performance
   class Plugin < LintRoller::Plugin
     def initialize(config)
       @config = config
-      @merges_upstream_metadata = LintRoller::Support::MergesUpstreamMetadata.new
-      @determines_yaml_path = DeterminesYamlPath.new
+      @builds_ruleset = BuildsRuleset.new
     end
 
     def about
@@ -24,15 +23,10 @@ module Standard::Performance
     def rules(context)
       trick_rubocop_into_thinking_we_required_rubocop_performance!
 
-      rules = @merges_upstream_metadata.merge(
-        YAML.load_file(@determines_yaml_path.determine(context.target_ruby_version)),
-        YAML.load_file(Pathname.new(Gem.loaded_specs["rubocop-performance"].full_gem_path).join("config/default.yml"))
-      )
-
       LintRoller::Rules.new(
         type: :object,
         config_format: :rubocop,
-        value: rules
+        value: @builds_ruleset.build(context.target_ruby_version)
       )
     end
 

data/lib/standard/performance/version.rb

@@ -1,5 +1,5 @@
 module Standard
   module Performance
-    VERSION = "1.1.1"
+    VERSION = "1.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: standard-performance
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Justin Searls
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-07 00:00:00.000000000 Z
+date: 2023-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lint_roller
@@ -61,7 +61,9 @@ files:
 - docs/RELEASE.md
 - lib/standard-performance.rb
 - lib/standard/performance.rb
+- lib/standard/performance/builds_ruleset.rb
 - lib/standard/performance/determines_yaml_path.rb
+- lib/standard/performance/loads_yaml_with_inheritance.rb
 - lib/standard/performance/plugin.rb
 - lib/standard/performance/version.rb
 homepage: https://github.com/standardrb/standard-performance
@@ -80,7 +82,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="