clausewitz-spelling 0.2.10 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c25755ce321d90c2c3af77bc897c1ab95dedf2285f5884b91dee41d9b925ef1
-  data.tar.gz: 99965fa7fc61ab2d6519edea3902e4e2231c2ed186acbd45476aa889caba24ff
+  metadata.gz: be3b69f409c5de0e788d8441bf149e1e98fb9e58dc1f884e1ddbdb677bc908b5
+  data.tar.gz: 69a997539a46e3433cdc3285c7cfc1f8902f54aff614c7c16140f561ecec5e65
 SHA512:
-  metadata.gz: 7eb916e06c5a9a68768cbc8e7a0ee5e92a014003a7e01af1756aff8caf9ead44c334399d30912ec10b66cf817deeb18e9613819c7dfe9ff91c7eb727b088592f
-  data.tar.gz: d2e71d714c163a21520419719f76c05655d7e7b6e137608053047832f6e31b2d553b782a2d30a01f3e80132c9772a341c423e4cfb6d5072bef4ee2e9e5305184
+  metadata.gz: 6e51f6da75ce51c4178c043613c4463d892c5f0f1d5335024ca532c598b56f423034d38a73c419c31498362607854ebab941788e1e39f9c9fafc9be13b58a655
+  data.tar.gz: b605f890e6263b5b2ec8f145a935d5a88682252c332ba0704c93ffa7ef537aff0d392741d850d716e402dc435055ee62f5f48b3c05c51bc6d3746e1e7479cbd6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    clausewitz-spelling (0.2.10)
+    clausewitz-spelling (0.2.11)
       colorize
       damerau-levenshtein
       ffi-hunspell-wtchappell

data/exe/clausewitz-spellcheck

@@ -21,6 +21,9 @@ class Main
       opt :verbose,
         "Whether to display additional output while running",
         default: false
+      opt :commit_range,
+        "Range of commits for limiting check to only changed lines",
+        type: :string
       Clausewitz::Localisation::LANG_MAP.each do |_, config|
         opt "#{config.name}_dialect".to_sym,
           "Select dialect for #{config.name.capitalize}",
@@ -43,6 +46,7 @@ class Main
     checker_opts[:dialect_map]      = dialect_map
     checker_opts[:suggestion_count] = opts[:suggestion_count]
     checker_opts[:verbose]          = opts[:verbose]
+    checker_opts[:commit_range]     = opts[:commit_range]
 
     [checker_opts, args]
   end

data/lib/clausewitz/spelling/checker.rb

@@ -20,6 +20,7 @@ module Clausewitz; module Spelling
       @dialect_map      = opts[:dialect_map]      || {}
       @suggestion_count = opts[:suggestion_count] || DEFAULT_SUGGESTION_COUNT
       @verbose          = opts[:verbose]
+      @commit_range     = opts[:commit_range]
 
       @check_cache = {}
 
@@ -69,25 +70,43 @@ module Clausewitz; module Spelling
         return UnparseableFileResult.new(filepath, e)
       end
 
+      changed_keys = Set.new
+      if @commit_range
+        diff = `git diff -U0 #{@commit_range} #{filepath} 2>/dev/null`
+        changed_lines = diff.lines.select { |line| line =~ /^\+ / }
+        changed_lines.each do |line|
+          match = /\+  ([\w\d.'_-]+):([0-9]+)? \"/.match(line)
+          changed_keys.add(match[1]) if match
+        end
+      end
+
       checks = contents.map do |lang_name, entries|
         lc = language_config(lang_name)
-        check_entries(entries, lc)
+        ignore = []
+        if @commit_range
+          ignore = entries.keys.select do |key|
+            !changed_keys.include?(key)
+          end
+        end
+        check_entries(entries, lc, ignore)
       end
       FileResults.new(filepath, checks)
     end
 
     private
 
-    def check_entries(entries, lc)
+    def check_entries(entries, lc, ignore = [])
       spellcheck_ignore = entries&.delete('spellcheck_ignore')
       ignored_keys = spellcheck_ignore ? spellcheck_ignore.split(',') : []
       ignored_keys << 'spellcheck_ignore'
+      ignored_keys.concat(ignore)
       if ignored_keys.include?('all')
         return IgnoredLangResult.new(lc.clausewitz_name)
       end
       return LangResults.new(lc.clausewitz_name, []) unless entries
       checks = entries.map do |key, entry|
         if ignored_keys.include?(key)
+          puts "SKIPPING #{key}"
           IgnoredEntryResult.new(key)
         else
           check_entry(key, entry, lc)

data/lib/clausewitz/spelling/results.rb

@@ -11,6 +11,10 @@ module Clausewitz; module Spelling
       @lang_results.all?(&:ignored?)
     end
 
+    def ignored
+      @lang_results.select(&:ignored?)
+    end
+
     def failed?
       @lang_results.any?(&:failed?)
     end
@@ -19,8 +23,12 @@ module Clausewitz; module Spelling
       @lang_results.select(&:failed?)
     end
 
+    def ignored_total
+      @lang_results.reduce(0) { |memo, obj| memo += obj.ignored.size }
+    end
+
     def failure_total
-      failures.reduce(0) { |memo, obj| memo += obj.failures.size }
+      @lang_results.reduce(0) { |memo, obj| memo += obj.failures.size }
     end
 
     def size
@@ -28,7 +36,7 @@ module Clausewitz; module Spelling
     end
 
     def to_s
-      outfile = failed? ? "#{@filepath} has #{failure_total} errors (#{size} total keys checked)".red : "#{@filepath} passed (#{size} total keys checked)".green
+      outfile = failed? ? "#{@filepath} has #{failure_total} errors (#{size} total keys checked, #{ignored_total} keys ignored)".red : "#{@filepath} passed (#{size} total keys checked, #{ignored_total} keys ignored)".green
       outfile = ignored? ? "#{@filepath} ignored".yellow : outfile
       interesting = @lang_results.select { |l| l.failed? || l.ignored? }
       "#{outfile}\n" + failures.map { |l| "  #{l}" }.join("\n")
@@ -45,6 +53,10 @@ module Clausewitz; module Spelling
       false
     end
 
+    def ignored
+      @entry_results.select(&:ignored?)
+    end
+
     def failed?
       @entry_results.any?(&:failed?)
     end
@@ -67,7 +79,7 @@ module Clausewitz; module Spelling
       failures = @entry_results.select(&:failed?)
       outlines = failures.map { |e| "#{spacer}#{e.to_str(indent + 2)}" }
       outlines = outlines.join("\n")
-      outlang = failed? ? "#{@lang} has #{failures.size} keys with errors".red : "#{@lang} passed (#{size} keys checked)".green
+      outlang = failed? ? "#{@lang} has #{failures.size} keys with errors (#{size} keys checked, #{ignored.size} ignored)".red : "#{@lang} passed (#{size} keys checked, #{ignored.size} ignored)".green
       out = "#{firstspacer}#{outlang}\n#{outlines}"
     end
   end
@@ -81,6 +93,10 @@ module Clausewitz; module Spelling
       true
     end
 
+    def ignored
+      []
+    end
+
     def failed?
       false
     end
@@ -109,6 +125,10 @@ module Clausewitz; module Spelling
       @word_results = word_results
     end
 
+    def ignored?
+      false
+    end
+
     def failed?
       !@word_results.empty?
     end
@@ -134,6 +154,10 @@ module Clausewitz; module Spelling
       @key          = key
     end
 
+    def ignored?
+      false
+    end
+
     def failed?
       true
     end
@@ -153,6 +177,10 @@ module Clausewitz; module Spelling
       @key = key
     end
 
+    def ignored?
+      true
+    end
+
     def failed?
       false
     end

data/lib/clausewitz/spelling/version.rb

@@ -1,5 +1,5 @@
 module Clausewitz
   module Spelling
-    VERSION = "0.2.10"
+    VERSION = "0.2.11"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clausewitz-spelling
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
 platform: ruby
 authors:
 - Will Chappell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-23 00:00:00.000000000 Z
+date: 2019-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler