rubygems-update 1.3.2 → 1.3.3

data/ChangeLog

@@ -1,5 +1,66 @@
 # -*- coding: utf-8 -*-
 
+2009-05-04  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/rubygems_version.rb: 1.3.3.
+	* doc/release_notes/rel_1_3_3.rdoc:  RubyGems 1.3.3 release notes.
+	* lib/rubygems/specification.rb:  Default has_rdoc to true, ignore
+	  its value.
+	* lib/rubygems/doc_manager.rb:  Always generate RDoc regardless of
+	  #has_rdoc?
+	* lib/rubygems.rb:  Raise Gem::LoadError if Kernel#gem fails due to
+	  previously-loaded gem.  Bug reported by Alf Mikula.
+
+2009-05-02  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/server_command.rb:  Allow port names with
+	  --port.
+	* lib/rubygems/requirement.rb:  Match prerelease versions and ~>
+	  correctly.  Patch #25759 by Yossef Mendelssohn.
+
+2009-05-01  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/specification.rb:  Check bindir for executables, not
+	  root.  Bug reported by David Chelimsky.  Remove Time.today, no way
+	  to override it before RubyGems loads.  Bug #25564 by Emanuele
+	  Vicentini.  Raise Gem::Exception for #installation_path when not
+	  installed.  Bug #25741 by Daniel Berger.  Don't error in #validate
+	  when homepage is nil.  Bug #25677 by Mike Burrows.
+	* lib/rubygems/commands/cleanup_command.rb:  Clean up --user-install
+	  gems.  Bug #25516 by Brett Eisenberg.
+	* lib/rubygems/uninstaller.rb:  Uninstall executables from the correct
+	  directory.  Bug #25555 by Brett Eisenberg.
+	* lib/rubygems/server.rb:  Add search that jumps to RDoc.  Patch
+	  #22959 by Vladimir Dobriakov.
+
+2009-05-01  James Tucker  <jftucker@gmail.com>
+
+	* lib/rubygems.rb: Gem.bin_path now escapes paths with spaces.
+
+2009-04-30  Daniel Berger  <djberg96@gmail.com>
+
+	* lib/rubygems/commands/install_command.rb:  Replaced deprecated
+	  Gem::SourceIndex method 'search' with 'find_name' when using
+	  the -t option. Fixes bug # 25632 by Daniel Berger.
+
+2009-04-30  James Tucker  <jftucker@gmail.com>
+
+	* lib/rubygems/ext/rake_builder.rb: Use explicit ruby command loading
+	  rubygems to invoke rake.
+
+2009-04-24  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/specification_command.rb:  Added requesting
+	  single fields from a spec.
+
+2009-04-23  James Tucker  <jftucker@gmail.com>
+
+	* lib/rubygems/ext/configure_builder.rb: Support Gem::Command.build_args.
+
+2009-04-15  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/rubygems_version.rb: 1.3.2.
+
 2009-04-14  Eric Hodel  <drbrain@segment7.net>
 
 	* lib/rubygems/specification.rb:  Complain when summary and

data/Manifest.txt

@@ -37,6 +37,7 @@ doc/release_notes/rel_1_2_0.rdoc
 doc/release_notes/rel_1_3_0.rdoc
 doc/release_notes/rel_1_3_1.rdoc
 doc/release_notes/rel_1_3_2.rdoc
+doc/release_notes/rel_1_3_3.rdoc
 lib/gauntlet_rubygems.rb
 lib/rbconfig/datadir.rb
 lib/rubygems.rb

data/doc/release_notes/rel_1_3_3.rdoc

