* lib/rubygems*: Updated to RubyGems 2.0

* test/rubygems*:  ditto.

* common.mk (prelude):  Updated for RubyGems 2.0 source rearrangement.

* tool/change_maker.rb:  Allow invalid UTF-8 characters in source
  files.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37976 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 7 insertions, 47 deletions

diff --git a/lib/rubygems/commands/generate_index_command.rb b/lib/rubygems/commands/generate_index_command.rb
index d4b4790649..a7db013caf 100644
--- a/lib/rubygems/commands/generate_index_command.rb
+++ b/lib/rubygems/commands/generate_index_command.rb
@@ -11,29 +11,16 @@ class Gem::Commands::GenerateIndexCommand < Gem::Command
   def initialize
     super 'generate_index',
           'Generates the index files for a gem server directory',
-          :directory => '.', :build_legacy => true, :build_modern => true
+          :directory => '.', :build_modern => true
 
     add_option '-d', '--directory=DIRNAME',
                'repository base dir containing gems subdir' do |dir, options|
       options[:directory] = File.expand_path dir
     end
 
-    add_option '--[no-]legacy',
-               'Generate Marshal.4.8' do |value, options|
-      unless options[:build_modern] or value then
-        raise OptionParser::InvalidOption, 'no indicies will be built'
-      end
-
-      options[:build_legacy] = value
-    end
-
     add_option '--[no-]modern',
-               'Generate indexes for RubyGems newer',
-               'than 1.2.0' do |value, options|
-      unless options[:build_legacy] or value then
-        raise OptionParser::InvalidOption, 'no indicies will be built'
-      end
-
+               'Generate indexes for RubyGems',
+               '(always true)' do |value, options|
       options[:build_modern] = value
     end
 
@@ -42,27 +29,10 @@ class Gem::Commands::GenerateIndexCommand < Gem::Command
                'since the last update' do |value, options|
       options[:update] = value
     end
-
-    add_option :RSS, '--rss-gems-host=GEM_HOST',
-               'Host name where gems are served from,',
-               'used for GUID and enclosure values' do |value, options|
-      options[:rss_gems_host] = value
-    end
-
-    add_option :RSS, '--rss-host=HOST',
-               'Host name for more gems information,',
-               'used for RSS feed link' do |value, options|
-      options[:rss_host] = value
-    end
-
-    add_option :RSS, '--rss-title=TITLE',
-               'Set title for RSS feed' do |value, options|
-      options[:rss_title] = value
-    end
   end
 
   def defaults_str # :nodoc:
-    "--directory . --legacy --modern"
+    "--directory . --modern"
   end
 
   def description # :nodoc:
@@ -85,25 +55,15 @@ When done, it will generate a set of files like this:
   prerelease_specs.<version>.gz                # prerelease specs index
   quick/Marshal.<version>/<gemname>.gemspec.rz # Marshal quick index file
 
-  # these files support legacy RubyGems
-  Marshal.<version>
-  Marshal.<version>.Z                          # Marshal full index
-
-The .Z and .rz extension files are compressed with the inflate algorithm.
+The .rz extension files are compressed with the inflate algorithm.
 The Marshal version number comes from ruby's Marshal::MAJOR_VERSION and
 Marshal::MINOR_VERSION constants.  It is used to ensure compatibility.
-
-If --rss-host and --rss-gem-host are given an RSS feed will be generated at
-index.rss containing gems released in the last two days.
     EOF
   end
 
   def execute
-    if options[:update] and
-       (options[:rss_host] or options[:rss_gems_host]) then
-      alert_error '--update not compatible with RSS generation'
-      terminate_interaction 1
-    end
+    # This is always true becasue it's the only way now.
+    options[:build_modern] = true
 
     if not File.exist?(options[:directory]) or
        not File.directory?(options[:directory]) then