diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2021-11-11 10:41:39 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2021-11-22 10:51:35 +0900 |
| commit | 24f911f474e11560af5fbd0f637f4c0ded23f604 (patch) | |
| tree | 2f4d2fbdf6bc195012cbced0dac7d1463934cc67 /lib/bundler | |
| parent | 31a71048521224774bdb8b5982ab73eb35dad66d (diff) | |
Merge RubyGems 3.2.28 and Bundler 2.2.28
Diffstat (limited to 'lib/bundler')
| -rw-r--r-- | lib/bundler/cli.rb | 1 | ||||
| -rw-r--r-- | lib/bundler/cli/remove.rb | 3 | ||||
| -rw-r--r-- | lib/bundler/templates/newgem/newgem.gemspec.tt | 2 | ||||
| -rw-r--r-- | lib/bundler/version.rb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb index 294b07d555..97c6f25a98 100644 --- a/lib/bundler/cli.rb +++ b/lib/bundler/cli.rb @@ -184,6 +184,7 @@ module Bundler method_option "install", :type => :boolean, :banner => "Runs 'bundle install' after removing the gems from the Gemfile" def remove(*gems) + SharedHelpers.major_deprecation(2, "The `--install` flag has been deprecated. `bundle install` is triggered by default.") if ARGV.include?("--install") require_relative "cli/remove" Remove.new(gems, options).run end diff --git a/lib/bundler/cli/remove.rb b/lib/bundler/cli/remove.rb index cd6a2cec28..44a4d891dd 100644 --- a/lib/bundler/cli/remove.rb +++ b/lib/bundler/cli/remove.rb @@ -11,8 +11,7 @@ module Bundler raise InvalidOption, "Please specify gems to remove." if @gems.empty? Injector.remove(@gems, {}) - - Installer.install(Bundler.root, Bundler.definition) if @options["install"] + Installer.install(Bundler.root, Bundler.definition) end end end diff --git a/lib/bundler/templates/newgem/newgem.gemspec.tt b/lib/bundler/templates/newgem/newgem.gemspec.tt index 271d39dec5..d0086e4bd1 100644 --- a/lib/bundler/templates/newgem/newgem.gemspec.tt +++ b/lib/bundler/templates/newgem/newgem.gemspec.tt @@ -16,7 +16,7 @@ Gem::Specification.new do |spec| <%- end -%> spec.required_ruby_version = ">= <%= config[:required_ruby_version] %>" - spec.metadata["allowed_push_host"] = "TODO: Set to 'https://mygemserver.com'" + spec.metadata["allowed_push_host"] = "TODO: Set to your gem server 'https://example.com'" spec.metadata["homepage_uri"] = spec.homepage spec.metadata["source_code_uri"] = "TODO: Put your gem's public repo URL here." diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb index 690d5a511c..cf4965c0db 100644 --- a/lib/bundler/version.rb +++ b/lib/bundler/version.rb @@ -1,7 +1,7 @@ # frozen_string_literal: false module Bundler - VERSION = "2.2.27".freeze + VERSION = "2.2.28".freeze def self.bundler_major_version @bundler_major_version ||= VERSION.split(".").first.to_i |