bibliothecary 6.12.3 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef4babc39a950bb7babd698d6b6de3022003aa6e6e112a0065d9b104adfcef13
-  data.tar.gz: 55fdb8f2a96a88d1d4810baccd74a5a0e0a753e91d68594325952610ade584c2
+  metadata.gz: 74f493b85e3dec08ab0c8aad09b9beb59eee3b8dc5317d6b9f20c6c5620298eb
+  data.tar.gz: 1f1dd61989f87a10974e205862e3a01c7808bdad072dcca2f74193d1c731c9ec
 SHA512:
-  metadata.gz: ad94c2c9e51aadbe003721deaf0d853269f04ff2730319256910283f15dd49517b9b4178747796d2c1c7bd4442c55d9ff411f95641a77d6fc6fed2e4c0f87bf8
-  data.tar.gz: 0220eeddcae84c0f2a6d7c0cb34bab3fdcd517a1da3c6e266913b6bc9729b285283dbe3cb771766b8efcee4f024320181ea42d7265b4e436ba3d261f8e42f203
+  metadata.gz: '02351483c4000b031662de8ed48459c74d8d533b9676ba3968060e01cca50fcf5ede59982d8e6237d6ddf8395fa0b5172c87eb13a7d849e866236c88fec20150'
+  data.tar.gz: b437fe17ca779bc99a6d78753936726ae102c75ef7e2583ae6544320aa5b65ba53e16e644035c5eaa445cd2bc6fe2fa695856b6e518c5d3fbad389f33c0419ae

data/bibliothecary.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "toml-rb", "~> 1.0"
+  spec.add_dependency "tomlrb", "~> 2.0"
   spec.add_dependency "librariesio-gem-parser"
   spec.add_dependency "ox", ">= 2.8.1"
   spec.add_dependency "typhoeus"

data/lib/bibliothecary/parsers/cargo.rb

@@ -1,5 +1,3 @@
-require 'toml-rb'
-
 module Bibliothecary
   module Parsers
     class Cargo
@@ -19,7 +17,7 @@ module Bibliothecary
       end
 
       def self.parse_manifest(file_contents)
-        manifest = TomlRB.parse(file_contents)
+        manifest = Tomlrb.parse(file_contents)
         manifest.fetch('dependencies', []).map do |name, requirement|
           if requirement.respond_to?(:fetch)
             requirement = requirement['version'] or next
@@ -34,7 +32,7 @@ module Bibliothecary
       end
 
       def self.parse_lockfile(file_contents)
-        manifest = TomlRB.parse(file_contents)
+        manifest = Tomlrb.parse(file_contents)
         manifest.fetch('package',[]).map do |dependency|
           next if not dependency['source'] or not dependency['source'].start_with?('registry+')
           {

data/lib/bibliothecary/parsers/go.rb

@@ -106,12 +106,12 @@ module Bibliothecary
       end
 
       def self.parse_dep_toml(file_contents)
-        manifest = TomlRB.parse file_contents
+        manifest = Tomlrb.parse file_contents
         map_dependencies(manifest, 'constraint', 'name', 'version', 'runtime')
       end
 
       def self.parse_dep_lockfile(file_contents)
-        manifest = TomlRB.parse file_contents
+        manifest = Tomlrb.parse file_contents
         map_dependencies(manifest, 'projects', 'name', 'revision', 'runtime')
       end
 

data/lib/bibliothecary/parsers/maven.rb

@@ -152,10 +152,12 @@ module Bibliothecary
           .compact
           .uniq
       end
+
       def self.parse_maven_tree(file_contents)
         file_contents = file_contents.gsub(/\r\n?/, "\n")
         captures = file_contents.scan(/^\[INFO\](?:(?:\+-)|\||(?:\\-)|\s)+((?:[\w\.-]+:)+[\w\.\-${}]+)/).flatten.uniq
-        captures.map do |item|
+
+        deps = captures.map do |item|
           parts = item.split(":")
           case parts.count
           when 4
@@ -170,6 +172,10 @@ module Bibliothecary
             type: type
           }
         end
