bibliothecary 7.1.0 → 7.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74f493b85e3dec08ab0c8aad09b9beb59eee3b8dc5317d6b9f20c6c5620298eb
-  data.tar.gz: 1f1dd61989f87a10974e205862e3a01c7808bdad072dcca2f74193d1c731c9ec
+  metadata.gz: e99bd64be33f917579aeca0ce4d27a1290328020516f2bf2328f3bc82273da99
+  data.tar.gz: 3c431e57230c9d20ba3e66e4e5e9b72def9ba81ad8707f47166be5d9e993a751
 SHA512:
-  metadata.gz: '02351483c4000b031662de8ed48459c74d8d533b9676ba3968060e01cca50fcf5ede59982d8e6237d6ddf8395fa0b5172c87eb13a7d849e866236c88fec20150'
-  data.tar.gz: b437fe17ca779bc99a6d78753936726ae102c75ef7e2583ae6544320aa5b65ba53e16e644035c5eaa445cd2bc6fe2fa695856b6e518c5d3fbad389f33c0419ae
+  metadata.gz: 722b6cad2fa9b84111fa97a5f925e6fb3967489bac80747e11ab1c6ac22cfec6a4fdeefa6e17ad9e926860e429322e1e1f182bfc88ea69a4778cfc0717d9de70
+  data.tar.gz: 0e92b678afe3f81ad3593f6feaa7e4357a4bda19e1ec4720a8f513c69261b87eb2916950b556ab645913432496b1153f8db7a44f3945baaa6e2154a0109fdd01

data/lib/bibliothecary/parsers/packagist.rb

@@ -26,7 +26,8 @@ module Bibliothecary
             requirement: dependency["version"],
             type: "runtime"
           }.tap do |result|
-            result[:drupal_requirement] = dependency.dig("source", "reference") if is_drupal_module(dependency)
+            # 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|
           {
@@ -34,7 +35,8 @@ module Bibliothecary
             requirement: dependency["version"],
             type: "development"
           }.tap do |result|
-            result[:drupal_requirement] = dependency.dig("source", "reference") if is_drupal_module(dependency)
+            # 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
@@ -51,7 +53,8 @@ module Bibliothecary
       # 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.
+      # 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

data/lib/bibliothecary/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 7.1.0
+  version: 7.1.1
 platform: ruby
 authors:
 - Andrew Nesbitt