From 08837d081d764af01a30d325007c3c9527e383a6 Mon Sep 17 00:00:00 2001 From: drbrain Date: Thu, 19 Jun 2008 18:15:26 +0000 Subject: Update to RubyGems 1.1.1 r1784 (pre 1.2) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17452 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/rubygems/commands/dependency_command.rb | 11 +++++++++-- lib/rubygems/config_file.rb | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'lib/rubygems') diff --git a/lib/rubygems/commands/dependency_command.rb b/lib/rubygems/commands/dependency_command.rb index 8fae87c90f..44b269bb11 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 c657bf7f01..8cea513790 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 -- cgit v1.2.3