dependabot-bundler 0.238.0 → 0.240.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15ed934b702f4aa5f9486243fa05fb5ff8f25b228a94b28087f496adad2094df
-  data.tar.gz: e608d86d64de0763edaa50de472dc8769b7edc796c119b1272674d789c428e77
+  metadata.gz: 184ec98271bdffb96143021278e853d243203749d328629cc92d42fa59ad0b7f
+  data.tar.gz: 1558b1c82b65090f3e452ca8fa109d4a7215914daca83df59f6e1e4155debe16
 SHA512:
-  metadata.gz: 772fb2392a262c2c9db7bdbe3ecd6a8e817cc863796e015141497ed9ae43ac4d4cd0e98eb7c245000422eb07c11b3d92a76ca34630f3216190b79dc2d669d524
-  data.tar.gz: 2cc4dc6fb2ff3a3c464a438ab0e4088e3660acdde352e5821d7609446d6f2ad539b1c4149bd98c683e669e5b0e8f8b6e7d2ff453bf5febfbc3ed415819cbe3e1
+  metadata.gz: b0135ab1575dd7348396524cfd2db5dd0a7d9aa9ff5e8ca0c5e2a16167deaecc4f4f548d9bc32c57dade64c72a02c774cbe61f60d696c8887a6acdae9de7d66d
+  data.tar.gz: 8cbe26699f6046cf6de8d6df572d679d6cccfdfbcf23b209aceefa02a734d2d22776afc2c61d3facad121cda3139cb9bdbbcc3564838cc1eacac1ef47d45fee3

data/helpers/v1/Gemfile

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gem "dependabot-common", path: "../../../common"
+
+gemspec path: "../.."

data/helpers/v1/build

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
@@ -24,18 +24,5 @@ export GEM_HOME=$install_dir/.bundle
 gem install bundler -v 1.17.3 --no-document
 
 if [ -z "$DEPENDABOT_NATIVE_HELPERS_PATH" ]; then
-  # NOTE: For native helper specs, Bundler 2 happily reuses test gems installed
-  # by the main spec suite, because Bundler automatically searches for Gemfiles
-  # in parent directories, so we don't need any extra install for native helper
-  # specs.
-  #
-  # However, Bundler 1 installs gems to a slightly different folder structure by
-  # default, so we need to make sure to explicit install test gems with Bundler
-  # 1 so that they can be found by Bundler 1. In addition to that, Bundler 1 is
-  # very picky about the `BUNDLED WITH` section in the lockfile, which has been
-  # generated with Bundler 2 for the main spec suite. So we also need to delete
-  # the previously generated lockfile first, so that it has the format Bundler 1
-  # likes.
-  rm -f ../../Gemfile.lock
   BUNDLER_VERSION=1.17.3 bundle install
 fi

data/helpers/v1/run.rb

@@ -1,4 +1,4 @@
-# typed: true
+# typed: strict
 # frozen_string_literal: true
 
 gem "bundler", "~> 1.17"
@@ -22,19 +22,15 @@ require "resolver_spec_group_sane_eql"
 
 require "functions"
 
-def output(obj)
-  print JSON.dump(obj)
-end
-
 begin
   request = JSON.parse($stdin.read)
 
   function = request["function"]
   args = request["args"].transform_keys(&:to_sym)
 
-  output({ result: Functions.send(function, **args) })
+  print JSON.dump({ result: Functions.send(function, **args) })
 rescue StandardError => e
