rubygems-update 0.9.0 → 0.9.1

data/post-install.rb

@@ -4,8 +4,20 @@
 # See LICENSE.txt for permissions.
 #++
 
+require 'rbconfig'
+
+def run_rdoc(*args)
+  args << '--quiet'
+  args << '--main' << 'README'
+  args << '.' << 'README' << 'LICENSE.txt' << 'GPL.txt'
+
+  r = RDoc::RDoc.new
+  r.document args
+end
+
 def remove_stubs
   is_apparent_stub = lambda { |path|
+    break unless File.readable? path
     File.read(path, 40) =~ /^# This file was generated by RubyGems/ and
       File.readlines(path).size < 20
   }
@@ -57,7 +69,7 @@ def install_windows_batch_files
     target = File.join(bindir, File.basename(f))
     if is_windows_platform
       File.open(target+".cmd", "w") do |file|
-	ruby_cmd = Gem.ruby rescue 'ruby'
+        ruby_cmd = Gem.ruby rescue 'ruby'
         file.puts %{@"#{ruby_cmd}" "#{target}" %1 %2 %3 %4 %5 %6 %7 %8 %9}
       end
     end
@@ -67,7 +79,8 @@ end
 def install_sources
   $: << "lib"
   require 'rubygems'
-  Gem::manage_gems
+  require 'rubygems/builder'
+  require 'rubygems/installer'
   Dir.chdir("pkgs/sources") do
     load "sources.gemspec"
     spec = Gem.sources_spec
@@ -76,7 +89,33 @@ def install_sources
   end
 end
 
+def remove_old_rdoc
+  require 'rubygems'
+  require 'fileutils'
+
+  puts "Removing old RubyGems RDoc and ri..."
+  Dir[File.join(Gem.dir, 'doc', 'rubygems-*')].each do |dir|
+    FileUtils.rm_rf dir
+  end
+end
+
+def install_rdoc
+  require 'rdoc/rdoc'
+  require 'rubygems'
+
+  rubygems_name = "rubygems-#{Gem::RubyGemsVersion}"
+
+  doc_dir = File.join Gem.dir, 'doc', rubygems_name
+
+  puts "Installing #{rubygems_name} ri..."
+  run_rdoc '--ri', '--op', File.join(doc_dir, 'ri')
+  puts "Installing #{rubygems_name} rdoc..."
+  run_rdoc '--op', File.join(doc_dir, 'rdoc')
+end
+
+install_sources
+remove_old_rdoc
+install_rdoc
 install_windows_batch_files
 remove_stubs
-install_sources
 

data/scripts/gemdoc.rb

@@ -50,10 +50,10 @@ while line = gets
     case cmd
     when "!usage"
       begin
-	cmdobj = $gm[arg]
-	pre(cmdobj, "--help")
+        cmdobj = $gm[arg]
+        pre(cmdobj, "--help")
       rescue NoMethodError
-	puts "Usage of command #{arg} failed"
+        puts "Usage of command #{arg} failed"
       end
     when "!toc"
       puts table_of_contents()

data/scripts/runtest.rb

@@ -17,7 +17,7 @@ def run_tests(pattern='test/test*.rb', log_enabled=false)
     rescue Exception => ex
       puts "Error in #{fn}: #{ex.message}"
       puts ex.backtrace
-	assert false
+      assert false
     end
   }
 end

data/scripts/upload_gemdoc.rb

@@ -26,12 +26,12 @@ def read_document
     name = nil
     f.each do |line|
       if line =~ /^==/
-	line =~ /gem\s+(\S+)/ or fail "Illformatted Document Line [#{line.chomp}]"
-	name = $1
-	DOC[name] = ''
+        line =~ /gem\s+(\S+)/ or fail "Illformatted Document Line [#{line.chomp}]"
+        name = $1
+        DOC[name] = ''
       else
-	next if name.nil?
-	DOC[name] << line
+        next if name.nil?
+        DOC[name] << line
       end
     end
   end
@@ -103,13 +103,13 @@ def update_command_docs(cmdref_page)
     if title =~ /gem\s([a-z]+)/
       name = $1
       if DOC[name]
-	body_field = edit_form.fields.find { |f| f.name == 'page[body]'}
-	body_field.value = DOC[name]
-	puts "*** Updating gem #{name} page"
-	$agent.submit(edit_form)
-	UPDATED[name] = true
+        body_field = edit_form.fields.find { |f| f.name == 'page[body]'}
+        body_field.value = DOC[name]
+        puts "*** Updating gem #{name} page"
+        $agent.submit(edit_form)
+        UPDATED[name] = true
       else
-	MISSING << name
+        MISSING << name
       end
     end
   end

data/setup.rb

@@ -244,6 +244,8 @@ class ConfigTable_class
         f.printf "%s=%s\n", i.name, i.value if i.value
       end
     }
