nucop 0.11.2 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '081e762c1062a77de4d3944faf033a1c108d8eb08096f08973acd34fbde3fe31'
-  data.tar.gz: 50c823a5c9f7a75ddc3ce7f78051a7002d52713b23180a86d92af43ea0542716
+  metadata.gz: 75e14093d66eefb64ddcab42c17e132a0ffedb4038dfdb13b3f3530efb2b8ce4
+  data.tar.gz: 7f9301976fb9e2f6faeea1c554600c475b652658b9650c21ce2485a83aa45f45
 SHA512:
-  metadata.gz: 4d9c1578e8a3019c286042b15fb7c8cd275e2a49ed924147e4e6df6140891c8acde2767bb1b1d7211326c104b19ed16f5a5e6f57a4febcfa446d92cc004084d5
-  data.tar.gz: 793a545e9c038b60b3bfad8bcc0ccd204d6a009acf75f0dcd88c75e162adfb813c24d123e20d7d1422d57a95f52ffabc5b8384b247a252aad2075534ebea77ab
+  metadata.gz: dc89dae160e8633cc9d227c2e204e49411a29fa184d5dd33f005d68950445d78abdd43b8b419dafcf0d3f28d2e235812fce4fe7f2270813a31a4473532ab07b5
+  data.tar.gz: 4965b8c0304655c314ea4aa945809449c4a7ab85d43db419845ec832791a3dc9465b75e986d6463c0dfb0eeebf723b88a049b074e8503cdbdae22af63ce8444e

data/lib/nucop/cli.rb

@@ -8,6 +8,34 @@ CONFIGURATION_FILEPATH = ".nucop.yml"
 
 module Nucop
   class Cli < Thor
+    class << self
+      private
+
+      def load_custom_options
+        @_load_custom_options ||= begin
+          if File.exist?(CONFIGURATION_FILEPATH)
+            default_configuration.merge(YAML.load_file(CONFIGURATION_FILEPATH))
+          else
+            default_configuration
+          end
+        end
+      end
+
+      def default_configuration
+        {
+          enforced_cops_file: ".rubocop.enforced.yml",
+          rubocop_todo_file: ".rubocop_todo.yml",
+          rubocop_todo_config_file: ".rubocop.backlog.yml",
+          diffignore_file: ".nucop_diffignore"
+        }
+      end
+    end
+
+    class_option :diffignore_file, default: load_custom_options[:diffignore_file]
+    class_option :enforced_cops_file, default: load_custom_options[:enforced_cops_file]
+    class_option :rubocop_todo_config_file, default: load_custom_options[:rubocop_todo_config_file]
+    class_option :rubocop_todo_file, default: load_custom_options[:rubocop_todo_file]
+
     desc "diff_enforced", "run RuboCop on the current diff using only the enforced cops"
     method_option "commit-spec", default: "origin/main", desc: "the commit used to determine the diff."
     method_option "auto-correct", type: :boolean, default: false, desc: "runs RuboCop with auto-correct option (deprecated)"
@@ -347,37 +375,10 @@ module Nucop
     end
 
     def enabled_cops
-      YAML
+      @_enabled_cops ||= YAML
         .safe_load(`bundle exec rubocop --parallel --show-cops`, permitted_classes: [Regexp, Symbol])
         .select { |_, config| config["Enabled"] }
         .map(&:first)
     end
-
-    # Override Thor's options method to include Nucop's options
-    def options
-      return @_options if defined?(@_options)
-
-      original_options = super
-      @_options = Thor::CoreExt::HashWithIndifferentAccess.new(
-        configuration_options.merge(original_options)
-      )
-    end
-
-    def configuration_options
-      if File.exist?(CONFIGURATION_FILEPATH)
-        default_configuration.merge(YAML.load_file(CONFIGURATION_FILEPATH))
-      else
-        default_configuration
-      end
-    end
-
-    def default_configuration
-      {
-        enforced_cops_file: ".rubocop.enforced.yml",
-        rubocop_todo_file: ".rubocop_todo.yml",
-        rubocop_todo_config_file: ".rubocop.backlog.yml",
-        diffignore_file: ".nucop_diffignore"
-      }
-    end
   end
 end

data/lib/nucop/cops/explicit_factory_bot_usage.rb

@@ -15,7 +15,8 @@ module Nucop
   #
   #   job = create(:job, project: project)
   #   build(:project, code: "Super Project")
-  class ExplicitFactoryBotUsage < ::RuboCop::Cop::Cop
+  class ExplicitFactoryBotUsage < ::RuboCop::Cop::Base
+    extend RuboCop::Cop::AutoCorrector
     include Helpers::FilePathHelper
 
     MSG = "Do not explicitly use `%<constant>s` to build objects. The factory method `%<method>s` is globally available."
@@ -26,18 +27,14 @@ module Nucop
 
     def on_send(node)
       explicit_factory_bot_usage(node) do
-        add_offense(node, location: :expression, message: format(MSG, constant: node.receiver.const_name, method: node.method_name))
+        add_offense(node, location: :expression, message: format(MSG, constant: node.receiver.const_name, method: node.method_name)) do |corrector|
+          corrector.replace(node.source_range, node.source.sub(/(?:FactoryGirl|FactoryBot)[.]/, ""))
+        end
       end
     end
 
     def relevant_file?(file)
       acceptance_or_spec_file?(file) && super
     end
