bibliothecary 8.3.0 → 8.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c551b8910bf1a2244fddcde8a12ab29d88816b61237b10c992a53d049b2ad661
-  data.tar.gz: 55254294ffec08398bc658b117673ea2697d31ddc8ad9592d24225313b9803bb
+  metadata.gz: 137de2598a6dc8e47bbaea1e232bb1c46e6efd9986e7307846fb371dc89439a2
+  data.tar.gz: ca97f6776e335b52dfc5f9b97d8bf24d8271d22cfd87d3f82f0e9c683e1a3dd9
 SHA512:
-  metadata.gz: 52966b0a1fa300c8115f413ebdc991b3856bb77f8098e5b19ed996b1f9bf3c46b54cc41ed2998f0a157f3544c54296b99437596b2666e8345c6285208f0bd46c
-  data.tar.gz: e0c980d9065bfbc3c98100c0ebd92f7c0e16ab93f5e0a3f4a8178d8fb4a89ff032225737951486bf704d337d2bf9f2d18d60074e545ee6852297293c5e952b5b
+  metadata.gz: 209aed3d49a29f62078f56bbb9c5ff7192adfd3c3c5f432cdb6993901f53e68c01451b6f5965a57cd3cfb30d0a25a3bb3435e6c96e4a7e7f26e097d00596cd01
+  data.tar.gz: 562ba360db10d9864ab9d18a90c9a10f5acd8e408eaef5c69be5afa99e0229a3078ba35b6919b63a91f523a6c3c7619b26006a8e56b337e9f004d264e4dbbd83

data/lib/bibliothecary/parsers/maven.rb

@@ -23,9 +23,8 @@ module Bibliothecary
       GRADLE_VAR_INTERPOLATION_REGEX = /\$\w+/ # e.g. '$myVersion'
       GRADLE_CODE_INTERPOLATION_REGEX = /\$\{.*\}/ # e.g. '${my-project-settings["version"]}'
       GRADLE_GAV_REGEX = /([\w.-]+)\:([\w.-]+)(?:\:(#{GRADLE_VERSION_REGEX}|#{GRADLE_VAR_INTERPOLATION_REGEX}|#{GRADLE_CODE_INTERPOLATION_REGEX}))?/ # e.g. "group:artifactId:1.2.3"
-      GRADLE_COMMENT_REGEX = /\/\/.*|\/\*.*\*\// # '// hello' or '/* hello */'
-      GRADLE_GROOVY_SIMPLE_REGEX = /(#{GRADLE_DEPENDENCY_METHODS.join('|')})\s+['"]#{GRADLE_GAV_REGEX}['"]\s*(?:#{GRADLE_COMMENT_REGEX})*$/m 
-      GRADLE_KOTLIN_SIMPLE_REGEX = /(#{GRADLE_DEPENDENCY_METHODS.join('|')})\s*\(\s*"#{GRADLE_GAV_REGEX}"\s*\)\s*(?:#{GRADLE_COMMENT_REGEX})*$/m 
+      GRADLE_GROOVY_SIMPLE_REGEX = /(#{GRADLE_DEPENDENCY_METHODS.join('|')})\s*\(?\s*['"]#{GRADLE_GAV_REGEX}['"]/m 
+      GRADLE_KOTLIN_SIMPLE_REGEX = /(#{GRADLE_DEPENDENCY_METHODS.join('|')})\s*\(\s*"#{GRADLE_GAV_REGEX}"/m 
 
       MAVEN_PROPERTY_REGEX = /\$\{(.+?)\}/
       MAX_DEPTH = 5
@@ -160,9 +159,17 @@ 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[0..1].join(":"),
+            name: dep_name.join(":"),
             requirement: version,
             type: type
           }

data/lib/bibliothecary/runner/multi_manifest_filter.rb

@@ -21,7 +21,7 @@ module Bibliothecary
       def results
         partition_file_entries!
 
-        no_lockfile_results + single_file_results + multiple_file_results
+        (no_lockfile_results + single_file_results + multiple_file_results).uniq
       end
 
       def no_lockfile_results

data/lib/bibliothecary/version.rb

@@ -1,3 +1,3 @@
 module Bibliothecary
-  VERSION = "8.3.0"
+  VERSION = "8.3.3"
 end

metadata

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