rubygems-update 1.3.5 → 1.3.6

data/lib/rubygems/builder.rb

@@ -11,6 +11,7 @@
 class Gem::Builder
 
   include Gem::UserInteraction
+
   ##
   # Constructs a builder instance for the provided specification
   #
@@ -33,7 +34,7 @@ class Gem::Builder
     @spec.validate
     @signer = sign
     write_package
-    say success
+    say success if Gem.configuration.verbose
     @spec.file_name
   end
 
@@ -42,7 +43,7 @@ class Gem::Builder
   Successfully built RubyGem
   Name: #{@spec.name}
   Version: #{@spec.version}
-  File: #{@spec.full_name+'.gem'}
+  File: #{@spec.file_name}
 EOM
   end
 
@@ -86,5 +87,6 @@ EOM
       end
     end
   end
+
 end
 

data/lib/rubygems/command.rb

@@ -49,7 +49,7 @@ class Gem::Command
   def self.build_args
     @build_args ||= []
   end
-  
+
   def self.build_args=(value)
     @build_args = value
   end
@@ -160,8 +160,8 @@ class Gem::Command
   end
 
   ##
-  # Get the single gem name from the command line.  Fail if there is no gem
-  # name or if there is more than one gem name given.
+  # Get a single gem name from the command line.  Fail if there is no gem name
+  # or if there is more than one gem name given.
 
   def get_one_gem_name
     args = options[:args]
@@ -197,7 +197,7 @@ class Gem::Command
   #   def usage
   #     "#{program_name} FILE [FILE ...]"
   #   end
-  #   
+  #
   #   def arguments
   #     "FILE          name of file to find"
   #   end
@@ -248,11 +248,12 @@ class Gem::Command
   # Invoke the command with the given list of arguments.
 
   def invoke(*args)
-    handle_options(args)
-    if options[:help]
+    handle_options args
+
+    if options[:help] then
       show_help
-    elsif @when_invoked
-      @when_invoked.call(options)
+    elsif @when_invoked then
+      @when_invoked.call options
     else
       execute
     end
@@ -362,37 +363,39 @@ class Gem::Command
   def create_option_parser
     @parser = OptionParser.new
 
-    @parser.separator("")
+    @parser.separator nil
     regular_options = @option_groups.delete :options
 
     configure_options "", regular_options
 
     @option_groups.sort_by { |n,_| n.to_s }.each do |group_name, option_list|
+      @parser.separator nil
       configure_options group_name, option_list
     end
 
+    @parser.separator nil
     configure_options "Common", Gem::Command.common_options
 
-    @parser.separator("")
     unless arguments.empty?
-      @parser.separator("  Arguments:")
+      @parser.separator nil
+      @parser.separator "  Arguments:"
       arguments.split(/\n/).each do |arg_desc|
-        @parser.separator("    #{arg_desc}")
+        @parser.separator "    #{arg_desc}"
       end
-      @parser.separator("")
     end
 
-    @parser.separator("  Summary:")
+    @parser.separator nil
+    @parser.separator "  Summary:"
     wrap(@summary, 80 - 4).split("\n").each do |line|
-      @parser.separator("    #{line.strip}")
+      @parser.separator "    #{line.strip}"
     end
 
     if description then
       formatted = description.split("\n\n").map do |chunk|
-        wrap(chunk, 80 - 4)
-      end.join("\n")
+        wrap chunk, 80 - 4
+      end.join "\n"
 
-      @parser.separator ""
+      @parser.separator nil
       @parser.separator "  Description:"
       formatted.split("\n").each do |line|
         @parser.separator "    #{line.rstrip}"
@@ -400,10 +403,10 @@ class Gem::Command
     end
 
     unless defaults_str.empty?
-      @parser.separator("")
-      @parser.separator("  Defaults:")
+      @parser.separator nil
+      @parser.separator "  Defaults:"
       defaults_str.split(/\n/).each do |line|
-        @parser.separator("    #{line}")
+        @parser.separator "    #{line}"
       end
     end
   end
