mirror of
https://github.com/ruby/ruby.git
synced 2025-08-23 13:04:13 +02:00
Update to RubyGems 1.3.4 r2223
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23659 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
drbrain
parent
a6afbaeb3b
commit
31c94ffeb5
126 changed files with 7610 additions and 3747 deletions
|
|
@ -4,357 +4,387 @@
|
|||
# See LICENSE.txt for permissions.
|
||||
#++
|
||||
|
||||
module Gem
|
||||
##
|
||||
# Module that defines the default UserInteraction. Any class including this
|
||||
# module will have access to the +ui+ method that returns the default UI.
|
||||
|
||||
module Gem::DefaultUserInteraction
|
||||
|
||||
##
|
||||
# Module that defines the default UserInteraction. Any class including this
|
||||
# module will have access to the +ui+ method that returns the default UI.
|
||||
# The default UI is a class variable of the singleton class for this
|
||||
# module.
|
||||
|
||||
module DefaultUserInteraction
|
||||
@ui = nil
|
||||
|
||||
##
|
||||
# The default UI is a class variable of the singleton class for this
|
||||
# module.
|
||||
|
||||
@ui = nil
|
||||
|
||||
##
|
||||
# Return the default UI.
|
||||
|
||||
def self.ui
|
||||
@ui ||= Gem::ConsoleUI.new
|
||||
end
|
||||
|
||||
##
|
||||
# Set the default UI. If the default UI is never explicitly set, a simple
|
||||
# console based UserInteraction will be used automatically.
|
||||
|
||||
def self.ui=(new_ui)
|
||||
@ui = new_ui
|
||||
end
|
||||
|
||||
##
|
||||
# Use +new_ui+ for the duration of +block+.
|
||||
|
||||
def self.use_ui(new_ui)
|
||||
old_ui = @ui
|
||||
@ui = new_ui
|
||||
yield
|
||||
ensure
|
||||
@ui = old_ui
|
||||
end
|
||||
|
||||
##
|
||||
# See DefaultUserInteraction::ui
|
||||
|
||||
def ui
|
||||
DefaultUserInteraction.ui
|
||||
end
|
||||
|
||||
##
|
||||
# See DefaultUserInteraction::ui=
|
||||
|
||||
def ui=(new_ui)
|
||||
DefaultUserInteraction.ui = new_ui
|
||||
end
|
||||
|
||||
##
|
||||
# See DefaultUserInteraction::use_ui
|
||||
|
||||
def use_ui(new_ui, &block)
|
||||
DefaultUserInteraction.use_ui(new_ui, &block)
|
||||
end
|
||||
##
|
||||
# Return the default UI.
|
||||
|
||||
def self.ui
|
||||
@ui ||= Gem::ConsoleUI.new
|
||||
end
|
||||
|
||||
##
|
||||
# Make the default UI accessable without the "ui." prefix. Classes
|
||||
# including this module may use the interaction methods on the default UI
|
||||
# directly. Classes may also reference the ui and ui= methods.
|
||||
#
|
||||
# Example:
|
||||
#
|
||||
# class X
|
||||
# include Gem::UserInteraction
|
||||
#
|
||||
# def get_answer
|
||||
# n = ask("What is the meaning of life?")
|
||||
# end
|
||||
# end
|
||||
# Set the default UI. If the default UI is never explicitly set, a simple
|
||||
# console based UserInteraction will be used automatically.
|
||||
|
||||
module UserInteraction
|
||||
|
||||
include DefaultUserInteraction
|
||||
|
||||
[:alert,
|
||||
:alert_error,
|
||||
:alert_warning,
|
||||
:ask,
|
||||
:ask_yes_no,
|
||||
:choose_from_list,
|
||||
:say,
|
||||
:terminate_interaction ].each do |methname|
|
||||
class_eval %{
|
||||
def #{methname}(*args)
|
||||
ui.#{methname}(*args)
|
||||
end
|
||||
}, __FILE__, __LINE__
|
||||
end
|
||||
def self.ui=(new_ui)
|
||||
@ui = new_ui
|
||||
end
|
||||
|
||||
##
|
||||
# StreamUI implements a simple stream based user interface.
|
||||
# Use +new_ui+ for the duration of +block+.
|
||||
|
||||
class StreamUI
|
||||
def self.use_ui(new_ui)
|
||||
old_ui = @ui
|
||||
@ui = new_ui
|
||||
yield
|
||||
ensure
|
||||
@ui = old_ui
|
||||
end
|
||||
|
||||
attr_reader :ins, :outs, :errs
|
||||
##
|
||||
# See DefaultUserInteraction::ui
|
||||
|
||||
def initialize(in_stream, out_stream, err_stream=STDERR)
|
||||
@ins = in_stream
|
||||
@outs = out_stream
|
||||
@errs = err_stream
|
||||
end
|
||||
def ui
|
||||
Gem::DefaultUserInteraction.ui
|
||||
end
|
||||
|
||||
##
|
||||
# Choose from a list of options. +question+ is a prompt displayed above
|
||||
# the list. +list+ is a list of option strings. Returns the pair
|
||||
# [option_name, option_index].
|
||||
##
|
||||
# See DefaultUserInteraction::ui=
|
||||
|
||||
def choose_from_list(question, list)
|
||||
@outs.puts question
|
||||
def ui=(new_ui)
|
||||
Gem::DefaultUserInteraction.ui = new_ui
|
||||
end
|
||||
|
||||
list.each_with_index do |item, index|
|
||||
@outs.puts " #{index+1}. #{item}"
|
||||
##
|
||||
# See DefaultUserInteraction::use_ui
|
||||
|
||||
def use_ui(new_ui, &block)
|
||||
Gem::DefaultUserInteraction.use_ui(new_ui, &block)
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
##
|
||||
# Make the default UI accessable without the "ui." prefix. Classes
|
||||
# including this module may use the interaction methods on the default UI
|
||||
# directly. Classes may also reference the ui and ui= methods.
|
||||
#
|
||||
# Example:
|
||||
#
|
||||
# class X
|
||||
# include Gem::UserInteraction
|
||||
#
|
||||
# def get_answer
|
||||
# n = ask("What is the meaning of life?")
|
||||
# end
|
||||
# end
|
||||
|
||||
module Gem::UserInteraction
|
||||
|
||||
include Gem::DefaultUserInteraction
|
||||
|
||||
##
|
||||
# :method: alert
|
||||
|
||||
##
|
||||
# :method: alert_error
|
||||
|
||||
##
|
||||
# :method: alert_warning
|
||||
|
||||
##
|
||||
# :method: ask
|
||||
|
||||
##
|
||||
# :method: ask_yes_no
|
||||
|
||||
##
|
||||
# :method: choose_from_list
|
||||
|
||||
##
|
||||
# :method: say
|
||||
|
||||
##
|
||||
# :method: terminate_interaction
|
||||
|
||||
[:alert,
|
||||
:alert_error,
|
||||
:alert_warning,
|
||||
:ask,
|
||||
:ask_yes_no,
|
||||
:choose_from_list,
|
||||
:say,
|
||||
:terminate_interaction ].each do |methname|
|
||||
class_eval %{
|
||||
def #{methname}(*args)
|
||||
ui.#{methname}(*args)
|
||||
end
|
||||
}, __FILE__, __LINE__
|
||||
end
|
||||
end
|
||||
|
||||
@outs.print "> "
|
||||
@outs.flush
|
||||
##
|
||||
# Gem::StreamUI implements a simple stream based user interface.
|
||||
|
||||
result = @ins.gets
|
||||
class Gem::StreamUI
|
||||
|
||||
return nil, nil unless result
|
||||
attr_reader :ins, :outs, :errs
|
||||
|
||||
result = result.strip.to_i - 1
|
||||
return list[result], result
|
||||
def initialize(in_stream, out_stream, err_stream=STDERR)
|
||||
@ins = in_stream
|
||||
@outs = out_stream
|
||||
@errs = err_stream
|
||||
end
|
||||
|
||||
##
|
||||
# Choose from a list of options. +question+ is a prompt displayed above
|
||||
# the list. +list+ is a list of option strings. Returns the pair
|
||||
# [option_name, option_index].
|
||||
|
||||
def choose_from_list(question, list)
|
||||
@outs.puts question
|
||||
|
||||
list.each_with_index do |item, index|
|
||||
@outs.puts " #{index+1}. #{item}"
|
||||
end
|
||||
|
||||
##
|
||||
# Ask a question. Returns a true for yes, false for no. If not connected
|
||||
# to a tty, raises an exception if default is nil, otherwise returns
|
||||
# default.
|
||||
@outs.print "> "
|
||||
@outs.flush
|
||||
|
||||
def ask_yes_no(question, default=nil)
|
||||
unless @ins.tty? then
|
||||
if default.nil? then
|
||||
raise Gem::OperationNotSupportedError,
|
||||
"Not connected to a tty and no default specified"
|
||||
else
|
||||
return default
|
||||
end
|
||||
end
|
||||
result = @ins.gets
|
||||
|
||||
qstr = case default
|
||||
when nil
|
||||
'yn'
|
||||
when true
|
||||
'Yn'
|
||||
else
|
||||
'yN'
|
||||
end
|
||||
return nil, nil unless result
|
||||
|
||||
result = nil
|
||||
result = result.strip.to_i - 1
|
||||
return list[result], result
|
||||
end
|
||||
|
||||
while result.nil?
|
||||
result = ask("#{question} [#{qstr}]")
|
||||
result = case result
|
||||
when /^[Yy].*/
|
||||
true
|
||||
when /^[Nn].*/
|
||||
false
|
||||
when /^$/
|
||||
default
|
||||
else
|
||||
nil
|
||||
end
|
||||
end
|
||||
##
|
||||
# Ask a question. Returns a true for yes, false for no. If not connected
|
||||
# to a tty, raises an exception if default is nil, otherwise returns
|
||||
# default.
|
||||
|
||||
return result
|
||||
end
|
||||
|
||||
##
|
||||
# Ask a question. Returns an answer if connected to a tty, nil otherwise.
|
||||
|
||||
def ask(question)
|
||||
return nil if not @ins.tty?
|
||||
|
||||
@outs.print(question + " ")
|
||||
@outs.flush
|
||||
|
||||
result = @ins.gets
|
||||
result.chomp! if result
|
||||
result
|
||||
end
|
||||
|
||||
##
|
||||
# Display a statement.
|
||||
|
||||
def say(statement="")
|
||||
@outs.puts statement
|
||||
end
|
||||
|
||||
##
|
||||
# Display an informational alert. Will ask +question+ if it is not nil.
|
||||
|
||||
def alert(statement, question=nil)
|
||||
@outs.puts "INFO: #{statement}"
|
||||
ask(question) if question
|
||||
end
|
||||
|
||||
##
|
||||
# Display a warning in a location expected to get error messages. Will
|
||||
# ask +question+ if it is not nil.
|
||||
|
||||
def alert_warning(statement, question=nil)
|
||||
@errs.puts "WARNING: #{statement}"
|
||||
ask(question) if question
|
||||
end
|
||||
|
||||
##
|
||||
# Display an error message in a location expected to get error messages.
|
||||
# Will ask +question+ if it is not nil.
|
||||
|
||||
def alert_error(statement, question=nil)
|
||||
@errs.puts "ERROR: #{statement}"
|
||||
ask(question) if question
|
||||
end
|
||||
|
||||
##
|
||||
# Terminate the application with exit code +status+, running any exit
|
||||
# handlers that might have been defined.
|
||||
|
||||
def terminate_interaction(status = 0)
|
||||
raise Gem::SystemExitException, status
|
||||
end
|
||||
|
||||
##
|
||||
# Return a progress reporter object chosen from the current verbosity.
|
||||
|
||||
def progress_reporter(*args)
|
||||
case Gem.configuration.verbose
|
||||
when nil, false
|
||||
SilentProgressReporter.new(@outs, *args)
|
||||
when true
|
||||
SimpleProgressReporter.new(@outs, *args)
|
||||
def ask_yes_no(question, default=nil)
|
||||
unless @ins.tty? then
|
||||
if default.nil? then
|
||||
raise Gem::OperationNotSupportedError,
|
||||
"Not connected to a tty and no default specified"
|
||||
else
|
||||
VerboseProgressReporter.new(@outs, *args)
|
||||
return default
|
||||
end
|
||||
end
|
||||
|
||||
##
|
||||
# An absolutely silent progress reporter.
|
||||
qstr = case default
|
||||
when nil
|
||||
'yn'
|
||||
when true
|
||||
'Yn'
|
||||
else
|
||||
'yN'
|
||||
end
|
||||
|
||||
class SilentProgressReporter
|
||||
attr_reader :count
|
||||
result = nil
|
||||
|
||||
def initialize(out_stream, size, initial_message, terminal_message = nil)
|
||||
end
|
||||
|
||||
def updated(message)
|
||||
end
|
||||
|
||||
def done
|
||||
while result.nil?
|
||||
result = ask("#{question} [#{qstr}]")
|
||||
result = case result
|
||||
when /^[Yy].*/
|
||||
true
|
||||
when /^[Nn].*/
|
||||
false
|
||||
when /^$/
|
||||
default
|
||||
else
|
||||
nil
|
||||
end
|
||||
end
|
||||
|
||||
##
|
||||
# A basic dotted progress reporter.
|
||||
return result
|
||||
end
|
||||
|
||||
class SimpleProgressReporter
|
||||
include DefaultUserInteraction
|
||||
##
|
||||
# Ask a question. Returns an answer if connected to a tty, nil otherwise.
|
||||
|
||||
attr_reader :count
|
||||
def ask(question)
|
||||
return nil if not @ins.tty?
|
||||
|
||||
def initialize(out_stream, size, initial_message,
|
||||
terminal_message = "complete")
|
||||
@out = out_stream
|
||||
@total = size
|
||||
@count = 0
|
||||
@terminal_message = terminal_message
|
||||
@outs.print(question + " ")
|
||||
@outs.flush
|
||||
|
||||
@out.puts initial_message
|
||||
end
|
||||
result = @ins.gets
|
||||
result.chomp! if result
|
||||
result
|
||||
end
|
||||
|
||||
##
|
||||
# Prints out a dot and ignores +message+.
|
||||
##
|
||||
# Display a statement.
|
||||
|
||||
def updated(message)
|
||||
@count += 1
|
||||
@out.print "."
|
||||
@out.flush
|
||||
end
|
||||
def say(statement="")
|
||||
@outs.puts statement
|
||||
end
|
||||
|
||||
##
|
||||
# Prints out the terminal message.
|
||||
##
|
||||
# Display an informational alert. Will ask +question+ if it is not nil.
|
||||
|
||||
def done
|
||||
@out.puts "\n#{@terminal_message}"
|
||||
end
|
||||
def alert(statement, question=nil)
|
||||
@outs.puts "INFO: #{statement}"
|
||||
ask(question) if question
|
||||
end
|
||||
|
||||
end
|
||||
##
|
||||
# Display a warning in a location expected to get error messages. Will
|
||||
# ask +question+ if it is not nil.
|
||||
|
||||
##
|
||||
# A progress reporter that prints out messages about the current progress.
|
||||
def alert_warning(statement, question=nil)
|
||||
@errs.puts "WARNING: #{statement}"
|
||||
ask(question) if question
|
||||
end
|
||||
|
||||
class VerboseProgressReporter
|
||||
include DefaultUserInteraction
|
||||
##
|
||||
# Display an error message in a location expected to get error messages.
|
||||
# Will ask +question+ if it is not nil.
|
||||
|
||||
attr_reader :count
|
||||
def alert_error(statement, question=nil)
|
||||
@errs.puts "ERROR: #{statement}"
|
||||
ask(question) if question
|
||||
end
|
||||
|
||||
def initialize(out_stream, size, initial_message,
|
||||
terminal_message = 'complete')
|
||||
@out = out_stream
|
||||
@total = size
|
||||
@count = 0
|
||||
@terminal_message = terminal_message
|
||||
##
|
||||
# Display a debug message on the same location as error messages.
|
||||
|
||||
@out.puts initial_message
|
||||
end
|
||||
def debug(statement)
|
||||
@errs.puts statement
|
||||
end
|
||||
|
||||
##
|
||||
# Prints out the position relative to the total and the +message+.
|
||||
##
|
||||
# Terminate the application with exit code +status+, running any exit
|
||||
# handlers that might have been defined.
|
||||
|
||||
def updated(message)
|
||||
@count += 1
|
||||
@out.puts "#{@count}/#{@total}: #{message}"
|
||||
end
|
||||
def terminate_interaction(status = 0)
|
||||
raise Gem::SystemExitException, status
|
||||
end
|
||||
|
||||
##
|
||||
# Prints out the terminal message.
|
||||
##
|
||||
# Return a progress reporter object chosen from the current verbosity.
|
||||
|
||||
def done
|
||||
@out.puts @terminal_message
|
||||
end
|
||||
def progress_reporter(*args)
|
||||
case Gem.configuration.verbose
|
||||
when nil, false
|
||||
SilentProgressReporter.new(@outs, *args)
|
||||
when true
|
||||
SimpleProgressReporter.new(@outs, *args)
|
||||
else
|
||||
VerboseProgressReporter.new(@outs, *args)
|
||||
end
|
||||
end
|
||||
|
||||
##
|
||||
# Subclass of StreamUI that instantiates the user interaction using STDIN,
|
||||
# STDOUT, and STDERR.
|
||||
# An absolutely silent progress reporter.
|
||||
|
||||
class ConsoleUI < StreamUI
|
||||
def initialize
|
||||
super(STDIN, STDOUT, STDERR)
|
||||
class SilentProgressReporter
|
||||
attr_reader :count
|
||||
|
||||
def initialize(out_stream, size, initial_message, terminal_message = nil)
|
||||
end
|
||||
|
||||
def updated(message)
|
||||
end
|
||||
|
||||
def done
|
||||
end
|
||||
end
|
||||
|
||||
##
|
||||
# SilentUI is a UI choice that is absolutely silent.
|
||||
# A basic dotted progress reporter.
|
||||
|
||||
class SilentUI
|
||||
def method_missing(sym, *args, &block)
|
||||
self
|
||||
class SimpleProgressReporter
|
||||
|
||||
include Gem::DefaultUserInteraction
|
||||
|
||||
attr_reader :count
|
||||
|
||||
def initialize(out_stream, size, initial_message,
|
||||
terminal_message = "complete")
|
||||
@out = out_stream
|
||||
@total = size
|
||||
@count = 0
|
||||
@terminal_message = terminal_message
|
||||
|
||||
@out.puts initial_message
|
||||
end
|
||||
|
||||
##
|
||||
# Prints out a dot and ignores +message+.
|
||||
|
||||
def updated(message)
|
||||
@count += 1
|
||||
@out.print "."
|
||||
@out.flush
|
||||
end
|
||||
|
||||
##
|
||||
# Prints out the terminal message.
|
||||
|
||||
def done
|
||||
@out.puts "\n#{@terminal_message}"
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
##
|
||||
# A progress reporter that prints out messages about the current progress.
|
||||
|
||||
class VerboseProgressReporter
|
||||
|
||||
include Gem::DefaultUserInteraction
|
||||
|
||||
attr_reader :count
|
||||
|
||||
def initialize(out_stream, size, initial_message,
|
||||
terminal_message = 'complete')
|
||||
@out = out_stream
|
||||
@total = size
|
||||
@count = 0
|
||||
@terminal_message = terminal_message
|
||||
|
||||
@out.puts initial_message
|
||||
end
|
||||
|
||||
##
|
||||
# Prints out the position relative to the total and the +message+.
|
||||
|
||||
def updated(message)
|
||||
@count += 1
|
||||
@out.puts "#{@count}/#{@total}: #{message}"
|
||||
end
|
||||
|
||||
##
|
||||
# Prints out the terminal message.
|
||||
|
||||
def done
|
||||
@out.puts @terminal_message
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
##
|
||||
# Subclass of StreamUI that instantiates the user interaction using STDIN,
|
||||
# STDOUT, and STDERR.
|
||||
|
||||
class Gem::ConsoleUI < Gem::StreamUI
|
||||
def initialize
|
||||
super STDIN, STDOUT, STDERR
|
||||
end
|
||||
end
|
||||
|
||||
##
|
||||
# SilentUI is a UI choice that is absolutely silent.
|
||||
|
||||
class Gem::SilentUI
|
||||
def method_missing(sym, *args, &block)
|
||||
self
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue