pronto-android_lint 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f424e52384b0982af1eed1c405a36a48f6a1347e
-  data.tar.gz: 16e9416d51fff23b9e979438a4e4b536eb183cf9
+  metadata.gz: 0ed2c615ee48cdd9ce83f444524beb9f68d81aed
+  data.tar.gz: 15a0ef9d2463b34fdbd08657b0e6bbb13f2acf7e
 SHA512:
-  metadata.gz: 35660a984bba2259b6e6fc064ca9f060884dc5d01a28b8eb29c974b6d1b35a3f7a77ab04fcdf47a8eabb10ccf4591d3a265d5303be2058dabceedd64a966565e
-  data.tar.gz: 4cb6174238894ea08cf5f3d9e073d97e7e82056dc76d64e364486b28e37f040d174a8a074c912aa54df573d528ab8514a49c9c561ea139b8a9dc9f76ee44893c
+  metadata.gz: fac4d41fa2df23d73deeaaa248f78f3650c26806b0079385e6c0a52d3e68fbdc5ef749b070ae873cbddc6cacc2946f6fbe3f5096c68f3e8cc07bdb97f41f1068
+  data.tar.gz: 6128633d7a8275046c127e6a9590c113f2cca07065c5350574cb1337f8a12360bb5e199e4ffb76e8be6a8da366a07f6b467fde12e297433172d5a0d88910d80e

data/lib/pronto/android_lint/output_parser.rb

@@ -1,3 +1,4 @@
+require 'active_support/core_ext/object/try'
 require 'nokogiri'
 
 module Pronto
@@ -16,32 +17,25 @@ module Pronto
 
       def parse
         lint_result = File.open(@path) { |f| Nokogiri::XML(f) }
-        lint_result.xpath("//issue").map do |issue|
-          {
-            path: parse_path(issue.xpath(".//location").attribute("file").value),
-            line: issue.xpath(".//location").attribute("line").value.to_i,
-            level: TYPE_WARNINGS[issue.attribute("severity").value],
-            message: create_message(issue)
-          }
+        lint_result.xpath("//issue").flat_map do |issue|
+          issue.xpath(".//location").map do |location|
+            {
+              path: location.attribute("file").try(:value),
+              line: location.attribute("line").try(:value).to_i,
+              level: TYPE_WARNINGS[issue.attribute("severity").value],
+              message: create_message(issue)
+            }
+          end
         end
       rescue => e
         raise "Error while parsing file: #{@path}\n#{e.message}"
       end
 
       private
-      # removed `/builds/group/project/` from path
-      # to match pronto patch path
-      def parse_path(path)
-        path.split("/")
-          .reject(&:empty?)
-          .drop(ENV["PRONTO_ANDROID_LINT_PATH_SHIFT"].to_i)
-          .join("/")
-      end
-
       def create_message(issue)
-        "#{issue.attribute("summary").value}\n\n#{issue.attribute("message").value}
+        "#{issue.attribute("summary").try(:value)}\n\n#{issue.attribute("message").try(:value)}
 
-        #{issue.attribute("explanation").value}"
+        #{issue.attribute("explanation").try(:value)}"
       end
     end
   end

data/lib/pronto/android_lint/version.rb

@@ -1,5 +1,5 @@
 module Pronto
   module AndroidLint
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/lib/pronto/android_lint_runner.rb

@@ -25,7 +25,7 @@ module Pronto
 
       messages = []
 
-      offences.select { |offence| offence[:path] == patch_path }
+      offences.select { |offence| offence[:path].end_with?(patch_path) }
         .each do |offence|
           messages += patch.added_lines
             .select { |line| line.new_lineno == offence[:line] }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pronto-android_lint
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Tobiasz Małecki
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
 description: 
 email:
 - tobiasz.malecki@appunite.com
@@ -111,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Pronto runner for android lint