@@ -0,0 +1,95 @@
+= Announce: RubyGems Release 1.3.3
+
+NOTE:  RubyGems 1.1 and 1.2 have problems upgrading when there is no
+rubygems-update installed.  You will need to follow the second set of update
+instructions if you see "Nothing to update".
+
+Release 1.3.3 fixes some bugs and adds some features.
+
+New Features:
+
+* `gem server` allows port names (from /etc/services) with --port.
+* `gem server` now has search that jumps to RDoc.  Patch #22959 by Vladimir
+  Dobriakov.
+* `gem spec` can retrieve single fields from a spec (like `gem spec rake
+  authors`).
+* Gem::Specification#has_rdoc= is deprecated and ignored (defaults to true)
+* RDoc is now generated regardless of Gem::Specification#has_rdoc?
+
+Bug Fixes:
+
+* `gem clean` now cleans up --user-install gems.  Bug #25516 by Brett
+  Eisenberg.
+* Gem.bin_path now escapes paths with spaces.
+* Rake extension builder uses explicit correctly loads rubygems when invoking
+  rake.
+* Prerelease versions now match "~>" correctly.  Patch #25759 by Yossef
+  Mendelssohn.
+* Check bindir for executables, not root when validating.  Bug reported by
+  David Chelimsky.
+* Remove Time.today, no way to override it before RubyGems loads.  Bug #25564
+  by Emanuele Vicentini
+* Raise Gem::Exception for #installation_path when not installed.  Bug #25741
+  by Daniel Berger.
+* Don't raise in Gem::Specification#validate when homepage is nil.  Bug #25677
+  by Mike Burrows.
+* Uninstall executables from the correct directory.  Bug #25555 by Brett
+  Eisenberg.
+* Raise Gem::LoadError if Kernel#gem fails due to previously-loaded gem.  Bug
+  reported by Alf Mikula.
+
+Deprecation Notices:
+
+* Gem::manage_gems has been removed.
+* Time::today has been removed early.  There was no way to make it warn and be
+  easy to override with user code.
+
+For a full list of changes to RubyGems and the contributor for each change, see
+the ChangeLog file.
+
+== How can I get RubyGems?
+
+NOTE:  If you have installed RubyGems using a package system you may want to
+install a new RubyGems through the same packaging system.
+
+If you have a recent version of RubyGems (0.8.5 or later), then all
+you need to do is:
+
+  $ gem update --system   (you might need to be admin/root)
+
+NOTE:  RubyGems 1.1 and 1.2 have problems upgrading when there is no
+rubygems-update installed.  You will need to follow the second set of update
+instructions if you see "Nothing to update".
+
+NOTE: You may have to run the command twice if you have any previosly
+installed rubygems-update gems.
+
+If you have an older version of RubyGems installed, then you can still
+do it in two steps:
+
+  $ gem install rubygems-update  (again, might need to be admin/root)
+  $ update_rubygems              (... here too)
+
+If you don't have any gems install, there is still the pre-gem
+approach to getting software ... doing it manually:
+
+1. DOWNLOAD FROM: http://rubyforge.org/frs/?group_id=126
+2. UNPACK INTO A DIRECTORY AND CD THERE
+3. INSTALL WITH:  ruby setup.rb  (you may need admin/root privilege)
+
+== To File Bugs
+
+The RubyGems bug tracker can be found on RubyForge at:
+http://rubyforge.org/tracker/?func=add&group_id=126&atid=575
+
+When filing a bug, `gem env` output will be helpful in diagnosing the issue.
+
+If you find a bug where RubyGems crashes, please provide debug output. You can
+do that with `gem --debug the_command`.
+
+== Thanks
+
+Keep those gems coming!
+
+-- The RubyGems team
+

data/lib/rubygems.rb

@@ -11,9 +11,26 @@ require 'thread'
 require 'etc'
 
 module Gem
+
+  ##
+  # Raised when RubyGems is unable to load or activate a gem.  Contains the
+  # name and version requirements of the gem that either conflicts with
+  # already activated gems or that RubyGems is otherwise unable to activate.
+
   class LoadError < ::LoadError
-    attr_accessor :name, :version_requirement
+
+    ##
+    # Name of gem
+
+    attr_accessor :name
+
+    ##
+    # Version requirement of gem
+
+    attr_accessor :version_requirement
+
   end
+
 end
 
 module Kernel
@@ -249,13 +266,17 @@ module Gem
 
       unless matches.any? { |spec| spec.version == existing_spec.version } then
          sources_message = sources.map { |spec| spec.full_name }
