1 files changed, 72 insertions, 39 deletions
@@ -6,10 +6,17 @@
 require 'find'
-require 'rubygems/digest/md5'
 require 'rubygems/format'
 require 'rubygems/installer'
 ##
 # Validator performs various gem file and gem database validation
@@ -33,7 +40,7 @@ class Gem::Validator
 sum_data = gem_data.gsub(/MD5SUM = "([a-z0-9]+)"/,
 "MD5SUM = \"#{"F" * 32}\"")
- unless Gem::MD5.hexdigest(sum_data) == $1.to_s then
 raise Gem::VerificationError, 'invalid checksum for gem file'
 end
 end
@@ -48,7 +55,7 @@ class Gem::Validator
 gem_data = file.read
 verify_gem gem_data
 end
- rescue Errno::ENOENT
 raise Gem::VerificationError, "missing gem file #{gem_path}"
 end
@@ -56,13 +63,11 @@ class Gem::Validator
 def find_files_for_gem(gem_directory)
 installed_files = []
- Find.find(gem_directory) {|file_name|
- fn = file_name.slice((gem_directory.size)..(file_name.size-1)).sub(/^\//, "")
- if(!(fn =~ /CVS/ || File.directory?(fn) || fn == "")) then
- installed_files << fn
- end
-
- }
 installed_files
 end
@@ -81,53 +86,82 @@ class Gem::Validator
 #
 # returns a hash of ErrorData objects, keyed on the problem gem's name.
- def alien
- errors = {}
 Gem::SourceIndex.from_installed_gems.each do |gem_name, gem_spec|
- errors[gem_name] ||= []
-
- gem_path = File.join(Gem.dir, "cache", gem_spec.full_name) + ".gem"
- spec_path = File.join(Gem.dir, "specifications", gem_spec.full_name) + ".gemspec"
- gem_directory = File.join(Gem.dir, "gems", gem_spec.full_name)
-
- installed_files = find_files_for_gem(gem_directory)
 unless File.exist? spec_path then
- errors[gem_name] << ErrorData.new(spec_path, "Spec file doesn't exist for installed gem")
 end
 begin
 verify_gem_file(gem_path)
 open gem_path, Gem.binary_mode do |file|
 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'])
- next unless data # HACK `gem check -a mkrf`
- open File.join(gem_directory, entry['path']), Gem.binary_mode do |f|
- unless Gem::MD5.hexdigest(f.read).to_s ==
- Gem::MD5.hexdigest(data).to_s then
- errors[gem_name] << ErrorData.new(entry['path'], "installed file doesn't match original from gem")
 end
 end
 end
 end
 rescue Gem::VerificationError => e
- errors[gem_name] << ErrorData.new(gem_path, e.message)
 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|
- File.directory?(File.join(gem_directory, potential_directory))
- }
- if(installed_files.size > 0) then
- errors[gem_name] << ErrorData.new(gem_path, "Unmanaged files in gem: #{installed_files.inspect}")
- end
 end
 errors
@@ -167,7 +201,7 @@ class Gem::Validator
 def unit_test(gem_spec)
 start_dir = Dir.pwd
 Dir.chdir(gem_spec.full_gem_path)
- $: << File.join(Gem.dir, "gems", gem_spec.full_name)
 # XXX: why do we need this gem_spec when we've already got 'spec'?
 test_files = gem_spec.test_files
@@ -200,7 +234,6 @@ class Gem::Validator
 Dir.chdir(start_dir)
 end
- private
 def remove_leading_dot_dir(path)
 path.sub(/^\.\//, "")
 end