standard-performance 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bae992bcc9fe9ebfe27b0fa39731373d07c9fa4eb60ca6d5114c3a2d20bb152
-  data.tar.gz: bdc0203b28a41368821a1dcab79bb6da9dbf4e1885f9f37536158082117ed223
+  metadata.gz: 930070f7d659e1940012562f63b84b5ed14c00c3e35d3d7e06319d0a9be44f21
+  data.tar.gz: cf9d413e889ff09bf457903083f807bfe4f9c91e920024db8ba6fb70fbc5be8f
 SHA512:
-  metadata.gz: d1bd85a254885e8850d2b22fdde747c47ec8e31685d9325e0e030cd41b4e2e69389ce684bc667e30b3f96c26598fdbaad4642b0a0b333fd49b668dfc4ec5a738
-  data.tar.gz: e3187abc3f81b1e20d7a2c6c2e0e312400946dbedc2424e5a98c579d12a79cad6acd77acf1b69a0f69c277c603de900bf4e15b0564f7cb6d6d80ea8f3f3c6474
+  metadata.gz: 516ddf177823b318787c6522f36a88e9321bab42c3965cbcf6283549fddab75ae8073615d4044788110e9aadeac61a0ce842a959b33a20ec6a27f73f9eda2050
+  data.tar.gz: 8d23940d46563584f6c24870f1483c724fe94efb9d46555a0c602c2f592e8730702060cd9cb0d970b8a4f5e5650433c0f789448a6d91dd694bee69583eda7021

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [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
+
 ## [1.1.0]
 
 - Updates rubocop-performance from 1.16.0 to 1.18.0

data/Gemfile

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

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    standard-performance (1.1.0)
-      lint_roller (~> 1.0)
+    standard-performance (1.1.2)
+      lint_roller (~> 1.1)
       rubocop-performance (~> 1.18.0)
 
 GEM
@@ -11,23 +11,26 @@ GEM
     ast (2.4.2)
     json (2.6.3)
     language_server-protocol (3.17.0.3)
-    lint_roller (1.0.0)
+    lint_roller (1.1.0)
     m (1.6.1)
       method_source (>= 0.6.7)
       rake (>= 0.9.2.2)
     method_source (1.0.0)
-    minitest (5.18.0)
+    minitest (5.18.1)
+    mocktail (1.2.2)
     parallel (1.23.0)
-    parser (3.2.2.1)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
+      racc
+    racc (1.7.1)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.8.0)
+    regexp_parser (2.8.1)
     rexml (3.2.5)
-    rubocop (1.50.2)
+    rubocop (1.52.1)
       json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.2.2.3)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
@@ -40,13 +43,13 @@ GEM
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.13.0)
-    standard (1.28.5)
+    standard (1.30.0)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.50.2)
+      rubocop (~> 1.52.0)
       standard-custom (~> 1.0.0)
-      standard-performance (~> 1.0.1)
-    standard-custom (1.0.0)
+      standard-performance (~> 1.1.0)
+    standard-custom (1.0.1)
       lint_roller (~> 1.0)
     unicode-display_width (2.4.2)
 
@@ -58,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/determines_yaml_path.rb

@@ -0,0 +1,28 @@
+module Standard
+  module Performance
+    class DeterminesYamlPath
+      def determine(desired_version)
+        desired_version = Gem::Version.new(desired_version) unless desired_version.is_a?(Gem::Version)
+        default = "base.yml"
+
+        file_name = if !Gem::Version.correct?(desired_version)
+          default
+        elsif desired_version < Gem::Version.new("1.9")
+          "ruby-1.8.yml"
+        elsif desired_version < Gem::Version.new("2.0")
+          "ruby-1.9.yml"
+        elsif desired_version < Gem::Version.new("2.1")
+          "ruby-2.0.yml"
+        elsif desired_version < Gem::Version.new("2.2")
+          "ruby-2.1.yml"
+        elsif desired_version < Gem::Version.new("2.3")
+          "ruby-2.2.yml"
+        else
+          default
+        end
+
+        Pathname.new(__dir__).join("../../../config/#{file_name}")
+      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,7 +1,10 @@
+require_relative "builds_ruleset"
+
 module Standard::Performance
   class Plugin < LintRoller::Plugin
     def initialize(config)
       @config = config
+      @builds_ruleset = BuildsRuleset.new
     end
 
     def about
@@ -21,9 +24,9 @@ module Standard::Performance
       trick_rubocop_into_thinking_we_required_rubocop_performance!
 
       LintRoller::Rules.new(
-        type: :path,
+        type: :object,
         config_format: :rubocop,
-        value: determine_yaml_path(context.target_ruby_version)
+        value: @builds_ruleset.build(context.target_ruby_version)
       )
     end
 
@@ -47,28 +50,5 @@ module Standard::Performance
       require "rubocop/cop/performance_cops"
       RuboCop::ConfigLoader.default_configuration.loaded_features.add("rubocop-performance")
     end
-
-    def determine_yaml_path(desired_version)
-      desired_version = Gem::Version.new(desired_version) unless desired_version.is_a?(Gem::Version)
-      default = "base.yml"
-
-      file_name = if !Gem::Version.correct?(desired_version)
-        default
-      elsif desired_version < Gem::Version.new("1.9")
-        "ruby-1.8.yml"
-      elsif desired_version < Gem::Version.new("2.0")
-        "ruby-1.9.yml"
-      elsif desired_version < Gem::Version.new("2.1")
-        "ruby-2.0.yml"
-      elsif desired_version < Gem::Version.new("2.2")
-        "ruby-2.1.yml"
-      elsif desired_version < Gem::Version.new("2.3")
-        "ruby-2.2.yml"
-      else
-        default
-      end
-
-      Pathname.new(__dir__).join("../../../config/#{file_name}")
-    end
   end
 end

data/lib/standard/performance/version.rb

@@ -1,5 +1,5 @@
 module Standard
   module Performance
-    VERSION = "1.1.0"
+    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.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Justin Searls
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-02 00:00:00.000000000 Z
+date: 2023-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lint_roller
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -38,7 +38,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.18.0
-description: 
+description:
 email:
 - searls@gmail.com
 executables: []
@@ -61,6 +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
@@ -71,7 +74,7 @@ metadata:
   source_code_uri: https://github.com/standardrb/standard-performance
   changelog_uri: https://github.com/standardrb/standard-performance/blob/main/CHANGELOG.md
   default_lint_roller_plugin: Standard::Performance::Plugin
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -79,15 +82,15 @@ 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.1.6
-signing_key: 
+rubygems_version: 3.4.14
+signing_key:
 specification_version: 4
 summary: Standard Ruby Plugin providing configuration for rubocop-performance
 test_files: []