Revert "Merge pull request #3196 from dependabot/feelepxyz/bundler2-s…

…pike" This reverts commit a0dd603, reversing changes made to c93e297.
dependabot · Mar 3, 2021 · b8ec905 · b8ec905
1 parent f79afa7
commit b8ec905
Show file tree

Hide file tree

Showing 30 changed files with 65 additions and 203 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -194,7 +194,7 @@ ENV DEPENDABOT_NATIVE_HELPERS_PATH="/opt" \
 RUN bash /opt/terraform/helpers/build /opt/terraform && \
   bash /opt/python/helpers/build /opt/python && \
   bash /opt/dep/helpers/build /opt/dep && \
-  bash /opt/bundler/helpers/v1/build /opt/bundler/v1 && \
+  bash /opt/bundler/helpers/build /opt/bundler && \
   bash /opt/go_modules/helpers/build /opt/go_modules && \
   bash /opt/npm_and_yarn/helpers/build /opt/npm_and_yarn && \
   bash /opt/hex/helpers/build /opt/hex && \

diff --git a/bundler/helpers/v1/build → bundler/helpers/build b/bundler/helpers/v1/build → bundler/helpers/build
@@ -8,20 +8,11 @@ if [ -z "$install_dir" ]; then
   exit 1
 fi
 
-if [ ! -d "$install_dir" ]; then
-  mkdir -p "$install_dir"
-fi
-
 helpers_dir="$(dirname "${BASH_SOURCE[0]}")"
 cp -r \
   "$helpers_dir/lib" \
   "$helpers_dir/monkey_patches" \
   "$helpers_dir/run.rb" \
-  "$helpers_dir/Gemfile" \
   "$install_dir"
 
 cd "$install_dir"
-
-# NOTE: Sets `BUNDLED WITH` to match the installed v1 version in Gemfile.lock
-# forcing specs and native helpers to run with the same version
-BUNDLER_VERSION=1 bundle install
diff --git a/bundler/helpers/v1/lib/functions.rb → bundler/helpers/lib/functions.rb b/bundler/helpers/v1/lib/functions.rb → bundler/helpers/lib/functions.rb
diff --git a/...ctions/conflicting_dependency_resolver.rb → ...ctions/conflicting_dependency_resolver.rb b/...ctions/conflicting_dependency_resolver.rb → ...ctions/conflicting_dependency_resolver.rb
diff --git a/...ers/v1/lib/functions/dependency_source.rb → ...elpers/lib/functions/dependency_source.rb b/...ers/v1/lib/functions/dependency_source.rb → ...elpers/lib/functions/dependency_source.rb
diff --git a/...r/helpers/v1/lib/functions/file_parser.rb → bundler/helpers/lib/functions/file_parser.rb b/...r/helpers/v1/lib/functions/file_parser.rb → bundler/helpers/lib/functions/file_parser.rb
diff --git a/...helpers/v1/lib/functions/force_updater.rb → ...er/helpers/lib/functions/force_updater.rb b/...helpers/v1/lib/functions/force_updater.rb → ...er/helpers/lib/functions/force_updater.rb
diff --git a/...pers/v1/lib/functions/lockfile_updater.rb → ...helpers/lib/functions/lockfile_updater.rb b/...pers/v1/lib/functions/lockfile_updater.rb → ...helpers/lib/functions/lockfile_updater.rb
diff --git a/...pers/v1/lib/functions/version_resolver.rb → ...helpers/lib/functions/version_resolver.rb b/...pers/v1/lib/functions/version_resolver.rb → ...helpers/lib/functions/version_resolver.rb
diff --git a/...tches/definition_bundler_version_patch.rb → ...tches/definition_bundler_version_patch.rb b/...tches/definition_bundler_version_patch.rb → ...tches/definition_bundler_version_patch.rb
diff --git a/..._patches/definition_ruby_version_patch.rb → ..._patches/definition_ruby_version_patch.rb b/..._patches/definition_ruby_version_patch.rb → ..._patches/definition_ruby_version_patch.rb
diff --git a/...ers/v1/monkey_patches/git_source_patch.rb → ...elpers/monkey_patches/git_source_patch.rb b/...ers/v1/monkey_patches/git_source_patch.rb → ...elpers/monkey_patches/git_source_patch.rb
diff --git a/bundler/helpers/v1/run.rb → bundler/helpers/run.rb b/bundler/helpers/v1/run.rb → bundler/helpers/run.rb
diff --git a/bundler/helpers/v1/.gitignore b/bundler/helpers/v1/.gitignore
diff --git a/bundler/helpers/v1/Gemfile b/bundler/helpers/v1/Gemfile
diff --git a/bundler/lib/dependabot/bundler/file_parser.rb b/bundler/lib/dependabot/bundler/file_parser.rb
@@ -5,7 +5,6 @@
 require "dependabot/file_parsers/base"
 require "dependabot/bundler/file_updater/lockfile_updater"
 require "dependabot/bundler/native_helpers"
