nucop 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecf24df0b4caaa54faaafd445f3fd50ddc6f76afbd366be865c7403aaec6f713
-  data.tar.gz: affe1a2f7f99ab79af551df47a760815bf362e39ab347e8844009f0c226b969e
+  metadata.gz: 957aed91fcda974f755014f939640d68c6a386b9c6a8df9ffb10a663302d3b6f
+  data.tar.gz: 532a3c3d3fd5b3814243fe9b71440e0ea37ba7e55b705f3c9dfe2a7a6190660b
 SHA512:
-  metadata.gz: 165178469a3a827067cc38e2dfde35513e7d091e21c8846a4729706904ee67dc6d27fe064ae3ffa4d08efbbdb0d064528e04d57e8d04c1224b2e5de474e8b1ce
-  data.tar.gz: '092f0e7d949b88eacd9703b8c134a059054702c05952ce01024a2f7c04f0b8020f0d40bdedbd8895bbaeda55d359d3bae0a5d546f821b29d123620282348e076'
+  metadata.gz: 952c7cddb1ab8bfb14e9fc9fb7d99058d21c5e77fc95317c45bc593771b89fee3464a966d8eaec00c076f4dbf372eeab6d4cd79093de2a495b45ae25a9094a44
+  data.tar.gz: 875d3e24c5347da87979e8c92f6abf9e7b96323c61e2025b46df6cc3378530a690f4c6c951dbd841e274fa27ba42c26f71a918846655609d08befe34ef92dac3

data/lib/nucop/cli.rb

@@ -15,6 +15,7 @@ module Nucop
     method_option "autocorrect-all", type: :boolean, default: false, desc: "runs RuboCop with autocorrect-all option"
     method_option "junit_report", type: :string, default: nil, desc: "runs RuboCop with junit formatter option"
     method_option "json", type: :string, default: nil, desc: "Output results as JSON format to the provided file"
+
     def diff_enforced
       invoke :diff, nil, options.merge(only: cops_to_enforce.join(","))
     end
@@ -27,6 +28,7 @@ module Nucop
     method_option "autocorrect-all", type: :boolean, default: false, desc: "runs RuboCop with autocorrect-all option"
     method_option "junit_report", type: :string, default: nil, desc: "runs RuboCop with junit formatter option"
     method_option "json", type: :string, default: nil, desc: "Output results as JSON format to the provided file"
+
     def diff_enforced_github
       invoke :diff_github, nil, options.merge(only: cops_to_enforce.join(","))
     end
@@ -40,6 +42,7 @@ module Nucop
     method_option "ignore", type: :boolean, default: true, desc: "ignores files specified in #{options[:diffignore_file]}"
     method_option "added-only", type: :boolean, default: false, desc: "runs RuboCop only on files that have been added (not on files that have been modified)"
     method_option "exit", type: :boolean, default: true, desc: "disable to prevent task from exiting. Used by other Thor tasks when invoking this task, to prevent parent task from exiting"
+
     def diff
       puts "Running on files changed relative to '#{options[:"commit-spec"]}' (specify using the 'commit-spec' option)"
       diff_filter = options[:"added-only"] ? "A" : "d"
@@ -88,6 +91,7 @@ module Nucop
     method_option "ignore", type: :boolean, default: true, desc: "ignores files specified in #{options[:diffignore_file]}"
     method_option "added-only", type: :boolean, default: false, desc: "runs RuboCop only on files that have been added (not on files that have been modified)"
     method_option "exit", type: :boolean, default: true, desc: "disable to prevent task from exiting. Used by other Thor tasks when invoking this task, to prevent parent task from exiting"
+
     def diff_github
       puts "Running on files changed relative to '#{options[:"commit-spec"]}' (specify using the 'commit-spec' option)"
       diff_head = capture_std_out("git rev-parse HEAD").chomp
