rubygems-update 1.1.0 → 1.1.1

data/test/gemutilities.rb

@@ -61,6 +61,8 @@ class FakeFetcher
     name = "#{spec.full_name}.gem"
     path = File.join(install_dir, 'cache', name)
 
+    Gem.ensure_gem_subdirectories install_dir
+
     if source_uri =~ /^http/ then
       File.open(path, "wb") do |f|
         f.write fetch_path(File.join(source_uri, "gems", name))
@@ -369,6 +371,17 @@ class RubyGemTestCase < Test::Unit::TestCase
     Gem.win_platform?
   end
 
+  # NOTE Allow tests to use a random (but controlled) port number instead of
+  # a hardcoded one. This helps CI tools when running parallels builds on
+  # the same builder slave.
+  def self.process_based_port
+    @@process_based_port ||= 8000 + $$ % 1000
+  end
+
+  def process_based_port
+    self.class.process_based_port
+  end
+
 end
 
 class TempIO

data/test/test_gem.rb

@@ -237,23 +237,25 @@ class TestGem < RubyGemTestCase
     assert_equal [Gem.dir], Gem.path
   end
 
-  def test_self_path_APPLE_GEM_HOME
-    Gem.clear_paths
-    Gem.const_set :APPLE_GEM_HOME, '/tmp/apple_gem_home'
-
-    assert Gem.path.include?('/tmp/apple_gem_home')
-  ensure
-    Gem.send :remove_const, :APPLE_GEM_HOME
-  end
-
-  def test_self_path_APPLE_GEM_HOME_GEM_PATH
-    Gem.clear_paths
-    ENV['GEM_PATH'] = @gemhome
-    Gem.const_set :APPLE_GEM_HOME, '/tmp/apple_gem_home'
-
-    assert !Gem.path.include?('/tmp/apple_gem_home')
-  ensure
-    Gem.send :remove_const, :APPLE_GEM_HOME
+  unless win_platform?
+    def test_self_path_APPLE_GEM_HOME
+      Gem.clear_paths
+      Gem.const_set :APPLE_GEM_HOME, '/tmp/apple_gem_home'
+  
+      assert Gem.path.include?('/tmp/apple_gem_home')
+    ensure
+      Gem.send :remove_const, :APPLE_GEM_HOME
+    end
+  
+    def test_self_path_APPLE_GEM_HOME_GEM_PATH
+      Gem.clear_paths
+      ENV['GEM_PATH'] = @gemhome
+      Gem.const_set :APPLE_GEM_HOME, '/tmp/apple_gem_home'
+  
+      assert !Gem.path.include?('/tmp/apple_gem_home')
+    ensure
+      Gem.send :remove_const, :APPLE_GEM_HOME
+    end
   end
 
   def test_self_path_ENV_PATH
@@ -303,21 +305,56 @@ class TestGem < RubyGemTestCase
 
   def test_self_prefix
     file_name = File.expand_path __FILE__
-    assert_equal File.dirname(File.dirname(file_name)), Gem.prefix
+
+    prefix = File.dirname File.dirname(file_name)
+    prefix = File.dirname prefix if File.basename(prefix) == 'test'
+
+    assert_equal prefix, Gem.prefix
+  end
+
+  def test_self_prefix_libdir
+    orig_libdir = Gem::ConfigMap[:libdir]
+
+    file_name = File.expand_path __FILE__
+    prefix = File.dirname File.dirname(file_name)
+
+    Gem::ConfigMap[:libdir] = prefix
+
+    assert_nil Gem.prefix
+  ensure
+    Gem::ConfigMap[:libdir] = orig_libdir
   end
 
-  def test_self_prefix_odd
+  def test_self_prefix_sitelibdir
     orig_sitelibdir = Gem::ConfigMap[:sitelibdir]
 
     file_name = File.expand_path __FILE__
