bibliothecary 6.9.0 → 6.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7ca2bc28f1c3a196e4720cfdac9666f17e6d5ec10ce27f8456a457c1f53c515
-  data.tar.gz: c615681be7d7e01dd4b3c41a29801f427e4f29c596f409350edb0b2ff5732e25
+  metadata.gz: 7b4f1697f4fcbba2dcb21acb917705fa323f711cb9d8228b0bd4910ea629ba40
+  data.tar.gz: e25145a37b29d74198e51b73e4c00eeeb9b0b2b09adc365ac523714bc4d79055
 SHA512:
-  metadata.gz: 9b263efaf273fb07ba8d4aec80dd04862c07bd82da0e53654d140826a7294a277bcdedb74d8cee9fe0592ec9374dc05fcb1d8d6f17e31612dc2f6c7fa60aab31
-  data.tar.gz: 116f2f45ebd796f1fdb505d87be5be6cfdb2e71694769e65e633e751d0d46e1ea1de41a0744ae095141244bebb901524f9baf9dd2c5c925b8c469b5b08e216b8
+  metadata.gz: b390db66abe4a3cc89a88574aafb202c5c8b94847a41eac5d0749360e9d1f61c96cd2e332a5a793e6f69fa0ee39ab8874581941ca083e9d6685c6237977122f3
+  data.tar.gz: 004ad44ccac55b16fb434a22b62785f57b7de51947f2ea29f314261a2e35659ecdd3a99e96f10fca90ac9821d62e9a148ad6442b1e8754f6c23aedc12318f643

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

@@ -124,8 +124,9 @@ module Bibliothecary
           split = gradle_dep_match.captures[0]
 
           # org.springframework.boot:spring-boot-starter-web:2.1.0.M3 (*)
-          # Lines can end with (n) or (*) to indicate that something was not resolved (n) or resolved previously (*).
-          dep = line.split(split)[1].sub(/\(n\)$/, "").sub(/\(\*\)$/,"").strip.split(":")
+          # 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(":")
           version = dep[-1]
           version = version.split("->")[-1].strip if line.include?("->")
           {
@@ -228,7 +229,7 @@ module Bibliothecary
         # the xml root is <project> so lookup the non property name in the xml
         # this converts ${project/group.id} -> ${group/id}
         non_prop_name = property_name.gsub(".", "/").gsub("project/", "")
-        return value if !xml.respond_to?("properties") && parent_properties.empty? && !xml.locate(non_prop_name)
+        return "${#{property_name}}" if !xml.respond_to?("properties") && parent_properties.empty? && xml.locate(non_prop_name).empty?
 
         prop_field = xml.properties.locate(property_name).first
         parent_prop = parent_properties[property_name]

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 6.9.0
+  version: 6.9.5
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-08 00:00:00.000000000 Z
+date: 2021-01-22 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