+  rescue Exception => e
+    $stderr.puts "Exception thrown while trying to open #{savefile} in #{Dir.pwd}: #{e}... continuing"
   end
 
   def [](key)
@@ -515,13 +517,18 @@ module FileOperations
       }
       File.chmod mode, realdest
 
-      File.open("#{objdir_root()}/InstalledFiles", 'a') {|f|
-        if prefix
-          f.puts realdest.sub(prefix, '')
-        else
-          f.puts realdest
-        end
-      }
+      path = "#{objdir_root()}/InstalledFiles"
+      begin
+        File.open(path, 'a') {|f|
+          if prefix
+            f.puts realdest.sub(prefix, '')
+          else
+            f.puts realdest
+          end
+        }
+      rescue Exception => e
+        $stderr.puts "Exception thrown while trying to open #{path} in #{Dir.pwd}: #{e}... continuing"
+      end
     end
   end
 

data/test/brokenbuildgem.rb

@@ -0,0 +1,35 @@
+#--
+# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
+# All rights reserved.
+# See LICENSE.txt for permissions.
+#++
+
+module BrokenBuildGem
+
+  DIR = "test/data/broken_build"
+  NAME = "broken-build-0.0.1.gem"
+  GEM = "#{DIR}/#{NAME}"
+
+  def clear
+    FileUtils.rm_f GEM
+  end
+
+  def make(controller)
+    unless File.exist?(GEM)
+      build(controller)
+    end
+  end
+
+  def build(controller)
+    Dir.chdir(DIR) do
+      controller.gem "build broken-build.gemspec"
+    end
+  end
+  
+  def install(controller)
+    make(controller)
+    controller.gem "install #{GEM}"
+  end
+
+  extend self
+end

data/test/data/broken_build/broken-build.gemspec

@@ -0,0 +1,20 @@
+$:.unshift '../lib'
+require 'rubygems'
+
+spec = Gem::Specification.new do |s|
+  s.name = 'broken-build'
+  s.version = "0.0.1"
+  s.required_ruby_version = ">= 1.8.1"
+  s.platform = Gem::Platform::RUBY
+  s.summary = "This gem demonstrates extensions that don't compile"
+  s.files = Dir.glob("ext/**/*").delete_if {|item| item.include?("CVS")}
+  s.require_path = 'lib'
+  s.extensions << "ext/extconf.rb"
+  s.bindir = "bin"
+end
+
+if $0==__FILE__
+  Gem::manage_gems
+  Gem::Builder.new(spec).build
+end
+

data/test/data/broken_build/ext/extconf.rb

@@ -0,0 +1,3 @@
+require 'mkmf'
+create_makefile("foo")
+

data/test/data/broken_build/ext/foo.c

@@ -0,0 +1 @@
+will not compile

data/test/data/gemhome/gems/a-0.0.1/lib/code.rb

@@ -1,7 +1 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
 CODE = 1

data/test/data/gemhome/gems/a-0.0.2/lib/code.rb

@@ -1,7 +1 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
 CODE = 1

data/test/data/gemhome/gems/b-0.0.2/lib/code.rb

@@ -1,7 +1 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
 CODE = 1

data/test/data/gemhome/gems/c-1.2/lib/code.rb

@@ -1,7 +1 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
 CODE = 1

data/test/data/gemhome/specifications/a-0.0.1.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = %q{a}
   s.version = "0.0.1"
-  s.date = %q{2006-06-28}
+  s.date = %q{2007-01-16}
   s.summary = %q{summary}
   s.description = %q{desc}
   s.files = ["lib/code.rb"]

data/test/data/gemhome/specifications/a-0.0.2.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = %q{a}
   s.version = "0.0.2"
-  s.date = %q{2006-06-28}
+  s.date = %q{2007-01-16}
   s.summary = %q{summary}
   s.description = %q{desc}
   s.files = ["lib/code.rb"]

data/test/data/gemhome/specifications/b-0.0.2.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = %q{b}
   s.version = "0.0.2"
-  s.date = %q{2006-06-28}
+  s.date = %q{2007-01-16}
   s.summary = %q{summary}
   s.description = %q{desc}
   s.files = ["lib/code.rb"]

data/test/data/gemhome/specifications/c-1.2.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = %q{c}
   s.version = "1.2"
-  s.date = %q{2006-06-28}
+  s.date = %q{2007-01-16}
   s.summary = %q{summary}
   s.description = %q{desc}
   s.files = ["lib/code.rb"]

data/test/data/lib/code.rb

@@ -1,7 +1 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
 CODE = 1

data/test/functional.rb

@@ -43,16 +43,16 @@ class FunctionalTest < Test::Unit::TestCase
   def test_environment
     gem_nossl 'environment'
     
