diff options
| -rw-r--r-- | lib/bundler.rb | 2 | ||||
| -rw-r--r-- | lib/bundler/fetcher.rb | 1 | ||||
| -rw-r--r-- | lib/bundler/version.rb | 2 | ||||
| -rw-r--r-- | lib/rubygems.rb | 2 | ||||
| -rw-r--r-- | lib/rubygems/compatibility.rb | 6 | ||||
| -rw-r--r-- | lib/rubygems/package.rb | 11 | ||||
| -rwxr-xr-x | libexec/bundle | 2 | ||||
| -rw-r--r-- | tool/bundler/dev_gems.rb.lock | 2 | ||||
| -rw-r--r-- | tool/bundler/rubocop_gems.rb.lock | 2 | ||||
| -rw-r--r-- | tool/bundler/standard_gems.rb.lock | 2 | ||||
| -rw-r--r-- | tool/bundler/test_gems.rb.lock | 2 |
11 files changed, 19 insertions, 15 deletions
diff --git a/lib/bundler.rb b/lib/bundler.rb index 8688206285..0025dee720 100644 --- a/lib/bundler.rb +++ b/lib/bundler.rb @@ -561,7 +561,7 @@ EOF def load_marshal(data) Marshal.load(data) - rescue StandardError => e + rescue TypeError => e raise MarshalError, "#{e.class}: #{e.message}" end diff --git a/lib/bundler/fetcher.rb b/lib/bundler/fetcher.rb index e07f925107..6fe047568f 100644 --- a/lib/bundler/fetcher.rb +++ b/lib/bundler/fetcher.rb @@ -226,6 +226,7 @@ module Bundler "GO_SERVER_URL" => "go", "SNAP_CI" => "snap", "GITLAB_CI" => "gitlab", + "GITHUB_ACTIONS" => "github", "CI_NAME" => ENV["CI_NAME"], "CI" => "ci", } diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb index efc815bbda..6a5af6c296 100644 --- a/lib/bundler/version.rb +++ b/lib/bundler/version.rb @@ -1,7 +1,7 @@ # frozen_string_literal: false module Bundler - VERSION = "2.3.9".freeze + VERSION = "2.3.10".freeze def self.bundler_major_version @bundler_major_version ||= VERSION.split(".").first.to_i diff --git a/lib/rubygems.rb b/lib/rubygems.rb index 9a45c23bd7..68c0781a50 100644 --- a/lib/rubygems.rb +++ b/lib/rubygems.rb @@ -8,7 +8,7 @@ require 'rbconfig' module Gem - VERSION = "3.3.9".freeze + VERSION = "3.3.10".freeze end # Must be first since it unloads the prelude from 1.9.2 diff --git a/lib/rubygems/compatibility.rb b/lib/rubygems/compatibility.rb index f1d452ea04..b4c1ef16fa 100644 --- a/lib/rubygems/compatibility.rb +++ b/lib/rubygems/compatibility.rb @@ -1,5 +1,4 @@ # frozen_string_literal: true -# :stopdoc: #-- # This file contains all sorts of little compatibility hacks that we've @@ -8,10 +7,13 @@ # # Ruby 1.9.x has introduced some things that are awkward, and we need to # support them, so we define some constants to use later. +# +# TODO remove at RubyGems 4 #++ -# TODO remove at RubyGems 4 module Gem + # :stopdoc: + RubyGemsVersion = VERSION deprecate_constant(:RubyGemsVersion) diff --git a/lib/rubygems/package.rb b/lib/rubygems/package.rb index a81c5f307c..2dd8e8c28e 100644 --- a/lib/rubygems/package.rb +++ b/lib/rubygems/package.rb @@ -3,7 +3,12 @@ # Copyright (C) 2004 Mauricio Julio Fernández Pradier # See LICENSE.txt for additional licensing information. #++ -# + +require_relative "../rubygems" +require_relative 'security' +require_relative 'user_interaction' + +## # Example using a Gem::Package # # Builds a .gem file given a Gem::Specification. A .gem file is a tarball @@ -41,10 +46,6 @@ # #files are the files in the .gem tar file, not the Ruby files in the gem # #extract_files and #contents automatically call #verify -require_relative "../rubygems" -require_relative 'security' -require_relative 'user_interaction' - class Gem::Package include Gem::UserInteraction diff --git a/libexec/bundle b/libexec/bundle index b8bf0d699b..73a6397e77 100755 --- a/libexec/bundle +++ b/libexec/bundle @@ -20,7 +20,7 @@ gem "bundler", Bundler::VERSION if Gem.rubygems_version < Gem::Version.new("2.6. if Gem.rubygems_version < Gem::Version.new("3.2.3") && Gem.ruby_version < Gem::Version.new("2.6.a") && !ENV["BUNDLER_NO_OLD_RUBYGEMS_WARNING"] Bundler.ui.warn \ - "Your RubyGems version (#{Gem::VERSION})) has a bug that prevents " \ + "Your RubyGems version (#{Gem::VERSION}) has a bug that prevents " \ "`required_ruby_version` from working for Bundler. Any scripts that use " \ "`gem install bundler` will break as soon as Bundler drops support for " \ "your Ruby version. Please upgrade RubyGems to avoid future breakage " \ diff --git a/tool/bundler/dev_gems.rb.lock b/tool/bundler/dev_gems.rb.lock index 00d1b9035d..721e80e1f0 100644 --- a/tool/bundler/dev_gems.rb.lock +++ b/tool/bundler/dev_gems.rb.lock @@ -72,4 +72,4 @@ DEPENDENCIES webrick (~> 1.6) BUNDLED WITH - 2.3.9 + 2.3.10 diff --git a/tool/bundler/rubocop_gems.rb.lock b/tool/bundler/rubocop_gems.rb.lock index ba170adfea..55b592094f 100644 --- a/tool/bundler/rubocop_gems.rb.lock +++ b/tool/bundler/rubocop_gems.rb.lock @@ -61,4 +61,4 @@ DEPENDENCIES test-unit BUNDLED WITH - 2.3.9 + 2.3.10 diff --git a/tool/bundler/standard_gems.rb.lock b/tool/bundler/standard_gems.rb.lock index 7424735eb5..c3d8c27eb8 100644 --- a/tool/bundler/standard_gems.rb.lock +++ b/tool/bundler/standard_gems.rb.lock @@ -67,4 +67,4 @@ DEPENDENCIES test-unit BUNDLED WITH - 2.3.9 + 2.3.10 diff --git a/tool/bundler/test_gems.rb.lock b/tool/bundler/test_gems.rb.lock index 6b7a4fd798..ad30ce10db 100644 --- a/tool/bundler/test_gems.rb.lock +++ b/tool/bundler/test_gems.rb.lock @@ -41,4 +41,4 @@ DEPENDENCIES webrick (= 1.7.0) BUNDLED WITH - 2.3.9 + 2.3.10 |