nucop 0.2.0 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96431415f4ba9ffdeccc8b3f831946afb8d32326b680b4c015061ad66038a89a
-  data.tar.gz: 713830bb560b1dd38cf70409e57f0a8af2616f9cac5e6c52c5429db89dbd6242
+  metadata.gz: 4e4d4bc70ff2bafe59ff5f5d0f139076cb223f45127c0af10879d7ca59e6ad58
+  data.tar.gz: 1eb6b93afe63711f4663959b62fc584d86b8f0cb2808311018b3fb125c312c30
 SHA512:
-  metadata.gz: 903b54b802f7d86f1476eb675785dfa251ae03a6b731d7e1069ca45df405d2ec3a4a84cdfb4e8411bfc3ef22e1a16f93c81c77f65031091b16255b21c7d21823
-  data.tar.gz: 95ef89faf62bb7528b88362d44e408ed793829f7993c1a6885e184e43c591e26d364a6a7a0119216fc2910dc3ca9f8b185acb76d27d46793a7391083cc0b866f
+  metadata.gz: 9718086bfdf283e30fa209b9ca997092f2eca1c417cc259e0490d1f25a02ca18103e3a8a6c07019a196889b854bbb1137000e46b3c626d70d451033923142713
+  data.tar.gz: c5d56ef473496fadc2a544e6cdd1f2faf6ab83c0b94c0324aa9cfeb00b46be41769314479f7202fcf285edcb8fa8d2f7543ba0df31f1eec6d3c5c27fec40accd

data/bin/nucop

@@ -5,4 +5,4 @@ $LOAD_PATH.unshift("#{__dir__}/../lib")
 require "nucop"
 require "nucop/cli"
 
-Nucop::CLI.start(ARGV)
+Nucop::Cli.start(ARGV)

data/lib/nucop.rb

@@ -3,9 +3,9 @@ require "nucop/version"
 require "rubocop"
 require "git_diff_parser"
 
-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 }
+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 }
 
 module Nucop
 end

data/lib/nucop/cli.rb

@@ -5,11 +5,12 @@ RUBOCOP_DEFAULT_CONFIG_FILE = ".rubocop.yml"
 CONFIGURATION_FILEPATH = ".nucop.yml"
 
 module Nucop
-  class CLI < Thor
+  class Cli < Thor
     desc "diff_enforced", "run RuboCop on the current diff using only the enforced cops"
     method_option "commit-spec", default: "origin/master", 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 "junit_report", type: :string, default: "", desc: "runs RuboCop with junit formatter 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
@@ -66,16 +67,30 @@ module Nucop
     def rubocop(files = nil)
       print_cops_being_run(options[:only])
       config_file = options[:"exclude-backlog"] ? RUBOCOP_DEFAULT_CONFIG_FILE : options[:rubocop_todo_config_file]
-      junit_report_path = options[:"junit_report"]
-      junit_report_options = junit_report_path.to_s.empty? ? "" : "--format Nucop::Formatters::JUnitFormatter --out #{junit_report_path} --format progress"
-
       rubocop_requires = [
         "--require rubocop-rspec",
         "--require rubocop-performance",
         "--require rubocop-rails"
       ]
 
-      system("bundle exec rubocop --parallel #{rubocop_requires.join(' ')} #{junit_report_options} --force-exclusion --config #{config_file} #{pass_through_option(options, 'auto-correct')} #{pass_through_flag(options, 'only')} #{files}")
+      formatters = []
+      formatters << "--format Nucop::Formatters::JUnitFormatter --out #{options[:junit_report]}" if options[:junit_report]
+      formatters << "--format json --out #{options[:json]}" if options[:json]
+      formatters << "--format progress" if formatters.any?
+
+      command = [
+        "bundle exec rubocop",
+        "--parallel",
+        rubocop_requires.join(" "),
+        formatters.join(" "),
+        "--force-exclusion",
+        "--config", config_file,
+        pass_through_option(options, "auto-correct"),
+        pass_through_flag(options, "only"),
+        files
+      ].join(" ")
+
+      system(command)
     end
 
     desc "regen_backlog", "update the RuboCop backlog, disabling offending files and excluding all cops with over 500 violating files."
