bibliothecary 6.9.5 → 6.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b4f1697f4fcbba2dcb21acb917705fa323f711cb9d8228b0bd4910ea629ba40
-  data.tar.gz: e25145a37b29d74198e51b73e4c00eeeb9b0b2b09adc365ac523714bc4d79055
+  metadata.gz: 4da554e866567459e3e2dea24812aa193288f913f7fd32bf2ccb65bb3d331106
+  data.tar.gz: 4125918d570e46d9076d11abff2f12e80168b9439b3a4c49c0c494367c089c52
 SHA512:
-  metadata.gz: b390db66abe4a3cc89a88574aafb202c5c8b94847a41eac5d0749360e9d1f61c96cd2e332a5a793e6f69fa0ee39ab8874581941ca083e9d6685c6237977122f3
-  data.tar.gz: 004ad44ccac55b16fb434a22b62785f57b7de51947f2ea29f314261a2e35659ecdd3a99e96f10fca90ac9821d62e9a148ad6442b1e8754f6c23aedc12318f643
+  metadata.gz: 39777e9b798d1b8acc1ca64c7148122e195539ed05aa960bdc9bd851b92c455ba0289a3b48820385d65c31b3b9b63ddf14060a80bc808f1ce676eebe64562a4b
+  data.tar.gz: 558180871bb9e340c0dd46239b82d976ff39884f56a8a7aedf483422c2182af1ea179c275387188c622a7dbc07a3fdb3d58a75a3e0aeacddea06f0bf13296643

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
@@ -126,11 +130,15 @@ module Bibliothecary
           # org.springframework.boot:spring-boot-starter-web:2.1.0.M3 (*)
           # Lines can end with (c), (n), or (*)
           # to indicate that something was a dependency constraint (c), not resolved (n), or resolved previously (*).
-          dep = line.split(split)[1].sub(/(\((c|n|\*)\))$/, "").strip.split(":")
+          dep = line.split(split)[1].sub(/(\((c|n|\*)\))$/, "").sub(" -> ", ":").strip.split(":")
+
+          # A testImplementation line can look like this so just skip those
+          # \--- org.springframework.security:spring-security-test (n)
+          next unless dep.length >= 3
+
           version = dep[-1]
-          version = version.split("->")[-1].strip if line.include?("->")
           {
-            name: dep[0, dep.length - 1].join(":"),
+            name: dep[0..1].join(":"),
             requirement: version,
             type: type
           }
@@ -144,6 +152,24 @@ module Bibliothecary
           .compact
           .uniq
       end
+      def self.parse_maven_tree(file_contents)
+        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(":")
@@ -197,7 +223,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.5"
+  VERSION = "6.10.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 6.9.5
+  version: 6.10.2
 platform: ruby
 authors:
 - Andrew Nesbitt
-autorequire:
+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
@@ -206,7 +206,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+description: 
 email:
 - andrewnez@gmail.com
 executables:
@@ -273,7 +273,7 @@ homepage: https://github.com/librariesio/bibliothecary
 licenses:
 - AGPL-3.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -288,8 +288,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: Find and parse manifests
 test_files: []