rubygems-update 0.9.3 → 0.9.4

data/ChangeLog

@@ -1,3 +1,23 @@
+2007-05-23  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/commands/sources_command.rb
+	(Gem::Commands::SourcesCommand::initialize): Added a --clear-all
+	option to the sources subcommand.  Clear-all will remove the cache
+	files.
+
+	* lib/rubygems/source_info_cache.rb (Gem): Moved system_cache_file
+	and user_cache_file to class methods so that we can get the file
+	names without creating a SourceInfoCache instance.
+
+2007-05-23  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/source_info_cache.rb: Teach SIC to repair itself
+	when it encounters a bad cache file.
+
+2007-05-14  Chad Fowler  <chad@chadfowler.com>
+ 	* lib/rubygems/command_manager.rb: Re-added registration for
+        gem cleanup command which I accidentally removed during refactoring.
+
 2007-05-10  Jim Weirich  <jim@weirichhouse.org>
 
 	* lib/rubygems/remote_installer.rb: Uncommented the require

data/Rakefile

@@ -182,10 +182,11 @@ task :tag => [:prerelease] do
   reltag = "REL_#{PKG_VERSION.gsub(/\./, '_')}"
   reltag = "REL_#{ENV['REUSE'].gsub(/\./, '_')}" if ENV['REUSE']
   announce "Tagging SVN with [#{reltag}]"
+  software_dir = File.basename(Dir.pwd)
   if ENV['RELTEST']
-    announce "Release Task Testing, skipping SVN tagging"
+    announce "Release Task Testing, skipping SVN tagging (in dir #{software_dir})"
   else
