gnurr 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2843e00c571af67d2c053e6fd6802c1d9931df1b
-  data.tar.gz: 850affcdbb39dc152257bf28e522e931b8f77ab4
+  metadata.gz: f3e95befbf1a5e59c904653e1130bc8485433203
+  data.tar.gz: de6da161665593392e4e6bbbc1237e461bdd2b37
 SHA512:
-  metadata.gz: 03de0522138a0f9c3448a42929aa97ef65ceaee8e616a2ec016f8b04bbcdf9f7644c4b6ee6efcc2f998337f9ce21c63be6fde460c6861f976f37244f5c51a35c
-  data.tar.gz: 9125b2649b5715292d09788fee855c529739ae9647eb6a1cd1df9f84a7c2de06a981532bac2375b15420805d34cf281d297c1e58a0ad004ed1db9f7e990d40aa
+  metadata.gz: dbd58f278889f353499cb650f73a14828acf3d83a6732bb2fc75d8a3d10f1430a48ffc6df4b6e3447ef8c53457acb73062b14d8f05ae7c6680131aaa4c60608e
+  data.tar.gz: 0515363f9d4335c17760595293c36a270a9ce5047aa6bea23c0fbcfd87f2aeeae8dd8c07170a4e02374592817e688db44fd3c72b98edae396a3741287a90f6d6

data/bin/gnurr

@@ -6,6 +6,7 @@ require 'gnurr'
 require 'optparse'
 
 options = {
+  debug: false,
   stdout: true
 }
 
@@ -37,6 +38,10 @@ option_parser = OptionParser.new do |opts|
     exit
   end
 
+  opts.on('--debug', 'Debug mode') do
+    options[:debug] = true
+  end
+
   opts.on('-h', '--help', 'Prints this help') do
     puts opts
     exit

data/lib/gnurr/cli.rb

@@ -1,4 +1,5 @@
 require 'colorize'
+require 'open3'
 require 'gnurr/helper'
 
 module Gnurr
@@ -10,6 +11,8 @@ module Gnurr
       format_start
       format_messages || format_all_clear
       format_finish
+      format_errors
+      puts
       messages
     end
 
@@ -41,6 +44,16 @@ module Gnurr
         format_linter(message)
     end
 
+    def format_errors
+      return unless (@options[:verbose] || @options[:debug]) && @errors.any?
+      puts "#{left_bump}The following messages were encountered:".colorize(mode: :bold)
+      @errors.each do |error|
+        error.split("\n").each do |line|
+          puts "#{left_bump(2)}#{line}"
+        end
+      end
+    end
+
     def format_expanded_notice
       if @options[:expanded]
         puts "#{left_bump(2)}Linting entire files".colorize(mode: :bold)
@@ -49,10 +62,12 @@ module Gnurr
 
     def format_finish
       if @options[:verbose]
-        puts "#{left_bump}Done linting #{type.to_s.colorize(color)}\n"
+        puts "#{left_bump}Done linting #{type.to_s.colorize(color)}"
+          .colorize(mode: :bold)
+      end
+      if violation_count > 0 || @options[:verbose] || @options[:debug]
+        puts "#{left_bump}Violations: #{violation_count.to_s.colorize(severity_color(violation_count, files.length))}"
           .colorize(mode: :bold)
-      else
-        puts
       end
     end
 

data/lib/gnurr/git.rb

@@ -5,8 +5,6 @@ module Gnurr
   module Git
     include Gnurr::Helper
 
-    private
-
     def extract_lines(diffs)
       diffs.map do |lines|
         nums = lines.match(/^.+\+(?<from>[0-9]+)(,(?<len>[0-9]+))? .+$/)
@@ -16,7 +14,7 @@ module Gnurr
 
     def full_file_diff
       return @diff if @diff
-      path = @options[:path].nil? || !@options[:path].any? ? '' : "-- #{@options[:path].join(' ')}"
+      path = @options[:path].nil? || !@options[:path].any? ? '' : "-- #{@options[:path].map { |p| escaped_filename(p) }.join(' ')}"
       diff = `git diff #{@options[:base]} --name-only --diff-filter=ACMRTUXB #{path}`
                .split("\n")
                .map { |file| [file, file_diffs(file)] }

data/lib/gnurr/helper.rb

@@ -19,8 +19,13 @@ module Gnurr
       ranges + [Range.new(left, right)]
     end
 
+    def severity_color(violations, files)
+      return :green if violations.zero? || files.zero?
+      violation_count / files < 1 ? :yellow : :red
+    end
+
     def escaped_filename(filename)
