rubygems-update 1.0.1 → 1.1.0

data/lib/rubygems/specification.rb

@@ -13,7 +13,7 @@ require 'rubygems/platform'
 if RUBY_VERSION < '1.9' then
   def Time.today
     t = Time.now
-    t - ((t.to_i + t.gmt_offset) % 86400)
+    t - ((t.to_f + t.gmt_offset) % 86400)
   end unless defined? Time.today
 end
 # :startdoc:
@@ -457,7 +457,7 @@ module Gem
 
     overwrite_accessor :default_executable do
       begin
-        if defined? @default_executable and @default_executable
+        if defined?(@default_executable) and @default_executable
           result = @default_executable
         elsif @executables and @executables.size == 1
           result = Array(@executables).first
@@ -471,14 +471,12 @@ module Gem
     end
 
     def add_bindir(executables)
-      if not defined? @executables || @executables.nil?
-        return nil
-      end
+      return nil if executables.nil?
 
-      if defined? @bindir and @bindir then
-        Array(@executables).map {|e| File.join(@bindir, e) }
+      if @bindir then
+        Array(executables).map { |e| File.join(@bindir, e) }
       else
-        @executables
+        executables
       end
     rescue
       return nil
@@ -511,7 +509,7 @@ module Gem
         @test_files = [@test_suite_file].flatten
         @test_suite_file = nil
       end
-      if defined? @test_files and @test_files then
+      if defined?(@test_files) and @test_files then
         @test_files
       else
         @test_files = []
@@ -535,6 +533,7 @@ module Gem
       @new_platform = nil
       assign_defaults
       @loaded = false
+      @loaded_from = nil
       @@list << self
 
       yield self if block_given?
@@ -902,7 +901,7 @@ module Gem
     # Also, the summary and description are converted to a normal
     # format. 
     def normalize
-      if defined? @extra_rdoc_files and @extra_rdoc_files then
+      if defined?(@extra_rdoc_files) and @extra_rdoc_files then
         @extra_rdoc_files.uniq!
         @files ||= []
         @files.concat(@extra_rdoc_files)

data/lib/rubygems/uninstaller.rb

@@ -12,7 +12,7 @@ require 'rubygems/user_interaction'
 
 ##
 # An Uninstaller.
-#
+
 class Gem::Uninstaller
 
   include Gem::UserInteraction
@@ -21,19 +21,22 @@ class Gem::Uninstaller
   # Constructs an Uninstaller instance
   #
   # gem:: [String] The Gem name to uninstall
-  #
-  def initialize(gem, options)
+
+  def initialize(gem, options = {})
     @gem = gem
     @version = options[:version] || Gem::Requirement.default
+    gem_home = options[:install_dir] || Gem.dir
+    @gem_home = File.expand_path gem_home
     @force_executables = options[:executables]
     @force_all = options[:all]
     @force_ignore = options[:ignore]
+    @bin_dir = options[:bin_dir] 
   end
 
   ##
   # Performs the uninstall of the Gem.  This removes the spec, the
   # Gem directory, and the cached .gem file,