+
+        # First dep line will be the package itself (unless we're only analyzing a single line)
+        package = deps[0]
+        deps.size < 2 ? deps : deps[1..-1].reject { |d| d[:name] == package[:name] && d[:requirement] == package[:requirement] }
       end
 
       def self.parse_resolved_dep_line(line)

data/lib/bibliothecary/parsers/packagist.rb

@@ -24,14 +24,18 @@ module Bibliothecary
           {
             name: dependency["name"],
             requirement: dependency["version"],
-            type: 'runtime'
-          }
+            type: "runtime"
+          }.tap do |result|
+            result[:drupal_requirement] = dependency.dig("source", "reference") if is_drupal_module(dependency)
+          end
         end + manifest.fetch('packages-dev',[]).map do |dependency|
           {
             name: dependency["name"],
             requirement: dependency["version"],
-            type: 'development'
-          }
+            type: "development"
+          }.tap do |result|
+            result[:drupal_requirement] = dependency.dig("source", "reference") if is_drupal_module(dependency)
+          end
         end
       end
 
@@ -40,6 +44,17 @@ module Bibliothecary
         map_dependencies(manifest, 'require', 'runtime') +
         map_dependencies(manifest, 'require-dev', 'development')
       end
+
+      # Drupal hosts its own Composer repository, where its "modules" are indexed and searchable. The best way to
+      # confirm that Drupal's repo is being used is if its in the "repositories" in composer.json
+      # (https://support.acquia.com/hc/en-us/articles/360048081273-Using-Composer-to-manage-dependencies-in-Drupal-8-and-9),
+      # but you may only have composer.lock, so we test if the type is "drupal-*" (e.g. "drupal-module" or "drupal-theme")
+      # The Drupal team also setup its own mapper of Composer semver -> Drupal tool-specfic versions
+      # (https://www.drupal.org/project/project_composer/issues/2622450),
+      # so we return the Drupal requirement instead of semver requirement if it's here.
+      private_class_method def self.is_drupal_module(dependency)
+        dependency["type"] =~ /drupal/ && dependency.dig("source", "reference")
+      end
     end
   end
 end

data/lib/bibliothecary/parsers/pypi.rb

@@ -61,12 +61,12 @@ module Bibliothecary
       end
 
       def self.parse_pipfile(file_contents)
-        manifest = TomlRB.parse(file_contents)
+        manifest = Tomlrb.parse(file_contents)
         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']
+        manifest = Tomlrb.parse(file_contents)['tool']['poetry']
         map_dependencies(manifest['dependencies'], 'runtime') + map_dependencies(manifest['dev-dependencies'], 'develop')
       end
 
@@ -124,7 +124,7 @@ module Bibliothecary
       end
 
       def self.parse_poetry_lock(file_contents)
-        manifest = TomlRB.parse(file_contents)
+        manifest = Tomlrb.parse(file_contents)
         deps = []
         manifest["package"].each do |package|
           # next if group == "_meta"

data/lib/bibliothecary/version.rb

@@ -1,3 +1,3 @@
 module Bibliothecary
-  VERSION = "6.12.3"
+  VERSION = "7.1.0"
 end

data/lib/bibliothecary.rb

@@ -6,6 +6,7 @@ require "bibliothecary/exceptions"
 require "bibliothecary/file_info"
 require "bibliothecary/related_files_info"
 require "find"
+require "tomlrb"
 
 Dir[File.expand_path('../bibliothecary/parsers/*.rb', __FILE__)].each do |file|
   require file

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 6.12.3
+  version: 7.1.0
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-04 00:00:00.000000000 Z
+date: 2021-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: toml-rb
+  name: tomlrb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: librariesio-gem-parser
   requirement: !ruby/object:Gem::Requirement