bibliothecary 6.10.2 → 6.10.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4da554e866567459e3e2dea24812aa193288f913f7fd32bf2ccb65bb3d331106
-  data.tar.gz: 4125918d570e46d9076d11abff2f12e80168b9439b3a4c49c0c494367c089c52
+  metadata.gz: 97884ae133cf8ff23366cfdfbd6a97382e200313693eaaca8ceae2e743897a72
+  data.tar.gz: 5cf10414b41b13552a692fa4802464eab0980489e9a1ce5a1e4f9601add8deb7
 SHA512:
-  metadata.gz: 39777e9b798d1b8acc1ca64c7148122e195539ed05aa960bdc9bd851b92c455ba0289a3b48820385d65c31b3b9b63ddf14060a80bc808f1ce676eebe64562a4b
-  data.tar.gz: 558180871bb9e340c0dd46239b82d976ff39884f56a8a7aedf483422c2182af1ea179c275387188c622a7dbc07a3fdb3d58a75a3e0aeacddea06f0bf13296643
+  metadata.gz: 58c47af966516baa1fb6c9586670cf8dc5d1a0831f2b6fa44b750d7e7f62471063b89083ce7306878fb2989cb8b073b3c9b105b68a90883f7f4f9ac86a111999
+  data.tar.gz: 2685dcd3c595d20c2d1fc5884dd1187079e2bdeddd6f354762b8ee3dfdb326fcb6574bcf4a15d3b7ea343f22847d188ee6093c4f7ccf6ae13c1b7d61794b6cce

data/lib/bibliothecary/parsers/maven.rb

@@ -153,7 +153,8 @@ module Bibliothecary
           .uniq
       end
       def self.parse_maven_tree(file_contents)
-        captures = file_contents.scan(/^\[INFO\][\s|+-\\]+([[\w.-]+:]+)(?=$|\s\(optional\)$)/).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
@@ -204,8 +205,8 @@ module Bibliothecary
         json = JSON.parse(response.body)
         return [] unless json['dependencies']
         json['dependencies'].map do |dependency|
-          name = [dependency["group"], dependency["name"]].join(':')
-          next unless name =~ (/[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+(\.[A-Za-z0-9_-])?\:[A-Za-z0-9_-]/)
+          name = gradle_dependency_name(dependency["group"], dependency["name"])
+          next unless name =~ /[\w-]+\.[\w_-]+(\.[\w-])?\:[\w-]/
           {
             name: name,
             requirement: dependency["version"],
@@ -214,6 +215,20 @@ module Bibliothecary
         end.compact
       end
 
+      def self.gradle_dependency_name(group, name)
+        if group.empty? && name.include?(":")
+          group, name = name.split(":", 2)
+        end
+
+        # Strip comments, and single/doublequotes
+        [group, name].map do |part|
+          part
+            .gsub(/\s*\/\/.*$/, "") # Comments
+            .gsub(/^["']/, "") # Beginning single/doublequotes
+            .gsub(/["']$/, "") # Ending single/doublequotes
+        end.join(":")
+      end
+
       def self.extract_pom_info(xml, location, parent_properties = {})
         extract_pom_dep_info(xml, xml, location, parent_properties)
       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.2"
+  VERSION = "6.10.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 6.10.2
+  version: 6.10.7
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-18 00:00:00.000000000 Z
+date: 2021-04-16 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