@@ -471,33 +474,33 @@ class Gem::Command
 
   # :stopdoc:
 
-  HELP = %{
-    RubyGems is a sophisticated package manager for Ruby.  This is a
-    basic help message containing pointers to more information.
-
-      Usage:
-        gem -h/--help
-        gem -v/--version
-        gem command [arguments...] [options...]
-
-      Examples:
-        gem install rake
-        gem list --local
-        gem build package.gemspec
-        gem help install
-
-      Further help:
-        gem help commands            list all 'gem' commands
-        gem help examples            show some examples of usage
-        gem help platforms           show information about platforms
-        gem help <COMMAND>           show help on COMMAND
-                                       (e.g. 'gem help install')
-        gem server                   present a web page at
-                                     http://localhost:8808/
-                                     with info about installed gems
-      Further information:
-        http://rubygems.rubyforge.org
-  }.gsub(/^    /, '')
+  HELP = <<-HELP
+RubyGems is a sophisticated package manager for Ruby.  This is a
+basic help message containing pointers to more information.
+
+  Usage:
+    gem -h/--help
+    gem -v/--version
+    gem command [arguments...] [options...]
+
+  Examples:
+    gem install rake
+    gem list --local
+    gem build package.gemspec
+    gem help install
+
+  Further help:
+    gem help commands            list all 'gem' commands
+    gem help examples            show some examples of usage
+    gem help platforms           show information about platforms
+    gem help <COMMAND>           show help on COMMAND
+                                   (e.g. 'gem help install')
+    gem server                   present a web page at
+                                 http://localhost:8808/
+                                 with info about installed gems
+  Further information:
+    http://rubygems.rubyforge.org
+  HELP
 
   # :startdoc:
 

data/lib/rubygems/command_manager.rb

@@ -58,7 +58,9 @@ class Gem::CommandManager
     register_command :lock
     register_command :mirror
     register_command :outdated
+    register_command :owner
     register_command :pristine
+    register_command :push
     register_command :query
     register_command :rdoc
     register_command :search

data/lib/rubygems/commands/dependency_command.rb

@@ -15,6 +15,7 @@ class Gem::Commands::DependencyCommand < Gem::Command
 
     add_version_option
     add_platform_option
+    add_prerelease_option
 
     add_option('-R', '--[no-]reverse-dependencies',
                'Include reverse dependencies in the output') do
@@ -59,6 +60,7 @@ class Gem::Commands::DependencyCommand < Gem::Command
               end
 
     dependency = Gem::Dependency.new pattern, options[:version]
+    dependency.prerelease = options[:prerelease]
 
     if options[:reverse_dependencies] and remote? and not local? then
       alert_error 'Only reverse dependencies for local gems are supported.'
@@ -75,7 +77,10 @@ class Gem::Commands::DependencyCommand < Gem::Command
       fetcher = Gem::SpecFetcher.fetcher
 
       begin
-        fetcher.find_matching(dependency).each do |spec_tuple, source_uri|
+        specs_and_sources = fetcher.find_matching(dependency, false, true,
+                                                  dependency.prerelease?)
+
+        specs_and_sources.each do |spec_tuple, source_uri|
           spec = fetcher.fetch_spec spec_tuple, URI.parse(source_uri)
 
           source_indexes[source_uri].add_spec spec
@@ -120,8 +125,8 @@ class Gem::Commands::DependencyCommand < Gem::Command
     if options[:pipe_format] then
       specs.values.sort_by { |_, spec| spec }.each do |_, spec|
         unless spec.dependencies.empty?
-          spec.dependencies.each do |dep|
-            say "#{dep.name} --version '#{dep.version_requirements}'"
+          spec.dependencies.sort_by { |dep| dep.name }.each do |dep|
+            say "#{dep.name} --version '#{dep.requirement}'"
           end
         end
       end
@@ -147,7 +152,7 @@ class Gem::Commands::DependencyCommand < Gem::Command
     response = ''
     response << '  ' * level + "Gem #{spec.full_name}\n"
     unless spec.dependencies.empty? then
