rubygems-update 2.1.0.rc.1 → 2.1.0.rc.2

data/test/rubygems/test_gem_source.rb

@@ -184,5 +184,28 @@ class TestGemSource < Gem::TestCase
     end
   end
 
+  def test_spaceship
+    remote    = @source
+    specific  = Gem::Source::SpecificFile.new(@a1.cache_file)
+    installed = Gem::Source::Installed.new
+    local     = Gem::Source::Local.new
+
+    assert_equal( 0, remote.   <=>(remote),    'remote    <=> remote')
+
+    assert_equal(-1, remote.   <=>(specific),  'remote    <=> specific')
+    assert_equal( 1, specific. <=>(remote),    'specific  <=> remote')
+
+    assert_equal(-1, remote.   <=>(local),     'remote    <=> local')
+    assert_equal( 1, local.    <=>(remote),    'local     <=> remote')
+
+    assert_equal(-1, remote.   <=>(installed), 'remote    <=> installed')
+    assert_equal( 1, installed.<=>(remote),    'installed <=> remote')
+
+    no_uri = @source.dup
+    no_uri.instance_variable_set :@uri, nil
+
+    assert_equal(-1, remote.   <=>(no_uri),    'remote <=> no_uri')
+  end
+
 end
 

data/test/rubygems/test_gem_source_installed.rb

@@ -0,0 +1,28 @@
+require 'rubygems/test_case'
+require 'rubygems/source'
+
+class TestGemSourceInstalled < Gem::TestCase
+
+  def test_spaceship
+    a1 = quick_gem 'a', '1'
+    util_build_gem a1
+
+    remote    = Gem::Source.new @gem_repo
+    specific  = Gem::Source::SpecificFile.new a1.cache_file
+    installed = Gem::Source::Installed.new
+    local     = Gem::Source::Local.new
+
+    assert_equal( 0, installed.<=>(installed), 'installed <=> installed')
+
+    assert_equal(-1, remote.   <=>(installed), 'remote    <=> installed')
+    assert_equal( 1, installed.<=>(remote),    'installed <=> remote')
+
+    assert_equal( 1, installed.<=>(local),     'installed <=> local')
+    assert_equal(-1, local.    <=>(installed), 'local     <=> installed')
+
+    assert_equal(-1, specific. <=>(installed), 'specific  <=> installed')
+    assert_equal( 1, installed.<=>(specific),  'installed <=> specific')
+  end
+
+end
+

data/test/rubygems/test_gem_source_local.rb

@@ -66,18 +66,41 @@ class TestGemSourceLocal < Gem::TestCase
     assert_equal s, @a
   end
 
+  def test_inspect
+    assert_equal '#<Gem::Source::Local specs: "NOT LOADED">', @sl.inspect
+
+    @sl.load_specs :released
+
+    inner = [@a, @ap, @b].map { |t| t.name_tuple }.inspect
+
+    assert_equal "#<Gem::Source::Local specs: #{inner}>", @sl.inspect
+  end
+
   def test_download
     path = @sl.download @a
 
     assert_equal File.expand_path(@a.file_name), path
   end
 
-  def test_compare
-    uri = URI.parse "http://gems.example/foo"
-    s = Gem::Source.new uri
+  def test_spaceship
+    a1 = quick_gem 'a', '1'
+    util_build_gem a1
 
-    assert_equal(-1,   s <=> @sl)
-    assert_equal  0, @sl <=> @sl
-    assert_equal  1, @sl <=> s
+    remote    = Gem::Source.new @gem_repo
+    specific  = Gem::Source::SpecificFile.new a1.cache_file
+    installed = Gem::Source::Installed.new
+    local     = Gem::Source::Local.new
+
+    assert_equal( 0, local.    <=>(local),     'local     <=> local')
+
+    assert_equal(-1, remote.   <=>(local),     'remote    <=> local')
+    assert_equal( 1, local.    <=>(remote),    'local     <=> remote')
+
+    assert_equal( 1, installed.<=>(local),     'installed <=> local')
+    assert_equal(-1, local.    <=>(installed), 'local     <=> installed')
+
+    assert_equal(-1, specific. <=>(local),     'specific  <=> local')
+    assert_equal( 1, local.    <=>(specific),  'local     <=> specific')
   end
+
 end

data/test/rubygems/test_gem_source_specific_file.rb

@@ -30,4 +30,42 @@ class TestGemSourceSpecificFile < Gem::TestCase
   def test_download
     assert_equal @a_gem, @sf.download(@a)
   end
+
+  def test_spaceship
+    a1 = quick_gem 'a', '1'
+    util_build_gem a1
+
+    remote    = Gem::Source.new @gem_repo
+    specific  = Gem::Source::SpecificFile.new a1.cache_file
+    installed = Gem::Source::Installed.new
+    local     = Gem::Source::Local.new
+
+    assert_equal( 0, specific. <=>(specific),  'specific  <=> specific')
+
+    assert_equal(-1, remote.   <=>(specific),  'remote    <=> specific')
+    assert_equal( 1, specific. <=>(remote),    'specific  <=> remote')
+
+    assert_equal(-1, specific. <=>(local),     'specific  <=> local')
+    assert_equal( 1, local.    <=>(specific),  'local     <=> specific')
+
+    assert_equal(-1, specific. <=>(installed), 'specific  <=> installed')
+    assert_equal( 1, installed.<=>(specific),  'installed <=> specific')
+
+    a2 = quick_gem 'a', '2'
+    util_build_gem a2
+
+    b1 = quick_gem 'b', '1'
+    util_build_gem b1
+
+    a1_source = specific
+    a2_source = Gem::Source::SpecificFile.new a2.cache_file
+    b1_source = Gem::Source::SpecificFile.new b1.cache_file
+
+    assert_nil       a1_source.<=>(b1_source), 'a1_source <=> b1_source'
+
+    assert_equal(-1, a1_source.<=>(a2_source), 'a1_source <=> a2_source')
+    assert_equal( 0, a1_source.<=>(a1_source), 'a1_source <=> a1_source')
+    assert_equal( 1, a2_source.<=>(a1_source), 'a2_source <=> a1_source')
+  end
+
 end

data/test/rubygems/test_gem_specification.rb

@@ -445,6 +445,14 @@ end
     end
   end
 
+  def test_self_all_equals
+    a = new_spec "foo", "1", nil, "lib/foo.rb"
+
+    Gem::Specification.all = [a]
+
+    assert_equal a, Gem::Specification.find_inactive_by_path('foo')
+  end
+
   def test_self_attribute_names
     expected_value = %w[
       authors
@@ -1313,7 +1321,7 @@ dependencies: []
   end
 
   def test_base_dir_not_loaded
-    @a1.instance_variable_set :@filename, nil
+    @a1.instance_variable_set :@loaded_from, nil
 
     assert_equal Gem.dir, @a1.base_dir
   end
@@ -1322,7 +1330,7 @@ dependencies: []
     default_dir =
       File.join Gem::Specification.default_specifications_dir, @a1.spec_name
 
-    @a1.instance_variable_set :@filename, default_dir
+    @a1.instance_variable_set :@loaded_from, default_dir
 
     assert_equal Gem.default_dir, @a1.base_dir
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-update
 version: !ruby/object:Gem::Version
-  version: 2.1.0.rc.1
+  version: 2.1.0.rc.2
 platform: ruby
 authors:
 - Jim Weirich
@@ -32,7 +32,7 @@ cert_chain:
   KDyY1VIazVgoC8XvR4h/95/iScPiuglzA+DBG1hip1xScAtw05BrXyUNrc9CEMYU
   wgF94UVoHRp6ywo8I7NP3HcwFQDFNEZPNGXsng==
   -----END CERTIFICATE-----
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2013-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -439,6 +439,7 @@ files:
 - test/rubygems/test_gem_server.rb
 - test/rubygems/test_gem_silent_ui.rb
 - test/rubygems/test_gem_source.rb
+- test/rubygems/test_gem_source_installed.rb
 - test/rubygems/test_gem_source_list.rb
 - test/rubygems/test_gem_source_local.rb
 - test/rubygems/test_gem_source_specific_file.rb
@@ -469,7 +470,7 @@ post_install_message:
 rdoc_options:
 - --main
 - README.rdoc
-- --title=RubyGems 2.1.0.rc.1 Documentation
+- --title=RubyGems Update Documentation
 require_paths:
 - hide_lib_for_update
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -483,8 +484,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: rubygems
-rubygems_version: 2.0.6
+rubyforge_project: rubygems-update
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: RubyGems is a package management framework for Ruby
@@ -566,6 +567,7 @@ test_files:
 - test/rubygems/test_gem_server.rb
 - test/rubygems/test_gem_silent_ui.rb
 - test/rubygems/test_gem_source.rb
+- test/rubygems/test_gem_source_installed.rb
 - test/rubygems/test_gem_source_list.rb
 - test/rubygems/test_gem_source_local.rb
 - test/rubygems/test_gem_source_specific_file.rb