rubygems-update 1.8.30 → 2.0.0.preview2

data/lib/rubygems/commands/owner_command.rb

@@ -14,6 +14,10 @@ class Gem::Commands::OwnerCommand < Gem::Command
     "GEM       gem to manage owners for"
   end
 
+  def usage # :nodoc:
+    "#{program_name} GEM"
+  end
+
   def initialize
     super 'owner', description
     add_proxy_option
@@ -63,12 +67,16 @@ class Gem::Commands::OwnerCommand < Gem::Command
 
   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", api_key
+      begin
+        response = rubygems_api_request method, "api/v1/gems/#{name}/owners" do |request|
+          request.set_form_data 'email' => owner
+          request.add_field "Authorization", api_key
+        end
+
+        with_response response
+      rescue
+        # ignore
       end
-
-      with_response response
     end
   end
 

data/lib/rubygems/commands/pristine_command.rb

@@ -1,5 +1,5 @@
 require 'rubygems/command'
-require 'rubygems/format'
+require 'rubygems/package'
 require 'rubygems/installer'
 require 'rubygems/version_option'
 
@@ -24,6 +24,11 @@ class Gem::Commands::PristineCommand < Gem::Command
       options[:extensions] = value
     end
 
+    add_option('--only-executables',
+               'Only restore executables') do |value, options|
+      options[:only_executables] = value
+    end
+
     add_version_option('restore to', 'pristine condition')
   end
 
@@ -78,6 +83,11 @@ extensions.
     say "Restoring gems to pristine condition..."
 
     specs.each do |spec|
+      if spec.default_gem?
+        say "Skipped #{spec.full_name}, it is a default gem"
+        next
+      end
+
       unless spec.extensions.empty? or options[:extensions] then
         say "Skipped #{spec.full_name}, it needs to compile an extension"
         next
@@ -96,13 +106,18 @@ extensions.
       # TODO use installer options
       install_defaults = Gem::ConfigFile::PLATFORM_DEFAULTS['install']
       installer_env_shebang = install_defaults.to_s['--env-shebang']
-      
+
       installer = Gem::Installer.new(gem,
                                      :wrappers => true,
                                      :force => true,
                                      :install_dir => spec.base_dir,
-                                     :env_shebang => installer_env_shebang)
-      installer.install
+                                     :env_shebang => installer_env_shebang,
+                                     :build_args => spec.build_args)
+      if options[:only_executables] then
+        installer.generate_bin
+      else
+        installer.install
+      end
 
       say "Restored #{spec.full_name}"
     end

data/lib/rubygems/commands/push_command.rb

@@ -1,6 +1,7 @@
 require 'rubygems/command'
 require 'rubygems/local_remote_options'
 require 'rubygems/gemcutter_utilities'
+require 'rubygems/package'
 
 class Gem::Commands::PushCommand < Gem::Command
   include Gem::LocalRemoteOptions
@@ -39,13 +40,23 @@ class Gem::Commands::PushCommand < Gem::Command
   def send_gem name
     args = [:post, "api/v1/gems"]
 
-    args << options[:host] if options[:host]
 
     if Gem.latest_rubygems_version < Gem::Version.new(Gem::VERSION) then
       alert_error "Using beta/unreleased version of rubygems. Not pushing."
       terminate_interaction 1
     end
 
+    host = options[:host]
+    unless host
+      if gem_data = Gem::Package.new(name) then
+        host = gem_data.spec.metadata['default_gem_server']
+      end
+    end
+
+    args << host if host
+
+    say "Pushing gem to #{host || Gem.host}..."
+
     response = rubygems_api_request(*args) do |request|
       request.body = Gem.read_binary name
       request.add_field "Content-Length", request.body.size

data/lib/rubygems/commands/query_command.rb

@@ -21,6 +21,10 @@ class Gem::Commands::QueryCommand < Gem::Command
       options[:installed] = value
     end
 
+    add_option('-I', 'Equivalent to --no-installed') do |value, options|
+      options[:installed] = false
+    end
+
     add_version_option command, "for use with --installed"
 
     add_option('-n', '--name-matches REGEXP',
@@ -80,6 +84,7 @@ class Gem::Commands::QueryCommand < Gem::Command
     req = Gem::Requirement.default
     # TODO: deprecate for real
     dep = Gem::Deprecate.skip_during { Gem::Dependency.new name, req }
+    dep.prerelease = prerelease
 
     if local? then
       if prerelease and not both? then
@@ -97,7 +102,7 @@ class Gem::Commands::QueryCommand < Gem::Command
       }
 
       spec_tuples = specs.map do |spec|