-      spec.dependencies.each do |dep|
+      spec.dependencies.sort_by { |dep| dep.name }.each do |dep|
         response << '  ' * level + "  #{dep}\n"
       end
     end
@@ -163,7 +168,7 @@ class Gem::Commands::DependencyCommand < Gem::Command
         dep = Gem::Dependency.new(*dep) unless Gem::Dependency === dep
 
         if spec.name == dep.name and
-           dep.version_requirements.satisfied_by?(spec.version) then
+           dep.requirement.satisfied_by?(spec.version) then
           result << [sp.full_name, dep]
         end
       end

data/lib/rubygems/commands/environment_command.rb

@@ -118,7 +118,7 @@ lib/rubygems/defaults/operating_system.rb
       end
 
     else
-      fail Gem::CommandLineError, "Unknown enviroment option [#{arg}]"
+      raise Gem::CommandLineError, "Unknown enviroment option [#{arg}]"
     end
     say out
     true

data/lib/rubygems/commands/fetch_command.rb

@@ -17,6 +17,7 @@ class Gem::Commands::FetchCommand < Gem::Command
 
     add_version_option
     add_platform_option
+    add_prerelease_option
   end
 
   def arguments # :nodoc:
@@ -39,12 +40,12 @@ class Gem::Commands::FetchCommand < Gem::Command
 
     gem_names.each do |gem_name|
       dep = Gem::Dependency.new gem_name, version
+      dep.prerelease = options[:prerelease]
 
-      specs_and_sources = Gem::SpecFetcher.fetcher.fetch dep, all
+      specs_and_sources = Gem::SpecFetcher.fetcher.fetch(dep, false, true,
+                                                         dep.prerelease?)
 
-      specs_and_sources.sort_by { |spec,| spec.version }
-
-      spec, source_uri = specs_and_sources.last
+      spec, source_uri = specs_and_sources.sort_by { |s,| s.version }.last
 
       if spec.nil? then
         alert_error "Could not find #{gem_name} in any repository"
@@ -52,7 +53,7 @@ class Gem::Commands::FetchCommand < Gem::Command
       end
 
       path = Gem::RemoteFetcher.fetcher.download spec, source_uri
-      FileUtils.mv path, "#{spec.full_name}.gem"
+      FileUtils.mv path, spec.file_name
 
       say "Downloaded #{spec.full_name}"
     end

data/lib/rubygems/commands/install_command.rb

@@ -32,6 +32,7 @@ class Gem::Commands::InstallCommand < Gem::Command
     add_local_remote_options
     add_platform_option
     add_version_option
+    add_prerelease_option "to be installed. (Only for listed gems)"
   end
 
   def arguments # :nodoc:

data/lib/rubygems/commands/mirror_command.rb

@@ -51,7 +51,7 @@ Multiple sources and destinations may be specified.
         Dir.mkdir gems_dir
       end
 
-      sourceindex_data = ''
+      source_index_data = ''
 
       say "fetching: #{get_from}/Marshal.#{Gem.marshal_version}.Z"
 
@@ -70,18 +70,18 @@ Multiple sources and destinations may be specified.
       end
 
       open File.join(get_from.to_s, "Marshal.#{Gem.marshal_version}.Z"), "rb" do |y|
-        sourceindex_data = Zlib::Inflate.inflate y.read
+        source_index_data = Zlib::Inflate.inflate y.read
         open File.join(save_to, "Marshal.#{Gem.marshal_version}"), "wb" do |out|
-          out.write sourceindex_data
+          out.write source_index_data
         end
       end
 
-      sourceindex = Marshal.load(sourceindex_data)
+      source_index = Marshal.load source_index_data
 
-      progress = ui.progress_reporter sourceindex.size,
-                                      "Fetching #{sourceindex.size} gems"
-      sourceindex.each do |fullname, gem|
-        gem_file = "#{fullname}.gem"
+      progress = ui.progress_reporter source_index.size,
+                                      "Fetching #{source_index.size} gems"
+      source_index.each do |fullname, gem|
+        gem_file = gem.file_name
         gem_dest = File.join gems_dir, gem_file
 
         unless File.exist? gem_dest then

data/lib/rubygems/commands/owner_command.rb

@@ -0,0 +1,75 @@
+require 'rubygems/command'
+require 'rubygems/local_remote_options'
+require 'rubygems/gemcutter_utilities'
+
+class Gem::Commands::OwnerCommand < Gem::Command
+  include Gem::LocalRemoteOptions
+  include Gem::GemcutterUtilities
+
+  def description # :nodoc:
+    'Manage gem owners on RubyGems.org.'
+  end
+
+  def arguments # :nodoc:
+    "GEM       gem to manage owners for"
+  end
+
+  def initialize
+    super 'owner', description
+    add_proxy_option
+    defaults.merge! :add => [], :remove => []
+
+    add_option '-a', '--add EMAIL', 'Add an owner' do |value, options|
+      options[:add] << value
+    end
+
+    add_option '-r', '--remove EMAIL', 'Remove an owner' do |value, options|
+      options[:remove] << value
+    end
+  end
+
+  def execute
+    sign_in
+    name = get_one_gem_name
+
+    add_owners    name, options[:add]
+    remove_owners name, options[:remove]
+    show_owners   name
+  end
+
+  def show_owners name
+    response = rubygems_api_request :get, "api/v1/gems/#{name}/owners.yaml" do |request|
+      request.add_field "Authorization", Gem.configuration.rubygems_api_key
+    end
+
+    with_response response do |resp|
+      owners = YAML.load resp.body
+
+      say "Owners for gem: #{name}"
+      owners.each do |owner|
+        say "- #{owner['email']}"
+      end
+    end
+  end
+
+  def add_owners name, owners
+    manage_owners :post, name, owners
+  end
+
+  def remove_owners name, owners
+    manage_owners :delete, name, owners
+  end
+
+  def manage_owners method, name, owners
+    owners.each do |owner|
+      response = rubygems_api_request method, "api/v1/gems/#{name}/owners" do |request|
+        request.set_form_data 'email' => owner
+        request.add_field "Authorization", Gem.configuration.rubygems_api_key
+      end
+
+      with_response response
+    end
+  end
+
+end
+

data/lib/rubygems/commands/pristine_command.rb

@@ -74,7 +74,7 @@ revert the gem.
     say "Restoring gem(s) to pristine condition..."
 
     specs.each do |spec|
-      gem = Dir[File.join(Gem.dir, 'cache', "#{spec.full_name}.gem")].first
+      gem = Dir[File.join(Gem.dir, 'cache', spec.file_name)].first
 
       if gem.nil? then
         alert_error "Cached gem for #{spec.full_name} not found, use `gem install` to restore"

data/lib/rubygems/commands/push_command.rb

@@ -0,0 +1,45 @@
+require 'rubygems/command'
+require 'rubygems/local_remote_options'
+require 'rubygems/gemcutter_utilities'
+
+class Gem::Commands::PushCommand < Gem::Command
+  include Gem::LocalRemoteOptions
+  include Gem::GemcutterUtilities
+
+  def description # :nodoc:
+    'Push a gem up to RubyGems.org'
+  end
+
+  def arguments # :nodoc:
+    "GEM       built gem to push up"
+  end
+
+  def usage # :nodoc:
+    "#{program_name} GEM"
+  end
+
+  def initialize
+    super 'push', description
+    add_proxy_option
+  end
+
+  def execute
+    sign_in
+    send_gem get_one_gem_name
+  end
+
+  def send_gem name
+    say "Pushing gem to RubyGems.org..."
+
+    response = rubygems_api_request :post, "api/v1/gems" do |request|
+      request.body = Gem.read_binary name
+      request.add_field "Content-Length", request.body.size
+      request.add_field "Content-Type",   "application/octet-stream"
+      request.add_field "Authorization",  Gem.configuration.rubygems_api_key
+    end
+
+    with_response response
+  end
+
+end
+