diff options
Diffstat (limited to 'lib/rubygems/commands')
| -rw-r--r-- | lib/rubygems/commands/install_command.rb | 46 | ||||
| -rw-r--r-- | lib/rubygems/commands/owner_command.rb | 3 | ||||
| -rw-r--r-- | lib/rubygems/commands/pristine_command.rb | 4 | ||||
| -rw-r--r-- | lib/rubygems/commands/query_command.rb | 15 |
4 files changed, 15 insertions, 53 deletions
diff --git a/lib/rubygems/commands/install_command.rb b/lib/rubygems/commands/install_command.rb index 4dd2f943c1..3a7d50517f 100644 --- a/lib/rubygems/commands/install_command.rb +++ b/lib/rubygems/commands/install_command.rb @@ -36,52 +36,6 @@ class Gem::Commands::InstallCommand < Gem::Command add_version_option add_prerelease_option "to be installed. (Only for listed gems)" - add_option(:"Install/Update", '-g', '--file [FILE]', - 'Read from a gem dependencies API file and', - 'install the listed gems') do |v,o| - v = Gem::GEM_DEP_FILES.find do |file| - File.exist? file - end unless v - - unless v then - message = v ? v : "(tried #{Gem::GEM_DEP_FILES.join ', '})" - - raise OptionParser::InvalidArgument, - "cannot find gem dependencies file #{message}" - end - - o[:gemdeps] = v - end - - add_option(:"Install/Update", '--without GROUPS', Array, - 'Omit the named groups (comma separated)', - 'when installing from a gem dependencies', - 'file') do |v,o| - o[:without_groups].concat v.map { |without| without.intern } - end - - add_option(:"Install/Update", '--default', - 'Add the gem\'s full specification to', - 'specifications/default and extract only its bin') do |v,o| - o[:install_as_default] = v - end - - add_option(:"Install/Update", '--explain', - 'Rather than install the gems, indicate which would', - 'be installed') do |v,o| - o[:explain] = v - end - - add_option(:"Install/Update", '--[no-]lock', - 'Create a lock file (when used with -g/--file)') do |v,o| - o[:lock] = v - end - - add_option(:"Install/Update", '--[no-]suggestions', - 'Suggest alternates when gems are not found') do |v,o| - o[:suggest_alternate] = v - end - @installed_specs = [] end diff --git a/lib/rubygems/commands/owner_command.rb b/lib/rubygems/commands/owner_command.rb index e507c988d6..4b99434e87 100644 --- a/lib/rubygems/commands/owner_command.rb +++ b/lib/rubygems/commands/owner_command.rb @@ -66,7 +66,7 @@ permission to. say "Owners for gem: #{name}" owners.each do |owner| - say "- #{owner['email']}" + say "- #{owner['email'] || owner['handle'] || owner['id']}" end end end @@ -97,4 +97,3 @@ permission to. end end - diff --git a/lib/rubygems/commands/pristine_command.rb b/lib/rubygems/commands/pristine_command.rb index a5a348dc72..6cab572b86 100644 --- a/lib/rubygems/commands/pristine_command.rb +++ b/lib/rubygems/commands/pristine_command.rb @@ -92,8 +92,8 @@ extensions will be restored. spec.extensions and not spec.extensions.empty? end else - get_all_gem_names.map do |gem_name| - Gem::Specification.find_all_by_name gem_name, options[:version] + get_all_gem_names.sort.map do |gem_name| + Gem::Specification.find_all_by_name(gem_name, options[:version]).reverse end.flatten end diff --git a/lib/rubygems/commands/query_command.rb b/lib/rubygems/commands/query_command.rb index d6196b44ed..fb2d6a53c8 100644 --- a/lib/rubygems/commands/query_command.rb +++ b/lib/rubygems/commands/query_command.rb @@ -247,7 +247,7 @@ is too hard to use. spec_summary entry, spec end - def entry_versions entry, name_tuples, platforms + def entry_versions entry, name_tuples, platforms, specs return unless options[:versions] list = @@ -256,7 +256,16 @@ is too hard to use. else platforms.sort.reverse.map do |version, pls| if pls == [Gem::Platform::RUBY] then - version + if options[:domain] == :remote || specs.all? { |spec| spec.is_a? Gem::Source } + version + else + spec = specs.select { |spec| spec.version == version } + if spec.first.default_gem? + "default: #{version}" + else + version + end + end else ruby = pls.delete Gem::Platform::RUBY platform_list = [ruby, *pls.sort].compact @@ -277,7 +286,7 @@ is too hard to use. entry = [name_tuples.first.name] - entry_versions entry, name_tuples, platforms + entry_versions entry, name_tuples, platforms, specs entry_details entry, detail_tuple, specs, platforms entry.join |