-
-    def autocorrect(node)
-      ->(corrector) do
-        corrector.replace(node.source_range, node.source.sub(/(?:FactoryGirl|FactoryBot)[.]/, ""))
-      end
-    end
   end
 end

data/lib/nucop/cops/no_core_method_overrides.rb

@@ -15,7 +15,7 @@ module Nucop
   #     # ...
   #   end
   #
-  class NoCoreMethodOverrides < ::RuboCop::Cop::Cop
+  class NoCoreMethodOverrides < ::RuboCop::Cop::Base
     MSG = "Core method overridden".freeze
 
     def_node_matcher :core_methods, <<~PATTERN

data/lib/nucop/cops/no_wip_specs.rb

@@ -15,7 +15,7 @@ module Nucop
   #     # ...
   #   end
   #
-  class NoWipSpecs < ::RuboCop::Cop::Cop
+  class NoWipSpecs < ::RuboCop::Cop::Base
     MSG = "WIP spec found".freeze
 
     def_node_matcher :wip_it_specs_present?, <<~PATTERN

data/lib/nucop/cops/ordered_hash.rb

@@ -16,7 +16,9 @@ module Nucop
   #   # good
   #
   #   hash = {}
-  class OrderedHash < ::RuboCop::Cop::Cop
+  class OrderedHash < ::RuboCop::Cop::Base
+    extend RuboCop::Cop::AutoCorrector
+
     MSG = "Ruby hashes after 1.9 enumerate keys in order of insertion"
 
     def_node_matcher :ordered_hash_usage, <<~PATTERN
@@ -25,17 +27,9 @@ module Nucop
 
     def on_send(node)
       ordered_hash_usage(node) do
-        add_offense(
-          node,
-          location: :expression,
-          message: MSG
-        )
-      end
-    end
-
-    def autocorrect(node)
-      ->(corrector) do
-        corrector.replace(node.source_range, "{}")
+        add_offense(node, location: :expression, message: MSG) do |corrector|
+          corrector.replace(node.source_range, "{}")
+        end
       end
     end
   end

data/lib/nucop/cops/release_toggles_use_symbols.rb

@@ -16,7 +16,9 @@ module Nucop
   #
   #   release_toggle_enabled?(:move_out_of_wip_autocomplete)
   #
-  class ReleaseTogglesUseSymbols < ::RuboCop::Cop::Cop
+  class ReleaseTogglesUseSymbols < ::RuboCop::Cop::Base
+    extend RuboCop::Cop::AutoCorrector
+
     MSG = "Use a symbol when referring to a Release Toggle's by name".freeze
 
     def_node_matcher :test_helper?, <<~PATTERN
@@ -29,14 +31,12 @@ module Nucop
 
     def on_send(node)
       test_helper?(node) { add_offense(node, message: MSG, location: node.children[2].loc.expression) }
-      release_toggles_public_api_method?(node) { add_offense(node, message: MSG, location: node.children[2].loc.expression) }
-    end
-
-    def autocorrect(node)
-      ->(corrector) do
-        toggle_name = node.children[2].value
+      release_toggles_public_api_method?(node) do
+        add_offense(node, message: MSG, location: node.children[2].loc.expression) do |corrector|
+          toggle_name = node.children[2].value
 
-        corrector.replace(node.children[2].source_range, ":#{toggle_name}")
+          corrector.replace(node.children[2].source_range, ":#{toggle_name}")
+        end
       end
     end
   end

data/lib/nucop/cops/shadowing_factory_bot_creation_methods.rb

@@ -15,7 +15,7 @@ module Nucop
   #   def create_transfer_pallet(args)
   #     ...
   #   end
-  class ShadowingFactoryBotCreationMethods < ::RuboCop::Cop::Cop
+  class ShadowingFactoryBotCreationMethods < ::RuboCop::Cop::Base
     include Helpers::FilePathHelper
 
     MSG = "Method `%<method>s` shadows a FactoryBot method. Please rename it to be more specific."

data/lib/nucop/helpers/cop_set.rb

@@ -1,5 +1,3 @@
-require "set"
-
 module Nucop
   module Helpers
     class CopSet

data/lib/nucop/version.rb

@@ -1,3 +1,3 @@
 module Nucop
-  VERSION = "0.11.2"
+  VERSION = "0.12.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nucop
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0
 platform: ruby
 authors:
 - Jason Schweier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-11 00:00:00.000000000 Z
+date: 2024-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.64'
+        version: '1.67'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.64'
+        version: '1.67'
 - !ruby/object:Gem::Dependency
   name: rubocop-capybara
   requirement: !ruby/object:Gem::Requirement
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.21'
+        version: '1.22'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.21'
+        version: '1.22'
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.25'
+        version: '2.26'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.25'
+        version: '2.26'
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec_rails
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +178,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -262,14 +276,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.14
+rubygems_version: 3.5.21
 signing_key:
 specification_version: 4
 summary: Nulogy's implementation of RuboCop, including custom cops and additional