bibliothecary 6.9.3 → 6.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eddf54931d180a739e69e33150ff5b105994976ff9436eae7765a88d7a5d7169
-  data.tar.gz: 8f53292f1e7c7be586f9810dc723fb39dd145b8f436b6d82c6eb984cf7a726da
+  metadata.gz: 103fbc1356cfb20fcf31abf8af5394c2edce750cb6dae48a8f58f43071c16498
+  data.tar.gz: 1a4c95071bd3c9b43b2a8a2ca969ce24ca8e616910b70ca324abb4763a881f74
 SHA512:
-  metadata.gz: bc54928770a24ef0214a11ca1cb9400875cf752ce28c907651cdc1ac879736e2e1c3860f71a5ebfda275d860dff4c495fcafb2f44cfd6c2b3f8f252b404dc7bc
-  data.tar.gz: 9886c713649ec7503b7106c91fb1b5242d898ccb1fbd65462494c4d80b56186f08b536fa321fba6658e4c7ba183d624cc974e20c29b7e4bd6ffd3e8c3756661d
+  metadata.gz: edfc0874faab4c9bdb4cb5e91aa01a291eede73eba388369dac1ea6a992db20e1767f1305d8bcc3d6019405c4bc8608e519c6ce67eaa52ddc481e60e7a53eb79
+  data.tar.gz: 0c366ea34c210a4f5ee8c8c7eb2154a8a6a1ecb103c248314a8f0af3b9cfa5d903d0f26d840733db9208e88db6b9509cc860d9b79a2f7f31283fecd368d1bfb0

data/lib/bibliothecary.rb

@@ -29,6 +29,10 @@ module Bibliothecary
     runner.load_file_info_list(path)
   end
 
+  def self.load_file_info_list_from_paths(paths)
+    runner.load_file_info_list_from_paths(paths)
+  end
+
   def self.analyse_file(file_path, contents)
     runner.analyse_file(file_path, contents)
   end
@@ -45,6 +49,10 @@ module Bibliothecary
     runner.find_manifests(path)
   end
 
+  def self.find_manifests_from_paths(paths)
+    runner.find_manifests_from_paths(paths)
+  end
+
   def self.ignored_dirs
     configuration.ignored_dirs
   end

data/lib/bibliothecary/parsers/maven.rb

@@ -126,11 +126,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
           }
@@ -197,7 +201,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/runner.rb

@@ -46,6 +46,19 @@ module Bibliothecary
       Bibliothecary::Parsers.constants.map{|c| Bibliothecary::Parsers.const_get(c) }.sort_by{|c| c.to_s.downcase }
     end
 
+    def load_file_info_list_from_paths(paths)
+      file_list = []
+      paths.each do |path|
+        info = FileInfo.new(nil, path)
+
+        next if ignored_files.include?(info.relative_path)
+
+        init_package_manager(info)
+        file_list.push(info)
+      end
+      file_list
+    end
+
     def load_file_info_list(path)
       file_list = []
       Find.find(path) do |subpath|
@@ -65,6 +78,10 @@ module Bibliothecary
       RelatedFilesInfo.create_from_file_infos(load_file_info_list(path).reject { |info| info.package_manager.nil? })
     end
 
+    def find_manifests_from_paths(paths)
+      RelatedFilesInfo.create_from_file_infos(load_file_info_list_from_paths(paths).reject { |info| info.package_manager.nil? })
+    end
+
     def analyse_file(file_path, contents)
       package_managers.select { |pm| pm.match?(file_path, contents) }.map do |pm|
         pm.analyse_contents(file_path, contents)

data/lib/bibliothecary/version.rb

@@ -1,3 +1,3 @@
 module Bibliothecary
-  VERSION = "6.9.3"
+  VERSION = "6.9.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 6.9.3
+  version: 6.9.8
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-24 00:00:00.000000000 Z
+date: 2021-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toml-rb