bibliothecary 6.8.10 → 6.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e741631279743ce1c101374e150651f3e234754a303b988c4c01a14e8ac384e
-  data.tar.gz: 7cd1e774a59ae18e9810340b2da990d973d05c26e0fe1cc0778ffbec9cdb8d24
+  metadata.gz: f57d8637d49aae8bd8f583109656fb0d350cfc158fc1361ed7402d3a6fba99e1
+  data.tar.gz: b85cb6e9c207463d3fa866c6ce5f9d2e6fd9f53db5da13ed1a7ef3d692bf8c63
 SHA512:
-  metadata.gz: 3a17720851d21d2f9289e9342a750d535c38b55cc4e1c58202855b557d7d52e46adcc768b0f629d6f4ff8104a7b954760a6f966fe48e1bee610efa28645f2cbe
-  data.tar.gz: e11348d1eaf3b9fa87e50ad20c307845e5ece4b51cc09b032dd392927e986ade478a2d5c46b71b94ec005ca4048bedc927389dad5790b4f609aa62749d04547b
+  metadata.gz: 1a7983ac7b9dfb8b17bab91a9a30afce59dc4ae0b7c6c9259eadd2bd0dfb4354aa77a01193bd02737c4bf57c3b58ab2c7c2ad44c3106eef4a5a3e9a377a336fa
+  data.tar.gz: a824e5fb5bcba3393c4f75e26a79c63b75127419777b287a1e3870a659b1d35b345e40fb7a4e19a3cffbc98b72543eac0d27f9c3064f1006f6200d6e2f0be1e5

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

@@ -70,6 +70,7 @@ module Bibliothecary
           {
             name: dep[:name],
             requirement: dep[:version],
+            lockfile_requirement: dep[:requirement],
             type: dep[:type]
           }
         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.8.10"
+  VERSION = "6.9.4"
 end

metadata

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