-        [[spec.name, spec.version, spec.original_platform, spec], :local]
+        [spec.name_tuple, spec]
       end
 
       output_query_results spec_tuples
@@ -110,13 +115,27 @@ class Gem::Commands::QueryCommand < Gem::Command
         say
       end
 
-      all = options[:all]
-
       fetcher = Gem::SpecFetcher.fetcher
-      spec_tuples = fetcher.find_matching dep, all, false, prerelease
 
-      spec_tuples += fetcher.find_matching dep, false, false, true if
-        prerelease and all
+      type = if options[:all]
+               if options[:prerelease]
+                 :complete
+               else
+                 :released
+               end
+             elsif options[:prerelease]
+               :prerelease
+             else
+               :latest
+             end
+
+      if options[:name].source.empty?
+        spec_tuples = fetcher.detect(type) { true }
+      else
+        spec_tuples = fetcher.detect(type) do |gem_name, ver, plat|
+          options[:name] === gem_name
+        end
+      end
 
       output_query_results spec_tuples
     end
@@ -135,32 +154,30 @@ class Gem::Commands::QueryCommand < Gem::Command
     output = []
     versions = Hash.new { |h,name| h[name] = [] }
 
-    spec_tuples.each do |spec_tuple, source_uri|
-      versions[spec_tuple.first] << [spec_tuple, source_uri]
+    spec_tuples.each do |spec_tuple, source|
+      versions[spec_tuple.name] << [spec_tuple, source]
     end
 
-    versions = versions.sort_by do |(name,_),_|
-      name.downcase
+    versions = versions.sort_by do |(n,_),_|
+      n.downcase
     end
 
     versions.each do |gem_name, matching_tuples|
-      matching_tuples = matching_tuples.sort_by do |(_, version,_),_|
-        version
-      end.reverse
+      matching_tuples = matching_tuples.sort_by { |n,_| n.version }.reverse
 
       platforms = Hash.new { |h,version| h[version] = [] }
 
-      matching_tuples.map do |(_, version, platform,_),_|
-        platforms[version] << platform if platform
+      matching_tuples.map do |n,_|
+        platforms[n.version] << n.platform if n.platform
       end
 
       seen = {}
 
-      matching_tuples.delete_if do |(_, version,_),_|
-        if seen[version] then
+      matching_tuples.delete_if do |n,_|
+        if seen[n.version] then
           true
         else
-          seen[version] = true
+          seen[n.version] = true
           false
         end
       end
@@ -169,7 +186,7 @@ class Gem::Commands::QueryCommand < Gem::Command
 
       if options[:versions] then
         list = if platforms.empty? or options[:details] then
-                 matching_tuples.map { |(_, version,_),_| version }.uniq
+                 matching_tuples.map { |n,_| n.version }.uniq
                else
                  platforms.sort.reverse.map do |version, pls|
                    if pls == [Gem::Platform::RUBY] then
@@ -188,12 +205,11 @@ class Gem::Commands::QueryCommand < Gem::Command
       if options[:details] then
         detail_tuple = matching_tuples.first
 
-        spec = if detail_tuple.first.length == 4 then
-                 detail_tuple.first.last
-               else
-                 uri = URI.parse detail_tuple.last
-                 Gem::SpecFetcher.fetcher.fetch_spec detail_tuple.first, uri
-               end
+        spec = detail_tuple.last
+
+        unless spec.kind_of? Gem::Specification
+          spec = spec.fetch_spec detail_tuple.first
+        end
 
         entry << "\n"
 
@@ -243,9 +259,9 @@ class Gem::Commands::QueryCommand < Gem::Command
             entry << "\n" << "    Installed at: #{loaded_from}"
           else
             label = 'Installed at'
-            matching_tuples.each do |(_,version,_,s),|
+            matching_tuples.each do |n,s|
               loaded_from = File.dirname File.dirname(s.loaded_from)
-              entry << "\n" << "    #{label} (#{version}): #{loaded_from}"
+              entry << "\n" << "    #{label} (#{n.version}): #{loaded_from}"
               label = ' ' * label.length
             end
           end

data/lib/rubygems/commands/rdoc_command.rb

@@ -1,6 +1,6 @@
 require 'rubygems/command'
 require 'rubygems/version_option'
-require 'rubygems/doc_manager'
+require 'rubygems/rdoc'
 
 class Gem::Commands::RdocCommand < Gem::Command
   include Gem::VersionOption
@@ -8,7 +8,7 @@ class Gem::Commands::RdocCommand < Gem::Command
   def initialize
     super 'rdoc', 'Generates RDoc for pre-installed gems',
           :version => Gem::Requirement.default,
-          :include_rdoc => true, :include_ri => true, :overwrite => false
+          :include_rdoc => false, :include_ri => true, :overwrite => false
 
     add_option('--all',
                'Generate RDoc/RI documentation for all',
@@ -39,7 +39,7 @@ class Gem::Commands::RdocCommand < Gem::Command
   end
 
   def defaults_str # :nodoc:
-    "--version '#{Gem::Requirement.default}' --rdoc --ri --no-overwrite"
+    "--version '#{Gem::Requirement.default}' --ri --no-overwrite"
   end
 
   def description # :nodoc:
@@ -54,37 +54,32 @@ The rdoc command builds RDoc and RI documentation for installed gems.  Use
   end
 
   def execute
-    if options[:all] then
-      specs = Gem::SourceIndex.from_installed_gems.collect { |name, spec|
-        spec
-      }
-    else
-      gem_name = get_one_gem_name
-      dep = Gem::Dependency.new gem_name, options[:version]
-      specs = Gem::SourceIndex.from_installed_gems.search dep
+    specs = if options[:all] then
+              Gem::Specification.to_a
+            else
+              get_all_gem_names.map do |name|
+                Gem::Specification.find_by_name name, options[:version]
+              end.flatten.uniq
+            end
+
+    if specs.empty? then
+      alert_error 'No matching gems found'
+      terminate_interaction 1
     end
 
-    if specs.empty?
-      raise "Failed to find gem #{gem_name} to generate RDoc for #{options[:version]}"
-    end
+    specs.each do |spec|
+      doc = Gem::RDoc.new spec, options[:include_rdoc], options[:include_ri]
 
-    if options[:include_ri]
-      specs.sort.each do |spec|
-        doc = Gem::DocManager.new(spec)
-        doc.generate_ri if options[:overwrite] || !doc.ri_installed?
-      end
+      doc.force = options[:overwrite]
 
-      Gem::DocManager.update_ri_cache
-    end
-
-    if options[:include_rdoc]
-      specs.sort.each do |spec|
-        doc = Gem::DocManager.new(spec)
-        doc.generate_rdoc if options[:overwrite] || !doc.rdoc_installed?
+      begin
+        doc.generate
+      rescue Errno::ENOENT => e
+        e.message =~ / - /
+        alert_error "Unable to document #{spec.full_name}, #{$'} is missing, skipping"
+        terminate_interaction 1 if specs.length == 1
       end
     end
-
-    true
   end
 
 end

data/lib/rubygems/commands/search_command.rb

@@ -1,30 +1,16 @@
 require 'rubygems/command'
-require 'rubygems/commands/query_command'
+require 'rubygems/commands/list_command'
 
-class Gem::Commands::SearchCommand < Gem::Commands::QueryCommand
+class Gem::Commands::SearchCommand < Gem::Commands::ListCommand
 
   def initialize
     super 'search', 'Display all gems whose name contains STRING'
 
-    remove_option '--name-matches'
-  end
-
-  def arguments # :nodoc:
-    "STRING        fragment of gem name to search for"
+    @defaults[:domain] = :remote
   end
 
   def defaults_str # :nodoc:
-    "--local --no-details"
-  end
-
-  def usage # :nodoc:
-    "#{program_name} [STRING]"
-  end
-
-  def execute
-    string = get_one_optional_argument
-    options[:name] = /#{string}/i
-    super
+    "--remote --no-details"
   end
 
 end

data/lib/rubygems/commands/server_command.rb

@@ -78,7 +78,7 @@ You can set up a shortcut to gem server documentation using the URL:
   end
 
   def execute
-    options[:gemdir] << Gem.dir if options[:gemdir].empty?
+    options[:gemdir] = Gem.path if options[:gemdir].empty?
     Gem::Server.run options
   end
 

data/lib/rubygems/commands/setup_command.rb

@@ -5,14 +5,22 @@ require 'rubygems/command'
 # RubyGems checkout or tarball.
 
 class Gem::Commands::SetupCommand < Gem::Command
+  HISTORY_HEADER = /^===\s*[\d.]+\s*\/\s*\d{4}-\d{2}-\d{2}\s*$/
+  VERSION_MATCHER = /^===\s*([\d.]+)\s*\/\s*\d{4}-\d{2}-\d{2}\s*$/
 
   def initialize
     require 'tmpdir'
 
     super 'setup', 'Install RubyGems',
-          :format_executable => true, :rdoc => true, :ri => true,
+          :format_executable => true, :document => %w[ri],
           :site_or_vendor => :sitelibdir,
-          :destdir => '', :prefix => ''
+          :destdir => '', :prefix => '', :previous_version => ''
+
+    add_option '--previous-version=VERSION',
+               'Previous version of rubygems',
+               'Used for changelog processing' do |version, options|
+      options[:previous_version] = version
+    end
 
     add_option '--prefix=PREFIX',
                'Prefix path for installing RubyGems',
@@ -37,14 +45,37 @@ class Gem::Commands::SetupCommand < Gem::Command
       options[:format_executable] = value
     end
 
+    add_option '--[no-]document [TYPES]', Array,
+               'Generate documentation for RubyGems.',
+               'List the documentation types you wish to',
+               'generate.  For example: rdoc,ri' do |value, options|
+      options[:document] = case value
+                           when nil   then %w[rdoc ri]
+                           when false then []
+                           else            value
+                           end
+    end
+
     add_option '--[no-]rdoc',
                'Generate RDoc documentation for RubyGems' do |value, options|
-      options[:rdoc] = value
+      if value then
+        options[:document] << 'rdoc'
+      else
+        options[:document].delete 'rdoc'
+      end
+
+      options[:document].uniq!
     end
 
     add_option '--[no-]ri',
                'Generate RI documentation for RubyGems' do |value, options|
-      options[:ri] = value
+      if value then
+        options[:document] << 'ri'
+      else
+        options[:document].delete 'ri'
+      end
+
+      options[:document].uniq!
     end
   end
 
@@ -58,7 +89,7 @@ class Gem::Commands::SetupCommand < Gem::Command
   end
 
   def defaults_str # :nodoc:
-    "--format-executable --rdoc --ri"
+    "--format-executable --document ri"
   end
 
   def description # :nodoc:
@@ -106,11 +137,13 @@ By default, this RubyGems will install gem as:
 
     remove_old_bin_files bin_dir
 
+    remove_old_lib_files lib_dir
+
     say "RubyGems #{Gem::VERSION} installed"
 
     uninstall_old_gemcutter
 
-    install_rdoc
+    documentation_success = install_rdoc
 
     say
     if @verbose then
@@ -118,16 +151,30 @@ By default, this RubyGems will install gem as:
       say
     end
 
+    if options[:previous_version].empty?
+      options[:previous_version] = Gem::VERSION.sub(/[0-9]+$/, '0')
+    end
+
+    options[:previous_version] = Gem::Version.new(options[:previous_version])
+
     release_notes = File.join Dir.pwd, 'History.txt'
 
     release_notes = if File.exist? release_notes then
-                      open release_notes do |io|
-                        text = io.gets '==='
-                        text << io.gets('===')
-                        text.force_encoding Encoding::UTF_8 if
-                          Object.const_defined? :Encoding
-                        text[0...-3].sub(/^# coding:.*?^=/mu, '')
+                      history = File.read release_notes
+                      history = history.sub(/^# coding:.*?^=/m, '')
+
+                      text = history.split(HISTORY_HEADER)
+                      text.shift # correct an off-by-one generated by split
+                      version_lines = history.scan(HISTORY_HEADER)
+                      versions = history.scan(VERSION_MATCHER).flatten.map { |x| Gem::Version.new(x) }
+
+                      history_string = ""
+
+                      until versions.length == 0 or versions.shift < options[:previous_version]
+                        history_string += version_lines.shift + text.shift
                       end
+
+                      history_string
                     else
                       "Oh-no! Unable to find release notes!"
                     end
@@ -147,6 +194,31 @@ By default, this RubyGems will install gem as:
       say "to remove it by hand."
       say
     end
+
+    if documentation_success
+      if options[:document].include? 'rdoc' then
+        say "Rdoc documentation was installed. You may now invoke:"
+        say "  gem server"
+        say "and then peruse beautifully formatted documentation for your gems"
+        say "with your web browser."
+        say "If you do not wish to install this documentation in the future, use the"
+        say "--no-document flag, or set it as the default in your ~/.gemrc file. See"
+        say "'gem help env' for details."
+        say
+      end
+
+      if options[:document].include? 'ri' then
+        say "Ruby Interactive (ri) documentation was installed. ri is kind of like man "
+        say "pages for ruby libraries. You may access it like this:"
+        say "  ri Classname"
+        say "  ri Classname.class_method"
+        say "  ri Classname#instance_method"
+        say "If you do not wish to install this documentation in the future, use the"
+        say "--no-document flag, or set it as the default in your ~/.gemrc file. See"
+        say "'gem help env' for details."
+        say
+      end
+    end
   end
 
   def install_executables(bin_dir)
@@ -210,12 +282,9 @@ TEXT
   def install_lib(lib_dir)
     say "Installing RubyGems" if @verbose
 
-    Dir.chdir 'lib' do
-      lib_files =  Dir[File.join('**', '*rb')]
-
-      # Be sure to include our SSL ca bundles
-      lib_files += Dir[File.join('**', '*pem')]
+    lib_files = rb_files_in 'lib'
 
+    Dir.chdir 'lib' do
       lib_files.each do |lib_file|
         dest_file = File.join lib_dir, lib_file
         dest_dir = File.dirname dest_file
@@ -231,6 +300,12 @@ TEXT
     rubygems_name = "rubygems-#{Gem::VERSION}"
     rubygems_doc_dir = File.join gem_doc_dir, rubygems_name
 
+    begin
+      Gem.ensure_gem_subdirectories Gem.dir
+    rescue SystemCallError
+      # ignore
+    end
+
     if File.writable? gem_doc_dir and
        (not File.exist? rubygems_doc_dir or
         File.writable? rubygems_doc_dir) then
@@ -239,21 +314,26 @@ TEXT
         rm_rf dir
       end
 
-      if options[:ri] then
-        ri_dir = File.join rubygems_doc_dir, 'ri'
-        say "Installing #{rubygems_name} ri into #{ri_dir}" if @verbose
-        run_rdoc '--ri', '--op', ri_dir
-      end
+      require 'rubygems/rdoc'
 
-      if options[:rdoc] then
-        rdoc_dir = File.join rubygems_doc_dir, 'rdoc'
-        say "Installing #{rubygems_name} rdoc into #{rdoc_dir}" if @verbose
-        run_rdoc '--op', rdoc_dir
+      fake_spec = Gem::Specification.new 'rubygems', Gem::VERSION
+      def fake_spec.full_gem_path
+        File.expand_path '../../../..', __FILE__
       end
+
+      generate_ri   = options[:document].include? 'ri'
+      generate_rdoc = options[:document].include? 'rdoc'
+
+      rdoc = Gem::RDoc.new fake_spec, generate_rdoc, generate_ri
+      rdoc.generate
+
+      return true
     elsif @verbose then
       say "Skipping RDoc generation, #{gem_doc_dir} not writable"
       say "Set the GEM_HOME environment variable if you want RDoc generated"
     end
+
+    return false
   end
 
   def make_destination_dirs(install_destdir)
@@ -301,6 +381,12 @@ TEXT
     [lib_dir, bin_dir]
   end
 
+  def rb_files_in dir
+    Dir.chdir dir do
+      Dir[File.join('**', '*rb')]
+    end
+  end
+
   def remove_old_bin_files(bin_dir)
     old_bin_files = {
       'gem_mirror' => 'gem mirror',
@@ -333,21 +419,21 @@ abort "#{deprecation_message}"
     end
   end
 
-  def run_rdoc(*args)
-    begin
-      gem 'rdoc'
-    rescue Gem::LoadError
-    end
+  def remove_old_lib_files lib_dir
+    lib_files = rb_files_in 'lib'
+
+    old_lib_files = rb_files_in lib_dir
 
-    require 'rdoc/rdoc'
+    to_remove = old_lib_files - lib_files
 
-    args << '--main' << 'README.rdoc' << '--quiet'
-    args << '.'
-    args << 'README.rdoc' << 'UPGRADING.rdoc'
-    args << 'LICENSE.txt' << 'MIT.txt' << 'History.txt'
+    Dir.chdir lib_dir do
+      to_remove.each do |file|
+        FileUtils.rm_f file
 
-    r = RDoc::RDoc.new
-    r.document args
+        warn "unable to remove old file #{file} please remove it by hand" if
+          File.exist? file
+      end
+    end
   end
 
   def uninstall_old_gemcutter