-         stack_message = @loaded_stacks[gem.name].map { |spec| spec.full_name } 
+         stack_message = @loaded_stacks[gem.name].map { |spec| spec.full_name }
 
          msg = "can't activate #{gem} for #{sources_message.inspect}, "
          msg << "already activated #{existing_spec.full_name} for "
          msg << "#{stack_message.inspect}"
 
-         raise Gem::Exception, msg
+         e = Gem::LoadError.new msg
+         e.name = gem.name
+         e.version_requirement = gem.version_requirements
+
+         raise e
       end
 
       return false
@@ -362,7 +383,7 @@ module Gem
       raise Gem::Exception, msg
     end
 
-    File.join spec.full_gem_path, spec.bindir, exec_name
+    File.join(spec.full_gem_path, spec.bindir, exec_name).sub(/.*\s.*/m, '"\&"')
   end
 
   ##

data/lib/rubygems/command_manager.rb

@@ -30,14 +30,14 @@ require 'rubygems/user_interaction'
 class Gem::CommandManager
 
   include Gem::UserInteraction
-  
+
   ##
   # Return the authoritative instance of the command manager.
 
   def self.instance
     @command_manager ||= new
   end
-  
+
   ##
   # Register all the subcommands supported by the gem command.
 
@@ -71,14 +71,14 @@ class Gem::CommandManager
     register_command :update
     register_command :which
   end
-  
+
   ##
   # Register the command object.
 
   def register_command(command_obj)
     @commands[command_obj] = false
   end
-  
+
   ##
   # Return the registered command from the command name.
 
@@ -87,14 +87,14 @@ class Gem::CommandManager
     return nil if @commands[command_name].nil?
     @commands[command_name] ||= load_and_instantiate(command_name)
   end
-  
+
   ##
   # Return a sorted list of all command names (as strings).
 
   def command_names
     @commands.keys.collect {|key| key.to_s}.sort
   end
-  
+
   ##
   # Run the config specified by +args+.
 
@@ -115,7 +115,7 @@ class Gem::CommandManager
     if args.size == 0
       say Gem::Command::HELP
       terminate_interaction(1)
-    end 
+    end
     case args[0]
     when '-h', '--help'
       say Gem::Command::HELP
@@ -149,7 +149,7 @@ class Gem::CommandManager
 
     command_names.select { |n| cmd_name == n[0, len] }
   end
-  
+
   private
 
   def load_and_instantiate(command_name)

data/lib/rubygems/commands/cleanup_command.rb

@@ -77,15 +77,21 @@ installed elsewhere in GEM_PATH the cleanup command won't touch it.
         say "Attempting to uninstall #{spec.full_name}"
 
         options[:args] = [spec.name]
-        options[:version] = "= #{spec.version}"
-        options[:executables] = false
 
-        uninstaller = Gem::Uninstaller.new spec.name, options
+        uninstall_options = {
+          :executables => false,
+          :version => "= #{spec.version}",
+        }
+
+        if Gem.user_dir == spec.installation_path then
+          uninstall_options[:install_dir] = spec.installation_path
+        end
+
+        uninstaller = Gem::Uninstaller.new spec.name, uninstall_options
 
         begin
           uninstaller.uninstall
-        rescue Gem::DependencyRemovalException,
-               Gem::InstallError,
+        rescue Gem::DependencyRemovalException, Gem::InstallError,
                Gem::GemNotInHomeException => e
           say "Unable to uninstall #{spec.full_name}:"
           say "\t#{e.class}: #{e.message}"

data/lib/rubygems/commands/install_command.rb

@@ -115,7 +115,7 @@ version is also installed.
 
       if options[:test] then
         installed_gems.each do |spec|
-          gem_spec = Gem::SourceIndex.from_installed_gems.search(spec.name, spec.version.version).first
+          gem_spec = Gem::SourceIndex.from_installed_gems.find_name(spec.name, spec.version.version).first
           result = Gem::Validator.new.unit_test(gem_spec)
           if result and not result.passed?
             unless ask_yes_no("...keep Gem?", true)

