dependabot-composer 0.211.0 → 0.212.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c301c62f6399c3a6ea97dc5717affcf55b096ed8f5d2935b3dfa3ea8e41af0aa
-  data.tar.gz: fc7f3ae126218f328e08f7235b990000840229bfd330ec8572099ac935b68fa2
+  metadata.gz: d54231e2c281495a4b8c6c292612268409f32c987bdc18ee855801c53c9988ef
+  data.tar.gz: f2d4a3d1ffbee23ae2f91e2d391f4fd9491cde895df260ecaa39ac9b1ecf8611
 SHA512:
-  metadata.gz: '0929ebdc549da2359ee9af96eaacd7662ad6a0610eb9b8394afb27b2d549669f6d19d0beb5543429c9dc858cc4e7e9db40a769debb0637a3a9a99cd900ba9a51'
-  data.tar.gz: 97514843752544d2ae486a1d3f9613dce7b87423f934dd97a92dd1c682a5fc78cff373d805adc920408fa985d03b6155685286b2f5b2fcdf4f556514c3ce0df6
+  metadata.gz: 2a822c49151406db75f91190c6db1960709e35dc84459bf51122db466e200c5cbf70eaa23319e563f0d405759678b212f70784b7675418931f971f6e4f91d3fb
+  data.tar.gz: 8463be054bcec7b7619d2d4638a66c03946ed1c788ce5b42a647520b6c1b84dbdc77f705b901412d900f8d96305cbe63ce7b19642ed05be5dc1734540022c87c

data/lib/dependabot/composer/file_fetcher.rb

@@ -93,13 +93,13 @@ module Dependabot
       end
 
       def build_unfetchable_deps(unfetchable_deps)
-        unfetchable_deps.map do |path|
+        unfetchable_deps.filter_map do |path|
           PathDependencyBuilder.new(
             path: path,
             directory: directory,
             lockfile: composer_lock
           ).dependency_file
-        end.compact
+        end
       end
 
       def expand_path(path)

data/lib/dependabot/composer/file_updater/lockfile_updater.rb

@@ -185,8 +185,7 @@ module Dependabot
           # NOTE: This matches an error message from composer plugins used to install ACF PRO
           # https://github.com/PhilippBaschke/acf-pro-installer/blob/772cec99c6ef8bc67ba6768419014cc60d141b27/src/ACFProInstaller/Exceptions/MissingKeyException.php#L14
           # https://github.com/pivvenit/acf-pro-installer/blob/f2d4812839ee2c333709b0ad4c6c134e4c25fd6d/src/Exceptions/MissingKeyException.php#L25
-          if error.message.start_with?("Could not find a key for ACF PRO") ||
-             error.message.start_with?("Could not find a license key for ACF PRO")
+          if error.message.start_with?("Could not find a key for ACF PRO", "Could not find a license key for ACF PRO")
             raise MissingEnvironmentVariable, "ACF_PRO_KEY"
           end
 
@@ -213,8 +212,8 @@ module Dependabot
 
           # NOTE: This error is raised by composer v1
           if error.message.include?("Argument 1 passed to Composer")
-            msg = "One of your Composer plugins is not compatible with the "\
-                  "latest version of Composer. Please update Composer and "\
+            msg = "One of your Composer plugins is not compatible with the " \
+                  "latest version of Composer. Please update Composer and " \
                   "try running `composer update` to debug further."
             raise DependencyFileNotResolvable, msg
           end
@@ -456,8 +455,7 @@ module Dependabot
         def credentials_env
           credentials.
             select { |c| c.fetch("type") == "php_environment_variable" }.
-            map { |cred| [cred["env-key"], cred.fetch("env-value", "-")] }.
-            to_h
+            to_h { |cred| [cred["env-key"], cred.fetch("env-value", "-")] }
         end
 
         def git_credentials

data/lib/dependabot/composer/metadata_finder.rb

@@ -18,7 +18,7 @@ module Dependabot
       def source_from_dependency
         source_url =
           dependency.requirements.
-          map { |r| r.fetch(:source) }.compact.
+          filter_map { |r| r.fetch(:source) }.
           first&.fetch(:url, nil)
 
         Source.from_url(source_url)

data/lib/dependabot/composer/update_checker/latest_version_finder.rb

@@ -104,7 +104,7 @@ module Dependabot
 
           urls = repositories.
                  select { |h| h["type"] == "composer" }.
-                 map { |h| h["url"] }.compact.
+                 filter_map { |h| h["url"] }.
                  map { |url| url.gsub(%r{\/$}, "") + "/packages.json" }
 
           unless repositories.any? { |rep| rep["packagist.org"] == false }

data/lib/dependabot/composer/update_checker/version_resolver.rb

@@ -198,7 +198,6 @@ module Dependabot
         end
 
         # rubocop:disable Metrics/PerceivedComplexity
-        # rubocop:disable Metrics/AbcSize
         def updated_version_requirement_string
           lower_bound =
             if requirements_to_unlock == :none
@@ -207,7 +206,7 @@ module Dependabot
               ">= #{dependency.version}"
             else
               version_for_requirement =
-                dependency.requirements.map { |r| r[:requirement] }.compact.
+                dependency.requirements.filter_map { |r| r[:requirement] }.
                 reject { |req_string| req_string.start_with?("<") }.
                 select { |req_string| req_string.match?(VERSION_REGEX) }.
                 map { |req_string| req_string.match(VERSION_REGEX) }.
@@ -232,7 +231,6 @@ module Dependabot
 
           lower_bound + ", <= #{latest_allowable_version}"
         end
-        # rubocop:enable Metrics/AbcSize
         # rubocop:enable Metrics/PerceivedComplexity
 
         # TODO: Extract error handling and share between the lockfile updater
@@ -290,8 +288,8 @@ module Dependabot
             raise Dependabot::DependencyFileNotResolvable, error.message
           elsif error.message.include?("No driver found to handle VCS") &&
                 !error.message.include?("@") && !error.message.include?("://")
-            msg = "Dependabot detected a VCS requirement with a local path, "\
-                  "rather than a URL. Dependabot does not support this "\
+            msg = "Dependabot detected a VCS requirement with a local path, " \
+                  "rather than a URL. Dependabot does not support this " \
                   "setup.\n\nThe underlying error was:\n\n#{error.message}"
             raise Dependabot::DependencyFileNotResolvable, msg
           elsif error.message.include?("requirements could not be resolved")
@@ -317,7 +315,7 @@ module Dependabot
 
             source = url.gsub(%r{/packages.json$}, "")
             raise Dependabot::PrivateSourceTimedOut, source
-          elsif error.message.start_with?("Allowed memory size") || error.message.start_with?("Out of memory")
+          elsif error.message.start_with?("Allowed memory size", "Out of memory")
             raise Dependabot::OutOfMemory
           elsif error.error_context[:process_termsig] == Dependabot::SharedHelpers::SIGKILL
             # If the helper was SIGKILL-ed, assume the OOMKiller did it
@@ -337,8 +335,8 @@ module Dependabot
             # Package is not installed: stefandoorn/sitemap-plugin-1.0.0.0
             nil
           elsif error.message.include?("does not match the expected JSON schema")
-            msg = "Composer failed to parse your composer.json as it does not match the expected JSON schema.\n"\
-                  "Run `composer validate` to check your composer.json and composer.lock files.\n\n"\
+            msg = "Composer failed to parse your composer.json as it does not match the expected JSON schema.\n" \
+                  "Run `composer validate` to check your composer.json and composer.lock files.\n\n" \
                   "See https://getcomposer.org/doc/04-schema.md for details on the schema."
             raise Dependabot::DependencyFileNotParseable, msg
           else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-composer
 version: !ruby/object:Gem::Version
-  version: 0.211.0
+  version: 0.212.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-23 00:00:00.000000000 Z
+date: 2022-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-common
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.211.0
+        version: 0.212.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.211.0
+        version: 0.212.0
 - !ruby/object:Gem::Dependency
   name: debase
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.11.1
+        version: 3.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.11.1
+        version: 3.12.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.35.1
+        version: 1.36.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.35.1
+        version: 1.36.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.14.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.14.2
 - !ruby/object:Gem::Dependency
   name: ruby-debug-ide
   requirement: !ruby/object:Gem::Requirement