bibliothecary 6.9.4 → 6.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f57d8637d49aae8bd8f583109656fb0d350cfc158fc1361ed7402d3a6fba99e1
-  data.tar.gz: b85cb6e9c207463d3fa866c6ce5f9d2e6fd9f53db5da13ed1a7ef3d692bf8c63
+  metadata.gz: f69e23d022b216f39433b7628672b1ba5556815ba5df6d96718280e8728f53c8
+  data.tar.gz: 80e4095a6325c6b6589b1ce7be6fbe290b238522d81a45b7faceb462f5167a2c
 SHA512:
-  metadata.gz: 1a7983ac7b9dfb8b17bab91a9a30afce59dc4ae0b7c6c9259eadd2bd0dfb4354aa77a01193bd02737c4bf57c3b58ab2c7c2ad44c3106eef4a5a3e9a377a336fa
-  data.tar.gz: a824e5fb5bcba3393c4f75e26a79c63b75127419777b287a1e3870a659b1d35b345e40fb7a4e19a3cffbc98b72543eac0d27f9c3064f1006f6200d6e2f0be1e5
+  metadata.gz: 9c6f9d2e2fa68ead83476b974595eb4e6251cd27b8f72751e928e39607dd6184f74e0c5c367bd058a8772195c533b1f4c07d3b72c4fd4d8582464ebc5e38834b
+  data.tar.gz: ed8ab5fe2320cda2c4decddeaf0b4442169a91f8369e9ee1ca8fda56724aed8117613f2fbbd33503ec51d8288aa66844aa56c12ff4c2e15d90d37457efd8d423

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,16 @@ module Bibliothecary
           .compact
           .uniq
       end
+      def self.parse_maven_tree(file_contents)
+        captures = file_contents.scan(/\s([\w.-]+:[\w.-]+:[\w.-]+:[\w.-]+:[a-zA-Z]+)/).flatten.uniq
+        captures.map do |item|
+          {
+            name: item.split(":")[0..1].join(":"),
+            requirement: item.split(":")[3],
+            type: item.split(":")[-1]
+          }
+        end
+      end
 
       def self.parse_resolved_dep_line(line)
         dep_parts = line.strip.split(":")
@@ -197,7 +215,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

@@ -70,10 +70,12 @@ module Bibliothecary
         if frameworks.size > 0
           # we should really return multiple manifests, but bibliothecary doesn't
           # do that yet so at least pick deterministically.
-          frameworks[frameworks.keys.sort.last]
-        else
-          []
+
+          # Note, frameworks can be empty, so remove empty ones and then return the last sorted item if any
+          frameworks = frameworks.delete_if { |k, v| v.empty? }
+          return frameworks[frameworks.keys.sort.last] unless frameworks.empty?
         end
+        []
       end
 
       def self.parse_packages_config(file_contents)
@@ -91,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.4"
+  VERSION = "6.10.1"
 end

metadata

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