nucop 0.8.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b06c2da379c5ceea08460f4fef215b819753f14fccadf5af591e683accb6ef66
-  data.tar.gz: b9d59749fb3b9c0071939ea7d04c499226f7d71bf525817cec8e0ab3e028f226
+  metadata.gz: 7ff54f8a1918cd048657e884cafc31ebebfc0b1f5cf4f680ee6744258c3f71d2
+  data.tar.gz: 68ce2d04feece7e38b8310d375b4b44bc30b7e04bd2310cf4d9782765a1cf483
 SHA512:
-  metadata.gz: 1e612a9b8a530a1b3e37233a3e7f48aeaeb5cae8161a6b56ae8fd2453f28401d8419b65cf1e22599810d863bbbee217d0180ea4dc9dae850d8c4a87faec9e522
-  data.tar.gz: 1621ea5c7bde20e04de0737ba8f8611e1ff7a38957da5a5b9cd8a6156652845187c20c546b71b8d60981e6a9fb4dbedb14c8ad6dc226b063695c533ebcccf575
+  metadata.gz: 7083788bc1f37779cc1eb5dbee8a9f2ff9afaf2d0e48a24bf7a3049b0005640b7194a73d9d3bed4c6968dceacd1febad1ef993989e0458a8d9571b3adc7e6e63
+  data.tar.gz: 5d90bbae9eb57877e843566391448e32e7f59a84ec650fb3adc89cc1fac43e742bd61a0ff3d178104a9a0d144c4417522976ade0d03da9d23b96691726acb658

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"
@@ -17,6 +19,18 @@ module Nucop
       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"
@@ -43,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
@@ -64,6 +78,77 @@ 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 (deprecated)"

data/lib/nucop/version.rb

@@ -1,3 +1,3 @@
 module Nucop
-  VERSION = "0.8.0"
+  VERSION = "0.10.0"
 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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nucop
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Jason Schweier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-16 00:00:00.000000000 Z
+date: 2023-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git_diff_parser
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.46'
+- !ruby/object:Gem::Dependency
+  name: rubocop-factory_bot
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.22'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.22'
 - !ruby/object:Gem::Dependency
   name: rubocop-graphql
   requirement: !ruby/object:Gem::Requirement
@@ -211,6 +225,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
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -226,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.8
+rubygems_version: 3.4.12
 signing_key:
 specification_version: 4
 summary: Nulogy's implementation of RuboCop, including custom cops and additional