diff options
| -rw-r--r-- | lib/rubygems/commands/environment_command.rb | 3 | ||||
| -rw-r--r-- | lib/rubygems/compatibility.rb | 40 | ||||
| -rw-r--r-- | test/rubygems/test_gem_commands_environment_command.rb | 11 |
3 files changed, 0 insertions, 54 deletions
diff --git a/lib/rubygems/commands/environment_command.rb b/lib/rubygems/commands/environment_command.rb index 11fb45f68d..c98a77ac2e 100644 --- a/lib/rubygems/commands/environment_command.rb +++ b/lib/rubygems/commands/environment_command.rb @@ -9,7 +9,6 @@ class Gem::Commands::EnvironmentCommand < Gem::Command def arguments # :nodoc: args = <<-EOF - packageversion display the package version gemdir display the path where gems are installed gempath display path used to search for gems version display the gem format version @@ -76,8 +75,6 @@ lib/rubygems/defaults/operating_system.rb arg = options[:args][0] out << case arg - when /^packageversion/ then - Gem::RubyGemsPackageVersion when /^version/ then Gem::VERSION when /^gemdir/, /^gemhome/, /^home/, /^GEM_HOME/ then diff --git a/lib/rubygems/compatibility.rb b/lib/rubygems/compatibility.rb deleted file mode 100644 index b4332eb9f1..0000000000 --- a/lib/rubygems/compatibility.rb +++ /dev/null @@ -1,40 +0,0 @@ -# frozen_string_literal: true -# :stopdoc: - -#-- -# This file contains all sorts of little compatibility hacks that we've -# had to introduce over the years. Quarantining them into one file helps -# us know when we can get rid of them. -# -# Ruby 1.9.x has introduced some things that are awkward, and we need to -# support them, so we define some constants to use later. -#++ - -module Gem - RubyGemsVersion = VERSION - - # TODO remove at RubyGems 3 - - RbConfigPriorities = %w[ - MAJOR - MINOR - TEENY - EXEEXT RUBY_SO_NAME arch bindir datadir libdir ruby_install_name - ruby_version rubylibprefix sitedir sitelibdir vendordir vendorlibdir - rubylibdir - ].freeze - - unless defined?(ConfigMap) - ## - # Configuration settings from ::RbConfig - ConfigMap = Hash.new do |cm, key| # TODO remove at RubyGems 3 - cm[key] = RbConfig::CONFIG[key.to_s] - end - else - RbConfigPriorities.each do |key| - ConfigMap[key.to_sym] = RbConfig::CONFIG[key] - end - end - - RubyGemsPackageVersion = VERSION -end diff --git a/test/rubygems/test_gem_commands_environment_command.rb b/test/rubygems/test_gem_commands_environment_command.rb index 074df19e52..5dd0fc7521 100644 --- a/test/rubygems/test_gem_commands_environment_command.rb +++ b/test/rubygems/test_gem_commands_environment_command.rb @@ -90,17 +90,6 @@ class TestGemCommandsEnvironmentCommand < Gem::TestCase assert_equal '', @ui.error end - def test_execute_packageversion - @cmd.send :handle_options, %w[packageversion] - - use_ui @ui do - @cmd.execute - end - - assert_equal "#{Gem::RubyGemsPackageVersion}\n", @ui.output - assert_equal '', @ui.error - end - def test_execute_remotesources orig_sources = Gem.sources.dup Gem.sources.replace %w[http://gems.example.com] |