standard-performance 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3313cb1b98296491d99d1c41ba34d8fb1d23554a3db84466c38a74bba905762
-  data.tar.gz: 0fde13d39f95f79376ae9c848a180661f708168033395cb0d66bb3a04ef57aba
+  metadata.gz: 1e3de877fbeba90b5e1d960e1d0be37066c3056782bb9c7d8cb8a9cf68015cb3
+  data.tar.gz: e5ff45b0503319d7d32edd0145cea9d7bf90b8de6ce8a78b4743b022d2c3d5cd
 SHA512:
-  metadata.gz: 6c0e97d9db245d0a97e1a4cb35cd2835de358b98d973056a8c6e2f0f4353e6fbf7d935f8c7da9d8d6667d7f7a4e0e4bafffc17f49e627b41ffb9051c4fc1b567
-  data.tar.gz: bdf5658c49bfb5e21c58c22dc00db7e335217eab5c8cbd0afbf4779aab2421b2e8acba81ef7ed316b1160b9b4cb03b613f8988b89923d80b8df745fb31e8a240
+  metadata.gz: ee17264a5ebf2a0ea998076d630a42ee40d21f0fe348b2fbb01d7c0803c8999318417f0492939d47189bcdca628c69dc62db9bca8a5aa368041c813361a2c25f
+  data.tar.gz: 56f03d54f49d953654e17051de0c5301ae7886b1ececb8b021b7ef8f7c09cf6b21704566de5e3e5ecf864ddcaf6ae03adeca91fc9405a2b6bf590128ec3e4a18

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## [1.2.0]
+
+- Updates rubocop-performance from 1.18.0 to 1.19.0
+  - Leaves the new rule MapMethodChain disabled.
+
+## [1.1.2]
+
+- Fix inheritance of YAML files when specifying an unsupported Ruby
+[#11](https://github.com/standardrb/standard-performance/issues/11)
+
 ## [1.1.1]
 
 - Preserve metadata from rubocop-performance by merging it

data/Gemfile

@@ -5,3 +5,8 @@ gem "rake"
 gem "minitest"
 gem "standard"
 gem "m"
+
+# Remove branch after 2.7 is dropped
+if RUBY_VERSION > "3"
+  gem "mocktail"
+end

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    standard-performance (1.1.1)
+    standard-performance (1.2.0)
       lint_roller (~> 1.1)
-      rubocop-performance (~> 1.18.0)
+      rubocop-performance (~> 1.19.0)
 
 GEM
   remote: https://rubygems.org/
@@ -16,7 +16,8 @@ GEM
       method_source (>= 0.6.7)
       rake (>= 0.9.2.2)
     method_source (1.0.0)
-    minitest (5.18.1)
+    minitest (5.19.0)
+    mocktail (1.2.2)
     parallel (1.23.0)
     parser (3.2.2.3)
       ast (~> 2.4.1)
@@ -25,7 +26,7 @@ GEM
     rainbow (3.1.1)
     rake (13.0.6)
     regexp_parser (2.8.1)
-    rexml (3.2.5)
+    rexml (3.2.6)
     rubocop (1.52.1)
       json (~> 2.3)
       parallel (~> 1.10)
@@ -38,18 +39,19 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.29.0)
       parser (>= 3.2.1.0)
-    rubocop-performance (1.18.0)
+    rubocop-performance (1.19.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.13.0)
-    standard (1.30.0)
+    standard (1.30.1)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
       rubocop (~> 1.52.0)
       standard-custom (~> 1.0.0)
       standard-performance (~> 1.1.0)
-    standard-custom (1.0.1)
+    standard-custom (1.0.2)
       lint_roller (~> 1.0)
+      rubocop (~> 1.50)
     unicode-display_width (2.4.2)
 
 PLATFORMS
@@ -60,6 +62,7 @@ PLATFORMS
 DEPENDENCIES
   m
   minitest
+  mocktail
   rake
   standard
   standard-performance!

data/config/base.yml

@@ -72,6 +72,9 @@ Performance/IoReadlines:
 Performance/MapCompact:
   Enabled: false
 
+Performance/MapMethodChain:
+  Enabled: false
+
 Performance/MethodObjectAsBlock:
   Enabled: false
 

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.2.0"
   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.2.0
 platform: ruby
 authors:
 - Justin Searls
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-07 00:00:00.000000000 Z
+date: 2023-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lint_roller
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: 1.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: 1.19.0
 description:
 email:
 - searls@gmail.com
@@ -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,14 +82,14 @@ 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:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.14
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Standard Ruby Plugin providing configuration for rubocop-performance