ndr_dev_support 1.1.1 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65678f389d477156798555985f5dadffa993f72e
-  data.tar.gz: 488e28b29645423774120f1dd44a8a7b0577c5c4
+  metadata.gz: 2b2f915258a3f3f168328b951e3eeb994ee319ba
+  data.tar.gz: 645d0844ed7125193c2796f79d5a4cf33c1dec70
 SHA512:
-  metadata.gz: 8d1d94e0acdea556a5bf333a2980da539da83f617749aa41c437fd2115a449dcc00288da87e7b4958159420eb2bd94fae4546458def9743fbbc9e6915e6c2966
-  data.tar.gz: b769d5ff8efce153fb33ba56882fff41db37dba8a61c02423d42067b258a3b45a895e9ef006b770bc3257b924e029f49de8822e752242dc067ba9d9960e46bae
+  metadata.gz: fac14a11fb811aae9b2c0e03c8027efb985eaa68f65f9575543f2c72cb629a119ed371d869e747af519183f0001cf038e3bb00afe461295aaaec320f48b63513
+  data.tar.gz: 46318f642050c869aab20e2d6b02ac902e82a5ade663142b9db0eeb86427231ac7d99124d33b321ce9265464eecb1e99cb998eca14c8c352763af5318fc5d40c

data/code_safety.yml

@@ -46,28 +46,28 @@ file safety:
     safe_revision: c59a45986f8b6d087c8c21b1e889f31f7346da17
   lib/ndr_dev_support/rubocop/executor.rb:
     comments: 
-    reviewed_by: joshpencheon
-    safe_revision: 301a0785d32fbc91b5fa175a0b4a4aed5bc5b8c1
+    reviewed_by: josh.pencheon
+    safe_revision: 41cf1558f567928faaa1e670a36d941c03c78044
   lib/ndr_dev_support/rubocop/range_augmenter.rb:
     comments: 
     reviewed_by: joshpencheon
     safe_revision: fe5f0a693b77eeecaa39ff6fcf87ad59c4fb46e1
   lib/ndr_dev_support/rubocop/range_finder.rb:
     comments: 
-    reviewed_by: joshpencheon
-    safe_revision: a8ecc0519a4abf9d464c49183863d65121dc8d0b
+    reviewed_by: josh.pencheon
+    safe_revision: 41cf1558f567928faaa1e670a36d941c03c78044
   lib/ndr_dev_support/rubocop/reporter.rb:
     comments: 
-    reviewed_by: joshpencheon
-    safe_revision: fe5f0a693b77eeecaa39ff6fcf87ad59c4fb46e1
+    reviewed_by: josh.pencheon
+    safe_revision: 41cf1558f567928faaa1e670a36d941c03c78044
   lib/ndr_dev_support/tasks.rb:
     comments: 
     reviewed_by: joshpencheon
     safe_revision: a55c971cb770a8e5dc4be7ed66663dd5d695fcd1
   lib/ndr_dev_support/version.rb:
     comments: 
-    reviewed_by: joshpencheon
-    safe_revision: 9611e403f47171962308a7c82cd11b116c6534ee
+    reviewed_by: josh.pencheon
+    safe_revision: 3f4e55cee33c956405ab82e55b76914be0770577
   lib/tasks/audit_code.rake:
     comments: Identical to the version reviewed by josh.pencheon when contained within
       ndr_support
@@ -75,8 +75,8 @@ file safety:
     safe_revision: 0d56ba443b2cddca5ba2d96ea61ec6f2b898436d
   lib/tasks/rubocop.rake:
     comments: 
-    reviewed_by: joshpencheon
-    safe_revision: 13cdf4eec8ea311ea480a90a3ba325a386db94e0
+    reviewed_by: josh.pencheon
+    safe_revision: 41cf1558f567928faaa1e670a36d941c03c78044
   ndr_dev_support.gemspec:
     comments: 
     reviewed_by: joshpencheon

data/lib/ndr_dev_support/rubocop/executor.rb

@@ -6,22 +6,26 @@ module NdrDevSupport
     # This class filters the Rubocop report of a file
     # to only the given lines.
     class Executor
-      def initialize(filename, lines)
-        @filename = filename
-        @lines    = lines
+      class << self
+        # Use RuboCop to produce a list of all files that should be scanned.
+        def target_files
+          @target_files ||= `rubocop -L`.each_line.map(&:strip)
+        end
       end
 
-      def output
-        offenses.select do |offense|
-          @lines.include? offense['location']['line']
-        end
+      def initialize(filenames)
+        @filenames = Executor.target_files & filenames
       end
 
-      private
+      def offenses_by_file
+        return [] if @filenames.empty?
 
-      def offenses
-        hash = JSON.parse(`rubocop --format json #{Shellwords.escape(@filename)}`)
-        hash['files'].first['offenses']
+        escaped_paths = @filenames.map { |path| Shellwords.escape(path) }
+        output = JSON.parse(`rubocop --format json #{escaped_paths.join(' ')}`)
+
+        output['files'].each_with_object({}) do |file_output, result|
+          result[file_output['path']] = file_output['offenses']
+        end
       end
     end
   end

