spoom 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e58e5584ba33b3b678ddedb06972121af9dd4b9a8b7f1b6941f6bb939086107a
-  data.tar.gz: c1cc668af1f42ace8318a47ac0b813815e4e6a9ee1d942593b1ff37b9b41cbc2
+  metadata.gz: fa8ac9092af39d9a951ffe28c217f9f7516d25e316483ba9398df6fbb220f10a
+  data.tar.gz: 5140065943452ad4ca4de375c13b27bd24003fa828ac4fe9594a7f66d11ac970
 SHA512:
-  metadata.gz: f389c4b463b7bd1c4a275e844ed68d0d9e7279fefe4b1e9ed29a1c9238c25ad941aa494dee63c4f15dab288602a22efce3da6e7b08c795b1cb99fb236e2edf39
-  data.tar.gz: 7071bc29a1d13087d0e0527832b7619af180b20375c006122d059c640a606a55edd68234e098cf2360f06c00aa165a7a673a4d009275707be830bebef947936a
+  metadata.gz: 1b706423681d2acdbdd167a3076229953df609036254c3dcbc470a828078857318c79c3bdbddfa422ad9f26ddeb01fe464d6ab3173949d47cdc490d799403b94
+  data.tar.gz: 13b7086057c38d3a1344f2920c42c8c9208d0f3c8c438eae02b3f0b32a21e0a35f526e6e5607c5235af2fad02d0aa0365678f9ae7ce88d13d7404f142890fe07

data/lib/spoom/cli/bump.rb

@@ -83,8 +83,10 @@ module Spoom
           exit(files_to_bump.empty?)
         end
 
+        error_url_base = Spoom::Sorbet::Errors::DEFAULT_ERROR_URL_BASE
         output, status, exit_code = Sorbet.srb_tc(
           "--no-error-sections",
+          "--error-url-base=#{error_url_base}",
           path: exec_path,
           capture_err: true,
           sorbet_bin: options[:sorbet]
@@ -104,7 +106,7 @@ module Spoom
           exit(files_to_bump.empty?)
         end
 
-        errors = Sorbet::Errors::Parser.parse_string(output)
+        errors = Sorbet::Errors::Parser.parse_string(output, error_url_base: error_url_base)
 
         files_with_errors = errors.map do |err|
           path = File.expand_path(err.file)

data/lib/spoom/sorbet/errors.rb

@@ -6,6 +6,8 @@ module Spoom
     module Errors
       extend T::Sig
 
+      DEFAULT_ERROR_URL_BASE = "https://srb.help/"
+
       # Parse errors from Sorbet output
       class Parser
         extend T::Sig
@@ -18,28 +20,16 @@ module Spoom
           "or set SORBET_SILENCE_DEV_MESSAGE=1 in your shell environment.",
         ]
 
-        ERROR_LINE_MATCH_REGEX = %r{
-          ^         # match beginning of line
-          (\S[^:]*) # capture filename as something that starts with a non-space character
-                    # followed by anything that is not a colon character
-          :         # match the filename - line number seperator
-          (\d+)     # capture the line number
-          :\s       # match the line number - error message separator
-          (.*)      # capture the error message
-          \shttps://srb.help/ # match the error code url prefix
-          (\d+)     # capture the error code
-          $         # match end of line
-        }x.freeze
-
-        sig { params(output: String).returns(T::Array[Error]) }
-        def self.parse_string(output)
-          parser = Spoom::Sorbet::Errors::Parser.new
+        sig { params(output: String, error_url_base: String).returns(T::Array[Error]) }
+        def self.parse_string(output, error_url_base: DEFAULT_ERROR_URL_BASE)
+          parser = Spoom::Sorbet::Errors::Parser.new(error_url_base: error_url_base)
           parser.parse(output)
         end
 
-        sig { void }
-        def initialize
+        sig { params(error_url_base: String).void }
+        def initialize(error_url_base: DEFAULT_ERROR_URL_BASE)
           @errors = []
+          @error_line_match_regex = error_line_match_regexp(error_url_base)
           @current_error = nil
         end
 
@@ -66,9 +56,26 @@ module Spoom
 
         private
 
+        sig { params(error_url_base: String).returns(Regexp) }
+        def error_line_match_regexp(error_url_base)
+          url = Regexp.escape(error_url_base)
+          %r{
+            ^         # match beginning of line
+            (\S[^:]*) # capture filename as something that starts with a non-space character
+                      # followed by anything that is not a colon character
+            :         # match the filename - line number seperator
+            (\d+)     # capture the line number
+            :\s       # match the line number - error message separator
+            (.*)      # capture the error message
+            \s#{url}  # match the error code url prefix
+            (\d+)     # capture the error code
+            $         # match end of line
+          }x
+        end
+
         sig { params(line: String).returns(T.nilable(Error)) }
         def match_error_line(line)
-          match = line.match(ERROR_LINE_MATCH_REGEX)
+          match = line.match(@error_line_match_regex)
           return unless match
 
           file, line, message, code = match.captures

data/lib/spoom/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Spoom
-  VERSION = "1.1.6"
+  VERSION = "1.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spoom
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Alexandre Terrasa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-08 00:00:00.000000000 Z
+date: 2021-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler