rubygems-update 3.3.18 → 3.6.2

data/bundler/lib/bundler/templates/newgem/README.md.tt

@@ -1,18 +1,24 @@
 # <%= config[:constant_name] %>
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/<%= config[:namespaced_path] %>`. To experiment with that code, run `bin/console` for an interactive prompt.
+TODO: Delete this and the text below, and describe your gem
 
-TODO: Delete this and the text above, and describe your gem
+Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/<%= config[:namespaced_path] %>`. To experiment with that code, run `bin/console` for an interactive prompt.
 
 ## Installation
 
+TODO: Replace `UPDATE_WITH_YOUR_GEM_NAME_IMMEDIATELY_AFTER_RELEASE_TO_RUBYGEMS_ORG` with your gem name right after releasing it to RubyGems.org. Please do not do it earlier due to security reasons. Alternatively, replace this section with instructions to install your gem from git if you don't plan to release to RubyGems.org.
+
 Install the gem and add to the application's Gemfile by executing:
 
-    $ bundle add <%= config[:name] %>
+```bash
+bundle add UPDATE_WITH_YOUR_GEM_NAME_IMMEDIATELY_AFTER_RELEASE_TO_RUBYGEMS_ORG
+```
 
 If bundler is not being used to manage dependencies, install the gem by executing:
 
-    $ gem install <%= config[:name] %>
+```bash
+gem install UPDATE_WITH_YOUR_GEM_NAME_IMMEDIATELY_AFTER_RELEASE_TO_RUBYGEMS_ORG
+```
 
 ## Usage
 
@@ -20,7 +26,7 @@ TODO: Write usage instructions here
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies.<% if config[:test] %> Then, run `rake <%= config[:test].sub('mini', '').sub('rspec', 'spec') %>` to run the tests.<% end %> You can also run `bin/console` for an interactive prompt that will allow you to experiment.<% if config[:bin] %> Run `bundle exec <%= config[:name] %>` to use the gem in this directory, ignoring other installed copies of this gem.<% end %>
+After checking out the repo, run `bin/setup` to install dependencies.<% if config[:test] %> Then, run `rake <%= config[:test_task] %>` to run the tests.<% end %> You can also run `bin/console` for an interactive prompt that will allow you to experiment.<% if config[:bin] %> Run `bundle exec <%= config[:name] %>` to use the gem in this directory, ignoring other installed copies of this gem.<% end %>
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 <% if config[:git] -%>

data/bundler/lib/bundler/templates/newgem/Rakefile.tt

@@ -4,13 +4,9 @@ require "bundler/gem_tasks"
 <% default_task_names = [config[:test_task]].compact -%>
 <% case config[:test] -%>
 <% when "minitest" -%>
-require "rake/testtask"
+require "minitest/test_task"
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList["test/**/test_*.rb"]
-end
+Minitest::TestTask.create
 
 <% when "test-unit" -%>
 require "rake/testtask"
@@ -39,14 +35,29 @@ require "standard/rake"
 
 <% end -%>
 <% if config[:ext] -%>
-<% default_task_names.unshift(:clobber, :compile) -%>
+<% default_task_names.unshift(:compile) -%>
+<% default_task_names.unshift(:clobber) unless config[:ext] == 'rust' -%>
+<% if config[:ext] == 'rust' -%>
+require "rb_sys/extensiontask"
+
+task build: :compile
+
+GEMSPEC = Gem::Specification.load("<%= config[:underscored_name] %>.gemspec")
+
+RbSys::ExtensionTask.new(<%= config[:name].inspect %>, GEMSPEC) do |ext|
+  ext.lib_dir = "lib/<%= config[:namespaced_path] %>"
+end
+<% else -%>
 require "rake/extensiontask"
 
 task build: :compile
 
-Rake::ExtensionTask.new("<%= config[:underscored_name] %>") do |ext|
+GEMSPEC = Gem::Specification.load("<%= config[:underscored_name] %>.gemspec")
+
+Rake::ExtensionTask.new("<%= config[:underscored_name] %>", GEMSPEC) do |ext|
   ext.lib_dir = "lib/<%= config[:namespaced_path] %>"
 end
+<% end -%>
 
 <% end -%>
 <% if default_task_names.size == 1 -%>

data/bundler/lib/bundler/templates/newgem/bin/console.tt