-  output(
+  print JSON.dump(
     { error: e.message, error_class: e.class, trace: e.backtrace }
   )
   exit(1)

data/helpers/v2/Gemfile

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gem "dependabot-common", path: "../../../common"
+
+gemspec path: "../.."

data/helpers/v2/build

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
@@ -24,3 +24,7 @@ default_version=$(ruby -rbundler -e'print Bundler::VERSION')
 export GEM_HOME=$install_dir/.bundle
 
 gem install bundler -v "$default_version" --no-document
+
+if [ -z "$DEPENDABOT_NATIVE_HELPERS_PATH" ]; then
+  bundle install
+fi

data/helpers/v2/spec/shared_contexts.rb

@@ -27,17 +27,7 @@ RSpec.shared_context "in a temporary bundler directory" do
   end
 end
 
-RSpec.shared_context "without caching rubygems" do
-  before do
-    # Stub Bundler to stop it using a cached versions of Rubygems
-    allow_any_instance_of(Bundler::CompactIndexClient::Updater)
-      .to receive(:etag_for).and_return("")
-  end
-end
-
 RSpec.shared_context "stub rubygems compact index" do
-  include_context "without caching rubygems"
-
   before do
     # Stub the Rubygems index
     stub_request(:get, "https://index.rubygems.org/versions")

data/lib/dependabot/bundler/file_fetcher.rb

@@ -47,15 +47,7 @@ module Dependabot
         fetched_files += path_gemspecs
         fetched_files += require_relative_files(fetched_files)
 
-        fetched_files = uniq_files(fetched_files)
-
-        check_required_files_present
-
-        unless self.class.required_files_in?(fetched_files.map(&:name))
-          raise "Invalid set of files: #{fetched_files.map(&:name)}"
-        end
-
-        fetched_files
+        uniq_files(fetched_files)
       end
 
       private
@@ -66,14 +58,6 @@ module Dependabot
                       .reject { |f| uniq_files.map(&:name).include?(f.name) }
       end
 
-      def check_required_files_present
-        return if gemfile || gemspecs.any?
-
-        path = Pathname.new(File.join(directory, "Gemfile"))
-                       .cleanpath.to_path
-        raise Dependabot::DependencyFileNotFound, path
-      end
-
       def gemfile
         return @gemfile if defined?(@gemfile)
 

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

@@ -12,7 +12,7 @@ module Dependabot
         class RubyVersionNotFound < StandardError; end
 
         RUBY_VERSIONS = %w(
-          1.8.7 1.9.3 2.0.0 2.1.10 2.2.10 2.3.8 2.4.10 2.5.9 2.6.9 2.7.6 3.0.6 3.1.4 3.2.2
+          1.8.7 1.9.3 2.0.0 2.1.10 2.2.10 2.3.8 2.4.10 2.5.9 2.6.9 2.7.6 3.0.6 3.1.4 3.2.2 3.3.0
         ).freeze
 
         attr_reader :gemspec

data/lib/dependabot/bundler/requirement.rb

@@ -1,14 +1,20 @@
 # typed: true
 # frozen_string_literal: true
 
+require "sorbet-runtime"
+
+require "dependabot/requirement"
 require "dependabot/utils"
 
 module Dependabot
   module Bundler
-    class Requirement < Gem::Requirement
+    class Requirement < Dependabot::Requirement
+      extend T::Sig
+
       # For consistency with other languages, we define a requirements array.
       # Ruby doesn't have an `OR` separator for requirements, so it always
       # contains a single element.
+      sig { override.params(requirement_string: T.nilable(String)).returns(T::Array[Requirement]) }
       def self.requirements_array(requirement_string)
         [new(requirement_string)]
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-bundler
 version: !ruby/object:Gem::Version
-  version: 0.238.0
+  version: 0.240.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-07 00:00:00.000000000 Z
+date: 2024-01-12 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.238.0
+        version: 0.240.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.238.0
+        version: 0.240.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.57.2
+        version: 1.58.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.57.2
+        version: 1.58.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -206,6 +206,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.18'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.7'
 description: Dependabot-Bundler provides support for bumping Ruby (bundler) gems via
   Dependabot. If you want support for multiple package managers, you probably want
   the meta-gem dependabot-omnibus.
@@ -215,6 +229,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - helpers/v1/.gitignore
+- helpers/v1/Gemfile
 - helpers/v1/build
 - helpers/v1/lib/functions.rb
 - helpers/v1/lib/functions/conflicting_dependency_resolver.rb
@@ -237,6 +252,7 @@ files:
 - helpers/v1/spec/native_spec_helper.rb
 - helpers/v1/spec/shared_contexts.rb
 - helpers/v2/.gitignore
+- helpers/v2/Gemfile
 - helpers/v2/build
 - helpers/v2/lib/functions.rb
 - helpers/v2/lib/functions/conflicting_dependency_resolver.rb
@@ -296,7 +312,7 @@ licenses:
 - Nonstandard
 metadata:
   bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
-  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.238.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.240.0
 post_install_message: 
 rdoc_options: []
 require_paths: