dependabot-bundler 0.125.6 → 0.125.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73cfe00d7eb389074d1697dcc0cfaea0bbd28e438fa834141af2381c32e921d3
-  data.tar.gz: 4ebd666e3ba7ac455e4f5c229479b9420de823c94647194ecab5bf9fa2673b09
+  metadata.gz: b4e9a7b2435d88bf37b280feddb2462827ed9be53d5734e0dc1d51d8c779df1d
+  data.tar.gz: d42bbde21d53e8cf60e443becfe3b7330061e17615dc25c88c184892b7603fe3
 SHA512:
-  metadata.gz: 114fb1cbea39b86479a3f82c19c73c943f16c95949cc7728cfdb9d1c5101ef6b41e8f2dcac6f173623ddc02fea8b8fb69c3b26c0c3e4d6cc5715f0d89039e697
-  data.tar.gz: ec88632d3276a1d08180caf75d96f830300b31b278cc0e8ffdfa544197e2f2a8ae3e5bb5b8a8c7be0db0e37f4c7fdad5bc3f8a56afadf7ff019e16cf8d4a6df4
+  metadata.gz: f9fbedc6d0ed8a5bec7b0c0fb6fc381cd1ac4a26bc669b46467176df0e6f14a0bf46f5064aa277be7340fe4a83262528be5c74161003db11c54bfae1a7a2e3cc
+  data.tar.gz: 422c7ae17518aa3b2e57c6dba21725101adf7c42352b56219a410f62f6b0214c1f7ee7f2e2374acd0d15c4465b83e0bec2fb68b3686cf01396b82ee854092d88

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

@@ -235,7 +235,7 @@ module Dependabot
             return unless node.is_a?(Parser::AST::Node)
 
             if unnecessary_assignment?(node) &&
-               node.children.last&.location&.respond_to?(:heredoc_end)
+               node.children.last&.location.respond_to?(:heredoc_end)
               range_to_remove = node.loc.expression.join(
                 node.children.last.location.heredoc_end
               )

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

@@ -70,9 +70,9 @@ module Dependabot
                 args: {
                   gemfile_name: gemfile.name,
                   lockfile_name: lockfile.name,
-                  using_bundler_2: using_bundler_2?,
+                  using_bundler2: using_bundler2?,
                   dir: tmp_dir,
-                  credentials: relevant_credentials,
+                  credentials: credentials,
                   dependencies: dependencies.map(&:to_h)
                 }
               )
@@ -234,17 +234,6 @@ module Dependabot
         end
         # rubocop:enable Metrics/PerceivedComplexity
 
-        def relevant_credentials
-          credentials.
-            select { |cred| cred["password"] || cred["token"] }.
-            select do |cred|
-              next true if cred["type"] == "git_source"
-              next true if cred["type"] == "rubygems_server"
-
-              false
-            end
-        end
-
         def prepared_gemfile_content(file)
           content =
             GemfileUpdater.new(
@@ -307,7 +296,7 @@ module Dependabot
           dependency_files.select { |f| f.name.end_with?(".specification") }
         end
 
-        def using_bundler_2?
+        def using_bundler2?
           return unless lockfile
 
           lockfile.content.match?(/BUNDLED WITH\s+2/m)

data/lib/dependabot/bundler/metadata_finder.rb

@@ -117,7 +117,7 @@ module Dependabot
         end
       end
 
-      # Note: This response MUST NOT be unmarshalled
+      # NOTE: This response MUST NOT be unmarshalled
       # (as calling Marshal.load is unsafe)
       def rubygems_marshalled_gemspec_response
         return @rubygems_marshalled_gemspec_response if defined?(@rubygems_marshalled_gemspec_response)

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

@@ -35,9 +35,9 @@ module Dependabot
                 dir: tmp_dir,
                 dependency_name: dependency.name,
                 target_version: target_version,
-                credentials: relevant_credentials,
+                credentials: credentials,
                 lockfile_name: lockfile.name,
-                using_bundler_2: using_bundler_2?
+                using_bundler2: using_bundler2?
               }
             )
           end

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