@@ -7,9 +7,5 @@ require "<%= config[:namespaced_path] %>"
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
 
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
 require "irb"
 IRB.start(__FILE__)

data/bundler/lib/bundler/templates/newgem/circleci/config.yml.tt

@@ -3,8 +3,20 @@ jobs:
   build:
     docker:
       - image: ruby:<%= RUBY_VERSION %>
+<%- if config[:ext] == 'rust' -%>
+    environment:
+      RB_SYS_FORCE_INSTALL_RUST_TOOLCHAIN: 'true'
+<%- end -%>
     steps:
       - checkout
+<%- if config[:ext] == 'rust' -%>
+      - run:
+          name: Install Rust/Cargo dependencies
+          command: apt-get update && apt-get install -y clang
+      - run:
+          name: Install a RubyGems version that can compile rust extensions
+          command: gem update --system '<%= ::Gem.rubygems_version %>'
+<%- end -%>
       - run:
           name: Run the default task
           command: |

data/bundler/lib/bundler/templates/newgem/ext/newgem/Cargo.toml.tt

@@ -0,0 +1,15 @@
+[package]
+name = <%= config[:name].inspect %>
+version = "0.1.0"
+edition = "2021"
+authors = ["<%= config[:author] %> <<%= config[:email] %>>"]
+<%- if config[:mit] -%>
+license = "MIT"
+<%- end -%>
+publish = false
+
+[lib]
+crate-type = ["cdylib"]
+
+[dependencies]
+magnus = { version = "0.6.2" }

data/bundler/lib/bundler/templates/newgem/ext/newgem/extconf-c.rb.tt

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require "mkmf"
+
+# Makes all symbols private by default to avoid unintended conflict
+# with other gems. To explicitly export symbols you can use RUBY_FUNC_EXPORTED
+# selectively, or entirely remove this flag.
+append_cflags("-fvisibility=hidden")
+
+create_makefile(<%= config[:makefile_path].inspect %>)

data/bundler/lib/bundler/templates/newgem/ext/newgem/extconf-rust.rb.tt

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+require "mkmf"
+require "rb_sys/mkmf"
+
+create_rust_makefile(<%= config[:makefile_path].inspect %>)

data/bundler/lib/bundler/templates/newgem/ext/newgem/newgem.c.tt

@@ -2,7 +2,7 @@
 
 VALUE rb_m<%= config[:constant_array].join %>;
 
