bibliothecary 6.9.2 → 6.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3778cb5e39ff53dd380c730271d2c834242776a0536b3bfd480d9b82143745c
-  data.tar.gz: ef099f4e867aaf12bce84b09192ac1b4b0c7a1cd7fcbe578717435df22fab643
+  metadata.gz: 127bb145341b9464e7c551a835ce172f3791a065081940de00e9cdddd5a16aec
+  data.tar.gz: 12db3fb6e30ee437182d56768428b51b0f7c3473bb818922fb1310865b3c4f40
 SHA512:
-  metadata.gz: 908961fc7d4b816951c79cef1610dc5976a75e7d18f344a7d08c0495e2b72ed68be4e7e642946bd764b551b11427f6b259f23dd36ee565ab0fde1122cb0bbbb2
-  data.tar.gz: 97f3090baea9dbe5f614fd607ecbbf15305e5480ca28670fb735b2e81cdb0fc87834bafeac425e14db2061a5fb3a03d0e17af27a8305a03fdcf4bb9b5bbda263
+  metadata.gz: ba78060a9d3793cd2251181404d1d354b3e1c968c77b470201cdb5e94a1bc1a13f7c68d9b4ecc460c43f06550e3e9d433b3206569bf188d9acf1a1191e095c13
+  data.tar.gz: d8e20b2df9b305570f252cd1c403248e178c0a489b8180a10dbfc13a2a6e0e31af588508671c9c4286589c2e560d84b59a168c40e427ea3751433e0c4e9f8901

data/.ruby-version

@@ -1 +1 @@
-2.6.6
+2.7.1

data/README.md

@@ -140,6 +140,7 @@ All available config options are in: https://github.com/librariesio/bibliothecar
   - Gopkg.lock
   - go.mod
   - go.sum
+  - go-resolved-dependencies.json
 - Elm
   - elm-package.json
   - elm_dependencies.json

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/go.rb

@@ -57,7 +57,11 @@ module Bibliothecary
           match_filename("Gopkg.lock") => {
             kind: 'lockfile',
             parser: :parse_dep_lockfile
-          }
+          },
+          match_filename("go-resolved-dependencies.json") => {
+            kind: 'lockfile',
+            parser: :parse_go_resolved
+          },
         }
       end
 
@@ -140,6 +144,12 @@ module Bibliothecary
         deps.uniq
       end
 
+      def self.parse_go_resolved(file_contents)
+        JSON.parse(file_contents)
+          .select { |dep| dep["Main"] != "true" }
+          .map { |dep| { name: dep["Path"], requirement: dep["Version"], type: 'runtime' } }
+      end
+
       def self.map_dependencies(manifest, attr_name, dep_attr_name, version_attr_name, type)
         manifest.fetch(attr_name,[]).map do |dependency|
           {

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)

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 6.9.2
+  version: 6.9.7
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-06 00:00:00.000000000 Z
+date: 2021-01-29 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.0.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Find and parse manifests