bundler 2.3.26 → 2.4.13

data/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/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/lib/bundler/templates/newgem/ext/newgem/src/lib.rs.tt

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

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

@@ -18,10 +18,20 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+<%- 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/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/lib/bundler/templates/newgem/gitlab-ci.yml.tt

@@ -2,9 +2,17 @@ default:
   image: ruby:<%= RUBY_VERSION %>
 
   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/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'"
 
@@ -26,15 +29,18 @@ Gem::Specification.new do |spec|
   # 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)})
+      (File.expand_path(f) == __FILE__) || f.start_with?(*%w[bin/ test/ spec/ features/ .git .circleci appveyor])
     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' -%>
   spec.extensions = ["ext/<%= config[:underscored_name] %>/extconf.rb"]
 <%- end -%>
+<%- if config[:ext] == 'rust' -%>
+  spec.extensions = ["ext/<%= config[:underscored_name] %>/Cargo.toml"]
+<%- end -%>
 
   # Uncomment to register a new dependency of your gem
   # spec.add_dependency "example-gem", "~> 1.0"

data/lib/bundler/ui/shell.rb

@@ -20,29 +20,52 @@ module Bundler
         @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 debug(msg = nil, newline = nil)
+        return unless debug?
+
+        tell_me(msg || yield, nil, newline)
+      end
+
+      def info?
+        level("info")
+      end
+
+      def confirm?
+        level("confirm")
       end
 
-      def error(msg, newline = nil, color = :red)
-        return unless level("error")
-        tell_err(msg, color, newline)
+      def warn?
+        level("warn")
       end
 
-      def debug(msg, newline = nil)
-        tell_me(msg, nil, newline) if debug?
+      def error?
+        level("error")
       end
 
       def debug?

data/lib/bundler/ui/silent.rb

@@ -13,30 +13,46 @@ 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 ask(message)
       end
 

data/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/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/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)

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

@@ -3,7 +3,9 @@ require_relative "connection_pool/version"
 
 class Bundler::ConnectionPool
   class Error < ::RuntimeError; end
+
   class PoolShuttingDownError < ::Bundler::ConnectionPool::Error; end
+
   class TimeoutError < ::Timeout::Error; end
 end
 
@@ -67,7 +69,7 @@ class Bundler::ConnectionPool
       end
     end
   end
-  alias then with
+  alias_method :then, :with
 
   def checkout(options = {})
     if ::Thread.current[@key]