rubygems-update 2.0.0.preview2.1 → 2.0.0.preview2.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
 !binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MDRiNTU5NDZhMmMyMjlmYzU1ZTc0NTcxODA3OTJmMTcwZjMyZThkZQ==
-  data.tar.gz: !binary |-
-    NTVhMmM4ZmM1ZTI3OTUwNzg2NzgzNjg3YmE5MjliZTE2MDRiMjMzMA==
+  metadata.gz: 91401633528f7c3f86f318466cec4743c796486f
+  data.tar.gz: 93bbdda6a76f26324bac46eea9603e7ecb19a9c9
 !binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    OGExMjMzYmQyNzUwZWI4ZWE5NDUzYWYwNTY0YzY2MjFlN2ZkNjBiOTBkZDUz
-    MDRiMTIxYjIzZmJlMjg4ZTM5YTBmOWMzYjliNjliMmEyMGVhY2MxNTIyZjYz
-    Nzc1MDM0MGM1YWRiNWRhN2UyY2M0MzJkMjE2YTg0ZGU4NjgyODM=
-  data.tar.gz: !binary |-
-    YTliNzhhYmQyMjc5YzIxM2NkYTY3ZjJkOWM2ZWYyODcwZjUxNzA5NTdiMTAw
-    ODM5MGRiNDdkMzhmYTM5MDY1N2MwYjQzNDVkNzZhOWRmYjc3MGIyMjVhMzFm
-    NWM2ZTdkMjM2YzM4ODlmYjQ4YWRlMGM3NDgzYzNlZjY1NzI5MjE=
+  metadata.gz: 50d19b65248acee6a4813e187084861fa2024fd64ab00de1d32e526d2fe5c22a0682bd1e3ed042621833c56732ca3518a04b32d0f89b4460b28ba84f4fd1303c
+  data.tar.gz: d269891086df82e1440a012b6cb16bbc6f466d566bac86bbcaf620e8fac314c4224c0fbfff4c393a2d897c9d607f9b94adc7838dd190f02f3eab98b37b0efeab

data/History.txt

@@ -1,9 +1,10 @@
 # coding: UTF-8
 
-=== 2.0.0.preview2.1
+=== 2.0.0.preview2.2 / 2012-12-14
 
 As a preview release, please file bugs for any problems you have with RubyGems
-at https://github.com/rubygems/rubygems/issues.
+at https://github.com/rubygems/rubygems/issues.  To update to preview releases
+use gem update --system=2.0.0.preview2.2
 
 RubyGems 2.0 includes several new features and many breaking changes.  Some of
 these changes will cause existing software to break.  These changes are a
@@ -13,6 +14,15 @@ maintainable and improve APIs for RubyGems users.
 If you are using bundler be sure to install version 1.3.0.pre.  Older versions
 of bundler will not work with RubyGems 2.0.
 
+* Minor enhancements:
+  * Added a cmake builder.  Pull request #265 by Allan Espinosa.
+
+* Bug fixes:
+  * Restored RubyGems 1.8 packaging behavior of omitting directories.  Bug
+    #413 by Jeremy Kemper.
+
+=== 2.0.0.preview2.1 / 2012-12-08
+
 * Minor enhancements:
   * Gem::DependencyInstaller now passes build_args down to the installer.
     Pull Request #412 by Sam Rawlins.

data/Manifest.txt

@@ -60,6 +60,7 @@ lib/rubygems/errors.rb
 lib/rubygems/exceptions.rb
 lib/rubygems/ext.rb
 lib/rubygems/ext/builder.rb
+lib/rubygems/ext/cmake_builder.rb
 lib/rubygems/ext/configure_builder.rb
 lib/rubygems/ext/ext_conf_builder.rb
 lib/rubygems/ext/rake_builder.rb
@@ -201,6 +202,7 @@ test/rubygems/test_gem_dependency.rb
 test/rubygems/test_gem_dependency_installer.rb
 test/rubygems/test_gem_dependency_list.rb
 test/rubygems/test_gem_dependency_resolver.rb
+test/rubygems/test_gem_ext_cmake_builder.rb
 test/rubygems/test_gem_ext_configure_builder.rb
 test/rubygems/test_gem_ext_ext_conf_builder.rb
 test/rubygems/test_gem_ext_rake_builder.rb

data/lib/rubygems.rb

@@ -98,7 +98,7 @@
 require 'rbconfig'
 
 module Gem
-  VERSION = '2.0.0.preview2.1'
+  VERSION = '2.0.0.preview2.2'
 end
 
 # Must be first since it unloads the prelude from 1.9.2

data/lib/rubygems/commands/rdoc_command.rb

@@ -1,6 +1,7 @@
 require 'rubygems/command'
 require 'rubygems/version_option'
 require 'rubygems/rdoc'
+require 'fileutils'
 
 class Gem::Commands::RdocCommand < Gem::Command
   include Gem::VersionOption
@@ -72,6 +73,11 @@ The rdoc command builds RDoc and RI documentation for installed gems.  Use
 
       doc.force = options[:overwrite]
 
+      if options[:overwrite] then
+        FileUtils.rm_rf File.join(spec.doc_dir, 'ri')
+        FileUtils.rm_rf File.join(spec.doc_dir, 'rdoc')
+      end
+
       begin
         doc.generate
       rescue Errno::ENOENT => e

data/lib/rubygems/ext.rb

@@ -15,4 +15,5 @@ require 'rubygems/ext/builder'
 require 'rubygems/ext/configure_builder'
 require 'rubygems/ext/ext_conf_builder'
 require 'rubygems/ext/rake_builder'
+require 'rubygems/ext/cmake_builder'
 

data/lib/rubygems/ext/cmake_builder.rb

@@ -0,0 +1,14 @@
+class Gem::Ext::CmakeBuilder < Gem::Ext::Builder
+  def self.build(extension, directory, dest_path, results)
+    unless File.exist?('Makefile') then
+      cmd = "cmake . -DCMAKE_INSTALL_PREFIX=#{dest_path}"
+      cmd << " #{Gem::Command.build_args.join ' '}" unless Gem::Command.build_args.empty?
+
+      run cmd, results
+    end
+
+    make dest_path, results
+
+    results
+  end
+end

data/lib/rubygems/installer.rb

@@ -667,6 +667,8 @@ TEXT
                 when /rakefile/i, /mkrf_conf/i then
                   ran_rake = true
                   Gem::Ext::RakeBuilder
+                when /CMakeLists.txt/ then
+                  Gem::Ext::CmakeBuilder
                 else
                   message = "No builder for extension '#{extension}'"
                   extension_build_error extension_dir, message

data/lib/rubygems/package.rb

@@ -192,6 +192,8 @@ class Gem::Package
     @spec.files.each do |file|
       stat = File.stat file
 
+      next unless stat.file?
+
       tar.add_file_simple file, stat.mode, stat.size do |dst_io|
         open file, 'rb' do |src_io|
           dst_io.write src_io.read 16384 until src_io.eof?

data/lib/rubygems/rdoc.rb

@@ -86,18 +86,16 @@ class Gem::RDoc # :nodoc: all
   def self.load_rdoc
     return if @rdoc_version
 
-    begin
-      require 'rdoc/rdoc'
+    require 'rdoc/rdoc'
 
-      @rdoc_version = if ::RDoc.const_defined? :VERSION then
-                        Gem::Version.new ::RDoc::VERSION
-                      else
-                        Gem::Version.new '1.0.1'
-                      end
+    @rdoc_version = if ::RDoc.const_defined? :VERSION then
+                      Gem::Version.new ::RDoc::VERSION
+                    else
+                      Gem::Version.new '1.0.1'
+                    end
 
-    rescue LoadError => e
-      raise Gem::DocumentError, "RDoc is not installed: #{e}"
-    end
+  rescue LoadError => e
+    raise Gem::DocumentError, "RDoc is not installed: #{e}"
   end
 
   ##
@@ -107,7 +105,7 @@ class Gem::RDoc # :nodoc: all
   #
   # Only +generate_ri+ is enabled by default.
 
-  def initialize spec, generate_rdoc = false, generate_ri = true
+  def initialize spec, generate_rdoc = true, generate_ri = true
     @doc_dir   = spec.doc_dir
     @file_info = nil
     @force     = false
@@ -123,6 +121,8 @@ class Gem::RDoc # :nodoc: all
 
   ##
   # Removes legacy rdoc arguments from +args+
+  #--
+  # TODO move to RDoc::Options
 
   def delete_legacy_args args
     args.delete '--inline-source'
@@ -138,16 +138,20 @@ class Gem::RDoc # :nodoc: all
   # Documentation will be generated into +destination+
 
   def document generator, options, destination
+    generator_name = generator
+
     options = options.dup
     options.exclude ||= [] # TODO maybe move to RDoc::Options#finish
     options.setup_generator generator
     options.op_dir = destination
     options.finish
 
+    generator = options.generator.new @rdoc.store, options
+
     @rdoc.options = options
-    @rdoc.generator = options.generator.new options
+    @rdoc.generator = generator
 
-    say "Installing #{generator} documentation for #{@spec.full_name}"
+    say "Installing #{generator_name} documentation for #{@spec.full_name}"
 
     FileUtils.mkdir_p options.op_dir
 
@@ -169,44 +173,51 @@ class Gem::RDoc # :nodoc: all
 
     setup
 
+    options = nil
+
     if Gem::Requirement.new('< 3').satisfied_by? self.class.rdoc_version then
       generate_legacy
-    else
-      ::RDoc::TopLevel.reset # TODO ::RDoc::RDoc.reset
-      ::RDoc::Parser::C.reset
+      return
+    end
 
-      options = ::RDoc::Options.new
-      options.default_title = "#{@spec.full_name} Documentation"
-      options.files = []
-      options.files.push(*@spec.require_paths)
-      options.files.push(*@spec.extra_rdoc_files)
+    ::RDoc::TopLevel.reset # TODO ::RDoc::RDoc.reset
+    ::RDoc::Parser::C.reset
 
-      args = @spec.rdoc_options
+    args = @spec.rdoc_options
+    args.concat @spec.require_paths
+    args.concat @spec.extra_rdoc_files
 
-      case config_args = Gem.configuration[:rdoc]
-      when String then
-        args = args.concat config_args.split
-      when Array then
-        args = args.concat config_args
-      end
+    case config_args = Gem.configuration[:rdoc]
+    when String then
+      args = args.concat config_args.split
+    when Array then
+      args = args.concat config_args
+    end
+
+    delete_legacy_args args
 
-      delete_legacy_args args
+    Dir.chdir @spec.full_gem_path do
+      options = ::RDoc::Options.new
+      options.default_title = "#{@spec.full_name} Documentation"
       options.parse args
-      options.quiet = !Gem.configuration.really_verbose
+    end
 
-      @rdoc = new_rdoc
-      @rdoc.options = options
+    options.quiet = !Gem.configuration.really_verbose
 
-      Dir.chdir @spec.full_gem_path do
-        @file_info = @rdoc.parse_files options.files
-      end
+    @rdoc = new_rdoc
+    @rdoc.options = options
 
-      document 'ri',       options, @ri_dir if
-        @generate_ri   and (@force or not File.exist? @ri_dir)
+    say "Parsing documentation for #{@spec.full_name}"
 
-      document 'darkfish', options, @rdoc_dir if
-        @generate_rdoc and (@force or not File.exist? @rdoc_dir)
+    Dir.chdir @spec.full_gem_path do
+      @file_info = @rdoc.parse_files options.files
     end
+
+    document 'ri',       options, @ri_dir if
+      @generate_ri   and (@force or not File.exist? @ri_dir)
+
+    document 'darkfish', options, @rdoc_dir if
+      @generate_rdoc and (@force or not File.exist? @rdoc_dir)
   end
 
   ##
@@ -268,7 +279,7 @@ class Gem::RDoc # :nodoc: all
   # #new_rdoc creates a new RDoc instance.  This method is provided only to
   # make testing easier.
 
-  def new_rdoc
+  def new_rdoc # :nodoc:
     ::RDoc::RDoc.new
   end
 

data/lib/rubygems/server.rb

@@ -79,7 +79,9 @@ class Gem::Server
 
     <b><%=spec["name"]%> <%=spec["version"]%></b>
 
-    <% if spec["rdoc_installed"] then %>
+    <% if spec["ri_installed"] then %>
+      <a href="<%=spec["doc_path"]%>">[rdoc]</a>
+    <% elsif spec["rdoc_installed"] then %>
       <a href="<%=spec["doc_path"]%>">[rdoc]</a>
     <% else %>
       <span title="rdoc not installed">[rdoc]</span>
@@ -464,7 +466,7 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
 
   def have_rdoc_4_plus?
     @have_rdoc_4_plus ||=
-      Gem::Requirement.new('>= 4').satisfied_by? Gem::RDoc.rdoc_version
+      Gem::Requirement.new('>= 4.0.0.preview2').satisfied_by? Gem::RDoc.rdoc_version
   end
 
   def latest_specs(req, res)
@@ -604,6 +606,7 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
         "homepage"            => spec.homepage,
         "name"                => spec.name,
         "rdoc_installed"      => Gem::RDoc.new(spec).rdoc_installed?,
+        "ri_installed"        => Gem::RDoc.new(spec).ri_installed?,
         "summary"             => spec.summary,
         "version"             => spec.version.to_s,
       }
@@ -619,7 +622,7 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
       "has_deps" => false,
       "homepage" => "http://docs.rubygems.org/",
       "name" => 'rubygems',
-      "rdoc_installed" => true,
+      "ri_installed" => true,
       "summary" => "RubyGems itself",
       "version" => Gem::VERSION,
     }

data/test/rubygems/test_gem_ext_cmake_builder.rb

@@ -0,0 +1,84 @@
+require 'rubygems/test_case'
+require 'rubygems/ext'
+
+class TestGemExtCmakeBuilder < Gem::TestCase
+
+  def setup
+    super
+
+    `cmake #{Gem::Ext::Builder.redirector}`
+
+    skip 'cmake not present' unless $?.success?
+
+    @ext = File.join @tempdir, 'ext'
+    @dest_path = File.join @tempdir, 'prefix'
+
+    FileUtils.mkdir_p @ext
+    FileUtils.mkdir_p @dest_path
+  end
+
+  def test_self_build
+    File.open File.join(@ext, 'CMakeLists.txt'), 'w' do |cmakelists|
+      cmakelists.write <<-eo_cmake
+cmake_minimum_required(VERSION 2.8)
+install (FILES test.txt DESTINATION bin)
+      eo_cmake
+    end
+    File.open File.join(@ext, 'test.txt'), 'w' do |testfile|
+    end
+
+    output = []
+
+    Dir.chdir @ext do
+      Gem::Ext::CmakeBuilder.build nil, nil, @dest_path, output
+    end
+
+    assert_equal "cmake . -DCMAKE_INSTALL_PREFIX=#{@dest_path}", output.shift
+    assert_match(/#{@ext}/, output.shift)
+    assert_equal make_command, output.shift
+    assert_equal "", output.shift.gsub(/^make\[1\]: (?:Entering|Leaving) directory .*\n/,"")
+    assert_equal make_command + " install", output.shift
+    assert_match(/test\.txt/, output.shift)
+  end
+
+  def test_self_build_fail
+    output = []
+
+    error = assert_raises Gem::InstallError do
+      Dir.chdir @ext do
+        Gem::Ext::CmakeBuilder.build nil, nil, @dest_path, output
+      end
+    end
+
+    shell_error_msg = %r{(CMake Error: .*)}
+    sh_prefix_cmake = "cmake . -DCMAKE_INSTALL_PREFIX="
+
+    expected = %r(cmake failed:
+
+#{Regexp.escape sh_prefix_cmake}#{Regexp.escape @dest_path}
+#{shell_error_msg}
+)
+
+    assert_match expected, error.message
+
+    assert_equal "#{sh_prefix_cmake}#{@dest_path}", output.shift
+    assert_match %r(#{shell_error_msg}), output.shift
+    assert_equal true, output.empty?
+  end
+
+  def test_self_build_has_makefile
+    File.open File.join(@ext, 'Makefile'), 'w' do |makefile|
+      makefile.puts "all:\n\t@echo ok\ninstall:\n\t@echo ok"
+    end
+
+    output = []
+    Dir.chdir @ext do
+      Gem::Ext::CmakeBuilder.build nil, nil, @dest_path, output
+    end
+
+    assert_equal make_command, output[0]
+    assert_equal "#{make_command} install", output[2]
+  end
+
+end
+

data/test/rubygems/test_gem_installer.rb

@@ -180,7 +180,7 @@ load Gem.bin_path('a', 'executable', version)
       end
 
       conflicted = File.join @gemhome, 'bin', 'executable'
-      assert_match /\A"executable" from a conflicts with (?:#{Regexp.quote(conflicted)}|installed executable from conflict)\z/,
+      assert_match %r%\A"executable" from a conflicts with (?:#{Regexp.quote(conflicted)}|installed executable from conflict)\z%,
                    e.message
     end
   ensure

data/test/rubygems/test_gem_package.rb

@@ -102,9 +102,10 @@ class TestGemPackage < Gem::Package::TarTestCase
 
   def test_add_files
     spec = Gem::Specification.new
-    spec.files = 'lib/code.rb'
+    spec.files = %w[lib/code.rb lib/empty]
+
+    FileUtils.mkdir_p 'lib/empty'
 
-    FileUtils.mkdir 'lib'
     open 'lib/code.rb',  'w' do |io| io.write '# lib/code.rb'  end
     open 'lib/extra.rb', 'w' do |io| io.write '# lib/extra.rb' end
 

data/test/rubygems/test_gem_rdoc.rb

@@ -1,15 +1,25 @@
-require 'rubygems/test_case'
 require 'rubygems'
+require 'rubygems/test_case'
 require 'rubygems/rdoc'
 
 class TestGemRDoc < Gem::TestCase
+  Gem::RDoc.load_rdoc
+  rdoc_4 = Gem::Requirement.new('> 3').satisfied_by?(Gem::RDoc.rdoc_version)
 
   def setup
     super
 
-    @a = quick_spec 'a'
+    @a = quick_spec 'a' do |s|
+      s.rdoc_options = %w[--main MyTitle]
+      s.extra_rdoc_files = %w[README]
+    end
+
+    write_file File.join(@tempdir, 'lib', 'a.rb')
+    write_file File.join(@tempdir, 'README')
+
+    install_gem @a
 
-    @rdoc = Gem::RDoc.new @a
+    @hook = Gem::RDoc.new @a
 
     begin
       Gem::RDoc.load_rdoc
@@ -24,17 +34,26 @@ class TestGemRDoc < Gem::TestCase
   # RDoc 4 ships with its own Gem::RDoc which overrides this one which is
   # shipped for backwards compatibility.
 
+  def rdoc_4?
+    Gem::Requirement.new('>= 4.0.0.preview2').satisfied_by? \
+      @hook.class.rdoc_version
+  end
+
   def rdoc_3?
-    Gem::Requirement.new('~> 3.0').satisfied_by? @rdoc.class.rdoc_version
+    Gem::Requirement.new('~> 3.0').satisfied_by? @hook.class.rdoc_version
   end
 
   def rdoc_3_8_or_better?
-    Gem::Requirement.new('>= 3.8').satisfied_by? @rdoc.class.rdoc_version
+    Gem::Requirement.new('>= 3.8').satisfied_by? @hook.class.rdoc_version
   end
 
   def test_initialize
-    assert @rdoc.generate_rdoc
-    assert @rdoc.generate_ri
+    if rdoc_4? then
+      refute @hook.generate_rdoc
+    else
+      assert @hook.generate_rdoc
+    end
+    assert @hook.generate_ri
 
     rdoc = Gem::RDoc.new @a, false, false
 
@@ -50,7 +69,7 @@ class TestGemRDoc < Gem::TestCase
       -p
     ]
 
-    @rdoc.delete_legacy_args args
+    @hook.delete_legacy_args args
 
     assert_empty args
   end
@@ -61,13 +80,14 @@ class TestGemRDoc < Gem::TestCase
     options = RDoc::Options.new
     options.files = []
 
-    @rdoc.instance_variable_set :@rdoc, @rdoc.new_rdoc
-    @rdoc.instance_variable_set :@file_info, []
+    rdoc = @hook.new_rdoc
+    @hook.instance_variable_set :@rdoc, rdoc
+    @hook.instance_variable_set :@file_info, []
 
-    @rdoc.document 'darkfish', options, @a.doc_dir('rdoc')
+    @hook.document 'darkfish', options, @a.doc_dir('rdoc')
 
-    assert @rdoc.rdoc_installed?
-  end
+    assert @hook.rdoc_installed?
+  end unless rdoc_4
 
   def test_generate
     skip 'RDoc 3 required' unless rdoc_3?
@@ -75,15 +95,15 @@ class TestGemRDoc < Gem::TestCase
     FileUtils.mkdir_p @a.doc_dir
     FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
 
-    @rdoc.generate
+    @hook.generate
 
-    assert @rdoc.rdoc_installed?
-    assert @rdoc.ri_installed?
+    assert @hook.rdoc_installed?
+    assert @hook.ri_installed?
 
-    rdoc = @rdoc.instance_variable_get :@rdoc
+    rdoc = @hook.instance_variable_get :@rdoc
 
     refute rdoc.options.hyperlink_all
-  end
+  end unless rdoc_4
 
   def test_generate_configuration_rdoc_array
     skip 'RDoc 3 required' unless rdoc_3?
@@ -93,12 +113,12 @@ class TestGemRDoc < Gem::TestCase
     FileUtils.mkdir_p @a.doc_dir
     FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
 
-    @rdoc.generate
+    @hook.generate
 
-    rdoc = @rdoc.instance_variable_get :@rdoc
+    rdoc = @hook.instance_variable_get :@rdoc
 
     assert rdoc.options.hyperlink_all
-  end
+  end unless rdoc_4
 
   def test_generate_configuration_rdoc_string
     skip 'RDoc 3 required' unless rdoc_3?
@@ -108,21 +128,21 @@ class TestGemRDoc < Gem::TestCase
     FileUtils.mkdir_p @a.doc_dir
     FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
 
-    @rdoc.generate
+    @hook.generate
 
-    rdoc = @rdoc.instance_variable_get :@rdoc
+    rdoc = @hook.instance_variable_get :@rdoc
 
     assert rdoc.options.hyperlink_all
-  end
+  end unless rdoc_4
 
   def test_generate_disabled
-    @rdoc.generate_rdoc = false
-    @rdoc.generate_ri   = false
+    @hook.generate_rdoc = false
+    @hook.generate_ri   = false
 
-    @rdoc.generate
+    @hook.generate
 
-    refute @rdoc.rdoc_installed?
-    refute @rdoc.ri_installed?
+    refute @hook.rdoc_installed?
+    refute @hook.ri_installed?
   end
 
   def test_generate_force
@@ -132,13 +152,13 @@ class TestGemRDoc < Gem::TestCase
     FileUtils.mkdir_p @a.doc_dir 'rdoc'
     FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
 
-    @rdoc.force = true
+    @hook.force = true
 
-    @rdoc.generate
+    @hook.generate
 
     assert_path_exists File.join(@a.doc_dir('rdoc'), 'index.html')
     assert_path_exists File.join(@a.doc_dir('ri'),   'cache.ri')
-  end
+  end unless rdoc_4
 
   def test_generate_no_overwrite
     skip 'RDoc 3 required' unless rdoc_3?
@@ -147,11 +167,11 @@ class TestGemRDoc < Gem::TestCase
     FileUtils.mkdir_p @a.doc_dir 'rdoc'
     FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
 
-    @rdoc.generate
+    @hook.generate
 
     refute_path_exists File.join(@a.doc_dir('rdoc'), 'index.html')
     refute_path_exists File.join(@a.doc_dir('ri'),   'cache.ri')
-  end
+  end unless rdoc_4
 
   def test_generate_legacy
     skip 'RDoc < 3.8 required' if rdoc_3_8_or_better?
@@ -159,11 +179,11 @@ class TestGemRDoc < Gem::TestCase
     FileUtils.mkdir_p @a.doc_dir
     FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
 
-    @rdoc.generate_legacy
+    @hook.generate_legacy
 
-    assert @rdoc.rdoc_installed?
-    assert @rdoc.ri_installed?
-  end
+    assert @hook.rdoc_installed?
+    assert @hook.ri_installed?
+  end unless rdoc_4
 
   def test_legacy_rdoc
     skip 'RDoc < 3.8 required' if rdoc_3_8_or_better?
@@ -171,31 +191,31 @@ class TestGemRDoc < Gem::TestCase
     FileUtils.mkdir_p @a.doc_dir
     FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
 
-    @rdoc.legacy_rdoc '--op', @a.doc_dir('rdoc')
+    @hook.legacy_rdoc '--op', @a.doc_dir('rdoc')
 
-    assert @rdoc.rdoc_installed?
-  end
+    assert @hook.rdoc_installed?
+  end unless rdoc_4
 
   def test_new_rdoc
-    assert_kind_of RDoc::RDoc, @rdoc.new_rdoc
+    assert_kind_of RDoc::RDoc, @hook.new_rdoc
   end
 
   def test_rdoc_installed?
-    refute @rdoc.rdoc_installed?
+    refute @hook.rdoc_installed?
 
     FileUtils.mkdir_p @a.doc_dir 'rdoc'
 
-    assert @rdoc.rdoc_installed?
+    assert @hook.rdoc_installed?
   end
 
   def test_remove
     FileUtils.mkdir_p @a.doc_dir 'rdoc'
     FileUtils.mkdir_p @a.doc_dir 'ri'
 
-    @rdoc.remove
+    @hook.remove
 
-    refute @rdoc.rdoc_installed?
-    refute @rdoc.ri_installed?
+    refute @hook.rdoc_installed?
+    refute @hook.ri_installed?
 
     assert_path_exists @a.doc_dir
   end
@@ -206,7 +226,7 @@ class TestGemRDoc < Gem::TestCase
     FileUtils.chmod 0, @a.base_dir
 
     e = assert_raises Gem::FilePermissionError do
-      @rdoc.remove
+      @hook.remove
     end
 
     assert_equal @a.base_dir, e.directory
@@ -215,15 +235,15 @@ class TestGemRDoc < Gem::TestCase
   end
 
   def test_ri_installed?
-    refute @rdoc.ri_installed?
+    refute @hook.ri_installed?
 
     FileUtils.mkdir_p @a.doc_dir 'ri'
 
-    assert @rdoc.ri_installed?
+    assert @hook.ri_installed?
   end
 
   def test_setup
-    @rdoc.setup
+    @hook.setup
 
     assert_path_exists @a.doc_dir
   end
@@ -234,12 +254,16 @@ class TestGemRDoc < Gem::TestCase
     FileUtils.chmod 0, @a.doc_dir
 
     e = assert_raises Gem::FilePermissionError do
-      @rdoc.setup
+      @hook.setup
     end
 
     assert_equal @a.doc_dir, e.directory
   ensure
-    FileUtils.chmod(0755, @a.doc_dir) if File.directory?(@a.doc_dir)
+    if File.exist? @a.doc_dir
+      FileUtils.chmod 0755, @a.doc_dir
+      FileUtils.rm_r @a.doc_dir
+    end
   end
 
 end
+

data/test/rubygems/test_gem_server.rb

@@ -40,7 +40,7 @@ class TestGemServer < Gem::TestCase
 
   def test_have_rdoc_4_plus_eh
     orig_rdoc_version = Gem::RDoc.rdoc_version
-    Gem::RDoc.instance_variable_set :@rdoc_version, Gem::Version.new('4.0')
+    Gem::RDoc.instance_variable_set(:@rdoc_version, Gem::Version.new('4.0'))
 
     server = Gem::Server.new Gem.dir, 0, false
     assert server.have_rdoc_4_plus?
@@ -49,6 +49,12 @@ class TestGemServer < Gem::TestCase
 
     server = Gem::Server.new Gem.dir, 0, false
     refute server.have_rdoc_4_plus?
+
+    Gem::RDoc.instance_variable_set(:@rdoc_version,
+                                    Gem::Version.new('4.0.0.preview2'))
+
+    server = Gem::Server.new Gem.dir, 0, false
+    assert server.have_rdoc_4_plus?
   ensure
     Gem::RDoc.instance_variable_set :@rdoc_version, orig_rdoc_version
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-update
 version: !ruby/object:Gem::Version
-  version: 2.0.0.preview2.1
+  version: 2.0.0.preview2.2
 platform: ruby
 authors:
 - Jim Weirich
@@ -40,116 +40,145 @@ cert_chain:
   UndmQzdzL1lJTEFITkFUb3BhSmRIOUROcGQxClU4MXpHSE1VQk92ei9WR1Q2
   d0p3WUozZW1TMm5mQTJOT0hGZmdBPT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUt
   LS0tLQo=
-date: 2012-12-08 00:00:00.000000000 Z
+date: 2012-12-15 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.10'
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
   name: hoe-seattlerb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: session
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
 - !ruby/object:Gem::Dependency
   name: ZenTest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.3
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
-description: ! "RubyGems is a package management framework for Ruby.\n\nThis gem is
-  an update for the RubyGems software. You must have an\ninstallation of RubyGems
-  before this update can be applied.\n\nSee Gem for information on RubyGems (or `ri
-  Gem`)\n\nTo upgrade to the latest RubyGems, run:\n\n  $ gem update --system  # you
-  might need to be an administrator or root\n\nSee UPGRADING.rdoc for more details
-  and alternative instructions.\n\n-----\n\nIf you don't have RubyGems installed,
-  you can still do it manually:\n\n* Download from: https://rubygems.org/pages/download\n*
-  Unpack into a directory and cd there\n* Install with: ruby setup.rb  # you may need
-  admin/root privilege\n\nFor more details and other options, see:\n\n  ruby setup.rb
-  --help"
+description: |-
+  RubyGems is a package management framework for Ruby.
+
+  This gem is an update for the RubyGems software. You must have an
+  installation of RubyGems before this update can be applied.
+
+  See Gem for information on RubyGems (or `ri Gem`)
+
+  To upgrade to the latest RubyGems, run:
+
+    $ gem update --system  # you might need to be an administrator or root
+
+  See UPGRADING.rdoc for more details and alternative instructions.
+
+  -----
+
+  If you don't have RubyGems installed, you can still do it manually:
+
+  * Download from: https://rubygems.org/pages/download
+  * Unpack into a directory and cd there
+  * Install with: ruby setup.rb  # you may need admin/root privilege
+
+  For more details and other options, see:
+
+    ruby setup.rb --help
 email:
 - rubygems-developers@rubyforge.org
 executables:
@@ -164,8 +193,8 @@ extra_rdoc_files:
 - UPGRADING.rdoc
 - hide_lib_for_update/note.txt
 files:
-- .autotest
-- .document
+- ".autotest"
+- ".document"
 - History.txt
 - LICENSE.txt
 - MIT.txt
@@ -226,6 +255,7 @@ files:
 - lib/rubygems/exceptions.rb
 - lib/rubygems/ext.rb
 - lib/rubygems/ext/builder.rb
+- lib/rubygems/ext/cmake_builder.rb
 - lib/rubygems/ext/configure_builder.rb
 - lib/rubygems/ext/ext_conf_builder.rb
 - lib/rubygems/ext/rake_builder.rb
@@ -367,6 +397,7 @@ files:
 - test/rubygems/test_gem_dependency_installer.rb
 - test/rubygems/test_gem_dependency_list.rb
 - test/rubygems/test_gem_dependency_resolver.rb
+- test/rubygems/test_gem_ext_cmake_builder.rb
 - test/rubygems/test_gem_ext_configure_builder.rb
 - test/rubygems/test_gem_ext_ext_conf_builder.rb
 - test/rubygems/test_gem_ext_rake_builder.rb
@@ -414,30 +445,30 @@ files:
 - test/rubygems/wrong_key_cert_32.pem
 - util/CL2notes
 - util/create_certs.rb
-- .gemtest
+- ".gemtest"
 homepage: http://rubygems.org
 licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.rdoc
-- --title=RubyGems 2.0.0.preview2.1 Documentation
+- "--title=RubyGems 2.0.0.preview2.2 Documentation"
 require_paths:
 - hide_lib_for_update
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: rubygems
-rubygems_version: 2.0.0.preview2
+rubygems_version: 2.0.0.preview2.1
 signing_key: 
 specification_version: 4
 summary: RubyGems is a package management framework for Ruby
@@ -483,6 +514,7 @@ test_files:
 - test/rubygems/test_gem_dependency_installer.rb
 - test/rubygems/test_gem_dependency_list.rb
 - test/rubygems/test_gem_dependency_resolver.rb
+- test/rubygems/test_gem_ext_cmake_builder.rb
 - test/rubygems/test_gem_ext_configure_builder.rb
 - test/rubygems/test_gem_ext_ext_conf_builder.rb
 - test/rubygems/test_gem_ext_rake_builder.rb