bibliothecary 8.7.5 → 8.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fbd83e689755fcae99771b12a88ce74a9c31c22d60b11b40fcb552987628f45
-  data.tar.gz: deb85d3948752fd0a3142bb41d5cd07bde78b4604b95a77eb652b2d7a6d2634b
+  metadata.gz: 57b89f5321f44b47f940c8fe8be9e50e2007ad4176fd002744f1f44a2bd9cbe7
+  data.tar.gz: 742a28fbf8a17708e64736bf49039347af391db3b1ad4c62355df83f45459d5f
 SHA512:
-  metadata.gz: f72d8392eae9835fa51ce423d76f2664592e666964dbf921d25b03d0edef6c5f79adb64e3527c89a2f0ecc9c88958e51de223c93b405a70d28e1a1ca73626dcf
-  data.tar.gz: d9928f3e5181293c015bbf72985bd7baf50f5126655e96cbb5d64d0abbe88c0a061b37a672ce7ea06869d6c1aedcec68fa02ea89fc7a4bc0ba45e32ad692b35d
+  metadata.gz: 7a86455347539c89417c398c19e99ff8cd4ea84d52057c4e67f991f6ac518083db567a733b83cc4044dbb326d4a7322dde9514b3a486ed1c7825bc6cf2fdad7c
+  data.tar.gz: a3c33ebc60114b4c9627d8dfd205d0579e32efd706c01fc84f00606d378db05c103f50655eb68c8b2f6383d0b50c9fcf7370a65d16d18c0dd1a9dd74241bbf45

data/lib/bibliothecary/parsers/go.rb

@@ -129,8 +129,12 @@ module Bibliothecary
 
         deps = categorized_deps["require"]
           .map do |dep|
-            # A "replace" directive doesn't add the dep to the module graph unless the original dep is also in a "require" directive,
+            # NOTE: A "replace" directive doesn't add the dep to the module graph unless the original dep is also in a "require" directive,
             # so we need to track down replacements here and use those instead of the originals, if present.
+            #
+            # NOTE: The "replace" directive doesn't actually change the version reported from Go (e.g. "go mod graph"), it only changes
+            # the *source code*. So by replacing the deps here, we're giving more honest results than you'd get when asking go
+            # about the versions used.
             replaced_dep = categorized_deps["replace"]
               .find do |replacement_dep| 
                 replacement_dep[:original_name] == dep[:name] && 
@@ -187,7 +191,18 @@ module Bibliothecary
       def self.parse_go_resolved(file_contents, options: {}) # rubocop:disable Lint/UnusedMethodArgument
         JSON.parse(file_contents)
           .select { |dep| dep["Main"] != "true" }
-          .map { |dep| { name: dep["Path"], requirement: dep["Version"], type: dep.fetch("Scope") { "runtime" } } }
+          .map do |dep| 
+            if dep["Replace"].is_a?(String) && dep["Replace"] != "<nil>" && dep["Replace"] != ""
+              # NOTE: The "replace" directive doesn't actually change the version reported from Go (e.g. "go mod graph"), it only changes
+              # the *source code*. So by replacing the deps here, we're giving more honest results than you'd get when asking go
+              # about the versions used.
+              name, requirement = dep["Replace"].split(" ", 2)
+              requirement = "*" if requirement.to_s.strip == ""
+              { name: name, requirement: requirement, original_name: dep["Path"], original_requirement: dep["Version"], type: dep.fetch("Scope") { "runtime" } }
+            else
+              { name: dep["Path"], requirement: dep["Version"], type: dep.fetch("Scope") { "runtime" } }
+            end
+          end
       end
 
       def self.map_dependencies(manifest, attr_name, dep_attr_name, version_attr_name, type)

data/lib/bibliothecary/version.rb

@@ -1,3 +1,3 @@
 module Bibliothecary
-  VERSION = "8.7.5"
+  VERSION = "8.7.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 8.7.5
+  version: 8.7.6
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-08 00:00:00.000000000 Z
+date: 2024-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tomlrb