dependabot-bundler 0.185.0 → 0.187.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 149703a633283283d90f697876543e96944f656162a6011d8e583f4fdc3f86c8
-  data.tar.gz: d3cc9b9a84e614a943a33fbdc92d403ed61b3941d5485a26b186b647b97a90aa
+  metadata.gz: 74e210cda55ec43731c1a8c58b679f806566cd3ab793251c5cf54be52e2e41bc
+  data.tar.gz: e162e75ef3bac5bee2b04edd81d201ead66050c210c383876863bbb065688f17
 SHA512:
-  metadata.gz: 6c2e823978b05cf242308ba15a22470eceb7d777aba00700f3108adbe1ef4bce66a495c937e05dccf929494e53425bb2b5b4155eddd0ce5a95c84e35b60265b8
-  data.tar.gz: b97fb4091560f8bbcfe627bb8aa72421c66a1739313e8b334ced53d7d7b2204f44f2463a97b2f1c000695a09de230e65e5691cc8e36296d72891fb0213a2862e
+  metadata.gz: 5f7d707de1a8dde237bf6b98eabcf442b0e14540e33633b172f7317e6de354d61fd4ad36d49437bbe27fc31da3bd25e0079d8c5fae7b4df896eadc43d3a49a57
+  data.tar.gz: 58d71fe67588f3e17a5b6afa6e975320a6bd4c70f52c3706698c3a5aa275bc07ffad536fa1646995d8592afb4a40f3e28e3f63dbfd1112a39eba29612f8cca5d

data/helpers/v1/lib/functions/file_parser.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "uri"
+
 module Functions
   class FileParser
     def initialize(lockfile_name:)
@@ -73,7 +75,12 @@ module Functions
       return true if source.nil?
       return false unless source.is_a?(Bundler::Source::Rubygems)
 
-      source.remotes.any? { |r| r.to_s.include?("rubygems.org") }
+      source.remotes.any? do |r|
+        [
+          "rubygems.org",
+          "www.rubygems.org"
+        ].include?(URI(r.to_s).host)
+      end
     end
 
     def serialize_bundler_dependency(dependency)

data/helpers/v2/build

@@ -22,6 +22,6 @@ cd "$install_dir"
 
 # NOTE: Sets `BUNDLED WITH` to match the installed v2 version in Gemfile.lock
 # forcing specs and native helpers to run with the same version
-BUNDLER_VERSION=2.3.12 bundle config --local path ".bundle"
-BUNDLER_VERSION=2.3.12 bundle config --local without "test"
-BUNDLER_VERSION=2.3.12 bundle install
+BUNDLER_VERSION=2.3.13 bundle config --local path ".bundle"
+BUNDLER_VERSION=2.3.13 bundle config --local without "test"
+BUNDLER_VERSION=2.3.13 bundle install

data/helpers/v2/lib/functions/file_parser.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "uri"
+
 module Functions
   class FileParser
     def initialize(lockfile_name:)
@@ -74,7 +76,12 @@ module Functions
       return true if source.nil?
       return false unless source.is_a?(Bundler::Source::Rubygems)
 
-      source.remotes.any? { |r| r.to_s.include?("rubygems.org") }
+      source.remotes.any? do |r|
+        [
+          "rubygems.org",
+          "www.rubygems.org"
+        ].include?(URI(r.to_s).host)
+      end
     end
 
     def serialize_bundler_dependency(dependency)

data/helpers/v2/spec/native_spec_helper.rb

@@ -21,10 +21,6 @@ RSpec.configure do |config|
   config.raise_errors_for_deprecations!
 end
 
-# Duplicated in lib/dependabot/bundler/file_updater/lockfile_updater.rb
-# TODO: Stop sanitizing the lockfile once we have bundler 2 installed
-LOCKFILE_ENDING = /(?<ending>\s*(?:RUBY VERSION|BUNDLED WITH).*)/m.freeze
-
 def project_dependency_files(project)
   project_path = File.expand_path(File.join("../../spec/fixtures/projects/bundler2", project))
 
@@ -36,7 +32,6 @@ def project_dependency_files(project)
     files = files.select { |f| File.file?(f) }
     files.map do |filename|
       content = File.read(filename)
-      content = content.gsub(LOCKFILE_ENDING, "") if filename == "Gemfile.lock"
       {
         name: filename,
         content: content

data/lib/dependabot/bundler/helpers.rb

@@ -4,7 +4,7 @@ module Dependabot
   module Bundler
     module Helpers
       V1 = "1.17.3"
-      V2 = "2.3.12"
+      V2 = "2.3.13"
       # If we are updating a project with no Gemfile.lock, we default to the
       # newest version we support
       DEFAULT = V2

data/lib/dependabot/bundler/update_checker/shared_bundler_helpers.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "excon"
+require "uri"
 
 require "dependabot/bundler/update_checker"
 require "dependabot/bundler/native_helpers"
@@ -143,7 +144,10 @@ module Dependabot
             regex = BundlerErrorPatterns::HTTP_ERR_REGEX
             if error.message.match?(regex)
               source = error.message.match(regex)[:source]
-              raise if source.end_with?("rubygems.org/")
+              raise if [
+                "rubygems.org",
+                "www.rubygems.org"
+              ].include?(URI(source).host)
 
               raise Dependabot::PrivateSourceTimedOut, source
             end
@@ -213,7 +217,7 @@ module Dependabot
             File.write(path, file.content)
           end
 
-          File.write(lockfile.name, sanitized_lockfile_body) if lockfile
+          File.write(lockfile.name, lockfile.content) if lockfile
         end
 
         def private_registry_credentials
@@ -230,12 +234,6 @@ module Dependabot
           dependency_files.find { |f| f.name == "Gemfile.lock" } ||
             dependency_files.find { |f| f.name == "gems.locked" }
         end
-
-        # TODO: Stop sanitizing the lockfile once we have bundler 2 installed
-        def sanitized_lockfile_body
-          re = FileUpdater::LockfileUpdater::LOCKFILE_ENDING
-          lockfile.content.gsub(re, "")
-        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-bundler
 version: !ruby/object:Gem::Version
-  version: 0.185.0
+  version: 0.187.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-09 00:00:00.000000000 Z
+date: 2022-05-13 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.185.0
+        version: 0.187.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.185.0
+        version: 0.187.0
 - !ruby/object:Gem::Dependency
   name: debase
   requirement: !ruby/object:Gem::Requirement