nucop 0.13.3 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4752865b765d3873a9add4d5e88d9e41f0d1dd3df76806e6f3e0c4b41a161fa0
-  data.tar.gz: '076051098218b7584ef87da0ddcbfa318280bcb60ade7957dec0dfd7e6e71166'
+  metadata.gz: 60a43ae26698ed539fb77fc3933d3ff662cd505608faa6199e9da620304a18a2
+  data.tar.gz: a255fad7d36bb62863b591c701ecfb42c975ed8415acf3347bdbe7b4d5477ef0
 SHA512:
-  metadata.gz: 236708bf2169162b4cd4f5f56026e2928bde7a2e58146c0b9b5fa7d505d565fb6aae34fc4a724ac44fc33ff94b699406094dc473e60090ae3623969c80b3ae55
-  data.tar.gz: 6359926411218b12f6e895d70bd334d837e876557a62d48ba1f2f811f698ace933bfefd7c76e02303b1482eb9a91dab3eeb9ce5572d218342b97c0604bf738c6
+  metadata.gz: 27f596c10a11e943dc0255751cf08c099593bb3b0bfd84c7bf64bb6ed7c2018ada52283088e5fefe495f27c3e1757b88f2e513a3fdb05c9546076936a9370817
+  data.tar.gz: a5c607cea7e35b761bec9c787be76e3384542d6315d45082b39a9ad4c3a6eff4b344cfbfb46e1c30d492e2f1034e095958ef8d4dce62e47c2b7586ea6f93b55f

data/lib/nucop/cli.rb

@@ -22,17 +22,13 @@ module Nucop
 
       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"
@@ -44,7 +40,7 @@ module Nucop
     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(","))
+      invoke :diff, nil, options
     end
 
     desc "diff_enforced_github", "run RuboCop on the current diff using only the enforced cops (using GitHub to find the files changed)"
@@ -57,7 +53,7 @@ module Nucop
     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(","))
+      invoke :diff_github, nil, options
     end
 
     desc "diff", "run RuboCop on the current diff"
@@ -186,11 +182,10 @@ module Nucop
     method_option "auto-correct", type: :boolean, default: false, desc: "runs RuboCop with auto-correct option (deprecated)"
     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]
+      puts "Running all cops..."
+      config_file = RUBOCOP_DEFAULT_CONFIG_FILE
 
       formatters = []
       formatters << "--format Nucop::Formatters::JUnitFormatter --out #{options[:junit_report]}" if options[:junit_report]
@@ -220,13 +215,11 @@ module Nucop
 
     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
+      puts "This is a no-op. Enforced cops are not currently supported."
     end
 
     desc "modified_lines", "display RuboCop violations for ONLY modified lines"
@@ -242,7 +235,7 @@ module Nucop
         "--parallel",
         "--no-server",
         "--format Nucop::Formatters::GitDiffFormatter",
-        "--config #{options[:rubocop_todo_config_file]}",
+        "--config #{RUBOCOP_DEFAULT_CONFIG_FILE}",
         multi_line_to_single_line(diff_files).to_s
       ].join(" ")
 
@@ -254,41 +247,11 @@ module Nucop
     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])
-
-      puts "The following cop(s) are ready to be promoted to enforced. Good luck!"
-      puts "Remember to run `nucop:regen_backlog` to capture your hard work."
-      puts
-      finder.find(options["n"].to_i).each do |todo|
-        puts "#{todo.name} with #{todo.offenses} offenses:"
-        puts
-
-        files = todo_config.fetch(todo.name, {}).fetch("Exclude", [])
-
-        system("bundle exec rubocop --no-server --parallel --config #{options[:rubocop_todo_config_file]} --only #{todo.name} #{files.join(' ')}")
-        puts("*" * 100) if options["n"] > 1
-        puts
-      end
+      puts "This is a no-op. Enforced cops are not currently supported."
     end
 
     private
 
-    # some cops cannot be used with the --only option and will raise an error
-    # this filters them out
-    def cops_to_enforce
-      cops = enforced_cops
-
-      cops.delete("Lint/UnneededCopDisableDirective")
-      cops.delete("Lint/RedundantCopDisableDirective")
-
-      cops
-    end
-
-    def enforced_cops
-      @_enforced_cops ||= YAML.load_file(options[:enforced_cops_file])
-    end
-
     def capture_std_out(command, error_message = nil, stdin_data = nil)
       std_out, std_error, status = Open3.capture3(command, stdin_data: stdin_data)
       print_errors_and_exit(std_error, error_message) unless status.success?
@@ -303,15 +266,6 @@ module Nucop
       exit 1
     end
 
-    def print_cops_being_run(only_option)
-      if only_option
-        enforced_cops_count = Helpers::CopCounter.count(enabled_cops, only_option.split(","))
-        puts "Running with a force of #{enforced_cops_count} cops. See '#{options[:enforced_cops_file]}' for more details."
-      else
-        puts "Running all cops (specify using the 'only' option)"
-      end
-    end
-
     def multi_line_to_single_line(str)
       str.split(/\n+/).join(" ")
     end
@@ -325,67 +279,30 @@ module Nucop
       "--#{option} #{options[option] if is_flag_option}"
     end
 
-    def files_changed_since(commit_spec)
-      `git diff #{commit_spec} HEAD --name-only`
-        .split("\n")
-        .select { |e| e.end_with?(".rb") }
-    end
-
     def regenerate_rubocop_todos
       puts "Regenerating '#{options[:rubocop_todo_file]}'. Please be patient..."
 
       rubocop_options = [
         "--auto-gen-config",
-        "--config #{options[:rubocop_todo_config_file]}",
+        "--config #{RUBOCOP_DEFAULT_CONFIG_FILE}",
         "--exclude-limit #{options[:"exclude-limit"]}",
         "--no-server"
       ]
 
-      rubocop_command = "DISABLE_SPRING=1 bundle exec rubocop #{rubocop_options.join(' ')} #{rubocop_gem_requires.join(' ')}"
+      system("rm -f #{options[:rubocop_todo_file]}")
+      system("touch #{options[:rubocop_todo_file]}")
 
+      rubocop_command = "DISABLE_SPRING=1 bundle exec rubocop #{rubocop_options.join(' ')} #{rubocop_gem_requires.join(' ')}"
       system(rubocop_command)
 
-      # RuboCop wants to inherit from our todos (options[:rubocop_todo_file]) in our backlog configuration file (options[:rubocop_todo_config_file])
-      # However, that means the next time we try to update our backlog, it will NOT include the violations recorded as todo
-      # For now, we ignore any changes in our backlog config
-      system("git checkout #{options[:rubocop_todo_config_file]}")
-    end
-
-    def rubocop_gem_plugins
-      Nucop::Helpers::RubocopGemDependencies.rubocop_plugins.map { |rubocop_gem| "--plugin #{rubocop_gem}" }
+      # RuboCop wants to inherit from our todos (options[:rubocop_todo_file]) in our configuration file.
+      # However, that means the next time we try to update our backlog, it will NOT include the violations
+      # recorded as todo. For now, we ignore any changes in our config.
+      system("git checkout #{RUBOCOP_DEFAULT_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..."
-
-      current_enforced_cops = Helpers::CopSet.new(enforced_cops)
-      cops_without_violations.each do |cop|
-        current_enforced_cops.add_cop(cop)
-      end
-
-      if current_enforced_cops.cop_added?
-        File.write(options[:enforced_cops_file], current_enforced_cops.to_a.sort.to_yaml)
-        puts "Updated '#{options[:enforced_cops_file]}'!"
-      else
-        puts "No new cops are clear of violations"
-      end
-    end
-
-    def cops_without_violations
-      cops_with_violations = YAML.load_file(options[:rubocop_todo_file]).map(&:first)
-
-      enabled_cops - cops_with_violations
-    end
-
-    def enabled_cops
-      @_enabled_cops ||= YAML
-        .safe_load(`bundle exec rubocop --no-server --parallel --show-cops`, permitted_classes: [Regexp, Symbol])
-        .select { |_, config| config["Enabled"] }
-        .map(&:first)
-    end
   end
 end

data/lib/nucop/version.rb

@@ -1,3 +1,3 @@
 module Nucop
-  VERSION = "0.13.3"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: nucop
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 1.0.1
 platform: ruby
 authors:
 - Jason Schweier
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-26 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -220,7 +219,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.13'
-description:
 email:
 - jasons@nulogy.com
 executables:
@@ -239,7 +237,6 @@ files:
 - lib/nucop/cops/shadowing_factory_bot_creation_methods.rb
 - lib/nucop/formatters/git_diff_formatter.rb
 - lib/nucop/formatters/junit_formatter.rb
-- lib/nucop/helpers/cop_counter.rb
 - lib/nucop/helpers/cop_set.rb
 - lib/nucop/helpers/factory_bot_helper.rb
 - lib/nucop/helpers/file_path_helper.rb
@@ -254,7 +251,6 @@ metadata:
   changelog_uri: https://github.com/nulogy/nucop/blob/master/CHANGELOG.md
   bug_tracker_uri: https://github.com/nulogy/nucop/issues
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -269,8 +265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
-signing_key:
+rubygems_version: 3.7.0
 specification_version: 4
 summary: Nulogy's implementation of RuboCop, including custom cops and additional
   tooling.

data/lib/nucop/helpers/cop_counter.rb

@@ -1,51 +0,0 @@
-# class to count the number of cops from a list of RuboCop "only" options
-# i.e. it accounts for whole "Departments"
-#
-# Examples:
-# "Style/Blah" is 1 cops
-# "Layout" may represent 70 cops
-module Nucop
-  module Helpers
-    class CopCounter
-      def self.count(all_cops, cops_or_departments)
-        new(all_cops).count(cops_or_departments)
-      end
-
-      def initialize(cops)
-        @cops_by_department = group_by_department(cops)
-      end
-
-      def count(cops_or_departments)
-        cops_or_departments
-          .map do |cop_or_department|
-          if department?(cop_or_department)
-            @cops_by_department.fetch(cop_or_department, []).length
-          else
-            1
-          end
-        end
-          .reduce(0, &:+)
-      end
-
-      private
-
-      def group_by_department(cop_names)
-        cop_names.group_by do |cop_name|
-          if department?(cop_name)
-            raise "Expected fully-qualified cops by name (i.e. Department/Cop). Got: #{cop_name}"
-          end
-
-          department(cop_name)
-        end
-      end
-
-      def department?(cop_name)
-        !cop_name.include?("/")
-      end
-
-      def department(cop_name)
-        cop_name.split("/").first
-      end
-    end
-  end
-end