-    sh %{cd ..; svn copy trunk tags/#{reltag}; svn ci -m "Tag #{reltag}" tags/#{reltag}}
+    sh %{svn copy svn+ssh://rubyforge.org/var/svn/rubygems/trunk svn+ssh://rubyforge.org/var/svn/rubygems/tags/#{reltag}}
   end
 end
 
@@ -203,7 +204,7 @@ if HAVE_RCOV
     t.libs << "test"
     t.rcov_opts = ['-xRakefile', '-xrakefile', '-xpublish.rf', '--text-report']
     t.test_files = FileList[
-      'test/test*.rb'
+      'test/{functional,test}*.rb'
     ]
     t.verbose = true
   end

data/lib/rubygems/command_manager.rb

@@ -68,6 +68,7 @@ module Gem
       register_command :specification
       register_command :uninstall
       register_command :unpack
+      register_command :cleanup
       register_command :update
     end
     

data/lib/rubygems/commands/sources_command.rb

@@ -17,6 +17,10 @@ module Gem
         add_option '-r', '--remove SOURCE_URI', 'Remove source' do |value, options|
           options[:remove] = value
         end
+
+        add_option '-c', '--clear-all', 'Remove all sources' do |value, options|
+          options[:clear_all] = value
+        end
       end
 
       def defaults_str
@@ -24,6 +28,13 @@ module Gem
       end
 
       def execute
+        options[:list] = ! (options[:add] || options[:remove] || options[:clear_all]) 
+
+        if options[:clear_all] then
+          remove_cache_file("user", Gem::SourceInfoCache.user_cache_file)
+          remove_cache_file("system", Gem::SourceInfoCache.system_cache_file)
+        end
+
         if options[:add] then
           source_uri = options[:add]
 
@@ -56,7 +67,7 @@ module Gem
           end
         end
 
-        if options[:list] or not (options[:add] or options[:remove]) then
+        if options[:list] then
           say "*** CURRENT SOURCES ***"
           say
 
@@ -66,8 +77,18 @@ module Gem
         end
       end
 
-    end
+      def remove_cache_file(desc, fn)
+        FileUtils.rm_rf fn rescue nil
+        if ! File.exist?(fn)
+          say "*** Removed #{desc} source cache ***"
+        elsif ! File.writable?(fn)
+          say "*** Unable to remove #{desc} source cache (write protected) ***"
+        else
+          say "*** Unable to remove #{desc} source cache ***"
+        end
+      end
+      private :remove_cache_file
 
-    
-  end
-end
+    end # class SourcesCommand
+  end # module Commands
+end # module Gem

data/lib/rubygems/rubygems_version.rb

@@ -2,5 +2,5 @@
 # This file is auto-generated by build scripts.
 # See:  rake update_version
 module Gem
-  RubyGemsVersion = '0.9.3'
+  RubyGemsVersion = '0.9.4'
 end

data/lib/rubygems/source_index.rb

@@ -258,6 +258,10 @@ module Gem
       self
     end
     
+    def ==(other) # :nodoc:
+      self.class === other and @gems == other.gems 
+    end
+
     protected
 
     attr_reader :gems

data/lib/rubygems/source_info_cache.rb

@@ -32,6 +32,8 @@ class Gem::SourceInfoCache
   include Gem::UserInteraction
 
   @cache = nil
+  @system_cache_file = nil
+  @user_cache_file = nil
 
   def self.cache
     return @cache if @cache
@@ -53,9 +55,6 @@ class Gem::SourceInfoCache
     @cache_data = nil
     @cache_file = nil
     @dirty = false
-
-    @system_cache_file = nil
-    @user_cache_file = nil
   end
 
   # The most recent cache data.
@@ -65,10 +64,22 @@ class Gem::SourceInfoCache
     cache_file # HACK writable check
     # Marshal loads 30-40% faster from a String, and 2MB on 20061116 is small
     begin
-      data = File.open cache_file, 'rb' do |fp|
-        fp.read
+      data = File.open cache_file, 'rb' do |fp| fp.read end
+      @cache_data = Marshal.load data
+      @cache_data.each do |url, sice|
+        next unless Hash === sice
+        @dirty = true
+        if sice.key? 'cache' and sice.key? 'size' and
+           Gem::SourceIndex === sice['cache'] and Numeric === sice['size'] then
+          new_sice = Gem::SourceInfoCacheEntry.new sice['cache'], sice['size']
+          @cache_data[url] = new_sice
+        else # irreperable, force refetch.
+          sice = Gem::SourceInfoCacheEntry.new Gem::SourceIndex.new, 0
+          sice.refresh url # HACK may be unnecessary, see ::cache and #refresh
+          @cache_data[url] = sice
+        end
       end
-      @cache_data = Marshal.load data 
+      @cache_data
     rescue
       {}
     end
@@ -110,18 +121,28 @@ class Gem::SourceInfoCache
     end.flatten
   end
 
+  # Mark the cache as updated (i.e. dirty).
+  def update
+    @dirty = true
+  end
+
   # The name of the system cache file.
   def system_cache_file
-    @system_cache_file ||= File.join(Gem.dir, "source_cache")
+    self.class.system_cache_file
   end
 
-  # Mark the cache as updated (i.e. dirty).
-  def update
-    @dirty = true
+  # The name of the system cache file. (class method)
+  def self.system_cache_file
+    @system_cache_file ||= File.join(Gem.dir, "source_cache")
   end
 
   # The name of the user cache file.
   def user_cache_file
+    self.class.user_cache_file
+  end
+
+  # The name of the user cache file. (class method)
+  def self.user_cache_file
     @user_cache_file ||=
       ENV['GEMCACHE'] || File.join(Gem.user_home, ".gem", "source_cache")
   end

data/lib/rubygems/source_info_cache_entry.rb

@@ -27,5 +27,11 @@ class Gem::SourceInfoCacheEntry
     @size = remote_size
   end
 
+  def ==(other) # :nodoc:
+    self.class === other and
+    @size == other.size and
+    @source_index == other.source_index
+  end
+
 end
 

data/test/data/gemhome/gems/a-0.0.1/lib/code.rb

@@ -0,0 +1 @@
+CODE = 1

data/test/data/gemhome/gems/a-0.0.2/lib/code.rb

@@ -0,0 +1 @@
+CODE = 1

data/test/data/gemhome/gems/b-0.0.2/lib/code.rb

@@ -0,0 +1 @@
+CODE = 1

data/test/data/gemhome/gems/c-1.2/lib/code.rb

@@ -0,0 +1 @@
+CODE = 1

data/test/data/gemhome/specifications/a-0.0.1.gemspec

@@ -0,0 +1,8 @@
+Gem::Specification.new do |s|
+  s.name = %q{a}
+  s.version = "0.0.1"
+  s.date = %q{2007-05-23}
+  s.summary = %q{summary}
+  s.description = %q{desc}
+  s.files = ["lib/code.rb"]
+end

data/test/data/gemhome/specifications/a-0.0.2.gemspec

@@ -0,0 +1,8 @@
+Gem::Specification.new do |s|
+  s.name = %q{a}
+  s.version = "0.0.2"
+  s.date = %q{2007-05-23}
+  s.summary = %q{summary}
+  s.description = %q{desc}
+  s.files = ["lib/code.rb"]
+end

data/test/data/gemhome/specifications/b-0.0.2.gemspec

@@ -0,0 +1,8 @@
+Gem::Specification.new do |s|
+  s.name = %q{b}
+  s.version = "0.0.2"
+  s.date = %q{2007-05-23}
+  s.summary = %q{summary}
+  s.description = %q{desc}
+  s.files = ["lib/code.rb"]
+end

data/test/data/gemhome/specifications/c-1.2.gemspec

@@ -0,0 +1,8 @@
+Gem::Specification.new do |s|
+  s.name = %q{c}
+  s.version = "1.2"
+  s.date = %q{2007-05-23}
+  s.summary = %q{summary}
+  s.description = %q{desc}
+  s.files = ["lib/code.rb"]
+end

data/test/test_gem_source_info_cache.rb

@@ -76,6 +76,25 @@ class TestGemSourceInfoCache < RubyGemTestCase
     assert_equal true, @sic.dirty, 'still dirty'
   end
 
+  def test_cache_data_irreparable
+    @fetcher.data['http://gems.example.com/yaml'] = @source_index.to_yaml
+
+    data = { 'http://gems.example.com' => { 'totally' => 'borked' } }
+
+    [@sic.system_cache_file, @sic.user_cache_file].each do |fn|
+      FileUtils.mkdir_p File.dirname(fn)
+      open(fn, "wb") { |f| f.write Marshal.dump(data) }
+    end
+
+    @sic.instance_eval { @cache_data = nil }
+
+    fetched = use_ui MockGemUi.new do @sic.cache_data end
+
+    fetched_si = fetched['http://gems.example.com'].source_index
+
+    assert_equal @source_index.index_signature, fetched_si.index_signature
+  end
+
   def test_cache_data_none_readable
     FileUtils.chmod 0222, @sic.system_cache_file
     FileUtils.chmod 0222, @sic.user_cache_file
@@ -94,6 +113,27 @@ class TestGemSourceInfoCache < RubyGemTestCase
     assert_equal 'unable to locate a writable cache file', e.message
   end
 
+  def test_cache_data_repair
+    data = {
+        'http://www.example.com' => {
+          'cache' => Gem::SourceIndex.new,
+          'size' => 0,
+      }
+    }
+    [@sic.system_cache_file, @sic.user_cache_file].each do |fn|
+      FileUtils.mkdir_p File.dirname(fn)
+      open(fn, "wb") { |f| f.write Marshal.dump(data) }
+    end
+
+    @sic.instance_eval { @cache_data = nil }
+
+    expected = {
+        'http://www.example.com' =>
+          Gem::SourceInfoCacheEntry.new(Gem::SourceIndex.new, 0)
+    }
+    assert_equal expected, @sic.cache_data
+  end
+
   def test_cache_data_user_fallback
     FileUtils.chmod 0444, @sic.system_cache_file
     assert_equal [['key','usr']], @sic.cache_data.to_a.sort

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.3
+rubygems_version: 0.9.4
 specification_version: 1
 name: rubygems-update
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
-date: 2007-05-10 00:00:00 -04:00
+  version: 0.9.4
+date: 2007-05-23 00:00:00 -04:00
 summary: RubyGems Update GEM
 require_paths: 
 - lib
@@ -129,6 +129,7 @@ files:
 - lib/rubygems/digest/sha2.rb
 - pkgs/sources
 - pkgs/sources/lib
+- pkgs/sources/sources-0.0.1.gem
 - pkgs/sources/sources.gemspec
 - pkgs/sources/lib/sources.rb
 - redist/session.gem
@@ -189,8 +190,13 @@ files:
 - test/testgem.rc
 - test/user_capture.rb
 - test/yaml_data.rb
+- test/data/a-0.0.1.gem
+- test/data/a-0.0.2.gem
+- test/data/b-0.0.2.gem
 - test/data/broken-1.0.0.gem
 - test/data/broken_build
+- test/data/c-1.2.gem
+- test/data/gemhome
 - test/data/legacy
 - test/data/lib
 - test/data/one
@@ -200,10 +206,35 @@ files:
 - test/data/broken_build/ext
 - test/data/broken_build/ext/extconf.rb
 - test/data/broken_build/ext/foo.c
+- test/data/gemhome/cache
+- test/data/gemhome/doc
+- test/data/gemhome/gems
+- test/data/gemhome/specifications
+- test/data/gemhome/cache/a-0.0.1.gem
+- test/data/gemhome/cache/a-0.0.2.gem
+- test/data/gemhome/cache/b-0.0.2.gem
+- test/data/gemhome/cache/c-1.2.gem
+- test/data/gemhome/gems/a-0.0.1
+- test/data/gemhome/gems/a-0.0.2
+- test/data/gemhome/gems/b-0.0.2
+- test/data/gemhome/gems/c-1.2
+- test/data/gemhome/gems/a-0.0.1/lib
+- test/data/gemhome/gems/a-0.0.1/lib/code.rb
+- test/data/gemhome/gems/a-0.0.2/lib
+- test/data/gemhome/gems/a-0.0.2/lib/code.rb
+- test/data/gemhome/gems/b-0.0.2/lib
+- test/data/gemhome/gems/b-0.0.2/lib/code.rb
+- test/data/gemhome/gems/c-1.2/lib
+- test/data/gemhome/gems/c-1.2/lib/code.rb
+- test/data/gemhome/specifications/a-0.0.1.gemspec
+- test/data/gemhome/specifications/a-0.0.2.gemspec
+- test/data/gemhome/specifications/b-0.0.2.gemspec
+- test/data/gemhome/specifications/c-1.2.gemspec
 - test/data/legacy/keyedlist-0.4.0.ruby
 - test/data/legacy/keyedlist-0.4.0.yaml
 - test/data/lib/code.rb
 - test/data/one/lib
+- test/data/one/one-0.0.1.gem
 - test/data/one/one.gemspec
 - test/data/one/one.yaml
 - test/data/one/README.one