rubygems-update 1.3.1 → 1.3.2

data/README

@@ -14,55 +14,7 @@ For more details and other options, see:
 
 * {User Guide/Installation}[http://docs.rubygems.org/read/chapter/3]
 
-== For User Documentation, see
-
-* {RubyGems User Guide}[http://docs.rubygems.org/read/book/1]
-* {Frequently Asked Questions}[http://docs.rubygems.org/read/book/3]
-
-== For developer docs see
-
-* {Creating Gems}[http://docs.rubygems.org/read/chapter/5]
-* {GEM Specification}[http://docs.rubygems.org/read/chapter/20]
-
-== The home page of the RubyGems Documentation
-
-* {RubyGems Home}[http://rubygems.rubyforge.org]
-
-== Additional directories
-
-[./bin/...]       binary commands (gem, gem_server, etc)
-[./lib/...]       the RubyGems library
-[./pkgs/...]  default RubyGems packages (currently only 'sources')
-[./test/...]      unit and functional tests
-
-== Credits
-
-RubyGems was originally developed at RubyConf 2003 by:
-
-* Rich Kilmer -- rich(at)infoether.com
-* Chad Fowler -- chad(at)chadfowler.com
-* David Black -- dblack(at)wobblini.net
-* Paul Brannan -- paul(at)atdesk.com
-* Jim Weirch -- {jim(at)weirichhouse.org}[mailto:jim@weirichhouse.org]
-
-== Contributors since then
-
-* Gavin Sinclair -- gsinclair(at)soyabean.com.au
-* George Marrows-- george.marrows(at)ntlworld.com
-* Dick Davies -- rasputnik(at)hellooperator.net
-* Mauricio Fernandez -- batsman.geo(at)yahoo.com
-* Simon Strandgaard -- neoneye(at)adslhome.dk
-* Dave Glasser -- glasser(at)mit.edu
-* Paul Duncan -- pabs(at)pablotron.org
-* Ville Aine -- vaine(at)cs.helsinki.fi
-* Ryan Davis -- 
-* Eric Hodel -- drbrain(at)segment7.net
-
-(If your name is missing, PLEASE let us know!)
-
-== Feedback
-
-Please provide us feedback at http://rubyforge.org/projects/rubygems
+Further documentation can be found on the Gem module.  (<tt>ri Gem</tt>)
 
 Thanks!
 

data/Rakefile

@@ -11,63 +11,57 @@ $:.unshift 'lib'
 require 'rubygems'
 require 'rake/clean'
 require 'rake/testtask'
-require 'rake/packagetask'
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
-
-def announce(msg='')
-  $stderr.puts msg
-end
+require 'rubygems/package_task'
 
 def generate_rubygems_version(path, version)
   open path, 'w' do |f|
     f.puts <<-EOF
+#--
 # DO NOT EDIT
 # This file is auto-generated by build scripts.
 # See:  rake update_version
+#++
+
 module Gem
+
+  ##
+  # The version of RubyGems you are using
+
   RubyGemsVersion = '#{version}'
+
+  ##
+  # The version of RubyGems you are using (duplicated for familiarity)
+
+  VERSION = RubyGemsVersion
+
 end
     EOF
   end
 end
 
-if RUBY_PLATFORM.match('mswin')
-   ENV['CERT_DIR'] ||= (File.join(ENV['USERPROFILE'], '.gem'))
-else
-   ENV['CERT_DIR'] ||= File.expand_path(File.join('~', '.gem'))
-end
+ENV['CERT_DIR'] ||=  File.join(Gem.user_home, '.gem')
 
 PKG_NAME = 'rubygems'
-def package_version
-  `ruby -Ilib bin/gem environment packageversion`.chomp
-end
 
-if ENV['REL']
+if ENV['REL'] then
   PKG_VERSION = ENV['REL']
-  CURRENT_VERSION = package_version
+  CURRENT_VERSION = Gem::RubyGemsVersion
 else
-  PKG_VERSION = package_version
+  PKG_VERSION = Gem::RubyGemsVersion
   CURRENT_VERSION = PKG_VERSION
 end
 
-CLEAN.include("COMMENTS")
 CLOBBER.include(
-  'InstalledFiles',
-  "test/data/one/one-*0.0.1.gem",
-  "test/temp",
-  'test/mock/gem/doc',
-  'test/mock/gem/cache',
-  'test/data/gemhome',
-  'test/data/[a-z]*.gem',
-  'scripts/*.hieraki',
+  '**/debug.log',
+  '*.out',
+  '.config',
   'data__',
   'html',
-  'pkgs/sources/sources*.gem',
-  '.config',
-  '**/debug.log',
   'logs',
-  '*.out'
+  'pkgs/sources/sources*.gem',
+  'scripts/*.hieraki',
+  'test/data/[a-z]*.gem',
+  'test/data/gemhome'
   )
 CLOBBER.exclude('test/data/broken-1.0.0.gem')
 
@@ -81,6 +75,7 @@ desc "Run just the unit tests"
 Rake::TestTask.new(:test_units) do |t|
   t.test_files = FileList['test/test*.rb']
   t.warning = true
+  t.libs = %w[lib test]
 end
 
 desc "Run just the functional tests"
@@ -95,33 +90,11 @@ Rake::TestTask.new(:test_all) do |t|
   t.warning = true
 end
 
-desc "Run the tests for a build"
-task :build_tests do
-  html_dir = ENV['TESTRESULTS'] || 'html/tests'
-  ruby %{-Ilib scripts/buildtests.rb #{html_dir}}
-  open("#{html_dir}/summary.html") do |inf|
-    open("#{html_dir}/summary.new", "w") do |outf|
-      inf.each do |line|
-        if line =~ /td align/
-          line = "    <td align=\"left\">#{Time.now}</td><td align=\"right\">"
-        end
-        outf.puts line
-      end
-    end
-  end
-  mv "#{html_dir}/summary.html", "#{html_dir}/summary.old"
-  mv "#{html_dir}/summary.new", "#{html_dir}/summary.html"
-end
-
 # Shortcuts for test targets
 task :tf => [:test_functional]
 task :tu => [:test_units]
 task :ta => [:test_all]
 
-task :gemtest do
-  ruby %{-Ilib -rscripts/runtest -e 'run_tests("test/test_gempaths.rb", true)'}
-end
-
 # --------------------------------------------------------------------
 # Creating a release
 
@@ -129,27 +102,24 @@ desc "Make a new release"
 task :release => [
   :prerelease,
   :clobber,
-  :test_all,
+  :test_functional,
+  :test_units,
   :update_version,
   :package,
   :tag] do
 
-  announce
-  announce "**************************************************************"
-  announce "* Release #{PKG_VERSION} Complete."
-  announce "* Packages ready to upload."
-  announce "**************************************************************"
-  announce
+  warn "**************************************************************"
+  warn "* Release #{PKG_VERSION} Complete."
+  warn "* Packages ready to upload."
+  warn "**************************************************************"
 end
 
 desc "Validate that everything is ready to go for a release."
 task :prerelease do
-  announce
-  announce "**************************************************************"
-  announce "* Making RubyGem Release #{PKG_VERSION}"
-  announce "* (current version #{CURRENT_VERSION})"
-  announce "**************************************************************"
-  announce
+  warn "**************************************************************"
+  warn "* Making RubyGem Release #{PKG_VERSION}"
+  warn "* (current version #{CURRENT_VERSION})"
+  warn "**************************************************************"
 
   # Is a release number supplied?
   raise "Usage: rake release REL=x.y.z [REUSE=tag_suffix]" unless ENV['REL']
@@ -161,28 +131,28 @@ task :prerelease do
   end
 
   # Are all source files checked in?
-  if ENV['RELTEST']
-    announce "Release Task Testing, skipping checked-in file test"
+  if ENV['RELTEST'] then
+    warn "Release Task Testing, skipping checked-in file test"
   else
-    announce "Checking for unchecked-in files..."
+    warn "Checking for unchecked-in files..."
     data = `svn st`
     unless data =~ /^$/
       abort "svn status is not clean ... do you have unchecked-in files?"
     end
-    announce "No outstanding checkins found ... OK"
+    warn "No outstanding checkins found ... OK"
   end
 end
 
 task :update_version => [:prerelease] do
-  if PKG_VERSION == CURRENT_VERSION
-    announce "No version change ... skipping version update"
+  if PKG_VERSION == CURRENT_VERSION then
+    warn "No version change ... skipping version update"
   else
-    announce "Updating RubyGem version to #{PKG_VERSION}"
+    warn "Updating RubyGem version to #{PKG_VERSION}"
 
     generate_rubygems_version 'lib/rubygems/rubygems_version.rb', PKG_VERSION
 
-    if ENV['RELTEST']
-      announce "Release Task Testing, skipping commiting of new version"
+    if ENV['RELTEST'] then
+      warn "Release Task Testing, skipping commiting of new version"
     else
       sh %{svn commit -m "Updated to version #{PKG_VERSION}" lib/rubygems/rubygems_version.rb} # "
     end
@@ -192,17 +162,15 @@ end
 task :tag => [:prerelease] do
   reltag = "REL_#{PKG_VERSION.gsub(/\./, '_')}"
   reltag = "REL_#{ENV['REUSE'].gsub(/\./, '_')}" if ENV['REUSE']
-  announce "Tagging SVN with [#{reltag}]"
+  warn "Tagging SVN with [#{reltag}]"
   software_dir = File.basename(Dir.pwd)
-  if ENV['RELTEST']
-    announce "Release Task Testing, skipping SVN tagging (in dir #{software_dir})"
+  if ENV['RELTEST'] then
+    warn "Release Task Testing, skipping SVN tagging (in dir #{software_dir})"
   else
     sh %{svn copy svn+ssh://rubyforge.org/var/svn/rubygems/trunk svn+ssh://rubyforge.org/var/svn/rubygems/tags/#{reltag}}
   end
 end
 
-# --------------------------------------------------------------------
-
 begin # rcov
   require 'rcov/rcovtask'
 
@@ -217,26 +185,24 @@ begin # rcov
 rescue LoadError
 end
 
-# --------------------------------------------------------------------
-# Create a task to build the RDOC documentation tree.
-
-desc "Create the RDOC html files"
-Rake::RDocTask.new("rdoc") { |rdoc|
-  rdoc.rdoc_dir = 'html'
-  rdoc.title    = "RubyGems"
-  rdoc.options << '--line-numbers' << '--inline-source' << '--main' << 'README'
-  rdoc.rdoc_files.include('README', 'TODO', 'LICENSE.txt', 'GPL.txt')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-  rdoc.rdoc_files.include('doc/**/*.rdoc')
-}
-
-desc "Publish the RDOCs on RubyForge"
-task :publish_rdoc => ["html/index.html"] do
-  # NOTE: This task assumes that you have an SSH alias setup for rubyforge.
-  mkdir_p "emptydir"
-  sh "scp -rq emptydir rubyforge:/var/www/gforge-projects/rubygems/rdoc"
-  sh "scp -rq html/* rubyforge:/var/www/gforge-projects/rubygems/rdoc"
-  rm_r "emptydir"
+begin # rdoc
+  gem 'rdoc'
+  require 'rdoc/task'
+
+  desc "Create the RDoc html files"
+  RDoc::Task.new :rdoc do |rdoc|
+    rdoc.rdoc_dir = 'html'
+    rdoc.title    = "RubyGems #{CURRENT_VERSION}"
+    rdoc.options << '--line-numbers' << '--main' << 'README'
+    rdoc.rdoc_files.include 'README', 'LICENSE.txt', 'GPL.txt', 'lib', 'doc'
+  end
+
+  desc "Publish RDoc on RubyForge"
+  task :publish_rdoc => ["html/index.html"] do
+    sh "rsync -avP --delete html/ rubyforge.org:/var/www/gforge-projects/rubygems/rdoc"
+  end
+rescue Gem::LoadError
+  warn "install RDoc 2.4.2+"
 end
 
 # Wiki Doc Targets
@@ -266,68 +232,49 @@ end
 
 # Package tasks
 
-PKG_FILES = FileList[
-  ".document",
-  "ChangeLog",
-  "GPL.txt",
-  "LICENSE.txt",
-  "README",
-  "Rakefile",
-  "TODO",
-  "bin/*",
-  "doc/release_notes/*",
-  "lib/**/*.rb",
-  "pkgs/**/*",
-  "scripts/*.rb",
-  "setup.rb",
-  "test/**/*"
-]
-
-PKG_FILES.exclude %r(^test/temp(/|$))
-PKG_FILES.exclude %r(\*\.rbc$)
-
-task :package_files do
-  puts PKG_FILES.join("\n")
-end
+PKG_FILES = File.read('Manifest.txt').split "\n"
 
-Rake::PackageTask.new("package") do |p|
-  p.name = PKG_NAME
-  p.version = PKG_VERSION
-  p.need_tar = true
-  p.need_zip = true
+Rake::PackageTask.new :package do |p|
+  p.name          = PKG_NAME
+  p.version       = PKG_VERSION
+  p.need_tar      = true
+  p.need_zip      = true
   p.package_files = PKG_FILES
 end
 
 warn_unsigned = true
 
 Spec = Gem::Specification.new do |s|
-  s.name = PKG_NAME + "-update"
-  s.version = PKG_VERSION
+  s.name                  = PKG_NAME + "-update"
+  s.version               = PKG_VERSION
   s.required_ruby_version = Gem::Requirement.new '> 1.8.3'
-  s.summary = "RubyGems Update GEM"
-  s.description = %{RubyGems is a package management framework for Ruby.  This Gem
-is a update for the base RubyGems software.  You must have a base
+  s.summary               = "RubyGems update gem"
+  s.description           = <<-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.
-}
-  s.files = PKG_FILES.to_a
-  s.require_path = 'lib'
-  s.authors = ['Jim Weirich', 'Chad Fowler', 'Eric Hodel']
-  s.email = "rubygems-developers@rubyforge.org"
-  s.homepage = "http://rubygems.rubyforge.org"
-  s.rubyforge_project = "rubygems"
-  s.bindir = "bin" # Use these for applications.
-  s.executables = ["update_rubygems"]
-  certdir = ENV['CERT_DIR']
+  DESCRIPTION
+  s.files                 = PKG_FILES
+  s.require_path          = 'lib'
+  s.authors               = ['Jim Weirich', 'Chad Fowler', 'Eric Hodel']
+  s.email                 = "rubygems-developers@rubyforge.org"
+  s.homepage              = "http://rubygems.rubyforge.org"
+  s.rubyforge_project     = "rubygems"
+  s.bindir                = "bin"
+  s.executables           = ["update_rubygems"]
+
+  certdir                 = ENV['CERT_DIR']
+
   if certdir then
     key  = File.join certdir, 'gem-private_key.pem'
     cert = File.join certdir, 'gem-public_cert.pem'
 
-    if File.exist? key and File.exist? cert then
+    warn_unsigned = ! (File.exist? key and File.exist? cert)
+
+    unless warn_unsigned then
       s.signing_key = File.join(certdir, 'gem-private_key.pem')
       s.cert_chain  = [File.join(certdir, 'gem-public_cert.pem')]
-      warn_unsigned = false
-    else
-      warn_unsigned = true
     end
   end
 end
@@ -341,12 +288,14 @@ file "pkg/#{Spec.full_name}.gem" do
   end
 end
 
-Rake::GemPackageTask.new(Spec) do |p| end
+Gem::PackageTask.new Spec do |p| end
 
 desc "Build the Gem spec file for the rubygems-update package"
 task :gemspec => "pkg/rubygems-update.gemspec"
 file "pkg/rubygems-update.gemspec" => ["pkg", "Rakefile"] do |t|
-  open(t.name, "w") do |f| f.puts Spec.to_yaml end
+  open t.name, 'w' do |f|
+    f.puts Spec.to_yaml
+  end
 end
 
 desc "Install RubyGems"
@@ -354,7 +303,7 @@ task :install do
   opts = ENV['SETUP_OPTIONS']
   ruby "setup.rb #{opts}".strip
 
-  svnversion = `svnversion`.split(':').last.sub(/[^\d]/, '').strip
+  svnversion = `svnversion`.split(':').last.sub(/[^\d]+/, '').strip
 
   unless svnversion.empty? then
     File.read('lib/rubygems/rubygems_version.rb') =~ /RubyGemsVersion = '(.*)'/
@@ -367,45 +316,29 @@ task :install do
   end
 end
 
-desc "Run local 'gem' e.g. rake rungem -- install -i ~/tmp/gems"
-task :rungem do
-  ARGV.shift
-  exec(Gem.ruby, '-Ilib', 'bin/gem', *ARGV)
-end
-
 # Misc Tasks ---------------------------------------------------------
 
-def egrep(pattern)
-  Dir['{bin,lib,test,util}/**/*.rb'].each do |fn|
-    count = 0
-    open(fn) do |f|
-      while line = f.gets
-        count += 1
-        if line =~ pattern
-          puts "#{fn}:#{count}:#{line}"
-        end
-      end
-    end
-  end
-end
+desc "build util/gem_prelude.rb from the template and defaults.rb"
+file 'util/gem_prelude.rb' =>
+     %w[util/gem_prelude.rb.template lib/rubygems/defaults.rb] do
+  gem_prelude = File.read 'util/gem_prelude.rb.template'
+  defaults = File.read 'lib/rubygems/defaults.rb'
 
-desc "Look for TODO and FIXME tags in the code"
-task :todo do
-  egrep /#.*(FIXME|TODO|TBD)/
-end
+  raise 'template error' unless defaults.sub!(/^module Gem\n/, '')
+  raise 'template error' unless defaults.sub!(/^end\n/, '')
 
-desc "Look for Debugging print lines"
-task :dbg do
-  egrep /\bDBG|\bbreakpoint\b/
-end
+  defaults.gsub!(/^/, '  ')
 
-desc "List all ruby files"
-task :rubyfiles do
-  puts Dir['**/*.rb'].reject { |fn| fn =~ /^pkg/ }
-  puts Dir['bin/*'].reject { |fn| fn =~ /CVS|(~$)|(\.rb$)/ }
-end
+  raise 'template error' unless
+    gem_prelude.sub!(/^# WARN\n/,
+                     "# THIS FILE WAS AUTOGENERATED, DO NOT EDIT\n")
+  raise 'template error' unless
+    gem_prelude.sub!(/^    # INCLUDE rubygems\/defaults\n/, defaults)
 
-task :rf => :rubyfiles
+  open 'util/gem_prelude.rb', 'w' do |io|
+    io.write gem_prelude
+  end
+end
 
 # These tasks expect to have the following directory structure:
 #
@@ -423,7 +356,7 @@ rubinius_dir = ENV['RUBINIUS_PATH'] || '../../../git/git.rubini.us/code'
 ruby_dir = ENV['RUBY_PATH'] || '../../ruby/trunk'
 
 desc "Updates Ruby HEAD with the currently checked-out copy of RubyGems."
-task :update_ruby do
+task :update_ruby => 'util/gem_prelude.rb' do
   sh "rsync #{rsync_options} bin/gem #{ruby_dir}/bin/gem"
   sh "rsync #{rsync_options} lib/ #{ruby_dir}/lib"
   sh "rsync #{rsync_options} test/ #{ruby_dir}/test/rubygems"
@@ -431,7 +364,7 @@ task :update_ruby do
 end
 
 desc "Diffs Ruby HEAD with the currently checked-out copy of RubyGems."
-task :diff_ruby do
+task :diff_ruby => 'util/gem_prelude.rb' do
   options = "-urpN --exclude '*svn*' --exclude '*swp' --exclude '*rbc'"
 
   sh "diff #{diff_options} bin/gem #{ruby_dir}/bin/gem; true"
@@ -444,19 +377,19 @@ task :diff_ruby do
 end
 
 desc "Updates Rubinius HEAD with the currently checked-out copy of RubyGems."
-task :update_rubinius do
-  sh "rsync #{rsync_options} bin/gem #{rubinius_dir}/lib/bin/gem"
+task :update_rubinius => 'util/gem_prelude.rb' do
+  sh "rsync #{rsync_options} bin/gem #{rubinius_dir}/lib/bin/gem.rb"
   sh "rsync #{rsync_options} lib/ #{rubinius_dir}/lib"
   sh "rsync #{rsync_options} test/ #{rubinius_dir}/test/rubygems"
-  sh "rsync #{rsync_options} util/gem_prelude.rb #{rubinius_dir}/kernel/core/gem_prelude.rb"
+  sh "rsync #{rsync_options} util/gem_prelude.rb #{rubinius_dir}/kernel/common/gem_prelude.rb"
 end
 
 desc "Diffs Rubinius HEAD with the currently checked-out copy of RubyGems."
-task :diff_rubinius do
-  sh "diff #{diff_options} bin/gem #{rubinius_dir}/lib/bin/gem; true"
+task :diff_rubinius => 'util/gem_prelude.rb' do
+  sh "diff #{diff_options} bin/gem #{rubinius_dir}/lib/bin/gem.rb; true"
   sh "diff #{diff_options} lib/ubygems.rb #{rubinius_dir}/lib/ubygems.rb; true"
   sh "diff #{diff_options} lib/rubygems.rb #{rubinius_dir}/lib/rubygems.rb; true"
   sh "diff #{diff_options} lib/rubygems #{rubinius_dir}/lib/rubygems; true"
   sh "diff #{diff_options} test #{rubinius_dir}/test/rubygems; true"
-  sh "diff #{diff_options} util/gem_prelude.rb #{rubinius_dir}/kernel/core/gem_prelude.rb; true"
+  sh "diff #{diff_options} util/gem_prelude.rb #{rubinius_dir}/kernel/common/gem_prelude.rb; true"
 end