summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorFrank Lam <ryzingsun11@yahoo.com>2020-05-28 17:48:15 +0800
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2020-06-18 19:14:15 +0900
commit52a900773e560e2dd5938a057ee743c8111642eb (patch)
treed4ffb932a977036636d39157289320c3cc45463f /lib
parente6479ac3f69ff1d27646ba9e44a829c3d00a1374 (diff)
[rubygems/rubygems] Incorporate naming/grammar suggestions from olleolleolle
https://github.com/rubygems/rubygems/commit/80571452ca
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/3212
Diffstat (limited to 'lib')
-rw-r--r--lib/bundler/cli.rb2
-rw-r--r--lib/bundler/cli/gem.rb8
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb
index e342aa6edb..405f9e1ac2 100644
--- a/lib/bundler/cli.rb
+++ b/lib/bundler/cli.rb
@@ -575,7 +575,7 @@ module Bundler
method_option :rubocop, :type => :boolean, :desc => "Add rubocop to the generated Rakefile and gemspec. Set a default with `bundle config set gem.rubocop true`."
method_option :test, :type => :string, :lazy_default => Bundler.settings["gem.test"] || "", :aliases => "-t", :banner => "Use the specified test framework for your library",
:desc => "Generate a test directory for your library, either rspec, minitest or test-unit. Set a default with `bundle config set gem.test rspec`."
- method_option :ci, :type => :string, :desc => "Generate CI configuration, either Github Actions, Travis CI, Gitlab CI or Circle CI. Set a default with `bundle config set gem.ci (github|travis|gitlab|circle)`"
+ method_option :ci, :type => :string, :desc => "Generate CI configuration, either GitHub Actions, Travis CI, GitLab CI or CircleCI. Set a default with `bundle config set gem.ci (github|travis|gitlab|circle)`"
def gem(name)
end
diff --git a/lib/bundler/cli/gem.rb b/lib/bundler/cli/gem.rb
index 65a37dbb47..1303a883f6 100644
--- a/lib/bundler/cli/gem.rb
+++ b/lib/bundler/cli/gem.rb
@@ -263,10 +263,10 @@ module Bundler
if ci_template.nil?
Bundler.ui.confirm "Do you want to set up automated testing for your gem? " \
"Continuous integration services make it easy to see if pull requests have passing tests " \
- "before you merge them. Bundler supports these services:"\
- "* Circle CI: https://circleci.com/\n" \
- "* Github Actions: https://github.com/features/actions\n" \
- "* Gitlab CI: https://docs.gitlab.com/ee/ci/\n" \
+ "before you merge them. Bundler supports these services:" \
+ "* CircleCI: https://circleci.com/\n" \
+ "* GitHub Actions: https://github.com/features/actions\n" \
+ "* GitLab CI: https://docs.gitlab.com/ee/ci/\n" \
"* Travis CI: https://travis-ci.org/\n" \
"\n"