-    prefix = File.join File.dirname(File.dirname(file_name)), 'lib'
-    Gem::ConfigMap[:sitelibdir] = prefix.sub(/[\w]\//, '\&/')
+    prefix = File.dirname File.dirname(file_name)
+
+    Gem::ConfigMap[:sitelibdir] = prefix
 
     assert_nil Gem.prefix
   ensure
     Gem::ConfigMap[:sitelibdir] = orig_sitelibdir
   end
 
+  def test_self_refresh
+    util_make_gems
+
+    a1_spec = File.join @gemhome, "specifications", "#{@a1.full_name}.gemspec" 
+
+    FileUtils.mv a1_spec, @tempdir
+
+    assert !Gem.source_index.gems.include?(@a1.full_name)
+
+    FileUtils.mv File.join(@tempdir, "#{@a1.full_name}.gemspec"), a1_spec
+
+    Gem.refresh
+
+    assert Gem.source_index.gems.include?(@a1.full_name)
+    assert_equal nil, Gem.instance_variable_get(:@searcher)
+  end
+
   def test_self_required_location
     util_make_gems
 

data/test/test_gem_commands_environment_command.rb

@@ -20,7 +20,7 @@ class TestGemCommandsEnvironmentCommand < RubyGemTestCase
       @cmd.execute
     end
 
-    assert_match %r|RUBYGEMS VERSION: (\d\.)+\d \((\d\.)+\d\)|, @ui.output
+    assert_match %r|RUBYGEMS VERSION: (\d\.)+\d|, @ui.output
     assert_match %r|RUBY VERSION: \d\.\d\.\d \(.*\) \[.*\]|, @ui.output
     assert_match %r|INSTALLATION DIRECTORY: #{Regexp.escape @gemhome}|,
                  @ui.output

data/test/test_gem_commands_query_command.rb

@@ -44,8 +44,10 @@ class TestGemCommandsQueryCommand < RubyGemTestCase
 
 *** REMOTE GEMS ***
 
+Updating metadata for 1 gems from http://gems.example.com/
+.
+complete
 a (2)
-pl (1)
     EOF
 
     assert_equal expected, @ui.output
@@ -79,8 +81,8 @@ pl (1)
 
 *** REMOTE GEMS ***
 
-Updating metadata for 1 gems from http://gems.example.com/
-.
+Updating metadata for 2 gems from http://gems.example.com/
+..
 complete
 a (2, 1)
     EOF
@@ -100,7 +102,7 @@ a (2, 1)
 
 *** REMOTE GEMS ***
 
-a (2, 1)
+a (2)
     This is a lot of text. This is a lot of text. This is a lot of text.
     This is a lot of text.
 

data/test/test_gem_commands_update_command.rb

@@ -97,6 +97,7 @@ class TestGemCommandsUpdateCommand < RubyGemTestCase
     assert_equal "Updating installed gems", out.shift
     assert_match %r|Bulk updating|, out.shift
     assert_equal "Updating #{@a2.name}", out.shift
+    assert_match %r|Bulk updating|, out.shift
     assert_equal "Successfully installed #{@c2.full_name}", out.shift
     assert_equal "Successfully installed #{@b2.full_name}", out.shift
     assert_equal "Successfully installed #{@a2.full_name}", out.shift

data/test/test_gem_dependency_installer.rb

@@ -216,6 +216,8 @@ class TestGemDependencyInstaller < RubyGemTestCase
 
     assert File.exist?(File.join(gemhome2, 'specifications',
                                  "#{@a1.full_name}.gemspec"))
+    assert File.exist?(File.join(gemhome2, 'cache',
+                                 "#{@a1.full_name}.gem"))
   end
 
   def test_install_domain_both

data/test/test_gem_remote_fetcher.rb

@@ -76,8 +76,9 @@ gems:
 
   # don't let 1.8 and 1.9 autotest collide
   RUBY_VERSION =~ /(\d+)\.(\d+)\.(\d+)/
-  PROXY_PORT = 12345 + $1.to_i * 100 + $2.to_i * 10 + $3.to_i
-  SERVER_PORT = 23456 + $1.to_i * 100 + $2.to_i * 10 + $3.to_i
+  # don't let parallel runners collide
+  PROXY_PORT = process_based_port + 100 + $1.to_i * 100 + $2.to_i * 10 + $3.to_i
+  SERVER_PORT = process_based_port + 200 + $1.to_i * 100 + $2.to_i * 10 + $3.to_i
 
   def setup
     super

data/test/test_gem_server.rb

@@ -15,7 +15,7 @@ class TestGemServer < RubyGemTestCase
 
     @a1 = quick_gem 'a', '1'
 
-    @server = Gem::Server.new Gem.dir, 8809, false
+    @server = Gem::Server.new Gem.dir, process_based_port, false
     @req = WEBrick::HTTPRequest.new :Logger => nil
     @res = WEBrick::HTTPResponse.new :HTTPVersion => '1.0'
   end

data/test/test_gem_source_index.rb

@@ -395,6 +395,22 @@ class TestGemSourceIndex < RubyGemTestCase
     assert_equal [updated_platform.name], @source_index.outdated
   end
 
+  def test_refresh_bang
+    a1_spec = File.join @gemhome, "specifications", "#{@a1.full_name}.gemspec" 
+
+    FileUtils.mv a1_spec, @tempdir
+
+    source_index = Gem::SourceIndex.from_installed_gems
+
+    assert !source_index.gems.include?(@a1.full_name)
+
+    FileUtils.mv File.join(@tempdir, "#{@a1.full_name}.gemspec"), a1_spec
+
+    source_index.refresh!
+
+    assert source_index.gems.include?(@a1.full_name)
+  end
+
   def test_remove_extra
     @source_index.add_spec @a1
     @source_index.add_spec @a2

data/test/test_gem_source_info_cache.rb

@@ -287,6 +287,7 @@ class TestGemSourceInfoCache < RubyGemTestCase
 
     @sic.set_cache_data @gem_repo => sice
     @sic.update
+    @sic.instance_variable_set :@only_latest, false
     @sic.write_cache
     @sic.reset_cache_data
 
@@ -358,6 +359,7 @@ class TestGemSourceInfoCache < RubyGemTestCase
     @sic.set_cache_data({@gem_repo => @sice_new})
     @sic.update
     @sic.write_cache
+    @sic.instance_variable_set :@only_latest, false
 
     assert File.exist?(@sic.user_cache_file), 'user_cache_file'
     assert File.exist?(@sic.latest_user_cache_file),
@@ -383,6 +385,7 @@ class TestGemSourceInfoCache < RubyGemTestCase
 
     @sic.set_cache_data({ @gem_repo => @sice })
     @sic.update
+
     @sic.write_cache
 
     assert File.exist?(@sic.user_cache_file), 'system_cache_file'
@@ -390,7 +393,7 @@ class TestGemSourceInfoCache < RubyGemTestCase
            'latest_system_cache_file'
 
     user_cache_data = read_cache(@sic.user_cache_file).to_a.sort
-    assert_equal 1, user_cache_data.length
+    assert_equal 1, user_cache_data.length, 'user_cache_data length'
     user_cache_data = user_cache_data.first
 
     assert_equal @gem_repo, user_cache_data.first
@@ -415,6 +418,24 @@ class TestGemSourceInfoCache < RubyGemTestCase
     @sic.update
     @sic.write_cache
 
+    assert_equal [[@gem_repo, @sys_sice]],
+                 read_cache(@sic.system_cache_file).to_a.sort
+    assert_equal [[@gem_repo, @sys_sice]],
+                 read_cache(@sic.user_cache_file).to_a.sort
+    assert_equal [[@gem_repo, @sice_new]],
+                 read_cache(@sic.latest_user_cache_file).to_a.sort
+  end
+
+  def test_write_cache_user_only_latest
+    FileUtils.chmod 0444, @sic.system_cache_file
+    @sic.set_cache_data({@gem_repo => @sice_new})
+    @sic.update
+    @sic.write_cache
+
+    assert File.exist?(@sic.user_cache_file), 'user_cache_file'
+    assert File.exist?(@sic.latest_user_cache_file),
+           'latest_user_cache_file exists'
+
     assert_equal [[@gem_repo, @sys_sice]],
                  read_cache(@sic.system_cache_file).to_a.sort
     assert_equal [[@gem_repo, @sice_new]],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubygems-update
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Jim Weirich
@@ -32,7 +32,7 @@ cert_chain:
   x52qPcexcYZR7w==
   -----END CERTIFICATE-----
 
-date: 2008-03-28 00:00:00 -07:00
+date: 2008-04-10 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -45,38 +45,39 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- Rakefile
+- .document
 - ChangeLog
-- TODO
-- README
-- LICENSE.txt
 - GPL.txt
-- setup.rb
+- LICENSE.txt
+- README
+- Rakefile
+- TODO
 - bin/gem
 - bin/update_rubygems
-- doc/doc.css
-- doc/makedoc.rb
-- examples/application
-- examples/application/an-app.gemspec
-- examples/application/bin
-- examples/application/bin/myapp
-- examples/application/ext
-- examples/application/ext/extconf.rb
-- examples/application/ext/foo.c
-- examples/application/ext/Makefile
-- examples/application/lib
-- examples/application/lib/somefunctionality.rb
-- gemspecs/cgikit-1.1.0.gemspec
-- gemspecs/jabber4r.gemspec
-- gemspecs/linguistics.gemspec
-- gemspecs/ook.gemspec
-- gemspecs/progressbar.gemspec
-- gemspecs/README
-- gemspecs/redcloth.gemspec
-- gemspecs/rublog.gemspec
-- gemspecs/ruby-doom.gemspec
-- gemspecs/rubyjdwp.gemspec
-- gemspecs/statistics.gemspec
+- doc/release_notes/docs-rubygems-announce.rdoc
+- doc/release_notes/rel_0_2_0.rdoc
+- doc/release_notes/rel_0_3_0.rdoc
+- doc/release_notes/rel_0_4_0.rdoc
+- doc/release_notes/rel_0_5_0.rdoc
+- doc/release_notes/rel_0_6_0.rdoc
+- doc/release_notes/rel_0_7_0.rdoc
+- doc/release_notes/rel_0_8_0.rdoc
+- doc/release_notes/rel_0_8_1.rdoc
+- doc/release_notes/rel_0_8_10.rdoc
+- doc/release_notes/rel_0_8_11.rdoc
+- doc/release_notes/rel_0_8_3.rdoc
+- doc/release_notes/rel_0_8_4.rdoc
+- doc/release_notes/rel_0_8_5.rdoc
+- doc/release_notes/rel_0_8_7.rdoc
+- doc/release_notes/rel_0_9_0.rdoc
+- doc/release_notes/rel_0_9_2.rdoc
+- doc/release_notes/rel_0_9_3.rdoc
+- doc/release_notes/rel_0_9_4.rdoc
+- doc/release_notes/rel_0_9_5.rdoc
+- doc/release_notes/rel_1_0_0.rdoc
+- doc/release_notes/rel_1_0_1.rdoc
+- doc/release_notes/rel_1_1_0.rdoc
+- doc/release_notes/rel_1_1_1.rdoc
 - lib/rbconfig/datadir.rb
 - lib/rubygems/builder.rb
 - lib/rubygems/command.rb
@@ -169,12 +170,12 @@ files:
 - pkgs/sources/lib
 - pkgs/sources/lib/sources.rb
 - pkgs/sources/sources.gemspec
-- redist/session.gem
 - scripts/buildtests.rb
 - scripts/gemdoc.rb
 - scripts/runtest.rb
 - scripts/specdoc.rb
 - scripts/upload_gemdoc.rb
+- setup.rb
 - test/bogussources.rb
 - test/data
 - test/data/gem-private_key.pem
@@ -313,7 +314,6 @@ files:
 - test/test_gem_version_option.rbc
 - test/test_kernel.rb
 - test/test_kernel.rbc
-- .document
 has_rdoc: false
 homepage: http://rubygems.rubyforge.org
 post_install_message: 

metadata.gz.sig

@@ -1,2 +1,2 @@
-0j�W�ڀlTČ8�R��`}_��UJ�6�0hU2�I���d�BF�
̸��`�?�Ppz��%L4Pj�Ԝ�22᩷Bј,�M]߀��WR��J��6I^��ü),.��G@y��	\퉎�����n���	
-���
+P�f�L9:�����L�%���A[R�t�������eڏ�����)���aℋ�K���#�y��� k�څ$��m���3F���y���}qv~� ��vD�^L;�E_(�W:l
+�c�L� �

data/doc/doc.css

@@ -1,73 +0,0 @@
-BODY
-{
-font-size:10.5pt;
-font-family:verdana,sans-serif;
-}
-
-th
-{
-font-size:10.5pt;
-font-family:verdana,sans-serif;
-}
-
-td
-{
-font-size:10.5pt;
-font-family:verdana,sans-serif;
-}
-
-
-code 
-{
-background-color:yellow;
-}
-
-#HEADLINE
-{
-font-size:12pt;
-font-family:verdana,sans-serif;
-}
-
-A
-{
-color:#993300;
-
-font-family:verdana,sans-serif;
-text-decoration:none;
-
-}
-
-A:hover
-{
-color:#404040;
-font-family:verdana,sans-serif;
-text-decoration:none;
-}
-
-h2 {
-    color:#993300;
-    background: #cccccc;
-    border-bottom: #646464 1px solid;
-		padding-top: 0.1em;
-    padding-left: 0.5em;
-    padding-bottom: 0.0em;
-		font-size:12pt;
-
-}
-
-pre {
-    border-right: #646464 1px solid;
-    padding-right: 0.5em;
-    border-top: #646464 1px solid;
-    padding-top: 0.5em;
-    border-left: #646464 1px solid;
-    padding-left: 0.5em;
-    border-bottom: #646464 1px solid;
-    padding-bottom: 0.5em;
-    margin-left: 1em;
-    margin-right: 2em;
-    white-space: pre;
-    background-color: #e6e6e6;
-    color: black;
-}
-