rubygems-update 3.5.5 → 3.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c73f20f52f61db2ba70e9fd03114617fbaf95d0d78b9cb296f5b10efeb762aa8
-  data.tar.gz: 0a30532cbba00ffba42ae8649f7a43fca6c688e8a3e2cb7c74818b1336ff2de5
+  metadata.gz: 3b83feaa9b9fd7b87e8ac6fcbff33eb461f17e32f59cdcf4825825944fb2e206
+  data.tar.gz: 5edabd88afc0a9efb93f1cc664071cef09a2869b1ab84e2eb627ed2d88b949b9
 SHA512:
-  metadata.gz: 86a479e68ce7ba20464ac3a1af32d2f3032ae12fa5ec61b529b69296dacfc2d3746ab3e92382c04fe0363cd48d0a289cb3996cfea609b73314cdaf4c5cecf08b
-  data.tar.gz: 006f72296a1ee5695a5df7a12be4c61bf58b39ac1698b2047219217a160115b6a34f329169cdcc1019782f99fbbe66e20dd165d5941dc396338ade779b54b8d7
+  metadata.gz: 882690618a686f258f5d6bd0d194c142129a8fa79643c6d12668c33e681cc2d5c55c31c6e7e5ec652893262270a25e99692ea2193d2305598be9f10c2b336036
+  data.tar.gz: e87beb2867ef8be9387914bad8c7fa760619ea5b76b3c0195dc5a0b56d284e500466ffdf71389c5fba19d5d8adcf895e8be36ec953af008cf25522040a8b0a80

data/CHANGELOG.md

