diff options
| -rw-r--r-- | lib/bundler/cli/gem.rb | 10 | ||||
| -rw-r--r-- | spec/bundler/commands/newgem_spec.rb | 7 |
2 files changed, 6 insertions, 11 deletions
diff --git a/lib/bundler/cli/gem.rb b/lib/bundler/cli/gem.rb index e42077b428..edbc6d6216 100644 --- a/lib/bundler/cli/gem.rb +++ b/lib/bundler/cli/gem.rb @@ -193,12 +193,6 @@ module Bundler "so -t is not needed if you want to continue using it. " \ "This setting can be changed anytime with `bundle config gem.test`." end - - if options[:ci] == Bundler.settings["gem.ci"] - Bundler.ui.info "Bundler is configured to generate CI files for #{Bundler.settings["gem.ci"]}, "\ - "so --ci is not needed if you want to continue using it. " \ - "This setting can be changed anytime with `bundle config gem.ci`." - end rescue Errno::EEXIST => e raise GenericSystemCallError.new(e, "There was a conflict while creating the new gem.") end @@ -288,6 +282,10 @@ module Bundler Bundler.settings.set_global("gem.ci", ci_template) end + if options[:ci] == Bundler.settings["gem.ci"] + Bundler.ui.info "#{options[:ci]} is already configured, ignoring --ci flag." + end + ci_template end diff --git a/spec/bundler/commands/newgem_spec.rb b/spec/bundler/commands/newgem_spec.rb index 325b9a7edd..46f73179f3 100644 --- a/spec/bundler/commands/newgem_spec.rb +++ b/spec/bundler/commands/newgem_spec.rb @@ -749,11 +749,8 @@ RSpec.describe "bundle gem" do expect(bundled_app("#{gem_name}/.github/workflows/main.yml")).to exist end - it "hints that --ci is not needed" do - hint = "Bundler is configured to generate CI files for github, "\ - "so --ci is not needed if you want to continue using it. " \ - "This setting can be changed anytime with `bundle config gem.ci`." - expect(out).to match(hint) + it "hints that --ci is already configured" do + expect(out).to match("github is already configured, ignoring --ci flag.") end end |