data/lib/ndr_dev_support/rubocop/range_finder.rb

@@ -1,4 +1,5 @@
 require 'English'
+require 'open3'
 require 'rubocop'
 require 'shellwords'
 
@@ -6,19 +7,8 @@ module NdrDevSupport
   module Rubocop
     # Produces diffs, and parses from them the file/hunk boundaries
     class RangeFinder
-      class << self
-        # Use RuboCop to produce a list of all files that should be scanned.
-        def target_files
-          @target_files ||= begin
-            defaults = ::RuboCop::ConfigStore.new
-            ::RuboCop::TargetFinder.new(defaults, {}).target_files_in_dir
-          end
-        end
-      end
-
       def diff_files(files)
-        diff = Array(files).map { |file| git_diff(%(-- "#{file}")) }.join
-        file_change_locations_from diff
+        file_change_locations_from git_diff(files * ' ')
       end
 
       def diff_head
@@ -40,9 +30,18 @@ module NdrDevSupport
       private
 
       def git_diff(args)
-        diff = `git diff --no-prefix --unified=0 #{Shellwords.escape(args)}`
-        fail "Failed to diff: '#{args}'" unless $CHILD_STATUS.exitstatus.zero?
-        diff
+        diff_cmd = 'git diff --no-prefix --unified=0 '
+        diff_cmd << Shellwords.escape(args) unless args.empty?
+        stdout, stderr, status = Open3.capture3(diff_cmd)
+
+        return stdout if status.success?
+
+        fail Rainbow(<<-MSG).red
+Failed to generate diff from:
+  #{diff_cmd}
+
+#{stderr}
+        MSG
       end
 
       def file_changes_hash
@@ -60,13 +59,7 @@ module NdrDevSupport
           end
         end
 
-        ruby_files_from changes
-      end
-
-      # Don't report on changes in files that RuboCop won't understand:
-      def ruby_files_from(changes)
-        whitelist = RangeFinder.target_files
-        changes.reject { |file, _ranges| !whitelist.include? File.join(Dir.pwd, file) }
+        changes
       end
 
       def hunk_range_from(line)

data/lib/ndr_dev_support/rubocop/reporter.rb

@@ -16,7 +16,7 @@ module NdrDevSupport
       }.freeze
 
       def initialize(offenses)
-        @offenses = offenses
+        @offenses = Hash[offenses.sort_by { |file, _offenses| file }]
       end
 
       # Prints out a report, and returns an appriopriate
@@ -28,7 +28,7 @@ module NdrDevSupport
           print_offenses
           return @offenses.values.all?(&:empty?)
         else
-          puts Rainbow('No files scanned.').red
+          puts Rainbow('No relevant changes found.').yellow
           return false
         end
       end

data/lib/ndr_dev_support/version.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 # This defines the NdrDevSupport version. If you change it, rebuild and commit the gem.
 # Use "rake build" to build the gem, see rake -T for all bundler rake tasks (and our own).
 module NdrDevSupport
-  VERSION = '1.1.1'.freeze
+  VERSION = '1.1.3'.freeze
 end

data/lib/tasks/rubocop.rake

@@ -4,16 +4,25 @@ namespace :rubocop do
   require 'ndr_dev_support/rubocop/executor'
   require 'ndr_dev_support/rubocop/reporter'
 
+  def filtered_offenses_by_line(offenses, lines)
+    offenses.select do |offense|
+      line = offense['location']['line']
+      1 == line || lines.include?(line)
+    end
+  end
+
   # For a given set of change locations (extract from a diff),
   # run rubocop on the relevant files, and report filtered results.
   def rubocop_file_ranges(file_ranges)
-    output  = {}
-    threads = file_ranges.map do |file, ranges|
+    output   = {}
+    offenses = NdrDevSupport::Rubocop::Executor.new(file_ranges.keys).offenses_by_file
+
+    threads = offenses.map do |file, file_offenses|
       Thread.new do
         # Expand ranges to include entire methods, etc:
-        lines = NdrDevSupport::Rubocop::RangeAugmenter.new(file, ranges).augmented_lines
-        # Get rubocop output for those files:
-        output[file] = NdrDevSupport::Rubocop::Executor.new(file, lines).output
+        augmenter = NdrDevSupport::Rubocop::RangeAugmenter.new(file, file_ranges[file] || [])
+        # Get subset of rubocop output for those files:
+        output[file] = filtered_offenses_by_line(file_offenses, augmenter.augmented_lines)
       end
     end
     threads.each(&:join)
@@ -31,8 +40,10 @@ namespace :rubocop do
       rake rubocop:diff master
   USAGE
   task :diff do
-    expr   = ARGV[1..-1].join(' ')
-    ranges = NdrDevSupport::Rubocop::RangeFinder.new.diff_expr(expr)
+    args = ARGV.dup
+    nil until 'rubocop:diff' == args.shift
+
+    ranges = NdrDevSupport::Rubocop::RangeFinder.new.diff_expr args.join(' ')
     rubocop_file_ranges ranges
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_dev_support
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.3
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-04 00:00:00.000000000 Z
+date: 2016-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop