pronto-clippy 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ae6bb9201f78c72b8ee5b34afed2543f4cb1e7d
-  data.tar.gz: 17cc3270d9902dc7d919ad1d57ca0f36ee1116f1
+  metadata.gz: eaf84449187646b216960f4f3c69e10423a9c2d9
+  data.tar.gz: 8bea12be7b33d56368c966ad616bde00fd4ed7ec
 SHA512:
-  metadata.gz: e5dd61df84698c401fbf337a76379c6524222d2b23f25a3945f271e72158384fa8e1c83560460ac846a36d8d1ec8cc007082564033988956e78ca25d0223a345
-  data.tar.gz: 01d6ec4939272c6cc6e5e0c4ff212cee43b8e790e6c0ac7d069c1b90f3b441f8637150ec2229d798e5e9ad791f4891ced4325484a4a41ac3b93ee32dc13e1f4a
+  metadata.gz: 5a61223f255912bd437f3cb72d2395cbd77870e1818baac85aaf84b9d551e2e3e3aa3e53174fa66692bfac2c9967469ad662c1c7cbba21cb27e73e4cc9f06ef9
+  data.tar.gz: edfdb52c1659ca2bc092d2004fc90d2d71faa8353be6022fbd80c2b21e87255f854d23a615934468981eafe4dce997f1f40a5876c6ad21e6374fd1fd64c34f49

data/lib/pronto/clippy/parser.rb

@@ -12,7 +12,7 @@ module Pronto
                  .each_line
                  .map { |json| JSON.parse(json) }
                  .group_by do |entry|
-          entry['spans'].first['file_name']
+          File.expand_path(entry['spans'].first['file_name'])
         end
       end
 

data/lib/pronto/clippy/version.rb

@@ -1,5 +1,5 @@
 module Pronto
   module Clippy
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.1.1'.freeze
   end
 end

data/lib/pronto/clippy_runner.rb

@@ -3,32 +3,40 @@ require_relative 'clippy/wrapper'
 
 module Pronto
   class ClippyRunner < Runner
+    attr_reader :patches
+
     def run
       return [] unless @patches
 
-      @offences = Clippy::Wrapper.new.lint
 
-      @patches
+      patches
         .reject { |patch| patch.additions.zero? }
         .select { |patch| rust_file?(patch.new_file_full_path.to_s) }
         .map { |patch| inspect(patch) }
     end
 
+    def offences
+      @offences ||= Clippy::Wrapper.new.lint
+    end
+
     private
 
     def inspect(patch)
-      @offences
+      offences
         .fetch(patch.new_file_full_path.to_s, [])
         .inject([]) do |arr, offence|
-        span = offence['spans']
-        line_start = span['line_start'].to_i
-        line_end = span['line_end'].to_i
+        line = contains?(patch, offence['spans'].first)
+        arr << new_message(offence, line) if line
+        arr
+      end
+    end
 
-        line = patch.added_lines.find do |nr|
-          (line_start..line_end).cover?(nr)
-        end
+    def contains?(patch, span)
+      line_start = span['line_start'].to_i
+      line_end = span['line_end'].to_i
 
-        arr << new_message(offence, line) if line
+      patch.added_lines.find do |entry|
+        (line_start..line_end).cover?(entry.new_lineno)
       end
     end
 
@@ -36,7 +44,7 @@ module Pronto
       path = line.patch.delta.new_file[:path]
       Message.new(path,
                   line,
-                  offence['level'],
+                  offence['level'].to_sym,
                   offence['message'],
                   nil,
                   self.class)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pronto-clippy
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Łukasz Jan Niemier