-require "dependabot/bundler/helpers"
 require "dependabot/bundler/version"
 require "dependabot/shared_helpers"
 require "dependabot/errors"
@@ -130,8 +129,8 @@ def parsed_gemfile
                                                       repo_contents_path) do
             write_temporary_dependency_files
 
-            NativeHelpers.run_bundler_subprocess(
-              bundler_version: bundler_version,
+            SharedHelpers.run_helper_subprocess(
+              command: NativeHelpers.helper_path,
               function: "parsed_gemfile",
               args: {
                 gemfile_name: gemfile.name,
@@ -160,8 +159,8 @@ def parsed_gemspec(file)
                                                       repo_contents_path) do
             write_temporary_dependency_files
 
-            NativeHelpers.run_bundler_subprocess(
-              bundler_version: bundler_version,
+            SharedHelpers.run_helper_subprocess(
+              command: NativeHelpers.helper_path,
               function: "parsed_gemspec",
               args: {
                 gemspec_name: file.name,
@@ -299,10 +298,6 @@ def imported_ruby_files
           select { |f| f.name.end_with?(".rb") }.
           reject { |f| f.name == "gems.rb" }
       end
-
-      def bundler_version
-        @bundler_version ||= Helpers.bundler_version(lockfile)
-      end
     end
   end
 end

diff --git a/bundler/lib/dependabot/bundler/file_updater.rb b/bundler/lib/dependabot/bundler/file_updater.rb
@@ -3,7 +3,6 @@
 require "dependabot/file_updaters"
 require "dependabot/file_updaters/base"
 require "dependabot/bundler/native_helpers"
-require "dependabot/bundler/helpers"
 require "dependabot/file_updaters/vendor_updater"
 
 module Dependabot
@@ -76,8 +75,8 @@ def vendor_cache_dir
         return @vendor_cache_dir if defined?(@vendor_cache_dir)
 
         @vendor_cache_dir =
-          NativeHelpers.run_bundler_subprocess(
-            bundler_version: bundler_version,
+          SharedHelpers.run_helper_subprocess(
+            command: NativeHelpers.helper_path,
             function: "vendor_cache_dir",
             args: {
               dir: repo_contents_path
@@ -160,10 +159,6 @@ def top_level_gemspecs
           select { |file| file.name.end_with?(".gemspec") }.
           reject(&:support_file?)
       end
-
-      def bundler_version
-        @bundler_version ||= Helpers.bundler_version(lockfile)
-      end
     end
   end
 end

diff --git a/bundler/lib/dependabot/bundler/file_updater/lockfile_updater.rb b/bundler/lib/dependabot/bundler/file_updater/lockfile_updater.rb
@@ -6,7 +6,6 @@
 require "dependabot/errors"
 require "dependabot/bundler/file_updater"
 require "dependabot/bundler/native_helpers"
-require "dependabot/bundler/helpers"
 
 module Dependabot
   module Bundler
@@ -65,8 +64,8 @@ def build_updated_lockfile
             ) do |tmp_dir|
               write_temporary_dependency_files
 
-              NativeHelpers.run_bundler_subprocess(
-                bundler_version: bundler_version,
+              SharedHelpers.run_helper_subprocess(
+                command: NativeHelpers.helper_path,
                 function: "update_lockfile",
                 args: {
                   gemfile_name: gemfile.name,
@@ -302,10 +301,6 @@ def using_bundler2?
 
           lockfile.content.match?(/BUNDLED WITH\s+2/m)
         end
-
-        def bundler_version
-          @bundler_version ||= Helpers.bundler_version(lockfile)
-        end
       end
     end
   end

diff --git a/bundler/lib/dependabot/bundler/helpers.rb b/bundler/lib/dependabot/bundler/helpers.rb
diff --git a/bundler/lib/dependabot/bundler/native_helpers.rb b/bundler/lib/dependabot/bundler/native_helpers.rb
@@ -1,39 +1,10 @@
 # frozen_string_literal: true
 
-require "dependabot/shared_helpers"
-
 module Dependabot
   module Bundler
     module NativeHelpers
-      def self.run_bundler_subprocess(function:, args:, bundler_version:)
-        SharedHelpers.run_helper_subprocess(
-          command: helper_path(bundler_version: bundler_version),
-          function: function,
-          args: args,
-          env: {
-            # Bundler will pick the matching installed major version
-            "BUNDLER_VERSION" => bundler_version,
-            # Force bundler to use the helper Gemfile that has been bundled with
-            # v1, otherwise it will point to core's bundler/Gemfile which will
-            # be bundled with v2 once it's installed
-            "BUNDLE_GEMFILE" => File.join(versioned_helper_path(bundler_version: bundler_version), "Gemfile"),
-            # Unset ruby env set by running dependabot-core with bundle exec,
-            # forcing bundler to reset them from helpers/v1
-            "RUBYLIB" => nil,
-            "RUBYOPT" => nil,
-            "GEM_PATH" => nil,
-            "GEM_HOME" => nil
-          }
-        )
-      end
-
-      def self.versioned_helper_path(bundler_version:)
-        native_helper_version = "v#{bundler_version}"
-        File.join(native_helpers_root, native_helper_version)
-      end
-
-      def self.helper_path(bundler_version:)
-        "bundle exec ruby #{File.join(versioned_helper_path(bundler_version: bundler_version), 'run.rb')}"
+      def self.helper_path
+        "bundle exec ruby #{File.join(native_helpers_root, 'run.rb')}"
       end
 
       def self.native_helpers_root

diff --git a/bundler/lib/dependabot/bundler/update_checker/conflicting_dependency_resolver.rb b/bundler/lib/dependabot/bundler/update_checker/conflicting_dependency_resolver.rb
@@ -2,7 +2,6 @@
 
 require "dependabot/bundler/update_checker"
 require "dependabot/bundler/native_helpers"
-require "dependabot/bundler/helpers"
 require "dependabot/shared_helpers"
 
 module Dependabot
@@ -29,8 +28,8 @@ def initialize(dependency_files:, repo_contents_path:, credentials:)
         #   * requirement [String] the requirement on the target_dependency
         def conflicting_dependencies(dependency:, target_version:)
           in_a_native_bundler_context(error_handling: false) do |tmp_dir|
-            NativeHelpers.run_bundler_subprocess(
-              bundler_version: bundler_version,
+            SharedHelpers.run_helper_subprocess(
+              command: NativeHelpers.helper_path,
               function: "conflicting_dependencies",
               args: {
                 dir: tmp_dir,
@@ -43,12 +42,6 @@ def conflicting_dependencies(dependency:, target_version:)
             )
           end
         end
-
-        private
-
-        def bundler_version
-          @bundler_version ||= Helpers.bundler_version(lockfile)
-        end
       end
     end
   end

diff --git a/bundler/lib/dependabot/bundler/update_checker/force_updater.rb b/bundler/lib/dependabot/bundler/update_checker/force_updater.rb
@@ -3,7 +3,6 @@
 require "dependabot/bundler/file_parser"
 require "dependabot/bundler/file_updater/lockfile_updater"
 require "dependabot/bundler/native_helpers"
-require "dependabot/bundler/helpers"
 require "dependabot/bundler/update_checker"
 require "dependabot/bundler/update_checker/requirements_updater"
 require "dependabot/errors"
@@ -44,8 +43,8 @@ def update_multiple_dependencies?
 
         def force_update
           in_a_native_bundler_context(error_handling: false) do |tmp_dir|
-            updated_deps, specs = NativeHelpers.run_bundler_subprocess(
-              bundler_version: bundler_version,
+            updated_deps, specs = SharedHelpers.run_helper_subprocess(
+              command: NativeHelpers.helper_path,
               function: "force_update",
               args: {
                 dir: tmp_dir,
@@ -147,10 +146,6 @@ def using_bundler2?
 
           lockfile.content.match?(/BUNDLED WITH\s+2/m)
         end
-
-        def bundler_version
-          @bundler_version ||= Helpers.bundler_version(lockfile)
-        end
       end
     end
   end

diff --git a/bundler/lib/dependabot/bundler/update_checker/latest_version_finder/dependency_source.rb b/bundler/lib/dependabot/bundler/update_checker/latest_version_finder/dependency_source.rb
@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require "dependabot/bundler/native_helpers"
-require "dependabot/bundler/helpers"
-
 module Dependabot
   module Bundler
     class UpdateChecker
@@ -56,8 +53,8 @@ def latest_git_version_details
 
             SharedHelpers.with_git_configured(credentials: credentials) do
               in_a_native_bundler_context do |tmp_dir|
-                NativeHelpers.run_bundler_subprocess(
-                  bundler_version: bundler_version,
+                SharedHelpers.run_helper_subprocess(
+                  command: NativeHelpers.helper_path,
                   function: "depencency_source_latest_git_version",
                   args: {
                     dir: tmp_dir,
@@ -101,8 +98,8 @@ def dependency_rubygems_uri
           def private_registry_versions
             @private_registry_versions ||=
               in_a_native_bundler_context do |tmp_dir|
-                NativeHelpers.run_bundler_subprocess(
-                  bundler_version: bundler_version,
+                SharedHelpers.run_helper_subprocess(
+                  command: NativeHelpers.helper_path,
                   function: "private_registry_versions",
                   args: {
                     dir: tmp_dir,
@@ -121,8 +118,8 @@ def source_type
             return @source_type = RUBYGEMS unless gemfile
 
             @source_type = in_a_native_bundler_context do |tmp_dir|
-              NativeHelpers.run_bundler_subprocess(
-                bundler_version: bundler_version,
+              SharedHelpers.run_helper_subprocess(
+                command: NativeHelpers.helper_path,
                 function: "dependency_source_type",
                 args: {
                   dir: tmp_dir,
@@ -138,15 +135,6 @@ def gemfile
             dependency_files.find { |f| f.name == "Gemfile" } ||
               dependency_files.find { |f| f.name == "gems.rb" }
           end
-
-          def lockfile
-            dependency_files.find { |f| f.name == "Gemfile.lock" } ||
-              dependency_files.find { |f| f.name == "gems.locked" }
-          end
-
-          def bundler_version
-            @bundler_version ||= Helpers.bundler_version(lockfile)
-          end
         end
       end
     end

diff --git a/bundler/lib/dependabot/bundler/update_checker/shared_bundler_helpers.rb b/bundler/lib/dependabot/bundler/update_checker/shared_bundler_helpers.rb
@@ -4,7 +4,6 @@
 
 require "dependabot/bundler/update_checker"
 require "dependabot/bundler/native_helpers"
-require "dependabot/bundler/helpers"
 require "dependabot/shared_helpers"
 require "dependabot/errors"
 
@@ -164,8 +163,8 @@ def handle_bundler_errors(error)
 
         def inaccessible_git_dependencies
           in_a_native_bundler_context(error_handling: false) do |tmp_dir|
-            git_specs = NativeHelpers.run_bundler_subprocess(
-              bundler_version: bundler_version,
+            git_specs = SharedHelpers.run_helper_subprocess(
+              command: NativeHelpers.helper_path,
               function: "git_specs",
               args: {
                 dir: tmp_dir,
@@ -188,8 +187,8 @@ def inaccessible_git_dependencies
 
         def jfrog_source
           in_a_native_bundler_context(error_handling: false) do |dir|
-            NativeHelpers.run_bundler_subprocess(
-              bundler_version: bundler_version,
+            SharedHelpers.run_helper_subprocess(
+              command: NativeHelpers.helper_path,
               function: "jfrog_source",
               args: {
                 dir: dir,
@@ -237,10 +236,6 @@ def using_bundler2?
 
           lockfile.content.match?(/BUNDLED WITH\s+2/m)
         end
-
-        def bundler_version
-          @bundler_version ||= Helpers.bundler_version(lockfile)
-        end
       end
     end
   end