-  #
+
   def uninstall
     list = Gem.source_index.search(/^#{@gem}$/, @version)
 
@@ -64,66 +67,81 @@ class Gem::Uninstaller
   end
   
   ##
-  # Remove executables and batch files (windows only) for the gem as
-  # it is being installed
-  #
-  # gemspec::[Specification] the gem whose executables need to be removed.
-  #
+  # Removes installed executables and batch files (windows only) for
+  # +gemspec+.
+
   def remove_executables(gemspec)
     return if gemspec.nil?
-    if(gemspec.executables.size > 0)
-      raise Gem::FilePermissionError.new(Gem.bindir) unless
-        File.writable?(Gem.bindir)
+
+    if gemspec.executables.size > 0 then
+      bindir = @bin_dir ? @bin_dir : (Gem.bindir @gem_home)
+
       list = Gem.source_index.search(gemspec.name).delete_if { |spec|
         spec.version == gemspec.version
       }
+
       executables = gemspec.executables.clone
+
       list.each do |spec|
         spec.executables.each do |exe_name|
           executables.delete(exe_name)
         end
       end
+
       return if executables.size == 0
-      answer = @force_executables || ask_yes_no(
-        "Remove executables and scripts for\n" +
-        "'#{gemspec.executables.join(", ")}' in addition to the gem?",
-        true) # " # appease ruby-mode - don't ask
-      unless answer
+
+      answer = if @force_executables.nil? then
+                 ask_yes_no("Remove executables:\n" \
+                            "\t#{gemspec.executables.join(", ")}\n\nin addition to the gem?",
+                            true) # " # appease ruby-mode - don't ask
+               else
+                 @force_executables
+               end
+
+      unless answer then
         say "Executables and scripts will remain installed."
-        return
       else
+        raise Gem::FilePermissionError, bindir unless File.writable? bindir
+
         gemspec.executables.each do |exe_name|
           say "Removing #{exe_name}"
-          File.unlink File.join(Gem.bindir, exe_name) rescue nil
-          File.unlink File.join(Gem.bindir, exe_name + ".bat") rescue nil
+          FileUtils.rm_f File.join(bindir, exe_name)
+          FileUtils.rm_f File.join(bindir, "#{exe_name}.bat")
         end
       end
     end
   end
   
+  ##
+  # Removes all gems in +list+.
   #
-  # list:: the list of all gems to remove
-  #
-  # Warning: this method modifies the +list+ parameter.  Once it has
-  # uninstalled a gem, it is removed from that list.
-  #
+  # NOTE: removes uninstalled gems from +list+.
+
   def remove_all(list)
-    list.dup.each { |gem| remove(gem, list) }
+    list.dup.each { |spec| remove spec, list }
   end
 
-  #
+  ##
   # spec:: the spec of the gem to be uninstalled
   # list:: the list of all such gems
   #
   # Warning: this method modifies the +list+ parameter.  Once it has
   # uninstalled a gem, it is removed from that list.
-  #
+
   def remove(spec, list)
-    unless ok_to_remove? spec then
+    unless dependencies_ok? spec then
       raise Gem::DependencyRemovalException,
             "Uninstallation aborted due to dependent gem(s)"
     end
 
+    unless path_ok? spec then
+      e = Gem::GemNotInHomeException.new \
+            "Gem is not installed in directory #{@gem_home}"
+      e.spec = spec
+
+      raise e
+    end
+
     raise Gem::FilePermissionError, spec.installation_path unless
       File.writable?(spec.installation_path)
 
@@ -157,11 +175,17 @@ class Gem::Uninstaller
     list.delete spec
   end
 
-  def ok_to_remove?(spec)
+  def path_ok?(spec)
+    match_path = File.join @gem_home, 'gems', spec.full_name
+
+    match_path == spec.full_gem_path
+  end
+
+  def dependencies_ok?(spec)
     return true if @force_ignore
 
-    srcindex = Gem::SourceIndex.from_installed_gems
-    deplist = Gem::DependencyList.from_source_index srcindex
+    source_index = Gem::SourceIndex.from_installed_gems
+    deplist = Gem::DependencyList.from_source_index source_index
     deplist.ok_to_remove?(spec.full_name) || ask_if_ok(spec)
   end
 

data/lib/rubygems/user_interaction.rb

@@ -68,14 +68,14 @@ module Gem
     include DefaultUserInteraction
     [
       :choose_from_list, :ask, :ask_yes_no, :say, :alert, :alert_warning,
-      :alert_error, :terminate_interaction!, :terminate_interaction
+      :alert_error, :terminate_interaction
     ].each do |methname|
       class_eval %{
         def #{methname}(*args)
           ui.#{methname}(*args)
         end
       }
-    end    
+    end
   end
 
   ####################################################################
@@ -182,16 +182,10 @@ module Gem
       ask(question) if question
     end
 
-    # Terminate the application immediately without running any exit
-    # handlers.
-    def terminate_interaction!(status=-1)
-      exit!(status)
-    end
-    
     # Terminate the appliation normally, running any exit handlers
     # that might have been defined.
-    def terminate_interaction(status=0)
-      exit(status)
+    def terminate_interaction(status = 0)
+      raise Gem::SystemExitException, status
     end
 
     # Return a progress reporter object

data/setup.rb

@@ -18,18 +18,27 @@ end
 $:.unshift 'lib'
 require 'rubygems'
 
-if ARGV.include? '--help' then
+if ARGV.include? '--help' or ARGV.include? '-h' then
   puts "ruby setup.rb [options]:"
   puts
-  puts "  --prefix=DIR         Prefix path for installing RubyGems"
-  puts "                       Will not affect gem repository"
+  puts "RubyGems will install the gem command with a name matching ruby's"
+  puts "prefix and suffix.  If ruby was installed as `ruby18`, gem will be"
+  puts "installed as `gem18`."
   puts
-  puts "  --format-executable  Make the gem command's prefix and suffix match ruby's"
-  puts "                       If ruby is installed as ruby19, gem will be gem19"
+  puts "By default, this RubyGems will install gem as:"
   puts
-  puts "  --no-rdoc            Don't build RDoc for RubyGems"
+  puts "  #{Gem.default_exec_format % 'gem'}"
   puts
-  puts "  --no-ri              Don't build ri for RubyGems"
+  puts "Options:"
+  puts
+  puts "  --prefix=DIR           Prefix path for installing RubyGems"
+  puts "                         Will not affect gem repository location"
+  puts
+  puts "  --no-format-executable Force installation as `gem`"
+  puts
+  puts "  --no-rdoc              Don't build RDoc for RubyGems"
+  puts
+  puts "  --no-ri                Don't build ri for RubyGems"
 
   exit
 end
@@ -91,11 +100,15 @@ Dir.chdir 'lib' do
   end
 end
 
+bin_file_names = []
+
 Dir.chdir 'bin' do
   bin_files = Dir['*']
 
+  bin_files.delete 'update_rubygems'
+
   bin_files.each do |bin_file|
-    bin_file_formatted = if ARGV.include? '--format-executable' then
+    bin_file_formatted = if ARGV.include? '--no-format-executable' then
                            bin_file
                          else
                            Gem.default_exec_format % bin_file
@@ -114,6 +127,7 @@ Dir.chdir 'bin' do
       end
 
       install bin_tmp_file, dest_file, :mode => 0755
+      bin_file_names << dest_file
     ensure
       rm bin_tmp_file
     end
@@ -127,10 +141,10 @@ Dir.chdir 'bin' do
         file.puts <<-TEXT
 @ECHO OFF
 IF NOT "%~f0" == "~f0" GOTO :WinNT
-@"#{Gem.ruby}" "#{bin_file}" %1 %2 %3 %4 %5 %6 %7 %8 %9
+@"#{File.basename(Gem.ruby)}" "#{dest_file}" %1 %2 %3 %4 %5 %6 %7 %8 %9
 GOTO :EOF
 :WinNT
-"%~d0%~p0ruby.exe" "%~d0%~p0%~n0" %*
+@"#{File.basename(Gem.ruby)}" "%~dpn0" %*
 TEXT
       end
 
@@ -180,15 +194,15 @@ require 'rubygems/source_info_cache'
 user_cache_file = Gem::SourceInfoCache.user_cache_file
 system_cache_file = Gem::SourceInfoCache.system_cache_file
 
-rm user_cache_file if File.writable? user_cache_file
-rm system_cache_file if File.writable? system_cache_file
+rm_f user_cache_file if File.writable? File.dirname(user_cache_file)
+rm_f system_cache_file if File.writable? File.dirname(system_cache_file)
 
 # install RDoc
 
 gem_doc_dir = File.join Gem.dir, 'doc'
 
 if File.writable? gem_doc_dir then
-  puts "Removing old RubyGems RDoc and ri..."
+  puts "Removing old RubyGems RDoc and ri"
   Dir[File.join(Gem.dir, 'doc', 'rubygems-[0-9]*')].each do |dir|
     rm_rf dir
   end
@@ -208,13 +222,13 @@ if File.writable? gem_doc_dir then
 
   unless ARGV.include? '--no-ri' then
     ri_dir = File.join doc_dir, 'ri'
-    puts "Installing #{rubygems_name} ri into #{ri_dir}..."
+    puts "Installing #{rubygems_name} ri into #{ri_dir}"
     run_rdoc '--ri', '--op', ri_dir
   end
 
   unless ARGV.include? '--no-rdoc' then
     rdoc_dir = File.join(doc_dir, 'rdoc')
-    puts "Installing #{rubygems_name} rdoc into #{rdoc_dir}..."
+    puts "Installing #{rubygems_name} rdoc into #{rdoc_dir}"
     run_rdoc '--op', rdoc_dir
   end
 else
@@ -230,10 +244,8 @@ def stub?(path)
   File.readlines(path).size < 20
 end
 
-puts <<-EOF.gsub(/^ */, '')
-  As of RubyGems 0.8.0, library stubs are no longer needed.
-  Searching $LOAD_PATH for stubs to optionally delete (may take a while)...
-  EOF
+puts "As of RubyGems 0.8.0, library stubs are no longer needed."
+puts "Searching $LOAD_PATH for stubs to optionally delete (may take a while)"
 
 gemfiles = Dir[File.join("{#{($LOAD_PATH).join(',')}}", '**', '*.rb')]
 gemfiles = gemfiles.map { |file| File.expand_path file }.uniq
@@ -268,3 +280,28 @@ else
   puts "No library stubs found."
 end
 
+puts
+puts "-" * 78
+puts
+
+release_notes = File.join 'doc', 'release_notes',
+                          "rel_#{Gem::RubyGemsVersion.gsub '.', '_'}.rdoc"
+
+if File.exist? release_notes then
+  puts File.read(release_notes)
+else
+  puts "Oh-no! Unable to find release notes in:\n\t#{release_notes}"
+end
+
+puts
+puts "-" * 78
+puts
+
+puts "RubyGems installed the following executables:"
+puts bin_file_names.map { |name| "\t#{name}\n" }
+puts
+
+puts "If `gem` was installed by a previous RubyGems installation, you may need"
+puts "to remove it by hand."
+puts
+

data/test/gem_installer_test_case.rb

@@ -0,0 +1,86 @@
+require 'test/unit'
+require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
+require 'rubygems/installer'
+
+class Gem::Installer
+  attr_accessor :gem_dir
+
+  attr_writer :format
+  attr_writer :gem_home
+  attr_writer :env_shebang
+  attr_writer :ignore_dependencies
+  attr_writer :format_executable
+  attr_writer :security_policy
+  attr_writer :spec
+  attr_writer :wrappers
+end
+
+class GemInstallerTestCase < RubyGemTestCase
+
+  def setup
+    super
+
+    @spec = quick_gem "a"
+    @gem = File.join @tempdir, "#{@spec.full_name}.gem"
+
+    util_build_gem @spec
+    FileUtils.mv File.join(@gemhome, 'cache', "#{@spec.full_name}.gem"),
+                 @tempdir
+
+    @installer = Gem::Installer.new @gem
+    @installer.gem_dir = util_gem_dir
+    @installer.gem_home = @gemhome
+    @installer.spec = @spec
+  end
+
+  def util_gem_bindir(version = '2')
+    File.join util_gem_dir(version), "bin"
+  end
+
+  def util_gem_dir(version = '2')
+    File.join @gemhome, "gems", "a-#{version}" # HACK
+  end
+
+  def util_inst_bindir
+    File.join @gemhome, "bin"
+  end
+
+  def util_make_exec(version = '2', shebang = "#!/usr/bin/ruby")
+    @spec.executables = ["my_exec"]
+
+    FileUtils.mkdir_p util_gem_bindir(version)
+    exec_file = @installer.formatted_program_filename "my_exec"
+    exec_path = File.join util_gem_bindir(version), exec_file
+    File.open exec_path, 'w' do |f|
+      f.puts shebang
+    end
+  end
+
+  def util_setup_gem(ui = @ui) # HACK fix use_ui to make this automatic
+    @spec.files = File.join('lib', 'code.rb')
+    @spec.executables << 'executable'
+    @spec.extensions << File.join('ext', 'a', 'mkrf_conf.rb')
+
+    Dir.chdir @tempdir do
+      FileUtils.mkdir_p 'bin'
+      FileUtils.mkdir_p 'lib'
+      FileUtils.mkdir_p File.join('ext', 'a')
+      File.open File.join('bin', 'executable'), 'w' do |f| f.puts '1' end
+      File.open File.join('lib', 'code.rb'), 'w' do |f| f.puts '1' end
+      File.open File.join('ext', 'a', 'mkrf_conf.rb'), 'w' do |f|
+        f << <<-EOF
+          File.open 'Rakefile', 'w' do |rf| rf.puts "task :default" end
+        EOF
+      end
+
+      use_ui ui do
+        FileUtils.rm @gem
+        Gem::Builder.new(@spec).build
+      end
+    end
+
+    @installer = Gem::Installer.new @gem
+  end
+
+end
+