rubygems-update 0.9.0 → 0.9.1

data/lib/rubygems/specification.rb

@@ -8,7 +8,7 @@ require 'time'
 require 'rubygems'
 require 'rubygems/version'
 
-class Time
+class Time # :nodoc:
   def self.today
     Time.parse Time.now.strftime("%Y-%m-%d")
   end
@@ -152,11 +152,11 @@ module Gem
       @@default_value[name] = []
       module_eval %{
         def #{name}
-	  @#{name} ||= []
-	end
+          @#{name} ||= []
+        end
         def #{name}=(value)
-	  @#{name} = value.to_a
-	end
+          @#{name} = value.to_a
+        end
       }
     end
 
@@ -273,6 +273,7 @@ module Gem
 
     def test_suite_file=(val)
       warn_deprecated(:test_suite_file, :test_files)
+      @test_files = [] unless defined? @test_files
       @test_files << val
     end
  
@@ -320,54 +321,73 @@ module Gem
     end
 
     overwrite_accessor :summary= do |str|
-      if str
-        @summary = str.strip.
-          gsub(/(\w-)\n[ \t]*(\w)/, '\1\2').
-          gsub(/\n[ \t]*/, " ")
-      end
+      @summary = if str then
+                   str.strip.
+                   gsub(/(\w-)\n[ \t]*(\w)/, '\1\2').
+                   gsub(/\n[ \t]*/, " ")
+                 end
     end
 
     overwrite_accessor :description= do |str|
-      if str
-        @description = str.strip.
-          gsub(/(\w-)\n[ \t]*(\w)/, '\1\2').
-          gsub(/\n[ \t]*/, " ")
-      end
+      @description = if str then
+                       str.strip.
+                       gsub(/(\w-)\n[ \t]*(\w)/, '\1\2').
+                       gsub(/\n[ \t]*/, " ")
+                     end
     end
 
     overwrite_accessor :default_executable do
-      return @default_executable if @default_executable
-      # Special case: if there is only one executable specified, then
-      # that's obviously the default one.
-      return @executables.first if @executables.size == 1
-      nil
+      begin
+        if defined? @default_executable and @default_executable
+          result = @default_executable 
+        elsif @executables and @executables.size == 1
+          result = @executables.first
+        else
+          result = nil
+        end
+        result
+      rescue
+        nil
+      end
     end
 
     def add_bindir(executables)
-      if(@executables.nil?) 
+      if not defined? @executables || @executables.nil?
         return nil
       end
-      if(@bindir)
+
+      if defined? @bindir and @bindir then
         @executables.map {|e| File.join(@bindir, e) }
       else
         @executables
       end
+    rescue
+      return nil
     end
 
     overwrite_accessor :files do
-      (@files || []) | (@test_files || []) | (add_bindir(@executables) || []) |
-        (@extra_rdoc_files || []) | (@extensions || [])
+      result = []
+      result |= as_array(@files) if defined?(@files)
+      result |= as_array(@test_files) if defined?(@test_files)
+      result |= as_array(add_bindir(@executables) || [])
+      result |= as_array(@extra_rdoc_files) if defined?(@extra_rdoc_files)
+      result |= as_array(@extensions) if defined?(@extensions)
+      result
     end
 
     overwrite_accessor :test_files do
       # Handle the possibility that we have @test_suite_file but not
       # @test_files.  This will happen when an old gem is loaded via
       # YAML.
-      if @test_suite_file
+      if defined? @test_suite_file then
         @test_files = [@test_suite_file].flatten
         @test_suite_file = nil
       end
-      @test_files ||= []
+      if defined? @test_files and @test_files then
+        @test_files
+      else
+        @test_files = []
+      end
     end
 
     # Predicates -----------------------------------------------------
@@ -412,13 +432,14 @@ module Gem
     def Specification.from_yaml(input)
       input = normalize_yaml_input(input)
       spec = YAML.load(input)
-      if(spec.class == FalseClass) then
+      if(spec && spec.class == FalseClass) then
         raise Gem::EndOfYAMLException
       end
       unless Specification === spec
         raise Gem::Exception, "YAML data doesn't evaluate to gem specification"
       end
-      unless spec.instance_variable_get :@specification_version
+      unless spec.instance_variables.include? '@specification_version' and
+             spec.instance_variable_get :@specification_version
         spec.instance_variable_set :@specification_version, 
           NONEXISTENT_SPECIFICATION_VERSION
       end
@@ -515,12 +536,26 @@ module Gem
     end
 
     # Tests specs for equality (across all attributes).
-    def ==(other)
+    def ==(other) # :nodoc:
+      other.kind_of?(self.class) && same_attributes?(other)
+    end
+
+    alias eql? == # :nodoc:
+
+    def same_attributes?(other)
       @@attributes.each do |name, default|
         return false unless self.send(name) == other.send(name)
       end
       true
     end
+    private :same_attributes?
+
+    def hash # :nodoc:
+      @@attributes.inject(0) { |hash_code, (name, default_value)|
+        n = self.send(name).hash
+        hash_code + n
+      }
+    end
     
     # Export methods (YAML and Ruby code) ----------------------------
     
@@ -584,7 +619,7 @@ module Gem
     # Also, the summary and description are converted to a normal
     # format. 
     def normalize
-      if @extra_rdoc_files
+      if defined? @extra_rdoc_files and @extra_rdoc_files then
         @extra_rdoc_files.uniq!
         @files ||= []
         @files.concat(@extra_rdoc_files)
@@ -639,6 +674,12 @@ module Gem
       end
     end
 
+    def as_array(items)
+      items.to_ary
+    rescue NoMethodError => ex
+      [items]
+    end
+
     # Return a string containing a Ruby code representation of the
     # given object.
     def ruby_code(obj)

data/lib/rubygems/user_interaction.rb

@@ -29,6 +29,9 @@ module Gem
 
     # The default UI is a class variable of the singleton class for
     # this module.
+
+    @ui = nil
+
     class << self
       def ui
         @ui ||= Gem::ConsoleUI.new
@@ -172,15 +175,15 @@ module Gem
     def progress_reporter(*args)
       case Gem.configuration.verbose
       when nil, false
-	SilentProgressReporter.new(@outs, *args)
+        SilentProgressReporter.new(@outs, *args)
       when true
-	SimpleProgressReporter.new(@outs, *args)
+        SimpleProgressReporter.new(@outs, *args)
       else
-	VerboseProgressReporter.new(@outs, *args)
+        VerboseProgressReporter.new(@outs, *args)
       end
     end
 
-    class SilentReporter
+    class SilentProgressReporter
       attr_reader :count
 
       def initialize(out_stream, size, initial_message)
@@ -199,20 +202,20 @@ module Gem
       attr_reader :count
 
       def initialize(out_stream, size, initial_message)
-	@out = out_stream
-	@total = size
-	@count = 0
-	ui.say initial_message
+        @out = out_stream
+        @total = size
+        @count = 0
+        @out.puts initial_message
       end
 
       def updated(message)
-	@count += 1
-	@out.print "."
-	@out.flush
+        @count += 1
+        @out.print "."
+        @out.flush
       end
 
       def done
-	@out.puts "\ncomplete"
+        @out.puts "\ncomplete"
       end
     end
 
@@ -222,24 +225,23 @@ module Gem
       attr_reader :count
 
       def initialize(out_stream, size, initial_message)
-	@out = out_stream
-	@total = size
-	@count = 0
-	@out.puts initial_message
+        @out = out_stream
+        @total = size
+        @count = 0
+        @out.puts initial_message
       end
 
       def updated(message)
-	@count += 1
-	@out.puts "#{@count}/#{@total}: #{message}"
+        @count += 1
+        @out.puts "#{@count}/#{@total}: #{message}"
       end
 
       def done
-	@out.puts "complete"
+        @out.puts "complete"
       end
     end
   end
 
-
   ####################################################################
   # Subclass of StreamUI that instantiates the user interaction using
   # standard in, out and error.

data/lib/rubygems/validator.rb

@@ -23,8 +23,8 @@ module Gem
       require 'md5'
      unless(gem_data =~ /MD5SUM/m)
        return # Don't worry about it...this sucks.  Need to fix MD5 stuff for
-		# new format
-		# FIXME
+                # new format
+                # FIXME
       end
       unless (MD5.md5(gem_data.gsub(/MD5SUM = "([a-z0-9]+)"/, "MD5SUM = \"" + ("F" * 32) + "\"")) == $1.to_s) 
         raise VerificationError.new("Invalid checksum for Gem file")
@@ -95,10 +95,10 @@ module Gem
             format = Gem::Format.from_file_by_path(gem_path)
             format.file_entries.each do |entry, data|
               # Found this file.  Delete it from list
-	      installed_files.delete remove_leading_dot_dir(entry['path'])
+              installed_files.delete remove_leading_dot_dir(entry['path'])
               File.open(File.join(gem_directory, entry['path']), 'rb') do |f|
                 unless MD5.md5(f.read).to_s == MD5.md5(data).to_s