@@ -235,7 +250,9 @@ module Nucop
     end
 
     def enabled_cops
-      YAML.load(`bundle exec rubocop --parallel --show-cops`).select { |_, config| config["Enabled"] }.map(&:first)
+      YAML.load(`bundle exec rubocop --parallel --show-cops`) # rubocop:disable Security/YAMLLoad
+        .select { |_, config| config["Enabled"] }
+        .map(&:first)
     end
 
     # Override Thor's options method to include Nucop's options

data/lib/nucop/formatters/junit_formatter.rb

@@ -21,16 +21,17 @@ module Nucop
         # One test case per cop per file
         COPS.each do |cop|
           cop_offences = offences.select { |offence| offence.cop_name == cop.cop_name }
-          unless cop_offences.empty?
-            REXML::Element.new("testcase", @testsuite).tap do |f|
-              f.attributes["classname"] = file.gsub(/\.rb\Z/, "").gsub("#{Dir.pwd}/", "").tr("/", ".")
-              f.attributes["name"]      = "Rubocop: #{cop.cop_name}"
-              f.attributes["file"]      = cop.cop_name
-              cop_offences.each do |offence|
-                REXML::Element.new("failure", f).tap do |e|
-                  e.add_text("#{offence.message}\n\n")
-                  e.add_text(offence.location.to_s.sub("/usr/src/app/", ""))
-                end
+
+          next if cop_offences.empty?
+
+          REXML::Element.new("testcase", @testsuite).tap do |f|
+            f.attributes["classname"] = file.gsub(/\.rb\Z/, "").gsub("#{Dir.pwd}/", "").tr("/", ".")
+            f.attributes["name"] = "Rubocop: #{cop.cop_name}"
+            f.attributes["file"] = cop.cop_name
+            cop_offences.each do |offence|
+              REXML::Element.new("failure", f).tap do |e|
+                e.add_text("#{offence.message}\n\n")
+                e.add_text(offence.location.to_s.sub("/usr/src/app/", ""))
               end
             end
           end

data/lib/nucop/helpers/factory_bot_helper.rb

@@ -1,7 +1,7 @@
 module Nucop
   module Helpers
     module FactoryBotHelper
-      extend self
+      module_function
 
       FACTORY_BOT_METHODS = [
         :build,

data/lib/nucop/helpers/next_cop_for_promotion.rb

@@ -30,7 +30,7 @@ module Nucop
             data << count_match.captures.first
           end
 
-          if (name_match = line.match(/^(\w+[\/]\w+):$/))
+          if (name_match = line.match(/^(\w+\/\w+):$/))
             data << name_match.captures.first
           end
         end

data/lib/nucop/version.rb

@@ -1,3 +1,3 @@
 module Nucop
-  VERSION = "0.2.0"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,127 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: nucop
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.3
 platform: ruby
 authors:
 - Jason Schweier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-19 00:00:00.000000000 Z
+date: 2020-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: git_diff_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 13.0.0
-  type: :development
+        version: '3.2'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 13.0.0
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.9.0
-  type: :development
+        version: 0.90.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 0.90.0
 - !ruby/object:Gem::Dependency
-  name: git_diff_parser
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 1.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 1.7.1
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: 2.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: 2.7.1
 - !ruby/object:Gem::Dependency
-  name: rubocop-performance
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.43.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.43.2
 - !ruby/object:Gem::Dependency
-  name: rubocop-rails
+  name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.37.0
-  type: :runtime
+        version: 13.0.1
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.37.0
+        version: 13.0.1
 - !ruby/object:Gem::Dependency
-  name: ruby-progressbar
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
-  type: :runtime
+        version: 3.9.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 3.9.0
 description: 
 email:
 - jasons@nulogy.com
@@ -171,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Nulogy's implementation of RuboCop, including custom cops and additional