rubygems-update 3.2.18 → 3.2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66be509531c57a4b354ae2bc3659fbe4f9dc375489b56ce77c6a5b5e7f45fd00
-  data.tar.gz: d2e4d40b260adf5a6e858e98ec64ef5cc73c6d71080fcc73d5af87c2dbe63ec5
+  metadata.gz: ba52b4a462e0da9cf903bc69e61096bd08a3281bd6d174cc35abf975099eb737
+  data.tar.gz: 791cfa5488c4d56d48b60bc372c16be5d426d53bbb603c8b95fbaf20bbc4b0c8
 SHA512:
-  metadata.gz: 6218e723da3fc5e75b9e6a4b5429184df3c27950a21c0722a51ade130de5df69341195404bf8b3ea242471d62fc23c8cc82f19cd4b5298b18ee3c2a7c6385024
-  data.tar.gz: f9abbc6dc9d704deeba13c969817a502a34aa564408ed65c143f5f1781c5edab1721be70c4168e5d25a512a6664d14eb128f817e18ffb6c880a37e9c870e961d
+  metadata.gz: 89c0efcd3e1f639edfac4af460a7bbb891f13cae5b1dc5c58829e10f0a64d9fe04c0d0e58c108b6dbff8b7f7e7f77d96edbe993dfbb6086ae998fb68b9b05793
+  data.tar.gz: a01059a530f414a334a8d16af04d8507ca6ca10891e869b395795bacb5748822b44e98eb4491f3f98dc781d72b9c4a228700eb1ee8ff18fdeb1a50aa14482114

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 3.2.19 / 2021-05-31
+
+## Enhancements:
+
+* Fix `gem help build` output format. Pull request #4613 by tnir
+
 # 3.2.18 / 2021-05-25
 
 ## Enhancements:

data/bundler/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 2.2.19 (May 31, 2021)
+
+## Bug fixes:
+
+  - Restore support for configuration keys with dashes [#4582](https://github.com/rubygems/rubygems/pull/4582)
+  - Fix some cached gems being unintentionally ignored when using rubygems 3.2.18 [#4623](https://github.com/rubygems/rubygems/pull/4623)
+
 # 2.2.18 (May 25, 2021)
 
 ## Security 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 = "2021-05-25".freeze
-    @git_commit_sha = "6a9e89bacd".freeze
+    @built_at = "2021-05-31".freeze
+    @git_commit_sha = "43f80b12c0".freeze
     @release = true
     # end ivars
 

data/bundler/lib/bundler/settings.rb

@@ -442,7 +442,20 @@ module Bundler
         valid_file = file.exist? && !file.size.zero?
         return {} unless valid_file
         require_relative "yaml_serializer"
-        YAMLSerializer.load file.read
+        YAMLSerializer.load(file.read).inject({}) do |config, (k, v)|
+          new_k = k
+
+          if k.include?("-")
+            Bundler.ui.warn "Your #{file} config includes `#{k}`, which contains the dash character (`-`).\n" \
+              "This is deprecated, because configuration through `ENV` should be possible, but `ENV` keys cannot include dashes.\n" \
+              "Please edit #{file} and replace any dashes in configuration keys with a triple underscore (`___`)."
+
+            new_k = k.gsub("-", "___")
+          end
+
+          config[new_k] = v
+          config
+        end
       end
     end
 

data/bundler/lib/bundler/source/rubygems.rb

@@ -398,10 +398,6 @@ module Bundler
             next if gemfile =~ /^bundler\-[\d\.]+?\.gem/
             s ||= Bundler.rubygems.spec_from_gem(gemfile)
             s.source = self
-            if Bundler.rubygems.spec_missing_extensions?(s, false)
-              Bundler.ui.debug "Source #{self} is ignoring #{s} because it is missing extensions"
-              next
-            end
             idx << s
           end
 

data/bundler/lib/bundler/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 
 module Bundler
-  VERSION = "2.2.18".freeze
+  VERSION = "2.2.19".freeze
 
   def self.bundler_major_version
     @bundler_major_version ||= VERSION.split(".").first.to_i

data/lib/rubygems.rb

@@ -8,7 +8,7 @@
 require 'rbconfig'
 
 module Gem
-  VERSION = "3.2.18".freeze
+  VERSION = "3.2.19".freeze
 end
 
 # Must be first since it unloads the prelude from 1.9.2

data/lib/rubygems/command.rb

@@ -355,6 +355,8 @@ class Gem::Command
   def add_option(*opts, &handler) # :yields: value, options
     group_name = Symbol === opts.first ? opts.shift : :options
 
+    raise "Do not pass an empty string in opts" if opts.include?("")
+
     @option_groups[group_name] << [opts, handler]
   end
 

data/lib/rubygems/commands/build_command.rb

@@ -23,7 +23,7 @@ class Gem::Commands::BuildCommand < Gem::Command
       options[:output] = value
     end
 
-    add_option '-C PATH', '', 'Run as if gem build was started in <PATH> instead of the current working directory.' do |value, options|
+    add_option '-C PATH', 'Run as if gem build was started in <PATH> instead of the current working directory.' do |value, options|
       options[:build_path] = value
     end
   end

data/rubygems-update.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "rubygems-update"
-  s.version = "3.2.18"
+  s.version = "3.2.19"
   s.authors = ["Jim Weirich", "Chad Fowler", "Eric Hodel", "Luis Lavena", "Aaron Patterson", "Samuel Giddins", "André Arko", "Evan Phoenix", "Hiroshi SHIBATA"]
   s.email = ["", "", "drbrain@segment7.net", "luislavena@gmail.com", "aaron@tenderlovemaking.com", "segiddins@segiddins.me", "andre@arko.net", "evan@phx.io", "hsbt@ruby-lang.org"]
 

data/test/rubygems/test_gem_command.rb

@@ -189,6 +189,18 @@ class TestGemCommand < Gem::TestCase
     assert_match %r{Usage: gem doit}, @ui.output
   end
 
+  def test_add_option
+    assert_nothing_raised RuntimeError do
+      @cmd.add_option('--force', 'skip validation of the spec') {|v,o| }
+    end
+  end
+
+  def test_add_option_with_empty
+    assert_raise RuntimeError, "Do not pass an empty string in opts" do
+      @cmd.add_option('', 'skip validation of the spec') {|v,o| }
+    end
+  end
+
   def test_option_recognition
     @cmd.add_option('-h', '--help [COMMAND]', 'Get help on COMMAND') do |value, options|
       options[:help] = true

data/test/rubygems/test_gem_commands_help_command.rb

@@ -35,6 +35,13 @@ class TestGemCommandsHelpCommand < Gem::TestCase
     end
   end
 
+  def test_gem_help_build
+    util_gem 'build' do |out, err|
+      assert_match(/-C PATH *Run as if gem build was started in <PATH>/, out)
+      assert_equal '', err
+    end
+  end
+
   def test_gem_help_commands
     mgr = Gem::CommandManager.new
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-update
 version: !ruby/object:Gem::Version
-  version: 3.2.18
+  version: 3.2.19
 platform: ruby
 authors:
 - Jim Weirich
@@ -16,7 +16,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-25 00:00:00.000000000 Z
+date: 2021-05-31 00:00:00.000000000 Z
 dependencies: []
 description: |-
   A package (also known as a library) contains a set of functionality
@@ -771,7 +771,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.18
+rubygems_version: 3.2.19
 signing_key: 
 specification_version: 4
 summary: RubyGems is a package management framework for Ruby.