bibliothecary 6.9.6 → 6.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d401e2ee48b3c9ea14b1ced4582ca501b5215bfd32283cbfa22ea6a3a013285
-  data.tar.gz: 28872324cf699eea26ac419cec67fba683bc75be6b335943471a82854b762109
+  metadata.gz: af1a007a1d21ef7ecfeffcbe97319185c31da96d252f27a58619e60afcc3faf8
+  data.tar.gz: 64fb93438b9f3af750b2d69206ec7601e52b77bb5236a2783ad724a064125f33
 SHA512:
-  metadata.gz: dbe0b6dd4065ea9fadf9c2458988fde20d7198d1142dca84460191704e2a7e61e1f9e6d96bd088424fcc5386be6e2b6b9dae479f40bebd03f328d6c623e02140
-  data.tar.gz: 189db2576879293749a94eba6dbcef993e822e0d3fc26ac5e7b8d6de405ac7eb2ae6e513166428197bc6e6f0e718a6bd810d66f24f21cc60bf2ff2f3c25ac82a
+  metadata.gz: f4816e56d6cea72b20deaa2f2832a27ce1c2d99ffe5ac224e7259bb3595b699083ec32dbd2b2b756ec0ea8c82aa411908f4ab83eed366e41726f5d634e241630
+  data.tar.gz: 1f5c52f3c4ad451a2c32e93bc129694580bb7f1c5af8769e859cfcc74ee928ea8a3ed0595c84c7a5ff13bad118ce4ff02bd519ee12bdd7c5f688dc2e98076e17

data/bin/console

@@ -10,5 +10,5 @@ require "bibliothecary"
 # require "pry"
 # Pry.start
 
-require "irb"
-IRB.start
+require "pry"
+Pry.start

data/lib/bibliothecary/parsers/maven.rb

@@ -60,6 +60,10 @@ module Bibliothecary
           match_filename("sbt-update-full.txt", case_insensitive: true) => {
             kind: 'lockfile',
             parser: :parse_sbt_update_full
+          },
+          match_filename("maven-dependency-tree.txt", case_insensitive: true) => {
+            kind: 'lockfile',
+            parser: :parse_maven_tree
           }
         }
       end
@@ -148,6 +152,25 @@ module Bibliothecary
           .compact
           .uniq
       end
+      def self.parse_maven_tree(file_contents)
+        file_contents = file_contents.gsub(/\r\n?/, "\n")
+        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: parts[0..1].join(":"),
+            requirement: version,
+            type: type
+          }
+        end
+      end
 
       def self.parse_resolved_dep_line(line)
         dep_parts = line.strip.split(":")
@@ -201,7 +224,7 @@ module Bibliothecary
         return nil if field.nil?
 
         value = field.nodes.first
-        match = value.match(MAVEN_PROPERTY_REGEX)
+        match = value&.match(MAVEN_PROPERTY_REGEX)
         if match
           return extract_property(xml, match[1], value, parent_properties)
         else

data/lib/bibliothecary/parsers/nuget.rb

@@ -93,10 +93,16 @@ module Bibliothecary
 
       def self.parse_csproj(file_contents)
         manifest = Ox.parse file_contents
+
         packages = manifest.locate('ItemGroup/PackageReference').map do |dependency|
+          requirement = (dependency.Version if dependency.respond_to? "Version") || "*"
+          if requirement.is_a?(Ox::Element)
+            requirement = dependency.nodes.detect{ |n| n.value == "Version" }&.text
+          end
+
           {
             name: dependency.Include,
-            requirement: (dependency.Version if dependency.respond_to? "Version") || "*",
+            requirement: requirement,
             type: 'runtime'
           }
         end

data/lib/bibliothecary/version.rb

@@ -1,3 +1,3 @@
 module Bibliothecary
-  VERSION = "6.9.6"
+  VERSION = "6.10.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 6.9.6
+  version: 6.10.3
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-22 00:00:00.000000000 Z
+date: 2021-03-18 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.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Find and parse manifests