bibliothecary 6.10.1 → 6.10.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f69e23d022b216f39433b7628672b1ba5556815ba5df6d96718280e8728f53c8
-  data.tar.gz: 80e4095a6325c6b6589b1ce7be6fbe290b238522d81a45b7faceb462f5167a2c
+  metadata.gz: 1b8ae8af99a91ccccfdaaf8a18aa03ff134856f4ff0bd3579ef0955ff28bb6b6
+  data.tar.gz: 7eeb154cbcc23edb621e3a1f332264bac5fe716d4e5026c20c072f14e60156b2
 SHA512:
-  metadata.gz: 9c6f9d2e2fa68ead83476b974595eb4e6251cd27b8f72751e928e39607dd6184f74e0c5c367bd058a8772195c533b1f4c07d3b72c4fd4d8582464ebc5e38834b
-  data.tar.gz: ed8ab5fe2320cda2c4decddeaf0b4442169a91f8369e9ee1ca8fda56724aed8117613f2fbbd33503ec51d8288aa66844aa56c12ff4c2e15d90d37457efd8d423
+  metadata.gz: 4fb19ca3ce60f786ee92a013ac6cddd2b29f8400ae7f3dce1258794360f90f3afd4b9bd594e9da34c4da2b2cae5ebc8936cc288ec0341710836ef0d13bffd210
+  data.tar.gz: f9e7a66faa72e61b47dff0b73a6e80af515746a1de3e333eed4930560f2eff9519f785e303412c9774a812080a4926f317f5c8a895c9d568f768f6c78ff9f67f

data/lib/bibliothecary/parsers/maven.rb

@@ -153,12 +153,21 @@ 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
+        file_contents = file_contents.gsub(/\r\n?/, "\n")
+        captures = file_contents.scan(/^\[INFO\](?:(?:\+-)|\||(?:\\-)|\s)+((?:[\w\.-]+:)+[\w\.\-${}]+)/).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/parsers/npm.rb

@@ -22,6 +22,10 @@ module Bibliothecary
           match_filename("package-lock.json") => {
             kind: 'lockfile',
             parser: :parse_package_lock
+          },
+          match_filename("npm-ls.json") => {
+            kind: 'lockfile',
+            parser: :parse_ls
           }
         }
       end
@@ -75,6 +79,25 @@ module Bibliothecary
           }
         end
       end
+
+      def self.parse_ls(file_contents)
+        manifest = JSON.parse(file_contents)
+
+        transform_tree_to_array(manifest.fetch('dependencies', {}))
+      end
+
+      private_class_method def self.transform_tree_to_array(deps_by_name)
+        deps_by_name.map do |name, metadata|
+          [
+            {
+              name: name,
+              requirement: metadata["version"],
+              lockfile_requirement: metadata.fetch("from", "").split('@').last,
+              type: "runtime"
+            }
+          ] + transform_tree_to_array(metadata.fetch("dependencies", {}))
+        end.flatten(1)
+      end
     end
   end
 end

data/lib/bibliothecary/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 6.10.1
+  version: 6.10.6
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-16 00:00:00.000000000 Z
+date: 2021-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toml-rb
@@ -288,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Find and parse manifests