-void
+RUBY_FUNC_EXPORTED void
 Init_<%= config[:underscored_name] %>(void)
 {
   rb_m<%= config[:constant_array].join %> = rb_define_module(<%= config[:constant_name].inspect %>);

data/bundler/lib/bundler/templates/newgem/ext/newgem/src/lib.rs.tt

@@ -0,0 +1,12 @@
+use magnus::{function, prelude::*, Error, Ruby};
+
+fn hello(subject: String) -> String {
+    format!("Hello from Rust, {subject}!")
+}
+
+#[magnus::init]
+fn init(ruby: &Ruby) -> Result<(), Error> {
+    let module = ruby.<%= config[:constant_array].map {|c| "define_module(#{c.dump})?"}.join(".") %>;
+    module.define_singleton_method("hello", function!(hello, 1))?;
+    Ok(())
+}

data/bundler/lib/bundler/templates/newgem/github/workflows/main.yml.tt

@@ -17,11 +17,21 @@ jobs:
           - '<%= RUBY_VERSION %>'
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-        bundler-cache: true
-    - name: Run the default task
-      run: bundle exec rake
+      - uses: actions/checkout@v4
+<%- if config[:ext] == 'rust' -%>
+      - name: Set up Ruby & Rust
+        uses: oxidize-rb/actions/setup-ruby-and-rust@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+          cargo-cache: true
+          rubygems: '<%= ::Gem.rubygems_version %>'
+<%- else -%>
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+<%- end -%>
+      - name: Run the default task
+        run: bundle exec rake

data/bundler/lib/bundler/templates/newgem/gitignore.tt

@@ -12,6 +12,9 @@
 *.o
 *.a
 mkmf.log
+<%- if config[:ext] == 'rust' -%>
+target/
+<%- end -%>
 <%- end -%>
 <%- if config[:test] == "rspec" -%>
 

data/bundler/lib/bundler/templates/newgem/gitlab-ci.yml.tt

@@ -1,9 +1,18 @@
-image: ruby:<%= RUBY_VERSION %>
+default:
+  image: ruby:<%= RUBY_VERSION %>
 
-before_script:
-  - gem install bundler -v <%= Bundler::VERSION %>
-  - bundle install
+  before_script:
+<%- if config[:ext] == 'rust' -%>
+    - apt-get update && apt-get install -y clang
+    - gem update --system '<%= ::Gem.rubygems_version %>'
+<%- end -%>
+    - gem install bundler -v <%= Bundler::VERSION %>
+    - bundle install
 
 example_job:
+<%- if config[:ext] == 'rust' -%>
+  variables:
+    RB_SYS_FORCE_INSTALL_RUST_TOOLCHAIN: 'true'
+<%- end -%>
   script:
     - bundle exec rake

data/bundler/lib/bundler/templates/newgem/newgem.gemspec.tt

@@ -15,6 +15,9 @@ Gem::Specification.new do |spec|
   spec.license = "MIT"
 <%- end -%>
   spec.required_ruby_version = ">= <%= config[:required_ruby_version] %>"
+<%- if config[:ext] == 'rust' -%>
+  spec.required_rubygems_version = ">= <%= config[:rust_builder_required_rubygems_version] %>"
+<%- end -%>
 
   spec.metadata["allowed_push_host"] = "TODO: Set to your gem server 'https://example.com'"
 
@@ -24,20 +27,25 @@ Gem::Specification.new do |spec|
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(__dir__) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
+  gemspec = File.basename(__FILE__)
+  spec.files = IO.popen(%w[git ls-files -z], chdir: __dir__, err: IO::NULL) do |ls|
+    ls.readlines("\x0", chomp: true).reject do |f|
+      (f == gemspec) ||
+        f.start_with?(*%w[bin/ test/ spec/ features/ .git <%= config[:ci_config_path] %>appveyor Gemfile])
     end
   end
   spec.bindir = "exe"
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-<%- if config[:ext] -%>
+<%- if config[:ext] == 'c' || config[:ext] == 'rust' -%>
   spec.extensions = ["ext/<%= config[:underscored_name] %>/extconf.rb"]
 <%- end -%>
 
   # Uncomment to register a new dependency of your gem
   # spec.add_dependency "example-gem", "~> 1.0"
+<%- if config[:ext] == 'rust' -%>
+  spec.add_dependency "rb_sys", "~> 0.9.91"
+<%- end -%>
 
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html

data/bundler/lib/bundler/templates/newgem/rubocop.yml.tt

@@ -2,12 +2,7 @@ AllCops:
   TargetRubyVersion: <%= ::Gem::Version.new(config[:required_ruby_version]).segments[0..1].join(".") %>
 
 Style/StringLiterals:
-  Enabled: true
   EnforcedStyle: double_quotes
 
 Style/StringLiteralsInInterpolation:
-  Enabled: true
   EnforcedStyle: double_quotes
-
-Layout/LineLength:
-  Max: 120

data/bundler/lib/bundler/templates/newgem/standard.yml.tt

@@ -1,3 +1,3 @@
 # For available configuration options, see:
-#   https://github.com/testdouble/standard
+#   https://github.com/standardrb/standard
 ruby_version: <%= ::Gem::Version.new(config[:required_ruby_version]).segments[0..1].join(".") %>

data/bundler/lib/bundler/ui/rg_proxy.rb

@@ -12,7 +12,7 @@ module Bundler
       end
 
       def say(message)
-        @ui && @ui.debug(message)
+        @ui&.debug(message)
       end
     end
   end

data/bundler/lib/bundler/ui/shell.rb

@@ -6,43 +6,69 @@ module Bundler
   module UI
     class Shell
       LEVELS = %w[silent error warn confirm info debug].freeze
+      OUTPUT_STREAMS = [:stdout, :stderr].freeze
 
       attr_writer :shell
+      attr_reader :output_stream
 
       def initialize(options = {})
         Thor::Base.shell = options["no-color"] ? Thor::Shell::Basic : nil
         @shell = Thor::Base.shell.new
         @level = ENV["DEBUG"] ? "debug" : "info"
         @warning_history = []
+        @output_stream = :stdout
       end
 
       def add_color(string, *color)
         @shell.set_color(string, *color)
       end
 
-      def info(msg, newline = nil)
-        tell_me(msg, nil, newline) if level("info")
+      def info(msg = nil, newline = nil)
+        return unless info?
+
+        tell_me(msg || yield, nil, newline)
       end
 
-      def confirm(msg, newline = nil)
-        tell_me(msg, :green, newline) if level("confirm")
+      def confirm(msg = nil, newline = nil)
+        return unless confirm?
+
+        tell_me(msg || yield, :green, newline)
       end
 
-      def warn(msg, newline = nil, color = :yellow)
-        return unless level("warn")
+      def warn(msg = nil, newline = nil, color = :yellow)
+        return unless warn?
         return if @warning_history.include? msg
         @warning_history << msg
 
-        tell_err(msg, color, newline)
+        tell_err(msg || yield, color, newline)
+      end
+
+      def error(msg = nil, newline = nil, color = :red)
+        return unless error?
+
+        tell_err(msg || yield, color, newline)
       end
 
-      def error(msg, newline = nil, color = :red)
-        return unless level("error")
-        tell_err(msg, color, newline)
+      def debug(msg = nil, newline = nil)
+        return unless debug?
+
+        tell_me(msg || yield, nil, newline)
       end
 
-      def debug(msg, newline = nil)
-        tell_me(msg, nil, newline) if debug?
+      def info?
+        level("info")
+      end
+
+      def confirm?
+        level("confirm")
+      end
+
+      def warn?
+        level("warn")
+      end
+
+      def error?
+        level("error")
       end
 
       def debug?
@@ -61,7 +87,7 @@ module Bundler
         @shell.yes?(msg)
       end
 
-      def no?
+      def no?(msg)
         @shell.no?(msg)
       end
 
@@ -78,6 +104,11 @@ module Bundler
         index <= LEVELS.index(@level)
       end
 
+      def output_stream=(symbol)
+        raise ArgumentError unless OUTPUT_STREAMS.include?(symbol)
+        @output_stream = symbol
+      end
+
       def trace(e, newline = nil, force = false)
         return unless debug? || force
         msg = "#{e.class}: #{e.message}\n#{e.backtrace.join("\n  ")}"
@@ -88,6 +119,10 @@ module Bundler
         with_level("silent", &blk)
       end
 
+      def progress(&blk)
+        with_output_stream(:stderr, &blk)
+      end
+
       def unprinted_warnings
         []
       end
@@ -96,6 +131,8 @@ module Bundler
 
       # valimism
       def tell_me(msg, color = nil, newline = nil)
+        return tell_err(msg, color, newline) if output_stream == :stderr
+
         msg = word_wrap(msg) if newline.is_a?(Hash) && newline[:wrap]
         if newline.nil?
           @shell.say(msg, color)
@@ -107,7 +144,7 @@ module Bundler
       def tell_err(message, color = nil, newline = nil)
         return if @shell.send(:stderr).closed?
 
-        newline ||= message.to_s !~ /( |\t)\Z/
+        newline = !message.to_s.match?(/( |\t)\Z/) if newline.nil?
         message = word_wrap(message) if newline.is_a?(Hash) && newline[:wrap]
 
         color = nil if color && !$stderr.tty?
@@ -124,7 +161,7 @@ module Bundler
         spaces ? text.gsub(/#{spaces}/, "") : text
       end
 
-      def word_wrap(text, line_width = @shell.terminal_width)
+      def word_wrap(text, line_width = Thor::Terminal.terminal_width)
         strip_leading_spaces(text).split("\n").collect do |line|
           line.length > line_width ? line.gsub(/(.{1,#{line_width}})(\s+|$)/, "\\1\n").strip : line
         end * "\n"
@@ -137,6 +174,14 @@ module Bundler
       ensure
         @level = original
       end
+
+      def with_output_stream(symbol)
+        original = output_stream
+        self.output_stream = symbol
+        yield
+      ensure
+        @output_stream = original
+      end
     end
   end
 end

data/bundler/lib/bundler/ui/silent.rb

@@ -13,30 +13,53 @@ module Bundler
         string
       end
 
-      def info(message, newline = nil)
+      def info(message = nil, newline = nil)
       end
 
-      def confirm(message, newline = nil)
+      def confirm(message = nil, newline = nil)
       end
 
-      def warn(message, newline = nil)
+      def warn(message = nil, newline = nil)
         @warnings |= [message]
       end
 
-      def error(message, newline = nil)
+      def error(message = nil, newline = nil)
       end
 
-      def debug(message, newline = nil)
+      def debug(message = nil, newline = nil)
+      end
+
+      def confirm?
+        false
+      end
+
+      def error?
+        false
       end
 
       def debug?
         false
       end
 
+      def info?
+        false
+      end
+
       def quiet?
         false
       end
 
+      def warn?
+        false
+      end
+
+      def output_stream=(_symbol)
+      end
+
+      def output_stream
+        nil
+      end
+
       def ask(message)
       end
 
@@ -44,7 +67,7 @@ module Bundler
         raise "Cannot ask yes? with a silent shell"
       end
 
-      def no?
+      def no?(msg)
         raise "Cannot ask no? with a silent shell"
       end
 
@@ -61,6 +84,10 @@ module Bundler
         yield
       end
 
+      def progress
+        yield
+      end
+
       def unprinted_warnings
         @warnings
       end

data/bundler/lib/bundler/uri_credentials_filter.rb

@@ -11,12 +11,12 @@ module Bundler
         return uri if File.exist?(uri)
 
         require_relative "vendored_uri"
-        uri = Bundler::URI(uri)
+        uri = Gem::URI(uri)
       end
 
       if uri.userinfo
         # oauth authentication
-        if uri.password == "x-oauth-basic" || uri.password == "x"
+        if uri.password == "x-oauth-basic" || uri.password == "x" || uri.password.nil?
           # URI as string does not display with password if no user is set
           oauth_designation = uri.password
           uri.user = oauth_designation
@@ -25,7 +25,7 @@ module Bundler
       end
       return uri.to_s if uri_to_anonymize.is_a?(String)
       uri
-    rescue Bundler::URI::InvalidURIError # uri is not canonical uri scheme
+    rescue Gem::URI::InvalidURIError # uri is not canonical uri scheme
       uri
     end
 

data/bundler/lib/bundler/uri_normalizer.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Bundler
+  module URINormalizer
+    module_function
+
+    # Normalizes uri to a consistent version, either with or without trailing
+    # slash.
+    #
+    # TODO: Currently gem sources are locked with a trailing slash, while git
+    # sources are locked without a trailing slash. This should be normalized but
+    # the inconsistency is there for now to avoid changing all lockfiles
+    # including GIT sources. We could normalize this on the next major.
+    #
+    def normalize_suffix(uri, trailing_slash: true)
+      if trailing_slash
+        uri.end_with?("/") ? uri : "#{uri}/"
+      else
+        uri.end_with?("/") ? uri.delete_suffix("/") : uri
+      end
+    end
+  end
+end

data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb

@@ -49,7 +49,7 @@ class Bundler::ConnectionPool::TimedStack
       @resource.broadcast
     end
   end
-  alias << push
+  alias_method :<<, :push
 
   ##
   # Retrieves a connection from the stack.  If a connection is available it is
@@ -74,7 +74,7 @@ class Bundler::ConnectionPool::TimedStack
         return connection if connection
 
         to_wait = deadline - current_time
-        raise Bundler::ConnectionPool::TimeoutError, "Waited #{timeout} sec" if to_wait <= 0
+        raise Bundler::ConnectionPool::TimeoutError, "Waited #{timeout} sec, #{length}/#{@max} available" if to_wait <= 0
         @resource.wait(@mutex, to_wait)
       end
     end
@@ -87,7 +87,7 @@ class Bundler::ConnectionPool::TimedStack
   # +:reload+ is +true+.
 
   def shutdown(reload: false, &block)
-    raise ArgumentError, "shutdown must receive a block" unless block_given?
+    raise ArgumentError, "shutdown must receive a block" unless block
 
     @mutex.synchronize do
       @shutdown_block = block

data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/version.rb

@@ -1,3 +1,3 @@
 class Bundler::ConnectionPool
-  VERSION = "2.3.0"
+  VERSION = "2.4.1"
 end

data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/wrapper.rb

@@ -30,7 +30,6 @@ class Bundler::ConnectionPool
       METHODS.include?(id) || with { |c| c.respond_to?(id, *args) }
     end
 
-    # rubocop:disable Style/MethodMissingSuper
     # rubocop:disable Style/MissingRespondToMissing
     if ::RUBY_VERSION >= "3.0.0"
       def method_missing(name, *args, **kwargs, &block)