gnurr 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a1410c6508df47eca91d6925eef3e939f31d9d7
-  data.tar.gz: b86e3ad6538174203af4986a072416a0c6bab212
+  metadata.gz: f014991bd857985d010c0f65bd97ad5adbd8cb85
+  data.tar.gz: d2166bfeb7b6a73d91c796c69ca0abb4d56cbe97
 SHA512:
-  metadata.gz: 2c8f93c2e60d0941e95c073d36bbfe0b5db367adb0c401cb3c1ca9e1dba07534b9a18298f0309eeb2e31ef4f3cac02ce67892ebe046a09bd103c0b1bcf98d022
-  data.tar.gz: 0f5cec29cb40f13bf85c688f90657ffa3b8459385e99f1c3c272613b5b137403f63ba17534b4cf91eb8bbdfd6b28975f298a49e12da381031a358d2561d996f8
+  metadata.gz: aa234f3f589d9c6e27302b4e9d06af7f2237dafe171dfb4dd31e204b0979e5b18f45ab7c10a569a2f419af5774fbfc370935fb3919c1278bf5762142791771ae
+  data.tar.gz: 2cb0fb5fd2dd42d0ad22ba5ff50a4a7182b4ebf351e3561dab21ab3587fd49d64e1bf4fe4e3cfad40a02a2da592f6ca56df5bda6c13c984725d506e6ef2572a4

data/bin/gnurr

@@ -16,18 +16,22 @@ option_parser = OptionParser.new do |opts|
           'Base branch: branch to diff against (default: master)') do |v|
     options[:branch] = v
   end
+
   opts.on('-e', '--expanded',
           'Show lints for all changed files, not just changed lines (false',
           'unless specified)') do
     options[:expanded] = true
   end
+
   opts.on('-l', '--linters LIST',
           'Linters to use (default: es,haml,ruby,scss (all))') do |v|
     options[:linters] = v.split(',').map(&:to_sym)
   end
+
   opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v|
     options[:verbose] = v
   end
+
   opts.on('--version', 'Show version') do
     puts Gnurr::VERSION
     exit

data/gnurr.gemspec

@@ -29,8 +29,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'git', '~> 1.3.0'
-  spec.add_development_dependency 'pry'
 
   spec.add_runtime_dependency 'colorize'
 end

data/lib/gnurr/cli.rb

@@ -17,7 +17,7 @@ module Gnurr
 
     def format_messages
       format_line_diffs if @options[:verbose]
-      return if messages.empty?
+      return false if messages.empty?
       puts "#{left_bump(2)}Messages:".colorize(mode: :bold)
       messages.each do |filename, messages|
         messages.each do |message|
@@ -36,6 +36,12 @@ module Gnurr
         format_linter(message)
     end
 
+    def format_expanded_notice
+      if @options[:expanded]
+        puts "#{left_bump(2)}Linting entire files".colorize(mode: :bold)
+      end
+    end
+
     def format_finish
       if @options[:verbose]
         puts "#{left_bump}Done linting #{type.to_s.colorize(color)}\n"
@@ -53,20 +59,25 @@ module Gnurr
 
     def format_line_diffs
       diffs = line_diffs
-      if diffs.empty?
-        puts "#{left_bump(2)}No changes.".colorize(mode: :bold)
-      else
-        puts "#{left_bump(2)}Lines changed:".colorize(mode: :bold)
-        diffs.each do |filename, lines|
-          puts "#{left_bump(3)}#{filename}:#{lines.join(', ').colorize(:cyan)}"
-        end
+      return if format_no_changes(diffs)
+      puts "#{left_bump(2)}Lines changed:".colorize(mode: :bold)
+      diffs.each do |filename, lines|
+        puts "#{left_bump(3)}#{filename}:#{lines.join(', ').colorize(:cyan)}"
       end
+      format_expanded_notice
     end
 
     def format_linter(message)
       message[:linter] ? " (#{message[:linter]})".colorize(:cyan) : ''
     end
 
+    def format_no_changes(diffs)
+      if diffs.empty?
+        puts "#{left_bump(2)}No changes.".colorize(mode: :bold)
+        true
+      end
+    end
+
     def format_severity(message)
       if message[:severity] == :error
         '[E]'.colorize(:red)

data/lib/gnurr/git.rb

@@ -0,0 +1,27 @@
+module Gnurr
+  # For handling/reading Git output
+  module Git
+    private
+
+    def extract_lines(diffs)
+      diffs.map do |lines|
+        nums = lines.match(/^.+\+(?<from>[0-9]+)(,(?<len>[0-9]+))? .+$/)
+        Range.new(nums[:from].to_i, nums[:from].to_i + nums[:len].to_i)
+      end.map(&:to_a).flatten
+    end
+
+    def full_file_diff
+      return @diff if @diff
+      diff = `git diff #{@options[:branch]} --name-only --diff-filter=ACMRTUXB`
+               .split("\n")
+               .map { |file| [file, file_diffs(file)] }
+      @diff = Hash[diff.select { |_k, v| v && v.any? }]
+    end
+
+    def file_diffs(file)
+      diffs = `git diff --unified=0 #{@options[:branch]} #{file} \
+              | egrep '\\+[0-9]+(,[1-9][0-9]*)? '`
+      extract_lines(diffs.split("\n"))
+    end
+  end
+end