data/lib/rubygems/commands/server_command.rb

@@ -7,7 +7,23 @@ class Gem::Commands::ServerCommand < Gem::Command
     super 'server', 'Documentation and gem repository HTTP server',
           :port => 8808, :gemdir => Gem.dir, :daemon => false
 
-    add_option '-p', '--port=PORT', Integer,
+    OptionParser.accept :Port do |port|
+      if port =~ /\A\d+\z/ then
+        port = Integer port
+        raise OptionParser::InvalidArgument, "#{port}: not a port number" if
+          port > 65535
+
+        port
+      else
+        begin
+          Socket.getservbyname port
+        rescue SocketError => e
+          raise OptionParser::InvalidArgument, "#{port}: no such named service"
+        end
+      end
+    end
+
+    add_option '-p', '--port=PORT', :Port,
                'port to listen on' do |port, options|
       options[:port] = port
     end
@@ -37,6 +53,12 @@ for gem installation.
 
 To install gems from a running server, use `gem install GEMNAME --source
 http://gem_server_host:8808`
+
+You can set up a shortcut to gem server documentation using the URL:
+
+  http://localhost:8808/rdoc?q=%s - Firefox
+  http://localhost:8808/rdoc?q=* - LaunchBar
+
     EOF
   end
 

data/lib/rubygems/commands/specification_command.rb

@@ -39,7 +39,10 @@ class Gem::Commands::SpecificationCommand < Gem::Command
   end
 
   def arguments # :nodoc:
-    "GEMFILE       name of gem to show the gemspec for"
+    <<-ARGS
+GEMFILE       name of gem to show the gemspec for
+FIELD         name of gemspec field to show
+    ARGS
   end
 
   def defaults_str # :nodoc:
@@ -47,14 +50,35 @@ class Gem::Commands::SpecificationCommand < Gem::Command
   end
 
   def usage # :nodoc:
-    "#{program_name} [GEMFILE]"
+    "#{program_name} [GEMFILE] [FIELD]"
   end
 
   def execute
     specs = []
-    gem = get_one_gem_name
+    gem = options[:args].shift
+
+    unless gem then
+      raise Gem::CommandLineError,
+            "Please specify a gem name or file on the command line"
+    end
+
     dep = Gem::Dependency.new gem, options[:version]
 
+    field = get_one_optional_argument
+
+    if field then
+      field = field.intern
+
+      if options[:format] == :ruby then
+        raise Gem::CommandLineError, "--ruby and FIELD are mutually exclusive"
+      end
+
+      unless Gem::Specification.attribute_names.include? field then
+        raise Gem::CommandLineError,
+              "no field %p on Gem::Specification" % field.to_s
+      end
+    end
+
     if local? then
       if File.exist? gem then
         specs << Gem::Format.from_file_by_path(gem).spec rescue nil
@@ -77,11 +101,14 @@ class Gem::Commands::SpecificationCommand < Gem::Command
     end
 
     output = lambda do |s|
+      s = s.send field if field
+
       say case options[:format]
           when :ruby then s.to_ruby
           when :marshal then Marshal.dump s
           else s.to_yaml
           end
+
       say "\n"
     end
 

data/lib/rubygems/doc_manager.rb

@@ -105,10 +105,8 @@ class Gem::DocManager
   # RI docs generation to fail if run after RDoc).
 
   def generate_ri
-    if @spec.has_rdoc then
-      setup_rdoc
-      install_ri # RDoc bug, ri goes first
-    end
+    setup_rdoc
+    install_ri # RDoc bug, ri goes first
 
     FileUtils.mkdir_p @doc_dir unless File.exist?(@doc_dir)
   end
@@ -121,10 +119,8 @@ class Gem::DocManager
   # RI docs generation to fail if run after RDoc).
 
   def generate_rdoc
-    if @spec.has_rdoc then
-      setup_rdoc
-      install_rdoc
-    end
+    setup_rdoc
+    install_rdoc
 
     FileUtils.mkdir_p @doc_dir unless File.exist?(@doc_dir)
   end