@@ -155,14 +159,10 @@ module Nucop
     method_option "autocorrect", type: :boolean, default: false, desc: "runs RuboCop with autocorrect option"
     method_option "autocorrect-all", type: :boolean, default: false, desc: "runs RuboCop with autocorrect-all option"
     method_option "exclude-backlog", type: :boolean, default: false, desc: "when true, uses config which excludes violations in the RuboCop backlog"
+
     def rubocop(files = nil)
       print_cops_being_run(options[:only])
       config_file = options[:"exclude-backlog"] ? RUBOCOP_DEFAULT_CONFIG_FILE : options[:rubocop_todo_config_file]
-      rubocop_requires = [
-        "--require rubocop-rspec",
-        "--require rubocop-performance",
-        "--require rubocop-rails"
-      ]
 
       formatters = []
       formatters << "--format Nucop::Formatters::JUnitFormatter --out #{options[:junit_report]}" if options[:junit_report]
@@ -173,7 +173,7 @@ module Nucop
         "bundle exec rubocop",
         "--no-server",
         "--parallel",
-        rubocop_requires.join(" "),
+        rubocop_gem_requires.join(" "),
         formatters.join(" "),
         "--force-exclusion",
         "--config", config_file,
@@ -189,18 +189,21 @@ module Nucop
 
     desc "regen_backlog", "update the RuboCop backlog, disabling offending files and excluding all cops with over 500 violating files."
     method_option "exclude-limit", type: :numeric, default: 500, desc: "Limit files listed to this limit. Passed to RuboCop"
+
     def regen_backlog
       regenerate_rubocop_todos
       update_enforced_cops
     end
 
     desc "update_enforced", "update the enforced cops list with file with cops that no longer have violations"
+
     def update_enforced
       update_enforced_cops
     end
 
     desc "modified_lines", "display RuboCop violations for ONLY modified lines"
     method_option "commit-spec", default: "main", desc: "the commit used to determine the diff."
+
     def modified_lines
       diff_files, diff_status = Open3.capture2("git diff #{options[:"commit-spec"]} --diff-filter=d --name-only | grep \"\\.rb$\"")
 
@@ -220,6 +223,7 @@ module Nucop
 
     desc "ready_for_promotion", "display the next n cops with the fewest offenses"
     method_option "n", type: :numeric, default: 1, desc: "number of cops to display"
+
     def ready_for_promotion
       finder = Helpers::NextCopForPromotion.new(options[:rubocop_todo_file])
       todo_config = YAML.load_file(options[:rubocop_todo_file])
@@ -303,17 +307,10 @@ module Nucop
       rubocop_options = [
         "--auto-gen-config",
         "--config #{options[:rubocop_todo_config_file]}",
-        "--exclude-limit #{options[:"exclude-limit"]}",
-        "--require rubocop-graphql",
-        "--require rubocop-performance",
-        "--require rubocop-rails",
-        "--require rubocop-rake",
-        "--require rubocop-rspec",
-        "--require rubocop-rubycw",
-        "--require rubocop-thread_safety"
+        "--exclude-limit #{options[:"exclude-limit"]}"
       ]
 
-      rubocop_command = "DISABLE_SPRING=1 bundle exec rubocop #{rubocop_options.join(' ')}"
+      rubocop_command = "DISABLE_SPRING=1 bundle exec rubocop #{rubocop_options.join(' ')} #{rubocop_gem_requires.join(' ')}"
 
       system(rubocop_command)
 
@@ -323,6 +320,10 @@ module Nucop
       system("git checkout #{options[:rubocop_todo_config_file]}")
     end
 
+    def rubocop_gem_requires
+      Nucop::Helpers::RubocopGemDependencies.rubocop_gems.map { |rubocop_gem| "--require #{rubocop_gem}" }
+    end
+
     def update_enforced_cops
       puts "Updating enforced cops list..."
 
@@ -346,7 +347,8 @@ module Nucop
     end
 
     def enabled_cops
