bibliothecary 6.9.1 → 6.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c5d41a3a8c73b6836a0cfaface97b412a72de93d0656bd1b81fa55c3059cafc
-  data.tar.gz: f2b1b0004f91c259e11c339df4680e8f24688b792e44fd943d340309373006b8
+  metadata.gz: 2d401e2ee48b3c9ea14b1ced4582ca501b5215bfd32283cbfa22ea6a3a013285
+  data.tar.gz: 28872324cf699eea26ac419cec67fba683bc75be6b335943471a82854b762109
 SHA512:
-  metadata.gz: 5065fcc1955f4143f6a6e3a5d25f4f84ac44b1d6cf9b9c1733b3a009ab396ec45a4748a6777d2d5e6be5640d971878fceaa474c72abe41e14e73a41b693f666d
-  data.tar.gz: 48720bf216d9893a970480bb2961b5c33aeae8fecaf17c261d6b4322e54b7c9e8f7fa86977e42ce83746655bb3b9f3098bc0674589a2455260ccd13087f182c2
+  metadata.gz: dbe0b6dd4065ea9fadf9c2458988fde20d7198d1142dca84460191704e2a7e61e1f9e6d96bd088424fcc5386be6e2b6b9dae479f40bebd03f328d6c623e02140
+  data.tar.gz: 189db2576879293749a94eba6dbcef993e822e0d3fc26ac5e7b8d6de405ac7eb2ae6e513166428197bc6e6f0e718a6bd810d66f24f21cc60bf2ff2f3c25ac82a

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,12 +124,17 @@ 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|\*)\))$/, "").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
           }

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.1"
+  VERSION = "6.9.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 6.9.1
+  version: 6.9.6
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-20 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.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Find and parse manifests