-	          errors[gem_name] << ErrorData.new(entry['path'], "installed file doesn't match original from gem")
+                  errors[gem_name] << ErrorData.new(entry['path'], "installed file doesn't match original from gem")
                 end
               end
             end
@@ -108,7 +108,7 @@ module Gem
         end
         # Clean out directories that weren't explicitly included in the gemspec
         # FIXME: This still allows arbitrary incorrect directories.
-        installed_files.delete_if {|potential_directory|	
+        installed_files.delete_if {|potential_directory|        
           File.directory?(File.join(gem_directory, potential_directory))
         }
         if(installed_files.size > 0) then
@@ -130,7 +130,7 @@ module Gem
         say "There are no unit tests to run for #{gem_spec.name}-#{gem_spec.version}"
         return
       end
-      require_gem gem_spec.name, "= #{gem_spec.version.version}"
+      gem gem_spec.name, "= #{gem_spec.version.version}"
       test_files.each do |f| require f end
       require 'test/unit/ui/console/testrunner'
       suite = Test::Unit::TestSuite.new("#{gem_spec.name}-#{gem_spec.version}")
@@ -144,8 +144,9 @@ module Gem
           #Gem::Uninstaller.new(gem_spec.name, gem_spec.version.version).uninstall
         #end
       end
-      Dir.chdir(start_dir)
       result
+    ensure
+      Dir.chdir(start_dir)
     end
 
     def remove_leading_dot_dir(path)

data/lib/rubygems/version.rb

@@ -10,7 +10,9 @@ module Gem
   # The Dependency class holds a Gem name and Version::Requirement
   #
   class Dependency
-    attr_accessor :name, :version_requirements
+    attr_accessor :name
+
+    attr_writer :version_requirements
 
     def <=>(other)
       [@name] <=> [other.name]
@@ -28,9 +30,8 @@ module Gem
       @version_requirement = nil   # Avoid warnings.
     end
 
-    undef version_requirements
     def version_requirements
-      normalize if @version_requirement
+      normalize if defined? @version_requirement and @version_requirement
       @version_requirements
     end
 
@@ -51,9 +52,15 @@ module Gem
     end
 
     def ==(other)
-      self.name = other.name and
+      other.kind_of?(self.class) &&
+        self.name == other.name &&
         self.version_requirements == other.version_requirements
     end
+
+    def hash
+      name.hash + version_requirements.hash
+    end
+    
   end
   
   ####################################################################
@@ -150,6 +157,10 @@ module Gem
       return r <=> v
     end
 
+    def hash
+      to_ints.inject { |hash_code, n| hash_code + n }
+    end
+
     # Return a new version object where the next to the last revision
     # number is one greater. (e.g.  5.3.1 => 5.4)
     def bump
@@ -200,13 +211,13 @@ module Gem
     #
     def self.create(input)
       if input.kind_of?(Requirement)
-	return input
+        return input
       elsif input.kind_of?(Array)
-	return self.new(input)
+        return self.new(input)
       elsif input.respond_to? :to_str
-	return self.new([input.to_str])
+        return self.new([input.to_str])
       else
-	return self.default
+        return self.default
       end
     end
     
@@ -224,8 +235,8 @@ module Gem
     #
     def initialize(reqs)
       @requirements = reqs.collect do |rq|
-	op, version_string = parse(rq)
-	[op, Version.new(version_string)]
+        op, version_string = parse(rq)
+        [op, Version.new(version_string)]
       end
       @version = nil   # Avoid warnings.
     end
@@ -248,12 +259,12 @@ module Gem
     def as_list
       normalize
       @requirements.collect { |req|
-	"#{req[0]} #{req[1]}"
+        "#{req[0]} #{req[1]}"
       }
     end
     
     def normalize
-      return if @version.nil?
+      return if not defined? @version or @version.nil?
       @requirements = [parse(@version)]
       @nums = nil
       @version = nil
@@ -287,20 +298,24 @@ module Gem
     #
     def parse(str)
       if md = /^\s*(#{OP_RE})\s*([0-9.]+)\s*$/.match(str)
-	[md[1], md[2]]
+        [md[1], md[2]]
       elsif md = /^\s*([0-9.]+)\s*$/.match(str)
-	["=", md[1]]
+        ["=", md[1]]
       elsif md = /^\s*(#{OP_RE})\s*$/.match(str)
-	[md[1], "0"]
+        [md[1], "0"]
       else
-	fail ArgumentError, "Illformed requirement [#{str}]"
+        fail ArgumentError, "Illformed requirement [#{str}]"
       end
     end
     
     def <=>(other)
       to_s <=> other.to_s
     end
-    
+
+    def hash
+      to_s.hash
+    end
+    public :hash
   end
   
 end