bibliothecary 8.3.4 → 8.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bd6e1d72ef747c4e0a6070e71609c20e4f801de4e61f05cd53bc8b20d30fc53
-  data.tar.gz: 0b0e70fde9855df7c3e18a6824b3d1b43ca83646128ee3972aed7eed1cf90df7
+  metadata.gz: f283979f0fd87432a9d26a07bea9f568276d25102f9b3e343e4304656bedc1fb
+  data.tar.gz: 7019277a0e5bcf8ea1b77d76889f7de9322121ec4b7abee44f2f83bfa8b09fe5
 SHA512:
-  metadata.gz: e3766156e6f96ad25947cd3b5f5d5703e288720f996870e80993e3297df9fa9697793109a0e3d4a8affdc8e87839a7c67374bda098befcac47578c3d61b3a3ee
-  data.tar.gz: 886ede7d0f5e7f91bc788a3cc7922be2cf9243deb3e5c8b45109b41a5bb0ed70e1d2d24049fd354ed230da1be9deb0b62cdbebc6e3db10a188fac7ae065a94b4
+  metadata.gz: e81204f529c0dd96cb75f43823a6440197474ddc06b37ddbd71eadcee710d4535f666d7ddfd59a670d96ff8592c22afc0b0c97e544cad2a3c661dd978df243bb
+  data.tar.gz: 3b972cbc604d1b1edd059c6a25a53f048eb1ce9554f541736188e1795da61bdf929acbc4999ddbbe3c54f4aad3941e6fc2ee2bf7107086959964d576451555bb

data/lib/bibliothecary/parsers/maven.rb

@@ -148,7 +148,6 @@ module Bibliothecary
 
           split = gradle_dep_match.captures[0]
 
-
           dep = line
             .split(split)[1].sub(/(\((c|n|\*)\))$/, "") # line ending legend: (c) means a dependency constraint, (n) means not resolved, or (*) means resolved previously, e.g. org.springframework.boot:spring-boot-starter-web:2.1.0.M3 (*)
             .sub(/ FAILED$/, "") # dependency could not be resolved (but still may have a version)
@@ -159,21 +158,28 @@ module Bibliothecary
           # \--- org.springframework.security:spring-security-test (n)
           next unless dep.length >= 3
 
-          dep_name = if dep.count == 6
-                       # get name from renamed package resolution "org:name:version -> renamed_org:name:version"
-                       dep[-3..-2]
-                     else
-                       # get name from version conflict resolution ("org:name:version -> version") and no-resolution ("org:name:version")
-                       dep[0..1]
-                     end
-
-          version = dep[-1]
-          {
-            name: dep_name.join(":"),
-            requirement: version,
-            type: type
-          }
-        end.compact.uniq {|item| [item[:name], item[:requirement], item[:type]]}
+          if dep.count == 6
+            # get name from renamed package resolution "org:name:version -> renamed_org:name:version"
+            {
+              original_name: dep[0,2].join(":"),
+              original_requirement: dep[2],
+              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")
+            {
+              name: dep[0..1].join(":"),
+              requirement: dep[-1],
+              type: type
+            }
+          end
+        end
+          .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]] }
       end
 
       def self.parse_maven_resolved(file_contents, options: {})

data/lib/bibliothecary/version.rb

@@ -1,3 +1,3 @@
 module Bibliothecary
-  VERSION = "8.3.4"
+  VERSION = "8.3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 8.3.4
+  version: 8.3.5
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-05 00:00:00.000000000 Z
+date: 2022-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tomlrb