bibliothecary 7.0.0 → 7.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 527bb093daab817755bf4f5a3d35b1aa831f292f9fe8112ddf6a917b368239ac
-  data.tar.gz: 37ffb251371c1aed5465e15e933dd41921f341ff4794da004d8678cda695cd25
+  metadata.gz: e99bd64be33f917579aeca0ce4d27a1290328020516f2bf2328f3bc82273da99
+  data.tar.gz: 3c431e57230c9d20ba3e66e4e5e9b72def9ba81ad8707f47166be5d9e993a751
 SHA512:
-  metadata.gz: 6f67cfe62ca501f2ad8064e3fff37593e929d20d8210d619a57e88a887f4fc981081fb1cdc09e9e8b5ab582d22eb46e760b6f53456e9ecfb179a744a7c6b1d91
-  data.tar.gz: 407398a4772816f145da883104d5a21516117fd8e544ecaff3e0dd438c26a02f8a17bc766e2c51a602ac72008c6954e16ee9478db2f80700d3ac47ebb6182858
+  metadata.gz: 722b6cad2fa9b84111fa97a5f925e6fb3967489bac80747e11ab1c6ac22cfec6a4fdeefa6e17ad9e926860e429322e1e1f182bfc88ea69a4778cfc0717d9de70
+  data.tar.gz: 0e92b678afe3f81ad3593f6feaa7e4357a4bda19e1ec4720a8f513c69261b87eb2916950b556ab645913432496b1153f8db7a44f3945baaa6e2154a0109fdd01

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,20 @@ module Bibliothecary
           {
             name: dependency["name"],
             requirement: dependency["version"],
-            type: 'runtime'
-          }
+            type: "runtime"
+          }.tap do |result|
+            # Store Drupal version if Drupal, but include the original manifest version for reference
+            result[:original_requirement], result[:requirement] = result[: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|
+            # Store Drupal version if Drupal, but include the original manifest version for reference
+            result[:original_requirement], result[:requirement] = result[:requirement], dependency.dig("source", "reference") if is_drupal_module(dependency)
+          end
         end
       end
 
@@ -40,6 +46,18 @@ 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
+      # (https://www.drupal.org/docs/develop/using-composer/using-composer-to-install-drupal-and-manage-dependencies#s-about-semantic-versioning)
+      private_class_method def self.is_drupal_module(dependency)
+        dependency["type"] =~ /drupal/ && dependency.dig("source", "reference")
+      end
     end
   end
 end

data/lib/bibliothecary/version.rb

@@ -1,3 +1,3 @@
 module Bibliothecary
-  VERSION = "7.0.0"
+  VERSION = "7.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.1.1
 platform: ruby
 authors:
 - Andrew Nesbitt
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-17 00:00:00.000000000 Z
+date: 2021-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tomlrb
@@ -206,7 +206,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+description: 
 email:
 - andrewnez@gmail.com
 executables:
@@ -274,7 +274,7 @@ homepage: https://github.com/librariesio/bibliothecary
 licenses:
 - AGPL-3.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -289,8 +289,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
-signing_key:
+rubygems_version: 3.1.2
+signing_key: 
 specification_version: 4
 summary: Find and parse manifests
 test_files: []