-    assert_match /VERSION:\s+(\d+\.)*\d+/, @out
-    assert_match /INSTALLATION DIRECTORY:/, @out
-    assert_match /GEM PATH:/, @out
-    assert_match /REMOTE SOURCES:/, @out
+    assert_match(/VERSION:\s+(\d+\.)*\d+/, @out)
+    assert_match(/INSTALLATION DIRECTORY:/, @out)
+    assert_match(/GEM PATH:/, @out)
+    assert_match(/REMOTE SOURCES:/, @out)
     assert_status
   end
 
   def test_env_version
     gem_nossl 'environment version'
-    assert_match /\d+\.\d+$/, @out
+    assert_match(/\d+\.\d+$/, @out)
   end
 
   def test_env_gemdir
@@ -67,16 +67,16 @@ class FunctionalTest < Test::Unit::TestCase
 
   def test_env_remotesources
     gem_nossl 'environment remotesources'
-    assert_equal Gem::RemoteInstaller.new.sources, @out.chomp.split("\n")
+    assert_equal Gem.sources, @out.chomp.split("\n")
   end
 
   def test_build
     OneGem.rebuild(self)
     assert File.exist?(OneGem::ONEGEM), "Gem file (#{OneGem::ONEGEM}) should exist"
-    assert_match /Successfully built RubyGem/, @out
-    assert_match /Name: one$/, @out
-    assert_match /Version: 0.0.1$/, @out
-    assert_match /File: #{OneGem::ONENAME}/, @out
+    assert_match(/Successfully built RubyGem/, @out)
+    assert_match(/Name: one$/, @out)
+    assert_match(/Version: 0.0.1$/, @out)
+    assert_match(/File: #{OneGem::ONENAME}/, @out)
     spec = read_gem_file(OneGem::ONEGEM)
     assert_equal "one", spec.name
     assert_equal "Test GEM One", spec.summary
@@ -85,16 +85,18 @@ class FunctionalTest < Test::Unit::TestCase
   def test_build_from_yaml
     OneGem.rebuild(self)
     assert File.exist?(OneGem::ONEGEM), "Gem file (#{OneGem::ONEGEM}) should exist"
-    assert_match /Successfully built RubyGem/, @out
-    assert_match /Name: one$/, @out
-    assert_match /Version: 0.0.1$/, @out
-    assert_match /File: #{OneGem::ONENAME}/, @out
+    assert_match(/Successfully built RubyGem/, @out)
+    assert_match(/Name: one$/, @out)
+    assert_match(/Version: 0.0.1$/, @out)
+    assert_match(/File: #{OneGem::ONENAME}/, @out)
     spec = read_gem_file(OneGem::ONEGEM)
     assert_equal "one", spec.name
     assert_equal "Test GEM One", spec.summary
   end
 
-  def test_bogus_source_hoses_up_remote_install_but_gem_command_gives_decent_error_message
+  # This test is disabled because of the insanely long time it takes
+  # to time out.
+  def xtest_bogus_source_hoses_up_remote_install_but_gem_command_gives_decent_error_message
     @ruby_options << " -rtest/bogussources"
     gem_nossl "install asdf --remote"
     assert_match(/error/im, @err)
@@ -105,7 +107,8 @@ class FunctionalTest < Test::Unit::TestCase
     mgr = Gem::CommandManager.new
     mgr.command_names.each do |cmdname|
       gem_nossl "help #{cmdname}"
-      assert_match /Usage: gem #{cmdname}/, @out, "should see help for #{cmdname}"
+      assert_match(/Usage: gem #{cmdname}/, @out,
+                   "should see help for #{cmdname}")
     end
   end
 
@@ -129,7 +132,7 @@ class FunctionalTest < Test::Unit::TestCase
       require 'openssl'
     rescue LoadError => ex
       puts "WARNING: openssl is not availble, " +
-	"unable to test the cert functions"
+        "unable to test the cert functions"
       return
     end
 
@@ -137,7 +140,7 @@ class FunctionalTest < Test::Unit::TestCase
     gem_withssl "cert --build x@y.z"
     SIGN_FILES.each do |fn| 
       assert File.exist?(fn),
-	"Signing key/cert file '#{fn}' should exist"
+        "Signing key/cert file '#{fn}' should exist"
     end
   ensure
     SIGN_FILES.each do |fn| FileUtils.rm_f fn end
@@ -145,9 +148,9 @@ class FunctionalTest < Test::Unit::TestCase
 
   def test_nossl_cert
     gem_nossl "cert --build x@y.z"
-    assert @status != 0
-    assert_match /not installed/, @err, 
-      "Should have a not installed error for openssl"
+    assert_not_equal 0, @status
+    assert_match(/not installed/, @err, 
+                 "Should have a not installed error for openssl")
   end
 
   # :section: Help Methods