bibliothecary 6.8.9 → 6.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c655fc14eb58f419b202c25b3b28d22f041c840ceda3d527aaf21b122d5663fe
-  data.tar.gz: 43b452b2ec6411d409aff5a479fd3d89d2bdf7eeb253b253b5a76849b8990b1a
+  metadata.gz: eddf54931d180a739e69e33150ff5b105994976ff9436eae7765a88d7a5d7169
+  data.tar.gz: 8f53292f1e7c7be586f9810dc723fb39dd145b8f436b6d82c6eb984cf7a726da
 SHA512:
-  metadata.gz: 921763c07b4ae50a14a905e5eed87a558631495500150ac732763a9456b081007b6e05dac4eabfec13f06ed3d3a6b38cdc30436e828204f389a627ab64fbc38b
-  data.tar.gz: daf4e977c0c46daec88c6e9cfc0dd41b0e4ce842266716bb40aa3da10effcd5d5ee291ca034f1509f8e0233bd4a6e08ed6ab00896f7cfe4dd66ca5bbe2a859d3
+  metadata.gz: bc54928770a24ef0214a11ca1cb9400875cf752ce28c907651cdc1ac879736e2e1c3860f71a5ebfda275d860dff4c495fcafb2f44cfd6c2b3f8f252b404dc7bc
+  data.tar.gz: 9886c713649ec7503b7106c91fb1b5242d898ccb1fbd65462494c4d80b56186f08b536fa321fba6658e4c7ba183d624cc974e20c29b7e4bd6ffd3e8c3756661d

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/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/parsers/pypi.rb

@@ -31,6 +31,14 @@ module Bibliothecary
           match_filename("Pipfile.lock") => {
             kind: 'lockfile',
             parser: :parse_pipfile_lock
+          },
+          match_filename("pyproject.toml") => {
+            kind: 'manifest',
+            parser: :parse_poetry
+          },
+          match_filename("poetry.lock") => {
+            kind: 'lockfile',
+            parser: :parse_poetry_lock
           }
         }
       end
@@ -40,6 +48,11 @@ module Bibliothecary
         map_dependencies(manifest['packages'], 'runtime') + map_dependencies(manifest['dev-packages'], 'develop')
       end
 
+      def self.parse_poetry(file_contents)
+        manifest = TomlRB.parse(file_contents)['tool']['poetry']
+        map_dependencies(manifest['dependencies'], 'runtime') + map_dependencies(manifest['dev-dependencies'], 'develop')
+      end
+
       def self.map_dependencies(packages, type)
         return [] unless packages
         packages.map do |name, info|
@@ -82,6 +95,27 @@ module Bibliothecary
         deps
       end
 
+      def self.parse_poetry_lock(file_contents)
+        manifest = TomlRB.parse(file_contents)
+        deps = []
+        manifest["package"].each do |package|
+          # next if group == "_meta"
+          group = case package['category']
+                  when 'main'
+                    'runtime'
+                  when 'dev'
+                    'develop'
+                  end
+
+          deps << {
+            name: package['name'],
+            requirement: map_requirements(package),
+            type: group
+          }
+        end
+        deps
+      end
+
       def self.parse_setup_py(manifest)
         match = manifest.match(INSTALL_REGEXP)
         return [] unless match

data/lib/bibliothecary/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 6.8.9
+  version: 6.9.3
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-16 00:00:00.000000000 Z
+date: 2020-11-24 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