-      filename.sub(/(\s)/,'\\\\\1')
+      filename.gsub(/(\s)/,'\\\\\1')
     end
 
     def left_bump(indent = 1)

data/lib/gnurr/linter.rb

@@ -11,7 +11,10 @@ module Gnurr
     include Gnurr::CLI
     include Gnurr::Git
 
+    attr_reader :errors
+
     def initialize(options)
+      @errors = []
       @options = {
         base: 'master',
         expanded: false,
@@ -28,17 +31,6 @@ module Gnurr
       @options[:stdout] ? print_messages : messages
     end
 
-    def parse_messages(json)
-      return [] unless json.any?
-      msgs = json.map { |f| map_errors(f) }
-                 .select { |_f, m| m && m.any? }
-      if @options[:expanded]
-        msgs.to_a
-      else
-        filter_messages(msgs)
-      end
-    end
-
     def files
       @files ||= Hash[full_file_diff.select { |file, _lines| filter(file) }]
     end
@@ -69,12 +61,16 @@ module Gnurr
 
     def relevant_messages
       return {} if files.empty?
-      JSON.parse(`#{command} #{escaped_files.join(' ')}`)
+      JSON.parse(run_command("#{command} #{escaped_files.join(' ')}"))
     rescue => e
       log_error(e)
       {}
     end
 
+    def violation_count
+      messages.map(&:last).flatten.length
+    end
+
     private
 
     def escaped_files
@@ -96,6 +92,17 @@ module Gnurr
       @messages ||= parse_messages(relevant_messages)
     end
 
+    def parse_messages(json)
+      return [] unless json.any?
+      msgs = json.map { |f| map_errors(f) }
+                 .select { |_f, m| m && m.any? }
+      if @options[:expanded]
+        msgs.to_a
+      else
+        filter_messages(msgs)
+      end
+    end
+
     def relative_filename(filename)
       filename
     end
@@ -107,5 +114,11 @@ module Gnurr
     def standardize_message(_message)
       raise 'Can\'t standardize on base Linter class'
     end
+
+    def run_command(command)
+      output, err = Open3.capture3(command)
+      @errors << err unless err.nil? || err.length == 0
+      output
+    end
   end
 end

data/lib/gnurr/linters/ruby_linter.rb

@@ -23,7 +23,7 @@ module Gnurr
       end
 
       def eligible_files
-        @eligible_files ||= `rubocop -L`.split("\n")
+        @eligible_files ||= run_command('rubocop -L').split("\n")
       end
 
       private

data/lib/gnurr/processor.rb

@@ -6,6 +6,8 @@ require 'gnurr/linters/scss_linter'
 module Gnurr
   # Main class for execution
   class Processor
+    include Gnurr::Helper
+
     LINTERS = {
       es: Gnurr::Linters::EsLinter,
       haml: Gnurr::Linters::HamlLinter,
@@ -13,8 +15,12 @@ module Gnurr
       scss: Gnurr::Linters::ScssLinter
     }.freeze
 
+    attr_reader :violation_count
+
     def initialize(options = {})
       @options = options
+      @violation_count = 0
+      @files = []
       if @options[:linters] && options[:linters].any?
         @options[:linters] = LINTERS.keys & @options[:linters]
       else
@@ -24,17 +30,27 @@ module Gnurr
 
     def execute
       @lints ||= {}
+      @violation_count = 0
       @options[:linters].each do |type|
-        begin
-          @lints[type] = LINTERS[type].new(@options)
-          @lints[type].execute
-        rescue => e
-          @lints[type] = e.inspect
-        end
+        lint_type(type)
+      end
+      if @options[:stdout]
+        print 'Total Violations: '.colorize(mode: :bold)
+        puts @violation_count.to_s.colorize(mode: :bold, color: severity_color(@violation_count, @files.length))
       end
       @lints
     end
 
+    def lint_type(type)
+      @lints[type] = LINTERS[type].new(@options)
+      @lints[type].execute
+      @violation_count += @lints[type].violation_count
+      (@files += @lints[type].files.keys).uniq!
+    rescue => e
+      log_error(e)
+      @lints[type] = e
+    end
+
     def lints
       @lints ||= {}
     end

data/lib/gnurr/version.rb

@@ -1,3 +1,3 @@
 module Gnurr
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gnurr
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Ben Saufley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-08 00:00:00.000000000 Z
+date: 2016-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler