bibliothecary 6.9.7 → 6.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 127bb145341b9464e7c551a835ce172f3791a065081940de00e9cdddd5a16aec
-  data.tar.gz: 12db3fb6e30ee437182d56768428b51b0f7c3473bb818922fb1310865b3c4f40
+  metadata.gz: a0fe6cf7ec6515474ae77b8675dce1e61fc29d66a7f01603cbd3d47da401810f
+  data.tar.gz: cd9653505a89fe19e9524d980e845046c043e3d6147f9139a77f24f206ad5496
 SHA512:
-  metadata.gz: ba78060a9d3793cd2251181404d1d354b3e1c968c77b470201cdb5e94a1bc1a13f7c68d9b4ecc460c43f06550e3e9d433b3206569bf188d9acf1a1191e095c13
-  data.tar.gz: d8e20b2df9b305570f252cd1c403248e178c0a489b8180a10dbfc13a2a6e0e31af588508671c9c4286589c2e560d84b59a168c40e427ea3751433e0c4e9f8901
+  metadata.gz: c3260f87303449999f892cb1f7a860eed43755800310772f2e4a2a55676f54a3170e2099da31a373ab1a3be31640101f2a830e76556552e8e16dd857337a290e
+  data.tar.gz: 9d11c0d38c59222971e4515089f7a44e5e90379e9317d4176a54d6303131d8d30ff90ac23b069533f5b1556f11cf2bf5a9c53b867ebf5f088b44ea283d5f4c4b

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\.-]+:)+[\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: parts[0..1].join(":"),
+            requirement: version,
+            type: type
+          }
+        end
+      end
 
       def self.parse_resolved_dep_line(line)
         dep_parts = line.strip.split(":")

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.7"
+  VERSION = "6.10.4"
 end

metadata

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