diff options
Diffstat (limited to 'lib/rubygems/command_manager.rb')
| -rw-r--r-- | lib/rubygems/command_manager.rb | 105 |
1 files changed, 69 insertions, 36 deletions
diff --git a/lib/rubygems/command_manager.rb b/lib/rubygems/command_manager.rb index 887272378e..76b2fba835 100644 --- a/lib/rubygems/command_manager.rb +++ b/lib/rubygems/command_manager.rb @@ -1,12 +1,14 @@ # frozen_string_literal: true + #-- # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others. # All rights reserved. # See LICENSE.txt for permissions. #++ -require 'rubygems/command' -require 'rubygems/user_interaction' +require_relative "command" +require_relative "user_interaction" +require_relative "text" ## # The command manager registers and installs all the individual sub-commands @@ -31,7 +33,7 @@ require 'rubygems/user_interaction' # See Gem::Command for instructions on writing gem commands. class Gem::CommandManager - + include Gem::Text include Gem::UserInteraction BUILTIN_COMMANDS = [ # :nodoc: @@ -42,9 +44,11 @@ class Gem::CommandManager :contents, :dependency, :environment, + :exec, :fetch, :generate_index, :help, + :info, :install, :list, :lock, @@ -54,8 +58,8 @@ class Gem::CommandManager :owner, :pristine, :push, - :query, :rdoc, + :rebuild, :search, :server, :signin, @@ -68,13 +72,19 @@ class Gem::CommandManager :update, :which, :yank, - ] + ].freeze + + ALIAS_COMMANDS = { + "i" => "install", + "login" => "signin", + "logout" => "signout", + }.freeze ## # Return the authoritative instance of the command manager. def self.instance - @command_manager ||= new + @instance ||= new end ## @@ -89,14 +99,14 @@ class Gem::CommandManager # Reset the authoritative instance of the command manager. def self.reset - @command_manager = nil + @instance = nil end ## # Register all the subcommands supported by the gem command. def initialize - require 'timeout' + require_relative "vendored_timeout" @commands = {} BUILTIN_COMMANDS.each do |name| @@ -107,7 +117,7 @@ class Gem::CommandManager ## # Register the Symbol +command+ as a gem command. - def register_command(command, obj=false) + def register_command(command, obj = false) @commands[command] = obj end @@ -131,66 +141,85 @@ class Gem::CommandManager # Return a sorted list of all command names as strings. def command_names - @commands.keys.collect {|key| key.to_s}.sort + @commands.keys.collect(&:to_s).sort end ## # Run the command specified by +args+. - def run(args, build_args=nil) + def run(args, build_args = nil) process_args(args, build_args) - rescue StandardError, Timeout::Error => ex - alert_error "While executing gem ... (#{ex.class})\n #{ex}" + rescue StandardError, Gem::Timeout::Error => ex + if ex.respond_to?(:detailed_message) + msg = ex.detailed_message(highlight: false).sub(/\A(.*?)(?: \(.+?\))/) { $1 } + else + msg = ex.message + end + alert_error clean_text("While executing gem ... (#{ex.class})\n #{msg}") ui.backtrace ex terminate_interaction(1) rescue Interrupt - alert_error "Interrupted" + alert_error clean_text("Interrupted") terminate_interaction(1) end - def process_args(args, build_args=nil) - if args.empty? then + def process_args(args, build_args = nil) + if args.empty? say Gem::Command::HELP terminate_interaction 1 end case args.first - when '-h', '--help' then + when "-h", "--help" then say Gem::Command::HELP terminate_interaction 0 - when '-v', '--version' then + when "-v", "--version" then say Gem::VERSION terminate_interaction 0 + when "-C" then + args.shift + start_point = args.shift + if Dir.exist?(start_point) + Dir.chdir(start_point) { invoke_command(args, build_args) } + else + alert_error clean_text("#{start_point} isn't a directory.") + terminate_interaction 1 + end when /^-/ then - alert_error "Invalid option: #{args.first}. See 'gem --help'." + alert_error clean_text("Invalid option: #{args.first}. See 'gem --help'.") terminate_interaction 1 else - cmd_name = args.shift.downcase - cmd = find_command cmd_name - cmd.invoke_with_build_args args, build_args + invoke_command(args, build_args) end end def find_command(cmd_name) + cmd_name = find_alias_command cmd_name + possibilities = find_command_possibilities cmd_name - if possibilities.size > 1 then + if possibilities.size > 1 raise Gem::CommandLineError, - "Ambiguous command #{cmd_name} matches [#{possibilities.join(', ')}]" - elsif possibilities.empty? then - raise Gem::CommandLineError, "Unknown command #{cmd_name}" + "Ambiguous command #{cmd_name} matches [#{possibilities.join(", ")}]" + elsif possibilities.empty? + raise Gem::UnknownCommandError.new(cmd_name) end self[possibilities.first] end + def find_alias_command(cmd_name) + alias_name = ALIAS_COMMANDS[cmd_name] + alias_name ? alias_name : cmd_name + end + def find_command_possibilities(cmd_name) len = cmd_name.length - found = command_names.select { |name| cmd_name == name[0, len] } + found = command_names.select {|name| cmd_name == name[0, len] } - exact = found.find { |name| name == cmd_name } + exact = found.find {|name| name == cmd_name } exact ? [exact] : found end @@ -200,22 +229,26 @@ class Gem::CommandManager def load_and_instantiate(command_name) command_name = command_name.to_s const_name = command_name.capitalize.gsub(/_(.)/) { $1.upcase } << "Command" - load_error = nil begin begin require "rubygems/commands/#{command_name}_command" - rescue LoadError => e - load_error = e + rescue LoadError + # it may have been defined from a rubygems_plugin.rb file end - Gem::Commands.const_get(const_name).new - rescue Exception => e - e = load_error if load_error - alert_error "Loading command: #{command_name} (#{e.class})\n\t#{e}" + Gem::Commands.const_get(const_name).new + rescue StandardError => e + alert_error clean_text("Loading command: #{command_name} (#{e.class})\n\t#{e}") ui.backtrace e end end + def invoke_command(args, build_args) + cmd_name = args.shift.downcase + cmd = find_command cmd_name + terminate_interaction 1 unless cmd + cmd.deprecation_warning if cmd.deprecated? + cmd.invoke_with_build_args args, build_args + end end - |