bibliothecary 9.0.0 → 9.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ee8f5b235766985dfe5ebab204d9102ab1ccaaa9d554bfe554717e5714a4d6a
-  data.tar.gz: 7c151adfd305c726b1fb071e057499b6db8e9ed23af5cae870faed1237ca3f12
+  metadata.gz: 663746258869345c2ab91235203d083b8c20862ceacc435726e0e903a5924a2c
+  data.tar.gz: d675d548e6c34bb985895087948753f43a132c09c28608a56d3cfce5cc14b0fa
 SHA512:
-  metadata.gz: 23631d08bd943cf601e1304bcc4dfc02eb61dc23813919e5f3c3fc46c747ebb38d827f11ae559f80004c47751e74adc4aa98792d0176bec0ff3edff239018827
-  data.tar.gz: 3216f53aa721364f9f0209cb30a8b6a000e672a7ba874f4b5d2282a100611c5f1a26d9c921020fd3c4bf3e39ee0cb89ccbd63d91bfe462967ac85c28cd5b5e79
+  metadata.gz: 65b0c2930fd92537908a604c94e2a12852e5cc5167838f3fb7c86325a16fc930479b746096a063506f01174c9eb40a792e7f88e1aacefce0f657059b630297a6
+  data.tar.gz: 1b29d13ee41d4a6aabe54854ebe316f1f17cea1be88ba9a73a290c645f3cad4853e2cc6497f419dff474809e1905c1ad851d1d214a58373eee013774830a23e6

data/lib/bibliothecary/parsers/go.rb

@@ -7,13 +7,13 @@ module Bibliothecary
       include Bibliothecary::Analyser
 
       GPM_REGEXP = /^(.+)\s+(.+)$/
+      GOMOD_COMMENT_REGEXP = /(\/\/(.*))/
       GOMOD_REPLACEMENT_SEPARATOR_REGEXP = /\s=>\s/
-      GOMOD_DEP_REGEXP = /(?<name>\S+)\s?(?<requirement>[^\s=>]+)?/ # the " =>" negative character class is to make sure we don't capture the delimiter for "replace" deps
+      GOMOD_DEP_REGEXP = /(?<name>\S+)\s?(?<requirement>[^\s=>]+)?\s*(?<indirect>\/\/\s+indirect)?/ # the " =>" negative character class is to make sure we don't capture the delimiter for "replace" deps
       GOMOD_SINGLELINE_DEP_REGEXP = /^(?<category>require|exclude|replace|retract)\s+#{GOMOD_DEP_REGEXP}.*$/
       GOMOD_MULTILINE_DEP_REGEXP = /^#{GOMOD_DEP_REGEXP}.*$/
       GOMOD_MULTILINE_START_REGEXP = /^(?<category>require|exclude|replace|retract)\s+\(/
       GOMOD_MULTILINE_END_REGEXP = /^\)/
-      GOMOD_COMMENT_REGEXP = /(\/\/(.*))/
       GOSUM_REGEXP = /^(.+)\s+(.+)\s+(.+)$/
 
       def self.mapping
@@ -158,8 +158,8 @@ module Bibliothecary
         }
         file_contents
           .lines
+          .map(&:strip)
           .reject { |line| line =~ /^#{GOMOD_COMMENT_REGEXP}/ } # ignore comment lines
-          .map { |line| line.strip.gsub(GOMOD_COMMENT_REGEXP, "") } # strip out trailing comments
           .each do |line|
             if line.match(GOMOD_MULTILINE_END_REGEXP) # detect the end of a multiline
               current_multiline_category = nil
@@ -227,6 +227,7 @@ module Bibliothecary
             name: replacement_match[:name],
             requirement: replacement_match[:requirement] || "*",
             type: "runtime",
+            direct: !match[:indirect],
           }
         when "retract"
           {
@@ -234,12 +235,14 @@ module Bibliothecary
             requirement: match[:requirement] || "*",
             type: "runtime",
             deprecated: true,
+            direct: !match[:indirect],
           }
         else
           {
             name: match[:name],
             requirement: match[:requirement] || "*",
             type: "runtime",
+            direct: !match[:indirect],
           }
         end
       end

data/lib/bibliothecary/version.rb

@@ -1,3 +1,3 @@
 module Bibliothecary
-  VERSION = "9.0.0"
+  VERSION = "9.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 9.0.0
+  version: 9.1.0
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-17 00:00:00.000000000 Z
+date: 2024-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tomlrb