bibliothecary 6.10.1 → 6.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f69e23d022b216f39433b7628672b1ba5556815ba5df6d96718280e8728f53c8
-  data.tar.gz: 80e4095a6325c6b6589b1ce7be6fbe290b238522d81a45b7faceb462f5167a2c
+  metadata.gz: 4da554e866567459e3e2dea24812aa193288f913f7fd32bf2ccb65bb3d331106
+  data.tar.gz: 4125918d570e46d9076d11abff2f12e80168b9439b3a4c49c0c494367c089c52
 SHA512:
-  metadata.gz: 9c6f9d2e2fa68ead83476b974595eb4e6251cd27b8f72751e928e39607dd6184f74e0c5c367bd058a8772195c533b1f4c07d3b72c4fd4d8582464ebc5e38834b
-  data.tar.gz: ed8ab5fe2320cda2c4decddeaf0b4442169a91f8369e9ee1ca8fda56724aed8117613f2fbbd33503ec51d8288aa66844aa56c12ff4c2e15d90d37457efd8d423
+  metadata.gz: 39777e9b798d1b8acc1ca64c7148122e195539ed05aa960bdc9bd851b92c455ba0289a3b48820385d65c31b3b9b63ddf14060a80bc808f1ce676eebe64562a4b
+  data.tar.gz: 558180871bb9e340c0dd46239b82d976ff39884f56a8a7aedf483422c2182af1ea179c275387188c622a7dbc07a3fdb3d58a75a3e0aeacddea06f0bf13296643

data/lib/bibliothecary/parsers/maven.rb

@@ -153,12 +153,20 @@ module Bibliothecary
           .uniq
       end
       def self.parse_maven_tree(file_contents)
-        captures = file_contents.scan(/\s([\w.-]+:[\w.-]+:[\w.-]+:[\w.-]+:[a-zA-Z]+)/).flatten.uniq
+        captures = file_contents.scan(/^\[INFO\][\s|+-\\]+([[\w.-]+:]+)(?=$|\s\(optional\)$)/).flatten.uniq
         captures.map do |item|
+          parts = item.split(":")
+          case parts.count
+          when 4
+            version = parts[-1]
+            type = parts[-2]
+          when 5..6
+            version, type = parts[-2..]
+          end
           {
-            name: item.split(":")[0..1].join(":"),
-            requirement: item.split(":")[3],
-            type: item.split(":")[-1]
+            name: parts[0..1].join(":"),
+            requirement: version,
+            type: type
           }
         end
       end

data/lib/bibliothecary/version.rb

@@ -1,3 +1,3 @@
 module Bibliothecary
-  VERSION = "6.10.1"
+  VERSION = "6.10.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 6.10.1
+  version: 6.10.2
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-16 00:00:00.000000000 Z
+date: 2021-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toml-rb