pronto-golang 0.0.12 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aef845e2e4afb8599a35044ce4a59a07443dc4d405128dc33c093ee084932a0e
-  data.tar.gz: c2a3e0095846f6fb6b6c76710e98df3397deed37ada5c674935eeac7d262b54c
+  metadata.gz: bd47b694962afba2ab2b70b52c243f9ee1f0deba76f55d9b9ece5f3ed0e1111b
+  data.tar.gz: ebe00aa8879c532f723948a50b75a8a9f99df36c78f1206361e86050cf82e597
 SHA512:
-  metadata.gz: 9aa29a44ed4283fe5f1a59a85a7112dcfb116cbba9f9a7924e1fa3a8ebabad988fa723cc3042b1ea9ec39bdca642727e1419fe050b1b147c33cae0bced346fc2
-  data.tar.gz: 04caac74a80c234131b862b78dbc0678deefa765a2816aafc4fb57bcbd063487a88a34265d774c1c5d8d8b9d08ee7feee00f6bb747082c2bbadaaa85bd66b252
+  metadata.gz: 9d28c4bc9ea6c005cf662f33a3e018b9a87b38af0de82955687cd3f100c01084a8f59745dd83c509e91ee079273660f4f5af04adf1b87dc01434171ad45d3297
+  data.tar.gz: fae491dea1af02da0a056ceabf214a38a25c9f5b898adc5233c75734d9961779e2157bcb028bc21e3179de1f2f5a8baa9815b1551fd6f7fc2440f157f00a5d9a

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2018 Cash Payment Solutions GmbH
+Copyright (c) 2023 viafintech GmbH
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,18 +1,18 @@
 # Pronto runner for Golang
 
-[![Build Status](https://travis-ci.org/Barzahlen/pronto-golang.svg?branch=master)](https://travis-ci.org/Barzahlen/pronto-golang) [![RubyDoc](https://img.shields.io/badge/ruby-doc-green.svg)](http://rubydoc.info/github/Barzahlen/pronto-golang)
+![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
 
 |  Tool    | Install  |
 |----------|----------|
 | go vet   | - |
-| golint   | go get -u golang.org/x/lint/golint |
-| gosec    | See [Install instructions](https://github.com/securego/gosec#install) |
-| staticcheck | go get -u honnef.co/go/tools/cmd/staticcheck |
-| golangci-lint | go get -u github.com/golangci/golangci-lint/cmd/golangci-lint |
+| golint   | go install golang.org/x/lint/golint@latest |
+| gosec    | go install github.com/securego/gosec/v2/cmd/gosec@v2.14.0 |
+| staticcheck | go install honnef.co/go/tools/cmd/staticcheck@latest |
+| golangci-lint | See [Install instructions](https://golangci-lint.run/usage/install/) |
 
 ## Configuring 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/tools/gosec.rb

@@ -5,6 +5,13 @@ require_relative '../errors'
 module Pronto
   module GolangTools
     class Gosec < Base
+
+      # Accepts lines of the following format:
+      #   [path_to_file:<line_number>] -
+      GOSEC_LINE_PATTERN = Regexp.new('^\[(\S+):(\d+)\] - (.+)')
+
+      ANSI_COLOR_CODING_PATTERN = Regexp.new('\e\[\d+(;\d+)?m')
+
       def self.base_command
         'gosec'
       end
@@ -14,9 +21,9 @@ module Pronto
       end
 
       def parse_line(line)
-        # Accepts lines of the following format:
-        #   [path_to_file:<line_number>] -
-        if line !~ /^\[(\S+):(\d+)\] - (.+)/
+        line = line.gsub(ANSI_COLOR_CODING_PATTERN, '')
+
+        if !GOSEC_LINE_PATTERN.match(line)
           raise ::Pronto::GolangSupport::UnprocessableLine.new(line)
         end
 

data/lib/pronto/golang/version.rb

@@ -1,5 +1,5 @@
 module Pronto
   module GolangVersion
-    VERSION = '0.0.12'.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.12
+  version: 0.0.14
 platform: ruby
 authors:
 - Tobias Schoknecht
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-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,37 +29,37 @@ 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
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
-description: 
-email: tobias.schoknecht@barzahlen.de
+        version: '3.12'
+description:
+email: tobias.schoknecht@viafintech.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -79,11 +79,11 @@ files:
 - lib/pronto/golang/tools/govet.rb
 - lib/pronto/golang/tools/staticcheck.rb
 - lib/pronto/golang/version.rb
-homepage: https://github.com/Barzahlen/pronto-golang
+homepage: https://github.com/viafintech/pronto-golang
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -98,8 +98,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Pronto runner for golang tools
 test_files: []