dependabot-bundler 0.94.1 → 0.94.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f0c8f6a10b2b3e4bf17ad90a2f6cd50040da936993b26afbf2cd288eb2d10b4
-  data.tar.gz: f84f6719c571a92f6c17dbbe4a93ab1012e41c7ace937a55abb39f6c3183a7ff
+  metadata.gz: 711f14915dc46523c62673e09ab4d1ab598d47949cc5c2a560c106414e60f177
+  data.tar.gz: 8a233b08d1526114c86563c813381931edb096c08b9d579d9b1c7a933354d865
 SHA512:
-  metadata.gz: 53d923db69877dfd4cf342414e7e98506e9456a51491f15c6e428b22d85169802ac8b8901e797743536df08125a415bd473d4173cbdeedee50098e2eec2608ce
-  data.tar.gz: 44534dada40456e9c4841d2ea08d94e38629f0fcf51283c52c798fa2a4d56aecf6971f3f3050c7d44108bc08a98feb82f67ab708c353567744136af75358aacb
+  metadata.gz: 226fc556559a0cb7f9a3b2e0c917f1a652e81768998f2be972751f1591cc34c1d98136d72da6b6263bf09184d5d45444f20091b6fc07338ebd74356e57177165
+  data.tar.gz: ef29e124269c0e354906a7479215b2bf1f87984e3062b6694e8855053d467e5153a1df817100182decb65213e7c9564088aafb4f9d32b9ccf87a4e01824c35ab

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

@@ -2,9 +2,9 @@
 
 require "bundler"
 
-require "bundler_definition_ruby_version_patch"
-require "bundler_definition_bundler_version_patch"
-require "bundler_git_source_patch"
+require "dependabot/monkey_patches/bundler/definition_ruby_version_patch"
+require "dependabot/monkey_patches/bundler/definition_bundler_version_patch"
+require "dependabot/monkey_patches/bundler/git_source_patch"
 
 require "dependabot/shared_helpers"
 require "dependabot/errors"

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require "bundler_definition_ruby_version_patch"
-require "bundler_definition_bundler_version_patch"
-require "bundler_git_source_patch"
+require "dependabot/monkey_patches/bundler/definition_ruby_version_patch"
+require "dependabot/monkey_patches/bundler/definition_bundler_version_patch"
+require "dependabot/monkey_patches/bundler/git_source_patch"
 
 require "dependabot/bundler/update_checker"
 require "dependabot/bundler/update_checker/requirements_updater"

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require "bundler_definition_ruby_version_patch"
-require "bundler_definition_bundler_version_patch"
-require "bundler_git_source_patch"
+require "dependabot/monkey_patches/bundler/definition_ruby_version_patch"
+require "dependabot/monkey_patches/bundler/definition_bundler_version_patch"
+require "dependabot/monkey_patches/bundler/git_source_patch"
 
 require "excon"
 

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require "bundler_definition_ruby_version_patch"
-require "bundler_definition_bundler_version_patch"
-require "bundler_git_source_patch"
+require "dependabot/monkey_patches/bundler/definition_ruby_version_patch"
+require "dependabot/monkey_patches/bundler/definition_bundler_version_patch"
+require "dependabot/monkey_patches/bundler/git_source_patch"
 
 require "excon"
 

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require "bundler_definition_ruby_version_patch"
-require "bundler_definition_bundler_version_patch"
-require "bundler_git_source_patch"
+require "dependabot/monkey_patches/bundler/definition_ruby_version_patch"
+require "dependabot/monkey_patches/bundler/definition_bundler_version_patch"
+require "dependabot/monkey_patches/bundler/git_source_patch"
 
 require "excon"
 

data/lib/dependabot/monkey_patches/bundler/definition_bundler_version_patch.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require "bundler/definition"
+
+# Ignore the Bundler version specified in the Gemfile (since the only Bundler
+# version available to us is the one we're using).
+module Bundler
+  class Definition
+    def expanded_dependencies
+      @expanded_dependencies ||=
+        expand_dependencies(dependencies + metadata_dependencies, @remote).
+        reject { |d| d.name == "bundler" }
+    end
+  end
+end

data/lib/dependabot/monkey_patches/bundler/definition_ruby_version_patch.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module BundlerDefinitionRubyVersionPatch
+  def index
+    @index ||= super.tap do
+      if ruby_version
+        requested_version = ruby_version.to_gem_version_with_patchlevel
+        sources.metadata_source.specs <<
+          Gem::Specification.new("ruby\0", requested_version)
+      end
+    end
+  end
+end
+Bundler::Definition.prepend(BundlerDefinitionRubyVersionPatch)

data/lib/dependabot/monkey_patches/bundler/git_source_patch.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Bundler
+  class Source
+    class Git
+      class GitProxy
+        private
+
+        # Bundler allows ssh authentication when talking to GitHub but there's
+        # no way for Dependabot to do so (it doesn't have any ssh keys).
+        # Instead, we convert all `git@github.com:` URLs to use HTTPS.
+        def configured_uri_for(uri)
+          uri = uri.gsub(/git@(.*?):/, 'https://\1/')
+          if uri.match?(/https?:/)
+            remote = URI(uri)
+            config_auth =
+              Bundler.settings[remote.to_s] || Bundler.settings[remote.host]
+            remote.userinfo ||= config_auth
+            remote.to_s
+          else
+            uri
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-bundler
 version: !ruby/object:Gem::Version
-  version: 0.94.1
+  version: 0.94.2
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-01 00:00:00.000000000 Z
+date: 2019-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.94.1
+        version: 0.94.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.94.1
+        version: 0.94.2
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -174,6 +174,9 @@ files:
 - lib/dependabot/bundler/update_checker/shared_bundler_helpers.rb
 - lib/dependabot/bundler/update_checker/version_resolver.rb
 - lib/dependabot/bundler/version.rb
+- lib/dependabot/monkey_patches/bundler/definition_bundler_version_patch.rb
+- lib/dependabot/monkey_patches/bundler/definition_ruby_version_patch.rb
+- lib/dependabot/monkey_patches/bundler/git_source_patch.rb
 homepage: https://github.com/dependabot/dependabot-core
 licenses:
 - Nonstandard