-      YAML.safe_load(`bundle exec rubocop --parallel --show-cops`, permitted_classes: [Regexp, Symbol])
+      YAML
+        .safe_load(`bundle exec rubocop --parallel --show-cops`, permitted_classes: [Regexp, Symbol])
         .select { |_, config| config["Enabled"] }
         .map(&:first)
     end

data/lib/nucop/cops/release_toggles_use_symbols.rb

@@ -17,7 +17,7 @@ module Nucop
   #   release_toggle_enabled?(:move_out_of_wip_autocomplete)
   #
   class ReleaseTogglesUseSymbols < ::RuboCop::Cop::Cop
-    MSG = "Use a symbol when refering to a Release Toggle's by name".freeze
+    MSG = "Use a symbol when referring to a Release Toggle's by name".freeze
 
     def_node_matcher :test_helper?, <<~PATTERN
       (send nil? {:release_toggle_enabled? :release_toggle_enabled_for_any_site?} (str _))

data/lib/nucop/helpers/cop_counter.rb

@@ -1,7 +1,7 @@
 # class to count the number of cops from a list of RuboCop "only" options
 # i.e. it accounts for whole "Departments"
 #
-# Examaples:
+# Examples:
 # "Style/Blah" is 1 cops
 # "Layout" may represent 70 cops
 module Nucop

data/lib/nucop/helpers/rubocop_gem_dependencies.rb

@@ -0,0 +1,24 @@
+module Nucop
+  module Helpers
+    # Knows the list of gems the nucop makes available.
+    module RubocopGemDependencies
+      module_function
+
+      def rubocop_gems
+        %w[
+          rubocop
+          rubocop-capybara
+          rubocop-factory_bot
+          rubocop-graphql
+          rubocop-performance
+          rubocop-rails
+          rubocop-rake
+          rubocop-rspec
+          rubocop-rspec_rails
+          rubocop-rubycw
+          rubocop-thread_safety
+        ]
+      end
+    end
+  end
+end

data/lib/nucop/version.rb

@@ -1,3 +1,3 @@
 module Nucop
-  VERSION = "0.11.0"
+  VERSION = "0.11.1"
 end

data/lib/nucop.rb

@@ -3,9 +3,9 @@ require "nucop/version"
 require "rubocop"
 require "git_diff_parser"
 
-Dir[File.join(__dir__, "nucop/helpers/**/*.rb")].sort.each { |f| require f }
-Dir[File.join(__dir__, "nucop/formatters/**/*.rb")].sort.each { |f| require f }
-Dir[File.join(__dir__, "nucop/cops/**/*.rb")].sort.each { |f| require f }
+Dir[File.join(__dir__, "nucop/helpers/**/*.rb")].each { |f| require f }
+Dir[File.join(__dir__, "nucop/formatters/**/*.rb")].each { |f| require f }
+Dir[File.join(__dir__, "nucop/cops/**/*.rb")].each { |f| require f }
 
 module Nucop
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: nucop
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Jason Schweier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-19 00:00:00.000000000 Z
+date: 2024-06-20 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: git_diff_parser
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.30'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.30'
 - !ruby/object:Gem::Dependency
   name: rubocop-rubycw
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: git_diff_parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -230,6 +244,7 @@ files:
 - lib/nucop/helpers/factory_bot_helper.rb
 - lib/nucop/helpers/file_path_helper.rb
 - lib/nucop/helpers/next_cop_for_promotion.rb
+- lib/nucop/helpers/rubocop_gem_dependencies.rb
 - lib/nucop/version.rb
 homepage: https://rubygems.org/gems/nucop
 licenses:
@@ -237,7 +252,6 @@ licenses:
 metadata:
   homepage_uri: https://github.com/nulogy/nucop
   changelog_uri: https://github.com/nulogy/nucop/blob/master/CHANGELOG.md
-  source_code_uri: https://github.com/nulogy/nucop
   bug_tracker_uri: https://github.com/nulogy/nucop/issues
   rubygems_mfa_required: 'true'
 post_install_message:
@@ -248,7 +262,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="