data/lib/gnurr/linter.rb

@@ -1,17 +1,17 @@
 require 'gnurr/helper'
 require 'gnurr/cli'
+require 'gnurr/git'
 
 module Gnurr
   # Base linter class from which each linter extends
   class Linter
     include Gnurr::Helper
     include Gnurr::CLI
+    include Gnurr::Git
 
-    def initialize(files, options)
-      raise "Dependency not available for #{type}" unless requirements_met?
+    def initialize(options)
       @options = options
-      @files = Hash[files.select { |file, _lines| filter(file) }]
-      @messages = {} if @files.empty?
+      raise "Dependency not available for #{type}" unless requirements_met?
     rescue => e
       log_error(e)
     end
@@ -22,34 +22,44 @@ module Gnurr
 
     def parse_messages(json)
       return [] unless json.any?
-      messages = json.map { |files| map_errors(files) }
-                     .select { |_f, msgs| msgs && msgs.any? }
+      msgs = json.map { |f| map_errors(f) }
+                 .select { |_f, m| m && m.any? }
       if @options[:expanded]
-        messages
+        msgs.to_a
       else
-        filter_messages(messages)
+        filter_messages(msgs)
       end
     end
 
+    def files
+      @files ||= Hash[full_file_diff.select { |file, _lines| filter(file) }]
+    end
+
     def filter_messages(messages)
       messages.map do |filename, msgs|
-        msgs.reject! { |msg| !@files[filename].include?(msg[:line]) }
+        msgs.reject! { |msg| !files[filename].include?(msg[:line]) }
         msgs.empty? ? nil : [filename, msgs]
       end.reject(&:nil?)
     end
 
+    def full_range(filename)
+      [Range.new(1, `wc -l < #{filename}`.to_i + 1)]
+    end
+
     def line_diffs
       Hash[
-        @files.map do |filename, lines|
-          [filename, array_to_ranges(lines)]
+        files.map do |filename, lines|
+          [
+            filename,
+            @options[:expanded] ? full_range(filename) : array_to_ranges(lines)
+          ]
         end
       ]
     end
 
     def relevant_messages
-      JSON.parse(`git diff --name-only --diff-filter=ACMRTUXB \
-                 #{@options[:branch]} #{@files.map(&:first).join(' ')} \
-                 | xargs #{command}`)
+      return {} if files.empty?
+      JSON.parse(`#{command} #{escaped_files.join(' ')}`)
     rescue => e
       log_error(e)
       {}
@@ -57,8 +67,10 @@ module Gnurr
 
     private
 
-    def requirements_met?
-      true # Set by subclasses
+    def escaped_files
+      files.map do |file, _lines|
+        file.sub(/(\s)/, '\\\\\1')
+      end
     end
 
     def map_errors(file)
@@ -71,9 +83,14 @@ module Gnurr
     end
 
     def messages
+      return @messages = {} if files.empty?
       @messages ||= parse_messages(relevant_messages)
     end
 
+    def requirements_met?
+      true # Set by subclasses
+    end
+
     def standardize_message(message)
       {
         column: message['column'],

data/lib/gnurr/processor.rb

@@ -25,7 +25,7 @@ module Gnurr
       lints = {}
       @options[:linters].each do |type|
         begin
-          lints[type] = LINTERS[type].new(git_diffs, @options)
+          lints[type] = LINTERS[type].new(@options)
           lints[type].execute
         rescue => e
           lints[type] = e.inspect
@@ -33,28 +33,5 @@ module Gnurr
       end
       lints
     end
-
-    private
-
-    def git_diffs
-      return @diff if @diff
-      diff = `git diff #{@options[:branch]} --name-only --diff-filter=ACMRTUXB`
-             .split("\n")
-             .map { |file| [file, file_diffs(file)] }
-      @diff = Hash[diff.select { |_k, v| v && v.any? }]
-    end
-
-    def file_diffs(file)
-      diffs = `git diff --unified=0 #{@options[:branch]} #{file} \
-              | egrep '\\+[0-9]+(,[1-9][0-9]*)? '`
-      line_diffs(diffs.split("\n"))
-    end
-
-    def line_diffs(diffs)
-      diffs.map do |lines|
-        nums = lines.match(/^.+\+(?<from>[0-9]+)(,(?<len>[0-9]+))? .+$/)
-        Range.new(nums[:from].to_i, nums[:from].to_i + nums[:len].to_i)
-      end.map(&:to_a).flatten
-    end
   end
 end

data/lib/gnurr/ruby_base_linter.rb

@@ -14,6 +14,7 @@ module Gnurr
     end
 
     def messages
+      return @messages = {} if files.empty?
       @messages ||= parse_messages(relevant_messages['files'])
     end
 

data/lib/gnurr/version.rb

@@ -1,3 +1,3 @@
 module Gnurr
-  VERSION = '0.2.2'.freeze
+  VERSION = '0.2.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gnurr
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Ben Saufley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2016-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,34 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: git
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -99,6 +71,7 @@ files:
 - lib/gnurr.rb
 - lib/gnurr/cli.rb
 - lib/gnurr/es_linter.rb
+- lib/gnurr/git.rb
 - lib/gnurr/haml_linter.rb
 - lib/gnurr/helper.rb
 - lib/gnurr/linter.rb