bibliothecary 8.3.6 → 8.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17f26c778e80bae98b90c9329deee84531373bd632522cafeaa6fd373625875d
-  data.tar.gz: 414e573a0fff88a2352fec3393ba4067fc96e483ee6f73752c23ed9578739d9f
+  metadata.gz: 5447f8ff7067f7eb7c0f1bfbd13f0ba6da33335dd31cee7b319587a09260308a
+  data.tar.gz: b23abc3e66340a26345db527803dcb7d7d8a3f9418297bff161deb72dd778aa5
 SHA512:
-  metadata.gz: fac3dbf50483860ae351fc198a884ec8e1b1f54f0e7f89da36cacd78dbac84800a4c75cf118b5af27529e1ca068d664dcbb63775aec4940c78023d867fb2e675
-  data.tar.gz: 389d6f67d33980bda05d35fd22c1533e2727f79734e40a0371fda3edee4ddbae81f22e276807b0c0898c5cf5d22575e1d221b9a967331af725cea937b81e3731
+  metadata.gz: 79159794155d5ea5c18978f4e6a57eba72bd78699fcee008e66fbf0bb83a5c737893ee369d7cb4d3f8afe2758b1029c4a87a526344ea8d7a2aa2ba38a2ab3729
+  data.tar.gz: 01ec2a377345cc804c1fac8149f27fc40a7e34c45db27ae0f9b6eb0cea1ebdece6b64b23c5da6f96354d1440102bc3854dcf2b4297d9cf915e89c920d3de3f25

data/.ruby-version

@@ -1 +1 @@
-2.7.1
+2.7.6

data/lib/bibliothecary/parsers/maven.rb

@@ -167,6 +167,15 @@ module Bibliothecary
               requirement: dep[-1],
               type: type
             }
+          elsif dep.count == 5
+            # get name from renamed package resolution "org:name -> renamed_org:name:version"
+            {
+              original_name: dep[0,2].join(":"),
+              original_requirement: "*",
+              name: dep[-3..-2].join(":"),
+              requirement: dep[-1],
+              type: type
+            }
           else
             # get name from version conflict resolution ("org:name:version -> version") and no-resolution ("org:name:version")
             {
@@ -179,7 +188,7 @@ module Bibliothecary
           .compact
           # Prefer duplicate deps with the aliased ones first, so we don't lose the aliases in the next uniq step.
           .sort_by { |dep| dep.key?(:original_name) || dep.key?(:original_requirement) ? 0 : 1 }
-          .uniq { |item| [item[:name], item[:requirement], item[:type]] }
+          .uniq { |item| item.values_at(:name, :requirement, :type, :original_name, :original_requirement) }
       end
 
       def self.parse_maven_resolved(file_contents, options: {})

data/lib/bibliothecary/parsers/npm.rb

@@ -68,8 +68,12 @@ module Bibliothecary
       def self.parse_manifest(file_contents, options: {})
         manifest = JSON.parse(file_contents)
         raise "appears to be a lockfile rather than manifest format" if manifest.key?('lockfileVersion')
-        map_dependencies(manifest, 'dependencies', 'runtime') +
-        map_dependencies(manifest, 'devDependencies', 'development')
+        
+        (
+          map_dependencies(manifest, 'dependencies', 'runtime') +
+          map_dependencies(manifest, 'devDependencies', 'development')
+        )
+          .reject { |dep| dep[:name].start_with?("//") } # Omit comment keys. They are valid in package.json: https://groups.google.com/g/nodejs/c/NmL7jdeuw0M/m/yTqI05DRQrIJ
       end
 
       def self.parse_yarn_lock(file_contents, options: {})

data/lib/bibliothecary/version.rb

@@ -1,3 +1,3 @@
 module Bibliothecary
-  VERSION = "8.3.6"
+  VERSION = "8.3.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 8.3.6
+  version: 8.3.9
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-18 00:00:00.000000000 Z
+date: 2022-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tomlrb
@@ -339,7 +339,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Find and parse manifests