pronto-golang 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0542e6e9b70b08409a682de22445a2a8a279b2352fed6e69bc461e3ee785aba4
-  data.tar.gz: bdb4f8fe3d184772a0e037f1636fa3a6487f2565f8a09fbf7d55f97c62e872ca
+  metadata.gz: bd47b694962afba2ab2b70b52c243f9ee1f0deba76f55d9b9ece5f3ed0e1111b
+  data.tar.gz: ebe00aa8879c532f723948a50b75a8a9f99df36c78f1206361e86050cf82e597
 SHA512:
-  metadata.gz: ab3887662aa406ea3ef6a1b3a2498fa1683cd5f72ed4599e1ae9aeb28e8c694a4c7ae3cc8e1b5a81d0f4ce146d9402f80a218e12b4b81c9f052f81b56a9904d2
-  data.tar.gz: 45c1b18511917b2fb85039b8d75770541f17cc65d38172e6f7cda5ef98b7004cfe9e05e61f855b94b98ae03079d72cda6b2688bfb4f613b5fd59f078add1b266
+  metadata.gz: 9d28c4bc9ea6c005cf662f33a3e018b9a87b38af0de82955687cd3f100c01084a8f59745dd83c509e91ee079273660f4f5af04adf1b87dc01434171ad45d3297
+  data.tar.gz: fae491dea1af02da0a056ceabf214a38a25c9f5b898adc5233c75734d9961779e2157bcb028bc21e3179de1f2f5a8baa9815b1551fd6f7fc2440f157f00a5d9a

data/README.md

@@ -2,7 +2,7 @@
 
 ![Build Status](https://github.com/viafintech/pronto-golang/actions/workflows/test.yml/badge.svg) [![RubyDoc](https://img.shields.io/badge/ruby-doc-green.svg)](http://rubydoc.info/github/Barzahlen/pronto-golang)
 
-Pronto runner for [Golang](https://golang.org) tools
+[Pronto](https://github.com/prontolabs/pronto) runner for [Golang](https://go.dev) tools
 
 ## Tools
 

data/lib/pronto/golang/tools/base.rb

@@ -14,7 +14,11 @@ module Pronto
       end
 
       def command(file_path)
-        "#{base_command} #{parameters} #{file_path}"
+        "cd #{directory} && #{base_command} #{parameters} #{file_path}"
+      end
+
+      def directory(default = '.')
+        @config.fetch('execution_directory', default)
       end
 
       def parameters
@@ -37,9 +41,21 @@ module Pronto
         @config.fetch('enabled', true) # Default to true if the key is not configured
       end
 
+      # Supported options:
+      # - file
+      # - project
+      def execution_mode
+        'file'
+      end
+
       def parse_line(line)
         file_path, line_number, _, message = line.split(':', 4)
 
+        dir = directory('')
+        if dir != ''
+          file_path = File.join(dir, file_path)
+        end
+
         return file_path, line_number, :warning, message.to_s.strip
       end
     end

data/lib/pronto/golang/tools/golangci_lint.rb

@@ -4,6 +4,10 @@ module Pronto
       def self.base_command
         'golangci-lint'
       end
+
+      def execution_mode
+        'project'
+      end
     end
   end
 end

data/lib/pronto/golang/version.rb

@@ -1,5 +1,5 @@
 module Pronto
   module GolangVersion
-    VERSION = '0.0.13'.freeze
+    VERSION = '0.0.14'.freeze
   end
 end

data/lib/pronto/golang.rb

@@ -17,9 +17,15 @@ module Pronto
     def run
       return [] unless @patches
 
-      @patches
-        .select { |patch| valid_patch?(patch) }
-        .map { |patch| inspect(patch) }
+      valid_patches = @patches.select { |patch| valid_patch?(patch) }
+      patch_file_paths = valid_patches.map { |patch| patch_file_path(patch) }
+
+      collected_findings = []
+      collected_findings += run_tools_for_projects
+      collected_findings += run_tools_for_files(patch_file_paths)
+
+      valid_patches
+        .map { |patch| inspect(patch, collected_findings) }
         .flatten
         .compact
     end
@@ -28,31 +34,77 @@ module Pronto
       patch.additions > 0 && go_file?(patch.new_file_full_path)
     end
 
-    def inspect(patch)
-      escaped_path = Shellwords.escape(patch.new_file_full_path.to_s)
+    def patch_file_path(patch)
+      return Shellwords.escape(patch.new_file_full_path.to_s)
+    end
 
-      messages = []
+    def run_tools_for_projects
+      collected_findings = []
 
       available_tools.each do |tool|
-        # Skip the patch if the filepath is blacklisted in the 'blacklisted_files' config
-        # Note: this defaults to '.*' and therefore matches everything by default
-        if tool.blacklisted_files_regexp.match?(escaped_path)
+        if tool.execution_mode != 'project'
           next
         end
 
-        Open3.popen3("#{tool.command(escaped_path)}") do |stdin, stdout, stderr, wait_thr|
-          [stdout, stderr].each do |result_text|
-            while output_line = result_text.gets
-              next if output_line.strip == 'exit status 1'
+        collected_findings += run_command(tool, tool.command(''))
+      end
+
+      return collected_findings
+    end
+
+    def run_tools_for_files(filepaths)
+      collected_findings = []
 
-              messages << process_line(patch, tool, output_line)
-            end
+      available_tools.each do |tool|
+        if tool.execution_mode != 'file'
+          next
+        end
+
+        filepaths.each do |filepath|
+          # Skip the patch if the filepath is blacklisted in the 'blacklisted_files' config
+          # Note: this defaults to '.*' and therefore matches everything by default
+          if tool.blacklisted_files_regexp.match?(filepath)
+            next
           end
 
-          while output_line = stderr.gets
-            process_line(patch, tool, output_line)
+          collected_findings += run_command(tool, tool.command(filepath))
+        end
+      end
+
+      return collected_findings
+    end
+
+    def run_command(tool, command)
+      collected_findings = []
+
+      Open3.popen3(command) do |stdin, stdout, stderr, wait_thr|
+        [stdout, stderr].each do |result_text|
+          while output_line = result_text.gets
+            next if output_line.strip == 'exit status 1'
+
+            collected_findings << {
+              line: output_line,
+              tool: tool,
+            }
           end
         end
+
+        while output_line = stderr.gets
+          collected_findings << {
+            line: output_line,
+            tool: tool,
+          }
+        end
+      end
+
+      return collected_findings
+    end
+
+    def inspect(patch, findings)
+      messages = []
+
+      findings.each do |finding|
+        messages << process_line(patch, finding[:tool], finding[:line])
       end
 
       return messages

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pronto-golang
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Tobias Schoknecht
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-16 00:00:00.000000000 Z
+date: 2023-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pronto
@@ -19,7 +19,7 @@ dependencies:
         version: 0.9.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 0.9.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement