Skip to content

Commit ff1b8ff

Browse files
Edouard-chinmatzbot
authored andcommitted
[ruby/rubygems] Tweak the Bundler's "X gems now installed message":
- Fix ruby/rubygems#9188 - This message is a bit misleading because it always outputs one extra specs, which is Bundler itself. This is now fixed when the message is about to be output. ruby/rubygems@70b4e19506
1 parent f88e797 commit ff1b8ff

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

lib/bundler/cli/install.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def dependencies_count_for(definition)
9090
end
9191

9292
def gems_installed_for(definition)
93-
count = definition.specs.count
93+
count = definition.specs.count {|spec| spec.name != "bundler" }
9494
"#{count} #{count == 1 ? "gem" : "gems"} now installed"
9595
end
9696

spec/bundler/commands/post_bundle_message_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
let(:bundle_show_path_message) { "Bundled gems are installed into `#{bundle_path}`" }
1919
let(:bundle_complete_message) { "Bundle complete!" }
2020
let(:bundle_updated_message) { "Bundle updated!" }
21-
let(:installed_gems_stats) { "4 Gemfile dependencies, 5 gems now installed." }
21+
let(:installed_gems_stats) { "4 Gemfile dependencies, 4 gems now installed." }
2222

2323
describe "when installing to system gems" do
2424
before do
@@ -44,14 +44,14 @@
4444
expect(out).to include(bundle_show_system_message)
4545
expect(out).to include("Gems in the groups 'emo' and 'test' were not installed")
4646
expect(out).to include(bundle_complete_message)
47-
expect(out).to include("4 Gemfile dependencies, 3 gems now installed.")
47+
expect(out).to include("4 Gemfile dependencies, 2 gems now installed.")
4848

4949
bundle "config set --local without emo obama test"
5050
bundle :install
5151
expect(out).to include(bundle_show_system_message)
5252
expect(out).to include("Gems in the groups 'emo', 'obama' and 'test' were not installed")
5353
expect(out).to include(bundle_complete_message)
54-
expect(out).to include("4 Gemfile dependencies, 2 gems now installed.")
54+
expect(out).to include("4 Gemfile dependencies, 1 gem now installed.")
5555
end
5656

5757
describe "for second bundle install run" do

0 commit comments

Comments
 (0)