@@ -50,10 +50,10 @@ module Dependabot
                 dir: tmp_dir,
                 dependency_name: dependency.name,
                 target_version: target_version,
-                credentials: relevant_credentials,
+                credentials: credentials,
                 gemfile_name: gemfile.name,
                 lockfile_name: lockfile.name,
-                using_bundler_2: using_bundler_2?,
+                using_bundler2: using_bundler2?,
                 update_multiple_dependencies: update_multiple_dependencies?
               }
             )
@@ -141,18 +141,7 @@ module Dependabot
           File.write(lockfile.name, sanitized_lockfile_body) if lockfile
         end
 
-        def relevant_credentials
-          credentials.
-            select { |cred| cred["password"] || cred["token"] }.
-            select do |cred|
-              next true if cred["type"] == "git_source"
-              next true if cred["type"] == "rubygems_server"
-
-              false
-            end
-        end
-
-        def using_bundler_2?
+        def using_bundler2?
           return unless lockfile
 
           lockfile.content.match?(/BUNDLED WITH\s+2/m)

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

@@ -169,8 +169,8 @@ module Dependabot
               args: {
                 dir: tmp_dir,
                 gemfile_name: gemfile.name,
-                credentials: relevant_credentials,
-                using_bundler_2: using_bundler_2?
+                credentials: credentials,
+                using_bundler2: using_bundler2?
               }
             )
             git_specs.reject do |spec|
@@ -193,8 +193,8 @@ module Dependabot
               args: {
                 dir: dir,
                 gemfile_name: gemfile.name,
-                credentials: relevant_credentials,
-                using_bundler_2: using_bundler_2?
+                credentials: credentials,
+                using_bundler2: using_bundler2?
               }
             )
           end
@@ -210,24 +210,11 @@ module Dependabot
           File.write(lockfile.name, sanitized_lockfile_body) if lockfile
         end
 
-        def relevant_credentials
-          [
-            *git_source_credentials,
-            *private_registry_credentials
-          ].select { |cred| cred["password"] || cred["token"] }
-        end
-
         def private_registry_credentials
           credentials.
             select { |cred| cred["type"] == "rubygems_server" }
         end
 
-        def git_source_credentials
-          credentials.
-            select { |cred| cred["password"] || cred["token"] }.
-            select { |cred| cred["type"] == "git_source" }
-        end
-
         def gemfile
           dependency_files.find { |f| f.name == "Gemfile" } ||
             dependency_files.find { |f| f.name == "gems.rb" }
@@ -244,7 +231,7 @@ module Dependabot
           lockfile.content.gsub(re, "")
         end
 
-        def using_bundler_2?
+        def using_bundler2?
           return unless lockfile
 
           lockfile.content.match?(/BUNDLED WITH\s+2/m)

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

@@ -83,7 +83,7 @@ module Dependabot
                   dependency_requirements: dependency.requirements,
                   gemfile_name: gemfile.name,
                   lockfile_name: lockfile&.name,
-                  using_bundler_2: using_bundler_2?,
+                  using_bundler2: using_bundler2?,
                   dir: tmp_dir,
                   credentials: credentials
                 }
@@ -213,7 +213,7 @@ module Dependabot
             dependency_files.find { |f| f.name == "gems.locked" }
         end
 
-        def using_bundler_2?
+        def using_bundler2?
           return unless lockfile
 
           lockfile.content.match?(/BUNDLED WITH\s+2/m)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-bundler
 version: !ruby/object:Gem::Version
-  version: 0.125.6
+  version: 0.125.7
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-27 00:00:00.000000000 Z
+date: 2020-11-30 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.125.6
+        version: 0.125.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.125.6
+        version: 0.125.7
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -100,28 +100,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.93.0
+        version: 1.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.93.0
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.20.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: simplecov-console
   requirement: !ruby/object:Gem::Requirement