summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-19 18:15:26 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-19 18:15:26 +0000
commitd78ee77d07cb894e236cb68d0964deb3ca34ae33 (patch)
tree227a49d530df51dd8f00972a4637bd568a3ca717 /lib
parentbb8f3270bd0054bd2ca6f73ae661824b8845fc4f (diff)
downloadruby-d78ee77d07cb894e236cb68d0964deb3ca34ae33.tar.gz
ruby-d78ee77d07cb894e236cb68d0964deb3ca34ae33.tar.xz
ruby-d78ee77d07cb894e236cb68d0964deb3ca34ae33.zip
Update to RubyGems 1.1.1 r1784 (pre 1.2)
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@17452 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/rubygems/commands/dependency_command.rb11
-rw-r--r--lib/rubygems/config_file.rb1
2 files changed, 10 insertions, 2 deletions
diff --git a/lib/rubygems/commands/dependency_command.rb b/lib/rubygems/commands/dependency_command.rb
index 8fae87c90..44b269bb1 100644
--- a/lib/rubygems/commands/dependency_command.rb
+++ b/lib/rubygems/commands/dependency_command.rb
@@ -43,14 +43,21 @@ class Gem::Commands::DependencyCommand < Gem::Command
end
def execute
- options[:args] << '.' if options[:args].empty?
+ options[:args] << '' if options[:args].empty?
specs = {}
source_indexes = Hash.new do |h, source_uri|
h[source_uri] = Gem::SourceIndex.new
end
- pattern = /\A#{Regexp.union(*options[:args])}/
+ pattern = if options[:args].length == 1 and
+ options[:args].first =~ /\A\/(.*)\/(i)?\z/m then
+ flags = $2 ? Regexp::IGNORECASE : nil
+ Regexp.new $1, flags
+ else
+ /\A#{Regexp.union(*options[:args])}/
+ end
+
dependency = Gem::Dependency.new pattern, options[:version]
if options[:reverse_dependencies] and remote? and not local? then
diff --git a/lib/rubygems/config_file.rb b/lib/rubygems/config_file.rb
index c657bf7f0..8cea51379 100644
--- a/lib/rubygems/config_file.rb
+++ b/lib/rubygems/config_file.rb
@@ -79,6 +79,7 @@ class Gem::ConfigFile
arg_list = arg_list.map do |arg|
if need_config_file_name then
@config_file_name = arg
+ need_config_file_name = false
nil
elsif arg =~ /^--config-file=(.*)/ then
@config_file_name = $1