bibliothecary 6.8.8 → 6.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a942d8a210e009f17a359b9ead9049423c091d9609d6d1770eb79fc47fb16d6
-  data.tar.gz: bd1f6a3f7d3652981ee46002fe3466480c9bf9d08c7dc1dbd5bffab3698e21a0
+  metadata.gz: b3778cb5e39ff53dd380c730271d2c834242776a0536b3bfd480d9b82143745c
+  data.tar.gz: ef099f4e867aaf12bce84b09192ac1b4b0c7a1cd7fcbe578717435df22fab643
 SHA512:
-  metadata.gz: af583cc0c0dea0e280a3b28c30a9bbda9413331e76d1bfd0eba6908d209b43893cd2677acdb6113d498833514b0656cd57a0014f4949a48d1d276a629838acba
-  data.tar.gz: e8f49049133561c3fdfeb48d692736e407457943f19668251f75c5db93fae1276540754e7f0a6b0986f80f303e81a7df72ecb1dbf03c48f05d81b0e1f2057922
+  metadata.gz: 908961fc7d4b816951c79cef1610dc5976a75e7d18f344a7d08c0495e2b72ed68be4e7e642946bd764b551b11427f6b259f23dd36ee565ab0fde1122cb0bbbb2
+  data.tar.gz: 97f3090baea9dbe5f614fd607ecbbf15305e5480ca28670fb735b2e81cdb0fc87834bafeac425e14db2061a5fb3a03d0e17af27a8305a03fdcf4bb9b5bbda263

data/lib/bibliothecary/parsers/maven.rb

@@ -15,6 +15,21 @@ module Bibliothecary
       MAVEN_PROPERTY_REGEX = /\$\{(.+?)\}/
       MAX_DEPTH = 5
 
+      # e.g. "[info]  test:"
+      SBT_TYPE_REGEX = /^\[info\]\s+([-\w]+):$/
+
+      # e.g. "[info]  org.typelevel:spire-util_2.12"
+      SBT_DEP_REGEX = /^\[info\]\s+(.+)$/
+
+      # e.g. "[info] 		- 1.7.5"
+      SBT_VERSION_REGEX = /^\[info\]\s+-\s+(.+)$/
+
+      # e.g. "[info] 			homepage: http://www.slf4j.org"
+      SBT_FIELD_REGEX = /^\[info\]\s+([^:]+):\s+(.+)$/
+
+      # e.g. "[info]  "
+      SBT_IGNORE_REGEX = /^\[info\]\s*$/
+
       def self.mapping
         {
           match_filename("ivy.xml", case_insensitive: true) => {
@@ -41,6 +56,10 @@ module Bibliothecary
           match_filename("maven-resolved-dependencies.txt", case_insensitive: true) => {
             kind: 'lockfile',
             parser: :parse_maven_resolved
+          },
+          match_filename("sbt-update-full.txt", case_insensitive: true) => {
+            kind: 'lockfile',
+            parser: :parse_sbt_update_full
           }
         }
       end
@@ -105,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?("->")
           {
@@ -209,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]
@@ -227,6 +247,103 @@ module Bibliothecary
           xml.locate("parent/#{non_prop_name}").first.nodes.first
         end
       end
+
+      def self.parse_sbt_update_full(file_contents)
+        all_deps = []
+        type = nil
+        lines = file_contents.split("\n")
+        while lines.any?
+          line = lines.shift
+
+          type_match = SBT_TYPE_REGEX.match(line)
+          next unless type_match
+          type = type_match.captures[0]
+
+          deps = parse_sbt_deps(type, lines)
+          all_deps.concat(deps)
+        end
+
+        # strip out evicted dependencies
+        all_deps.select! do |dep|
+          dep[:fields]["evicted"] != "true"
+        end
+
+        # in the future, we could use "callers" in the fields to
+        # decide which deps are direct root deps and which are
+        # pulled in by another dep.  The direct deps have the sbt
+        # project name as a caller.
+
+        # clean out any duplicates (I'm pretty sure sbt will have done this for
+        # us so this is paranoia, basically)
+        squished = all_deps.compact.uniq {|item| [item[:name], item[:requirement], item[:type]]}
+
+        # get rid of the fields
+        squished.each do |dep|
+          dep.delete(:fields)
+        end
+
+        return squished
+      end
+
+      def self.parse_sbt_deps(type, lines)
+        deps = []
+        while lines.any? and not SBT_TYPE_REGEX.match(lines[0])
+          line = lines.shift
+
+          next if SBT_IGNORE_REGEX.match(line)
+
+          dep_match = SBT_DEP_REGEX.match(line)
+          if dep_match
+            versions = parse_sbt_versions(type, dep_match.captures[0], lines)
+            deps.concat(versions)
+          else
+            lines.unshift(line)
+            break
+          end
+        end
+
+        deps
+      end
+
+      def self.parse_sbt_versions(type, name, lines)
+        versions = []
+        while lines.any? and not SBT_TYPE_REGEX.match(lines[0])
+          line = lines.shift
+
+          version_match = SBT_VERSION_REGEX.match(line)
+          if version_match
+            versions.push(parse_sbt_version(type, name, version_match.captures[0], lines))
+          else
+            lines.unshift(line)
+            break
+          end
+        end
+
+        versions
+      end
+
+      def self.parse_sbt_version(type, name, version, lines)
+        fields = {}
+        while lines.any? and not SBT_TYPE_REGEX.match(lines[0])
+          line = lines.shift
+
+          field_match = SBT_FIELD_REGEX.match(line)
+          if field_match
+            fields[field_match.captures[0]] = field_match.captures[1]
+          else
+            lines.unshift(line)
+            break
+          end
+        end
+
+        {
+          name: name,
+          requirement: version,
+          type: type,
+          # we post-process using some of these fields and then delete them again
+          fields: fields
+        }
+      end
     end
   end
 end

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.8"
+  VERSION = "6.9.2"
 end

metadata

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