code-scanning-rubocop 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09beea9b3ef6e114f880760f06d17dd25ba099ec4e77456f5cd2274b36551a4c'
-  data.tar.gz: 6355d25dec4c91e28a5d88841b1bff44e4dec9495831ebcc1e7f6d06d0bd0b8f
+  metadata.gz: 739a88bd1b19ec2ee128962c43c90c7c3680e2e04ad8cfb98feb9773aa7419d8
+  data.tar.gz: f7f7aaa9fc8607ffe535494dcbfcd9ea1ac17620bba8073a9a67859064c45e28
 SHA512:
-  metadata.gz: acb1fd0cf47857e36c53107481e4214e5ae45ec095977a4ba3a1c4a8c2778504b4d30a853d01e6fc78f3b9d12c6532470af731b2e39cb352764e486ea42fb246
-  data.tar.gz: 5166198c7c0025fafc28150ae5479b90fbdbd270fdb1f2e596bedd9d66a9bbf23e1afa72b2209213e9cc578bf2c4163c942f71317604d3e86635b377117aca97
+  metadata.gz: 8c48865aedc4968ed50c8d6dfb1ae3e42b8b44fde53a82219e0b47bafcc0b51b84cb29642d7e29db5759caec0345a953a7940928bc85396aacbee393deb35ffe
+  data.tar.gz: 33a344112b71cba3ab3a77411173cff7bc96a88fb4d2df3db9536edbb86aa6ececf57052950cf4098daf6df5e18bf15c41af1d4e8635102ec300948768f6003c

data/Dockerfile

@@ -3,7 +3,7 @@ FROM ruby:2.7.1
 # throw errors if Gemfile has been modified since Gemfile.lock
 RUN bundle config --global frozen 1
 
-RUN gem install code-scanning-rubocop
+RUN gem install code-scanning-rubocop -v0.2.0
 
 ARG GITHUB_WORKSPACE
 

data/Gemfile.lock

@@ -1,23 +1,13 @@
 PATH
   remote: .
   specs:
-    code-scanning-rubocop (0.1.0)
-      activesupport
+    code-scanning-rubocop (0.2.0)
       rubocop (~> 0.82.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.2.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
     ast (2.4.0)
-    concurrent-ruby (1.1.6)
-    i18n (1.8.2)
-      concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
     minitest (5.14.0)
     parallel (1.19.1)
@@ -35,11 +25,7 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
     ruby-progressbar (1.10.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
     unicode-display_width (1.7.0)
-    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby

data/code-scanning-rubocop.gemspec

@@ -30,6 +30,4 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'rubocop', '~> 0.82.0'
-  # TODO: remove this
-  spec.add_dependency 'activesupport'
 end

data/entrypoint.sh

@@ -4,5 +4,17 @@ set -x
 
 cd $GITHUB_WORKSPACE
 
-rubocop --require code_scanning --format CodeScanning::SarifFormatter -o rubocop.sarif
-exit 0
+# Install correct bundler version
+gem install bundler -v "$(grep -A 1 "BUNDLED WITH" Gemfile.lock | tail -n 1)"
+
+bundle install
+
+bundle inject code-scanning-rubocop "$(gem list | grep code-scanning-rubocop | tr -cd '0-9.')"
+
+bundle exec rubocop --require code_scanning --format CodeScanning::SarifFormatter -o rubocop.sarif
+
+if [ ! -f rubocop.sarif ]; then
+    exit 1
+else
+    exit 0
+fi

data/lib/code_scanning/rubocop/sarif_formatter.rb

@@ -1,12 +1,8 @@
 # frozen_string_literal: true
-
 require 'rubocop/formatter/base_formatter'
 require 'json'
-require 'active_support/all'
 require 'pathname'
 
-# TODO: fix me
-ROOT = __dir__
 module CodeScanning
 
   class SarifFormatter < RuboCop::Formatter::BaseFormatter
@@ -27,17 +23,9 @@ module CodeScanning
           },
           'results' => @results }
       ]
-      # TODO: under runs
-      #    "tool" : {
-      #      "driver" : {
-      #        "name" : "CodeQL command-line toolchain",
-      #        "organization" : "GitHub",
-      #        "semanticVersion" : "2.0.0",
-      #        "rules" : [ {
     end
 
-    Rule = Struct.new(:name, :index, :hash) do
-    end
+    Rule = Struct.new(:name, :index)
 
     def set_rule(cop_name, severity)
       if r = @rules_map[cop_name]
@@ -59,14 +47,13 @@ module CodeScanning
         'properties' => {}
       }
       @rules << h
-      @rules_map[cop_name] = Rule.new(cop_name, @rules.size - 1, h)
+      @rules_map[cop_name] = Rule.new(cop_name, @rules.size - 1)
     end
 
     def sarif_severity(cop_severity)
-      return cop_severity if cop_severity.in? %w[warning error]
-      return 'note' if cop_severity.in? %w[refactor convention]
-      return 'error' if cop_severity.in? %w[fatal]
-
+      return cop_severity if %w[warning error].include?(cop_severity)
+      return 'note' if %w[refactor convention].include?(cop_severity)
+      return 'error' if cop_severity == 'fatal'
       'none'
     end
 
@@ -99,18 +86,9 @@ module CodeScanning
             }
           ],
           'partialFingerprints' => {
-            #        "primaryLocationLineHash" : "39fa2ee980eb94b0:1",
-            #        "primaryLocationStartColumnFingerprint" : "4"
+            # This will be computed by the upload action for now
           }
         }
-
-        #      #       "%<path>s:%<line>d:%<column>d: %<severity>s: %<message>s\n",
-        #      #       path: file,
-        #      #       line: o.line,
-        #      #       column: o.real_column,
-        #      #       severity: o.severity.code,
-        #      #       message: message(o)
-        #      #     )
       end
     end
 

data/lib/code_scanning/rubocop/version.rb

@@ -1,5 +1,5 @@
 module CodeScanning
   module Rubocop
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: code-scanning-rubocop
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Arthur Neves
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-01 00:00:00.000000000 Z
+date: 2020-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.82.0
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: This gem adds a SARIF formatter to rubocop, so we can export alerts to
   code-scanning inside GitHub.
 email:
@@ -61,7 +47,7 @@ files:
 - lib/code_scanning.rb
 - lib/code_scanning/rubocop/sarif_formatter.rb
 - lib/code_scanning/rubocop/version.rb
-- rubocop-scan/action.yml
+- rubocop-action/action.yml
 homepage: https://github.com/arthurnn/code-scanning-rubocop
 licenses:
 - MIT