nucop 0.7.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30002f7a5d17b3853feacf67687280bf3367a54ac9cb897cba41e239623eea8b
-  data.tar.gz: 1c35996b84674d981b12029e80280b344d14582ad8b4e0a879b3209bd35367ea
+  metadata.gz: 40456b1522f92b7bf6e329fbfea17e7f791d1ab2ae60a9cefe3bd227001b748b
+  data.tar.gz: 15c67e8bfacd08cf148832fa0780f5248955c3f0592584e241f7325560898d50
 SHA512:
-  metadata.gz: 9dbab800cda4dd3918162d6e29669467dca2f00a7c01d89a0ba63324452fa936d391fbc0467c968e8dd8134c44f2ee61b9a79d3ab09982beb970a4f8448f2adf
-  data.tar.gz: 6c196e24daf8a46dd5669147aa4a413ffdd8f56bc5652e3e666c9a001d8908d5a3ad6759cb8d0e30edaaca5923599107255d0b720e0720f5a3b847edf32f70bd
+  metadata.gz: '068244795d6dbe1fae94fddfca5185e80ca4fcdc6ad0516c66fc5d158329e4ade87c781e0d760cdb8832accec568e97d957c815634b135d5cec6c72e65d83fd6'
+  data.tar.gz: cf40ddb5ccda40eaf4ba112702d3d1f10fe7dc3a113166a10152876483dbe625169393d43638d33bd0b3e43424479e26ad0b160583e2b1dfcf104bb202c6bc8b

data/lib/nucop/cli.rb

@@ -1,5 +1,7 @@
 require "thor"
 require "open3"
+require "net/http"
+require "json"
 
 RUBOCOP_DEFAULT_CONFIG_FILE = ".rubocop.yml"
 CONFIGURATION_FILEPATH = ".nucop.yml"
@@ -8,17 +10,33 @@ module Nucop
   class Cli < Thor
     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"
+    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 "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
 
+    desc "diff_enforced_github", "run RuboCop on the current diff using only the enforced cops (using GitHub to find the files changed)"
+    method_option "github-authorization-token", desc: "a GitHub authorization token for the repository this script is running against"
+    method_option "commit-spec", default: "main", desc: "the commit-ish used to determine the diff."
+    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 "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
+
     desc "diff", "run RuboCop on the current diff"
     method_option "commit-spec", default: "origin/main", desc: "the commit used to determine the diff."
     method_option "only", desc: "run only specified cop(s) and/or cops in the specified departments"
-    method_option "auto-correct", type: :boolean, default: false, desc: "runs RuboCop with auto-correct option"
+    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 "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"
@@ -39,7 +57,7 @@ module Nucop
         end
       end
 
-      if options[:ignore] && File.exist?(options[:diffignore_file]) && !File.zero?(options[:diffignore_file])
+      if options[:ignore] && File.exist?(options[:diffignore_file]) && !File.empty?(options[:diffignore_file])
         files, non_ignored_diff_status = Open3.capture2("grep -v -f #{options[:diffignore_file]}", stdin_data: files)
 
         if non_ignored_diff_status != 0
@@ -60,9 +78,82 @@ module Nucop
       exit 0
     end
 
+    desc "diff_github", "run RuboCop on the current diff (using GitHub to find the files changes)"
+    method_option "github-authorization-token", desc: "a GitHub authorization token for the repository this script is running against"
+    method_option "commit-spec", default: "main", desc: "the commit-ish used to determine the diff."
+    method_option "only", desc: "run only specified cop(s) and/or cops in the specified departments"
+    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 "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
+      diff_base = options[:"commit-spec"]
+      repository = capture_std_out("git remote get-url origin | sed 's/git@github.com://; s/.git//'").chomp
+
+      uri = URI("https://api.github.com/repos/#{repository}/compare/#{diff_base}...#{diff_head}")
+      request = Net::HTTP::Get.new(uri)
+      request["Accept"] = "application/vnd.github+json"
+      request["Authorization"] = "Bearer #{options[:"github-authorization-token"]}"
+      request["X-GitHub-Api-Version"] = "2022-11-28"
+
+      response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) { |http| http.request(request) }
+
+      if response.code != "200"
+        puts "Error fetching data from Github: #{response.code} -- #{response.body}"
+        return true unless options[:exit]
+
+        exit 0
+      end
+
+      commit_data = JSON.parse(response.body)
+
+      diff_filter = options[:"added-only"] ? proc { |status| status == "added" } : proc { |status| status != "removed" }
+      files = commit_data["files"]
+        .filter { |file_data| diff_filter.call(file_data["status"]) }
+        .pluck("filename")
+        .filter { |file_name| file_name.include?(".rb") }
+
+      if files.empty?
+        if options[:exit]
+          puts "There are no rb files present in diff. Exiting."
+          exit 0
+        else
+          puts "There are no rb files present in diff."
+          return true
+        end
+      end
+
+      if options[:ignore] && File.exist?(options[:diffignore_file]) && !File.empty?(options[:diffignore_file])
+        files, non_ignored_diff_status = Open3.capture2("grep -v -f #{options[:diffignore_file]}", stdin_data: files.join("\n"))
+
+        if non_ignored_diff_status != 0
+          if options[:exit]
+            puts "There are no non-ignored rb files present in diff. Exiting."
+            exit 0
+          else
+            puts "There are no non-ignored rb files present in diff."
+            return true
+          end
+        end
+      end
+
+      no_violations_detected = invoke :rubocop, [multi_line_to_single_line(files)], options
+
+      exit 1 unless no_violations_detected
+      return true unless options[:exit]
+
+      exit 0
+    end
+
     desc "rubocop", "run RuboCop on files provided"
     method_option "only", desc: "run only specified cop(s) and/or cops in the specified departments"
-    method_option "auto-correct", type: :boolean, default: false, desc: "runs RuboCop with auto-correct option"
+    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])
@@ -86,6 +177,8 @@ module Nucop
         "--force-exclusion",
         "--config", config_file,
         pass_through_option(options, "auto-correct"),
+        pass_through_option(options, "autocorrect"),
+        pass_through_option(options, "autocorrect-all"),
         pass_through_flag(options, "only"),
         files
       ].join(" ")

data/lib/nucop/version.rb

@@ -1,3 +1,3 @@
 module Nucop
-  VERSION = "0.7.0"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nucop
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Jason Schweier
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-27 00:00:00.000000000 Z
+date: 2023-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git_diff_parser
@@ -178,7 +178,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
-description:
+description: 
 email:
 - jasons@nulogy.com
 executables:
@@ -211,7 +211,7 @@ metadata:
   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
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -226,8 +226,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
-signing_key:
+rubygems_version: 3.4.7
+signing_key: 
 specification_version: 4
 summary: Nulogy's implementation of RuboCop, including custom cops and additional
   tooling.