@@ -1,3 +1,57 @@
+# 3.5.7 / 2024-03-22
+
+## Enhancements:
+
+* Warn on empty or open required_ruby_version specification attribute.
+  Pull request [#5010](https://github.com/rubygems/rubygems/pull/5010) by
+  simi
+* Control whether YAML aliases are enabled in Gem::SafeYAML.safe_load via
+  attribute. Pull request
+  [#7464](https://github.com/rubygems/rubygems/pull/7464) by segiddins
+* Update SPDX license list as of 2024-02-08. Pull request
+  [#7468](https://github.com/rubygems/rubygems/pull/7468) by
+  github-actions[bot]
+* Installs bundler 2.5.7 as a default gem.
+
+## Bug fixes:
+
+* Allow prerelease activation (even if requirement is not explicit about
+  it) when it's the only possibility. Pull request
+  [#7428](https://github.com/rubygems/rubygems/pull/7428) by kimesf
+
+## Documentation:
+
+* Fix a typo. Pull request
+  [#7505](https://github.com/rubygems/rubygems/pull/7505) by hsbt
+* Use https instead of http in documentation links. Pull request
+  [#7481](https://github.com/rubygems/rubygems/pull/7481) by hsbt
+
+# 3.5.6 / 2024-02-06
+
+## Enhancements:
+
+* Deep copy requirements in `Gem::Specification` and `Gem::Requirement`.
+  Pull request [#7439](https://github.com/rubygems/rubygems/pull/7439) by
+  flavorjones
+* Change gem login message to clear up that username can be also used.
+  Pull request [#7422](https://github.com/rubygems/rubygems/pull/7422) by
+  VitaliySerov
+* Add metadata for rubygems.org. Pull request
+  [#7435](https://github.com/rubygems/rubygems/pull/7435) by m-nakamura145
+* Improve gem login scope selection. Pull request
+  [#7342](https://github.com/rubygems/rubygems/pull/7342) by williantenfen
+* Vendor uri in RubyGems. Pull request
+  [#7386](https://github.com/rubygems/rubygems/pull/7386) by
+  deivid-rodriguez
+* Installs bundler 2.5.6 as a default gem.
+
+## Bug fixes:
+
+* Skip to load commented out words. Pull request
+  [#7413](https://github.com/rubygems/rubygems/pull/7413) by hsbt
+* Fix rake runtime dependency warning for rake based extension. Pull
+  request [#7395](https://github.com/rubygems/rubygems/pull/7395) by ntkme
+
 # 3.5.5 / 2024-01-18
 
 ## Enhancements:

data/Manifest.txt

@@ -431,37 +431,7 @@ lib/rubygems/installer.rb
 lib/rubygems/installer_uninstaller_utils.rb
 lib/rubygems/local_remote_options.rb
 lib/rubygems/name_tuple.rb
-lib/rubygems/net-http/.document
-lib/rubygems/net-http/LICENSE.txt
-lib/rubygems/net-http/lib/net/http.rb
-lib/rubygems/net-http/lib/net/http/backward.rb
-lib/rubygems/net-http/lib/net/http/exceptions.rb
-lib/rubygems/net-http/lib/net/http/generic_request.rb
-lib/rubygems/net-http/lib/net/http/header.rb
-lib/rubygems/net-http/lib/net/http/proxy_delta.rb
-lib/rubygems/net-http/lib/net/http/request.rb
-lib/rubygems/net-http/lib/net/http/requests.rb
-lib/rubygems/net-http/lib/net/http/response.rb
-lib/rubygems/net-http/lib/net/http/responses.rb
-lib/rubygems/net-http/lib/net/http/status.rb
-lib/rubygems/net-http/lib/net/https.rb
-lib/rubygems/net-protocol/.document
-lib/rubygems/net-protocol/LICENSE.txt
-lib/rubygems/net-protocol/lib/net/protocol.rb
-lib/rubygems/net/http.rb
 lib/rubygems/openssl.rb
-lib/rubygems/optparse.rb
-lib/rubygems/optparse/.document
-lib/rubygems/optparse/COPYING
-lib/rubygems/optparse/lib/optionparser.rb
-lib/rubygems/optparse/lib/optparse.rb
-lib/rubygems/optparse/lib/optparse/ac.rb
-lib/rubygems/optparse/lib/optparse/date.rb
-lib/rubygems/optparse/lib/optparse/kwargs.rb
-lib/rubygems/optparse/lib/optparse/shellwords.rb
-lib/rubygems/optparse/lib/optparse/time.rb
-lib/rubygems/optparse/lib/optparse/uri.rb
-lib/rubygems/optparse/lib/optparse/version.rb
 lib/rubygems/package.rb
 lib/rubygems/package/digest_io.rb
 lib/rubygems/package/file_source.rb
@@ -489,9 +459,6 @@ lib/rubygems/request_set/lockfile.rb
 lib/rubygems/request_set/lockfile/parser.rb
 lib/rubygems/request_set/lockfile/tokenizer.rb
 lib/rubygems/requirement.rb
-lib/rubygems/resolv/.document
-lib/rubygems/resolv/LICENSE.txt
-lib/rubygems/resolv/lib/resolv.rb
 lib/rubygems/resolver.rb
 lib/rubygems/resolver/activation_request.rb
 lib/rubygems/resolver/api_set.rb
@@ -511,29 +478,6 @@ lib/rubygems/resolver/installer_set.rb
 lib/rubygems/resolver/local_specification.rb
 lib/rubygems/resolver/lock_set.rb
 lib/rubygems/resolver/lock_specification.rb
-lib/rubygems/resolver/molinillo.rb
-lib/rubygems/resolver/molinillo/.document
-lib/rubygems/resolver/molinillo/LICENSE
-lib/rubygems/resolver/molinillo/lib/molinillo.rb
-lib/rubygems/resolver/molinillo/lib/molinillo/delegates/resolution_state.rb
-lib/rubygems/resolver/molinillo/lib/molinillo/delegates/specification_provider.rb
-lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph.rb
-lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/action.rb
-lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb
-lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_vertex.rb
-lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/delete_edge.rb
-lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb
-lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/log.rb
-lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/set_payload.rb
-lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/tag.rb
-lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/vertex.rb
-lib/rubygems/resolver/molinillo/lib/molinillo/errors.rb
-lib/rubygems/resolver/molinillo/lib/molinillo/gem_metadata.rb
-lib/rubygems/resolver/molinillo/lib/molinillo/modules/specification_provider.rb
-lib/rubygems/resolver/molinillo/lib/molinillo/modules/ui.rb
-lib/rubygems/resolver/molinillo/lib/molinillo/resolution.rb
-lib/rubygems/resolver/molinillo/lib/molinillo/resolver.rb
-lib/rubygems/resolver/molinillo/lib/molinillo/state.rb
 lib/rubygems/resolver/requirement_list.rb
 lib/rubygems/resolver/set.rb
 lib/rubygems/resolver/source_set.rb
@@ -573,14 +517,6 @@ lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA.pem
 lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA_R3.pem
 lib/rubygems/stub_specification.rb
 lib/rubygems/text.rb
-lib/rubygems/timeout.rb
-lib/rubygems/timeout/.document
-lib/rubygems/timeout/LICENSE.txt
-lib/rubygems/timeout/lib/timeout.rb
-lib/rubygems/tsort.rb
-lib/rubygems/tsort/.document
-lib/rubygems/tsort/LICENSE.txt
-lib/rubygems/tsort/lib/tsort.rb
 lib/rubygems/uninstaller.rb
 lib/rubygems/unknown_command_spell_checker.rb
 lib/rubygems/update_suggestion.rb
@@ -591,6 +527,87 @@ lib/rubygems/util.rb
 lib/rubygems/util/licenses.rb
 lib/rubygems/util/list.rb
 lib/rubygems/validator.rb
+lib/rubygems/vendor/molinillo/.document
+lib/rubygems/vendor/molinillo/LICENSE
+lib/rubygems/vendor/molinillo/lib/molinillo.rb
+lib/rubygems/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb
+lib/rubygems/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb
+lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph.rb
+lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/action.rb
+lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb
+lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb
+lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb
+lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb
+lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/log.rb
+lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb
+lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb
+lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb
+lib/rubygems/vendor/molinillo/lib/molinillo/errors.rb
+lib/rubygems/vendor/molinillo/lib/molinillo/gem_metadata.rb
+lib/rubygems/vendor/molinillo/lib/molinillo/modules/specification_provider.rb
+lib/rubygems/vendor/molinillo/lib/molinillo/modules/ui.rb
+lib/rubygems/vendor/molinillo/lib/molinillo/resolution.rb
+lib/rubygems/vendor/molinillo/lib/molinillo/resolver.rb
+lib/rubygems/vendor/molinillo/lib/molinillo/state.rb
+lib/rubygems/vendor/net-http/.document
+lib/rubygems/vendor/net-http/LICENSE.txt
+lib/rubygems/vendor/net-http/lib/net/http.rb
+lib/rubygems/vendor/net-http/lib/net/http/backward.rb
+lib/rubygems/vendor/net-http/lib/net/http/exceptions.rb
+lib/rubygems/vendor/net-http/lib/net/http/generic_request.rb
+lib/rubygems/vendor/net-http/lib/net/http/header.rb
+lib/rubygems/vendor/net-http/lib/net/http/proxy_delta.rb
+lib/rubygems/vendor/net-http/lib/net/http/request.rb
+lib/rubygems/vendor/net-http/lib/net/http/requests.rb
+lib/rubygems/vendor/net-http/lib/net/http/response.rb
+lib/rubygems/vendor/net-http/lib/net/http/responses.rb
+lib/rubygems/vendor/net-http/lib/net/http/status.rb
+lib/rubygems/vendor/net-http/lib/net/https.rb
+lib/rubygems/vendor/net-protocol/.document
+lib/rubygems/vendor/net-protocol/LICENSE.txt
+lib/rubygems/vendor/net-protocol/lib/net/protocol.rb
+lib/rubygems/vendor/optparse/.document
+lib/rubygems/vendor/optparse/COPYING
+lib/rubygems/vendor/optparse/lib/optionparser.rb
+lib/rubygems/vendor/optparse/lib/optparse.rb
+lib/rubygems/vendor/optparse/lib/optparse/ac.rb
+lib/rubygems/vendor/optparse/lib/optparse/date.rb
+lib/rubygems/vendor/optparse/lib/optparse/kwargs.rb
+lib/rubygems/vendor/optparse/lib/optparse/shellwords.rb
+lib/rubygems/vendor/optparse/lib/optparse/time.rb
+lib/rubygems/vendor/optparse/lib/optparse/uri.rb
+lib/rubygems/vendor/optparse/lib/optparse/version.rb
+lib/rubygems/vendor/resolv/.document
+lib/rubygems/vendor/resolv/LICENSE.txt
+lib/rubygems/vendor/resolv/lib/resolv.rb
+lib/rubygems/vendor/timeout/.document
+lib/rubygems/vendor/timeout/LICENSE.txt
+lib/rubygems/vendor/timeout/lib/timeout.rb
+lib/rubygems/vendor/tsort/.document
+lib/rubygems/vendor/tsort/LICENSE.txt
+lib/rubygems/vendor/tsort/lib/tsort.rb
+lib/rubygems/vendor/uri/.document
+lib/rubygems/vendor/uri/LICENSE.txt
+lib/rubygems/vendor/uri/lib/uri.rb
+lib/rubygems/vendor/uri/lib/uri/common.rb
+lib/rubygems/vendor/uri/lib/uri/file.rb
+lib/rubygems/vendor/uri/lib/uri/ftp.rb
+lib/rubygems/vendor/uri/lib/uri/generic.rb
+lib/rubygems/vendor/uri/lib/uri/http.rb
+lib/rubygems/vendor/uri/lib/uri/https.rb
+lib/rubygems/vendor/uri/lib/uri/ldap.rb
+lib/rubygems/vendor/uri/lib/uri/ldaps.rb
+lib/rubygems/vendor/uri/lib/uri/mailto.rb
+lib/rubygems/vendor/uri/lib/uri/rfc2396_parser.rb
+lib/rubygems/vendor/uri/lib/uri/rfc3986_parser.rb
+lib/rubygems/vendor/uri/lib/uri/version.rb
+lib/rubygems/vendor/uri/lib/uri/ws.rb
+lib/rubygems/vendor/uri/lib/uri/wss.rb
+lib/rubygems/vendored_molinillo.rb
+lib/rubygems/vendored_net_http.rb
+lib/rubygems/vendored_optparse.rb
+lib/rubygems/vendored_timeout.rb
+lib/rubygems/vendored_tsort.rb
 lib/rubygems/version.rb
 lib/rubygems/version_option.rb
 lib/rubygems/yaml_serializer.rb

data/bundler/CHANGELOG.md

@@ -1,3 +1,36 @@
+# 2.5.7 (March 22, 2024)
+
+## Deprecations:
+
+  - Deprecate `bundle plugin install --local-git=` [#7048](https://github.com/rubygems/rubygems/pull/7048)
+
+## Enhancements:
+
+  - Ignore commented out keys in config file [#7514](https://github.com/rubygems/rubygems/pull/7514)
+  - Fix exclusion of `.gemspec` file itself in `bundle gem` generated gemspec file [#7488](https://github.com/rubygems/rubygems/pull/7488)
+  - Remove redundant configs from `bundle gem` generated rubocop configuration [#7478](https://github.com/rubygems/rubygems/pull/7478)
+  - Add `gitlab:` git source shorthand [#7449](https://github.com/rubygems/rubygems/pull/7449)
+  - Use full path for `instance_eval` in `Bundler::DSL#eval_gemfile` [#7471](https://github.com/rubygems/rubygems/pull/7471)
+
+## Documentation:
+
+  - Use https instead of http in documentation links [#7481](https://github.com/rubygems/rubygems/pull/7481)
+
+# 2.5.6 (February 6, 2024)
+
+## Deprecations:
+
+  - Refactor lockfile generation and deprecate `Definition#lock` with explicit lockfile [#7047](https://github.com/rubygems/rubygems/pull/7047)
+
+## Enhancements:
+
+  - Bump `required_ruby_version` to be used in `bundle gem` template [#7430](https://github.com/rubygems/rubygems/pull/7430)
+
+## Bug fixes:
+
+  - Fix musl platform not being added to the lockfile [#7441](https://github.com/rubygems/rubygems/pull/7441)
+  - Let `Bundler.with_original_env` properly restore env variables originally empty [#7383](https://github.com/rubygems/rubygems/pull/7383)
+
 # 2.5.5 (January 18, 2024)
 
 ## Bug fixes:

data/bundler/lib/bundler/build_metadata.rb

@@ -4,8 +4,8 @@ module Bundler
   # Represents metadata from when the Bundler gem was built.
   module BuildMetadata
     # begin ivars
-    @built_at = "2024-01-18".freeze
-    @git_commit_sha = "2efa8cec93".freeze
+    @built_at = "2024-03-22".freeze
+    @git_commit_sha = "199531f621".freeze
     @release = true
     # end ivars
 

data/bundler/lib/bundler/cli/binstubs.rb

@@ -45,7 +45,7 @@ module Bundler
             next
           end
 
-          Bundler.settings.temporary(path: (Bundler.settings[:path] || Bundler.root)) do
+          Bundler.settings.temporary(path: Bundler.settings[:path] || Bundler.root) do
             installer.generate_standalone_bundler_executable_stubs(spec, installer_opts)
           end
         else

data/bundler/lib/bundler/cli/gem.rb

@@ -437,7 +437,7 @@ module Bundler
     end
 
     def required_ruby_version
-      "2.6.0"
+      "3.0.0"
     end
 
     def rubocop_version

data/bundler/lib/bundler/cli/lock.rb

@@ -33,8 +33,11 @@ module Bundler
         update = { bundler: bundler }
       end
 
+      file = options[:lockfile]
+      file = file ? Pathname.new(file).expand_path : Bundler.default_lockfile
+
       Bundler.settings.temporary(frozen: false) do
-        definition = Bundler.definition(update)
+        definition = Bundler.definition(update, file)
 
         Bundler::CLI::Common.configure_gem_version_promoter(definition, options) if options[:update]
 
@@ -60,10 +63,8 @@ module Bundler
         if print
           puts definition.to_lock
         else
-          file = options[:lockfile]
-          file = file ? File.expand_path(file) : Bundler.default_lockfile
           puts "Writing lockfile to #{file}"
-          definition.lock(file)
+          definition.lock
         end
       end
 

data/bundler/lib/bundler/cli/plugin.rb

@@ -5,12 +5,12 @@ module Bundler
   class CLI::Plugin < Thor
     desc "install PLUGINS", "Install the plugin from the source"
     long_desc <<-D
-      Install plugins either from the rubygems source provided (with --source option) or from a git source provided with --git (for remote repos) or --local_git (for local repos). If no sources are provided, it uses Gem.sources
+      Install plugins either from the rubygems source provided (with --source option) or from a git source provided with --git. If no sources are provided, it uses Gem.sources
    D
     method_option "source", type: :string, default: nil, banner: "URL of the RubyGems source to fetch the plugin from"
     method_option "version", type: :string, default: nil, banner: "The version of the plugin to fetch"
     method_option "git", type: :string, default: nil, banner: "URL of the git repo to fetch from"
-    method_option "local_git", type: :string, default: nil, banner: "Path of the local git repo to fetch from"
+    method_option "local_git", type: :string, default: nil, banner: "Path of the local git repo to fetch from (deprecated)"
     method_option "branch", type: :string, default: nil, banner: "The git branch to checkout"
     method_option "ref", type: :string, default: nil, banner: "The git revision to check out"
     def install(*plugins)

data/bundler/lib/bundler/cli.rb

@@ -620,7 +620,7 @@ module Bundler
     method_option "major", type: :boolean, banner:       "If updating, prefer updating to next major version (default)"
     method_option "pre", type: :boolean, banner: "If updating, always choose the highest allowed version, regardless of prerelease status"
     method_option "strict", type: :boolean, banner: "If updating, do not allow any gem to be updated past latest --patch | --minor | --major"
-    method_option "conservative", type: :boolean, banner:       "If updating, use bundle install conservative update behavior and do not allow shared dependencies to be updated"
+    method_option "conservative", type: :boolean, banner: "If updating, use bundle install conservative update behavior and do not allow shared dependencies to be updated"
     method_option "bundler", type: :string, lazy_default: "> 0.a", banner: "Update the locked version of bundler"
     def lock
       require_relative "cli/lock"
@@ -785,7 +785,7 @@ module Bundler
       return unless SharedHelpers.md5_available?
 
       latest = Fetcher::CompactIndex.
-               new(nil, Source::Rubygems::Remote.new(Bundler::URI("https://rubygems.org")), nil, nil).
+               new(nil, Source::Rubygems::Remote.new(Gem::URI("https://rubygems.org")), nil, nil).
                send(:compact_index_client).
                instance_variable_get(:@cache).
                dependencies("bundler").

data/bundler/lib/bundler/definition.rb

@@ -320,38 +320,26 @@ module Bundler
       dependencies.map(&:groups).flatten.uniq
     end
 
-    def lock(file, preserve_unknown_sections = false)
-      return if Definition.no_lock
-
-      contents = to_lock
-
-      # Convert to \r\n if the existing lock has them
-      # i.e., Windows with `git config core.autocrlf=true`
-      contents.gsub!(/\n/, "\r\n") if @lockfile_contents.match?("\r\n")
-
-      if @locked_bundler_version
-        locked_major = @locked_bundler_version.segments.first
-        current_major = bundler_version_to_lock.segments.first
-
-        updating_major = locked_major < current_major
-      end
+    def lock(file_or_preserve_unknown_sections = false, preserve_unknown_sections_or_unused = false)
+      if [true, false, nil].include?(file_or_preserve_unknown_sections)
+        target_lockfile = lockfile || Bundler.default_lockfile
+        preserve_unknown_sections = file_or_preserve_unknown_sections
+      else
+        target_lockfile = file_or_preserve_unknown_sections
+        preserve_unknown_sections = preserve_unknown_sections_or_unused
 
-      preserve_unknown_sections ||= !updating_major && (Bundler.frozen_bundle? || !(unlocking? || @unlocking_bundler))
+        suggestion = if target_lockfile == lockfile
+          "To fix this warning, remove it from the `Definition#lock` call."
+        else
+          "Instead, instantiate a new definition passing `#{target_lockfile}`, and call `lock` without a file argument on that definition"
+        end
 
-      if file && File.exist?(file) && lockfiles_equal?(@lockfile_contents, contents, preserve_unknown_sections)
-        return if Bundler.frozen_bundle?
-        SharedHelpers.filesystem_access(file) { FileUtils.touch(file) }
-        return
-      end
+        msg = "`Definition#lock` was passed a target file argument. #{suggestion}"
 
-      if Bundler.frozen_bundle?
-        Bundler.ui.error "Cannot write a changed lockfile while frozen."
-        return
+        Bundler::SharedHelpers.major_deprecation 2, msg
       end
 
-      SharedHelpers.filesystem_access(file) do |p|
-        File.open(p, "wb") {|f| f.puts(contents) }
-      end
+      write_lock(target_lockfile, preserve_unknown_sections)
     end
 
     def locked_ruby_version
@@ -518,7 +506,45 @@ module Bundler
     end
 
     def lockfile_exists?
-      lockfile && File.exist?(lockfile)
+      file_exists?(lockfile)
+    end
+
+    def file_exists?(file)
+      file && File.exist?(file)
+    end
+
+    def write_lock(file, preserve_unknown_sections)
+      return if Definition.no_lock
+
+      contents = to_lock
+
+      # Convert to \r\n if the existing lock has them
+      # i.e., Windows with `git config core.autocrlf=true`
+      contents.gsub!(/\n/, "\r\n") if @lockfile_contents.match?("\r\n")
+
+      if @locked_bundler_version
+        locked_major = @locked_bundler_version.segments.first
+        current_major = bundler_version_to_lock.segments.first
+
+        updating_major = locked_major < current_major
+      end
+
+      preserve_unknown_sections ||= !updating_major && (Bundler.frozen_bundle? || !(unlocking? || @unlocking_bundler))
+
+      if file_exists?(file) && lockfiles_equal?(@lockfile_contents, contents, preserve_unknown_sections)
+        return if Bundler.frozen_bundle?
+        SharedHelpers.filesystem_access(file) { FileUtils.touch(file) }
+        return
+      end
+
+      if Bundler.frozen_bundle?
+        Bundler.ui.error "Cannot write a changed lockfile while frozen."
+        return
+      end
+
+      SharedHelpers.filesystem_access(file) do |p|
+        File.open(p, "wb") {|f| f.puts(contents) }
+      end
     end
 
     def resolver

data/bundler/lib/bundler/dsl.rb

@@ -19,6 +19,7 @@ module Bundler
                     platform platforms type source install_if gemfile force_ruby_platform].freeze
 
     GITHUB_PULL_REQUEST_URL = %r{\Ahttps://github\.com/([A-Za-z0-9_\-\.]+/[A-Za-z0-9_\-\.]+)/pull/(\d+)\z}
+    GITLAB_MERGE_REQUEST_URL = %r{\Ahttps://gitlab\.com/([A-Za-z0-9_\-\./]+)/-/merge_requests/(\d+)\z}
 
     attr_reader :gemspecs, :gemfile
     attr_accessor :dependencies
@@ -46,7 +47,7 @@ module Bundler
       @gemfile = expanded_gemfile_path
       @gemfiles << expanded_gemfile_path
       contents ||= Bundler.read_file(@gemfile.to_s)
-      instance_eval(contents, gemfile.to_s, 1)
+      instance_eval(contents, @gemfile.to_s, 1)
     rescue Exception => e # rubocop:disable Lint/RescueException
       message = "There was an error " \
         "#{e.is_a?(GemfileEvalError) ? "evaluating" : "parsing"} " \
@@ -308,6 +309,20 @@ module Bundler
         repo_name ||= user_name
         "https://#{user_name}@bitbucket.org/#{user_name}/#{repo_name}.git"
       end
+
+      git_source(:gitlab) do |repo_name|
+        if repo_name =~ GITLAB_MERGE_REQUEST_URL
+          {
+            "git" => "https://gitlab.com/#{$1}.git",
+            "branch" => nil,
+            "ref" => "refs/merge-requests/#{$2}/head",
+            "tag" => nil,
+          }
+        else
+          repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
+          "https://gitlab.com/#{repo_name}.git"
+        end
+      end
     end
 
     def with_source(source)

data/bundler/lib/bundler/environment_preserver.rb

@@ -58,9 +58,9 @@ module Bundler
       env = @original.clone
       @keys.each do |key|
         value = env[key]
-        if !value.nil? && !value.empty?
+        if !value.nil?
           env[@prefix + key] ||= value
-        elsif value.nil?
+        else
           env[@prefix + key] ||= INTENTIONALLY_NIL
         end
       end
@@ -72,7 +72,7 @@ module Bundler
       env = @original.clone
       @keys.each do |key|
         value_original = env[@prefix + key]
-        next if value_original.nil? || value_original.empty?
+        next if value_original.nil?
         if value_original == INTENTIONALLY_NIL
           env.delete(key)
         else

data/bundler/lib/bundler/fetcher/downloader.rb

@@ -23,7 +23,7 @@ module Bundler
         when Gem::Net::HTTPSuccess, Gem::Net::HTTPNotModified
           response
         when Gem::Net::HTTPRedirection
-          new_uri = Bundler::URI.parse(response["location"])
+          new_uri = Gem::URI.parse(response["location"])
           if new_uri.host == uri.host
             new_uri.user = uri.user
             new_uri.password = uri.password

data/bundler/lib/bundler/fetcher.rb

@@ -111,7 +111,7 @@ module Bundler
       spec -= [nil, "ruby", ""]
       spec_file_name = "#{spec.join "-"}.gemspec"
 
-      uri = Bundler::URI.parse("#{remote_uri}#{Gem::MARSHAL_SPEC_DIR}#{spec_file_name}.rz")
+      uri = Gem::URI.parse("#{remote_uri}#{Gem::MARSHAL_SPEC_DIR}#{spec_file_name}.rz")
       spec = if uri.scheme == "file"
         path = Gem::Util.correct_for_windows_path(uri.path)
         Bundler.safe_load_marshal Bundler.rubygems.inflate(Gem.read_binary(path))
@@ -255,7 +255,7 @@ module Bundler
 
         con = Gem::Net::HTTP::Persistent.new name: "bundler", proxy: :ENV
         if gem_proxy = Gem.configuration[:http_proxy]
-          con.proxy = Bundler::URI.parse(gem_proxy) if gem_proxy != :no_proxy
+          con.proxy = Gem::URI.parse(gem_proxy) if gem_proxy != :no_proxy
         end
 
         if remote_uri.scheme == "https"

data/bundler/lib/bundler/injector.rb

@@ -50,7 +50,7 @@ module Bundler
         append_to(gemfile_path, build_gem_lines(@options[:conservative_versioning])) if @deps.any?
 
         # since we resolved successfully, write out the lockfile
-        @definition.lock(Bundler.default_lockfile)
+        @definition.lock
 
         # invalidate the cached Bundler.definition
         Bundler.reset_paths!

data/bundler/lib/bundler/installer.rb

@@ -260,8 +260,8 @@ module Bundler
       true
     end
 
-    def lock(opts = {})
-      @definition.lock(Bundler.default_lockfile, opts[:preserve_unknown_sections])
+    def lock
+      @definition.lock
     end
   end
 end

data/bundler/lib/bundler/man/bundle-add.1

@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-ADD" "1" "December 2023" ""
+.TH "BUNDLE\-ADD" "1" "February 2024" ""
 .SH "NAME"
 \fBbundle\-add\fR \- Add gem to the Gemfile and run bundle install
 .SH "SYNOPSIS"

data/bundler/lib/bundler/man/bundle-binstubs.1

@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-BINSTUBS" "1" "December 2023" ""
+.TH "BUNDLE\-BINSTUBS" "1" "February 2024" ""
 .SH "NAME"
 \fBbundle\-binstubs\fR \- Install the binstubs of the listed gems
 .SH "SYNOPSIS"

data/bundler/lib/bundler/man/bundle-cache.1

@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-CACHE" "1" "December 2023" ""
+.TH "BUNDLE\-CACHE" "1" "February 2024" ""
 .SH "NAME"
 \fBbundle\-cache\fR \- Package your needed \fB\.gem\fR files into your application
 .SH "SYNOPSIS"

data/bundler/lib/bundler/man/bundle-check.1

@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-CHECK" "1" "December 2023" ""
+.TH "BUNDLE\-CHECK" "1" "February 2024" ""
 .SH "NAME"
 \fBbundle\-check\fR \- Verifies if dependencies are satisfied by installed gems
 .SH "SYNOPSIS"

data/bundler/lib/bundler/man/bundle-clean.1

@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-CLEAN" "1" "December 2023" ""
+.TH "BUNDLE\-CLEAN" "1" "February 2024" ""
 .SH "NAME"
 \fBbundle\-clean\fR \- Cleans up unused gems in your bundler directory
 .SH "SYNOPSIS"

data/bundler/lib/bundler/man/bundle-config.1

@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-CONFIG" "1" "December 2023" ""
+.TH "BUNDLE\-CONFIG" "1" "February 2024" ""
 .SH "NAME"
 \fBbundle\-config\fR \- Set bundler configuration options
 .SH "SYNOPSIS"