Skip to content

Commit cb67141

Browse files
committed
Remove pessimistic versioning in gem command output
Switch examples to use `>=2` instead of `~>2.0.0` (which is really terrible as you are limited to 2.0.x versions). For the help output, show a simpler example with a single version restriction, before an example with multiple version restrictions.
1 parent 5869518 commit cb67141

7 files changed

Lines changed: 9 additions & 7 deletions

lib/rubygems/commands/fetch_command.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def check_version # :nodoc:
5656
if options[:version] != Gem::Requirement.default &&
5757
get_all_gem_names.size > 1
5858
alert_error "Can't use --version with multiple gems. You can specify multiple gems with" \
59-
" version requirements using `gem fetch 'my_gem:1.0.0' 'my_other_gem:~>2.0.0'`"
59+
" version requirements using `gem fetch 'my_gem:1.0.0' 'my_other_gem:>=2'`"
6060
terminate_interaction 1
6161
end
6262
end

lib/rubygems/commands/help_command.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,9 @@ class Gem::Commands::HelpCommand < Gem::Command
9090
9191
To depend on a specific set of versions:
9292
93-
gem 'rake', '~> 10.3', '>= 10.3.2'
93+
gem 'rake', '>= 10.3.2'
94+
# or for multiple version restrictions
95+
gem 'rake', '>= 10.3.2', "< 13"
9496
9597
RubyGems will require the gem name when activating the gem using
9698
the RUBYGEMS_GEMDEPS environment variable or Gem::use_gemdeps. Use the

lib/rubygems/commands/install_command.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ def check_version # :nodoc:
140140
if options[:version] != Gem::Requirement.default &&
141141
get_all_gem_names.size > 1
142142
alert_error "Can't use --version with multiple gems. You can specify multiple gems with" \
143-
" version requirements using `gem install 'my_gem:1.0.0' 'my_other_gem:~>2.0.0'`"
143+
" version requirements using `gem install 'my_gem:1.0.0' 'my_other_gem:>=2'`"
144144
terminate_interaction 1
145145
end
146146
end

lib/rubygems/commands/uninstall_command.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ def check_version # :nodoc:
117117
if options[:version] != Gem::Requirement.default &&
118118
get_all_gem_names.size > 1
119119
alert_error "Can't use --version with multiple gems. You can specify multiple gems with" \
120-
" version requirements using `gem uninstall 'my_gem:1.0.0' 'my_other_gem:~>2.0.0'`"
120+
" version requirements using `gem uninstall 'my_gem:1.0.0' 'my_other_gem:>=2'`"
121121
terminate_interaction 1
122122
end
123123
end

test/rubygems/test_gem_commands_fetch_command.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ def test_execute_two_version
157157
execute_with_term_error
158158

159159
msg = "ERROR: Can't use --version with multiple gems. You can specify multiple gems with" \
160-
" version requirements using `gem fetch 'my_gem:1.0.0' 'my_other_gem:~>2.0.0'`"
160+
" version requirements using `gem fetch 'my_gem:1.0.0' 'my_other_gem:>=2'`"
161161

162162
assert_empty @ui.output
163163
assert_equal msg, @ui.error.chomp

test/rubygems/test_gem_commands_install_command.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -880,7 +880,7 @@ def test_execute_two_version
880880
assert_empty @cmd.installed_specs
881881

882882
msg = "ERROR: Can't use --version with multiple gems. You can specify multiple gems with" \
883-
" version requirements using `gem install 'my_gem:1.0.0' 'my_other_gem:~>2.0.0'`"
883+
" version requirements using `gem install 'my_gem:1.0.0' 'my_other_gem:>=2'`"
884884

885885
assert_empty @ui.output
886886
assert_equal msg, @ui.error.chomp

test/rubygems/test_gem_commands_uninstall_command.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ def test_execute_two_version
513513
end
514514

515515
msg = "ERROR: Can't use --version with multiple gems. You can specify multiple gems with" \
516-
" version requirements using `gem uninstall 'my_gem:1.0.0' 'my_other_gem:~>2.0.0'`"
516+
" version requirements using `gem uninstall 'my_gem:1.0.0' 'my_other_gem:>=2'`"
517517

518518
assert_empty @ui.output
519519
assert_equal msg, @ui.error.lines.last.chomp

0 commit comments

Comments
 (0)