rubygems-update 1.3.5 → 1.3.6

data/test/test_gem_requirement.rb

@@ -1,222 +1,292 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
-require 'rubygems/version'
+require File.expand_path('../gemutilities', __FILE__)
+require "rubygems/requirement"
 
 class TestGemRequirement < RubyGemTestCase
 
-  def setup
-    super
-
-    @r1_2 = Gem::Requirement.new '= 1.2'
-    @r1_3 = Gem::Requirement.new '= 1.3'
-  end
-
-  def test_initialize
-    r = Gem::Requirement.new '2'
-    assert_equal '= 2', r.to_s, 'String'
-
-    r = Gem::Requirement.new %w[2]
-    assert_equal '= 2', r.to_s, 'Array of Strings'
-
-    r = Gem::Requirement.new Gem::Version.new('2')
-    assert_equal '= 2', r.to_s, 'Gem::Version'
-  end
-
   def test_equals2
-    assert_equal @r1_2, @r1_2.dup
-    assert_equal @r1_2.dup, @r1_2
+    r = req "= 1.2"
+    assert_equal r, r.dup
+    assert_equal r.dup, r
 
-    refute_equal @r1_3, @r1_2
-    refute_equal @r1_2, @r1_3
+    refute_requirement_equal "= 1.2", "= 1.3"
+    refute_requirement_equal "= 1.3", "= 1.2"
 
-    refute_equal Object.new, @r1_2
-    refute_equal @r1_2, Object.new
+    refute_equal Object.new, req("= 1.2")
+    refute_equal req("= 1.2"), Object.new
   end
 
-  def test_hash
-    assert_equal @r1_2.hash, @r1_2.dup.hash
-    assert_equal @r1_2.dup.hash, @r1_2.hash
-
-    refute_equal @r1_2.hash, @r1_3.hash
-    refute_equal @r1_3.hash, @r1_2.hash
+  def test_initialize
+    assert_requirement_equal "= 2", "2"
+    assert_requirement_equal "= 2", ["2"]
+    assert_requirement_equal "= 2", v(2)
   end
 
-  # We may get some old gems that have requirements in old formats.
-  # We need to be able to handle those old requirements by normalizing
-  # them to the latest format.
-  def test_normalization
-    require 'yaml'
-    yamldep = %{--- !ruby/object:Gem::Requirement
-      nums:
-        - 1
-        - 0
-        - 4
-      op: ">="
-      version: ">= 1.0.4"}
-    dep = YAML.load(yamldep)
-    dep.normalize
-    assert_equal ">= 1.0.4", dep.to_s
+  def test_class_available_as_gem_version_requirement
+    assert_same Gem::Requirement, Gem::Version::Requirement,
+      "Gem::Version::Requirement is aliased for old YAML compatibility."
   end
 
   def test_parse
-    assert_equal ['=', Gem::Version.new(1)], @r1_2.parse('  1')
-
-    assert_equal ['=', Gem::Version.new(1)], @r1_2.parse('= 1')
-    assert_equal ['>', Gem::Version.new(1)], @r1_2.parse('> 1')
+    assert_equal ['=', Gem::Version.new(1)], Gem::Requirement.parse('  1')
+    assert_equal ['=', Gem::Version.new(1)], Gem::Requirement.parse('= 1')
+    assert_equal ['>', Gem::Version.new(1)], Gem::Requirement.parse('> 1')
+    assert_equal ['=', Gem::Version.new(1)], Gem::Requirement.parse("=\n1")
 
-    assert_equal ['=', Gem::Version.new(0)], @r1_2.parse('=')
-    assert_equal ['>', Gem::Version.new(0)], @r1_2.parse('>')
-
-    assert_equal ['=', Gem::Version.new(1)], @r1_2.parse("=\n1")
-    assert_equal ['=', Gem::Version.new(0)], @r1_2.parse("=\njunk")
-
-    assert_equal ['=', Gem::Version.new(2)], @r1_2.parse(Gem::Version.new('2'))
+    assert_equal ['=', Gem::Version.new(2)],
+      Gem::Requirement.parse(Gem::Version.new('2'))
   end
 
-  def test_parse_illformed
+  def test_parse_bad
     e = assert_raises ArgumentError do
-      @r1_2.parse(nil)
+      Gem::Requirement.parse nil
     end
 
     assert_equal 'Illformed requirement [nil]', e.message
 
     e = assert_raises ArgumentError do
-      @r1_2.parse('')
+      Gem::Requirement.parse ""
     end
 
     assert_equal 'Illformed requirement [""]', e.message
   end
 
+  def test_prerelease_eh
+    r = req '= 1'
+
+    refute r.prerelease?
+
+    r = req '= 1.a'
+
+    assert r.prerelease?
+
+    r = req '> 1.a', '< 2'
+
+    assert r.prerelease?
+  end
+
   def test_satisfied_by_eh_bang_equal
-    r1_2 = Gem::Requirement.new '!= 1.2'
-    v1_1 = Gem::Version.new '1.1'
-    v1_2 = Gem::Version.new '1.2'
-    v1_3 = Gem::Version.new '1.3'
+    r = req '!= 1.2'
 
-    assert_equal true,  r1_2.satisfied_by?(nil)
-    assert_equal true,  r1_2.satisfied_by?(v1_1)
-    assert_equal false, r1_2.satisfied_by?(v1_2)
-    assert_equal true,  r1_2.satisfied_by?(v1_3)
+    assert_satisfied_by nil,   r
+    assert_satisfied_by "1.1", r
+    refute_satisfied_by "1.2", r
+    assert_satisfied_by "1.3", r
   end
 
   def test_satisfied_by_eh_blank
-    r1_2 = Gem::Requirement.new '1.2'
-    v1_1 = Gem::Version.new '1.1'
-    v1_2 = Gem::Version.new '1.2'
-    v1_3 = Gem::Version.new '1.3'
+    r = req "1.2"
 
-    assert_equal false, r1_2.satisfied_by?(nil)
-    assert_equal false, r1_2.satisfied_by?(v1_1)
-    assert_equal true,  r1_2.satisfied_by?(v1_2)
-    assert_equal false, r1_2.satisfied_by?(v1_3)
+    refute_satisfied_by nil,   r
+    refute_satisfied_by "1.1", r
+    assert_satisfied_by "1.2", r
+    refute_satisfied_by "1.3", r
   end
 
   def test_satisfied_by_eh_equal
-    r1_2 = @r1_2
-    v1_1 = Gem::Version.new '1.1'
-    v1_2 = Gem::Version.new '1.2'
-    v1_3 = Gem::Version.new '1.3'
+    r = req "= 1.2"
 
-    assert_equal false, r1_2.satisfied_by?(nil)
-    assert_equal false, r1_2.satisfied_by?(v1_1)
-    assert_equal true,  r1_2.satisfied_by?(v1_2)
-    assert_equal false, r1_2.satisfied_by?(v1_3)
+    refute_satisfied_by nil,   r
+    refute_satisfied_by "1.1", r
+    assert_satisfied_by "1.2", r
+    refute_satisfied_by "1.3", r
   end
 
   def test_satisfied_by_eh_gt
-    r1_2 = Gem::Requirement.new '> 1.2'
-    v1_1 = Gem::Version.new '1.1'
-    v1_2 = Gem::Version.new '1.2'
-    v1_3 = Gem::Version.new '1.3'
+    r = req "> 1.2"
 
-    assert_equal false, r1_2.satisfied_by?(v1_1)
-    assert_equal false, r1_2.satisfied_by?(v1_2)
-    assert_equal true,  r1_2.satisfied_by?(v1_3)
+    refute_satisfied_by "1.1", r
+    refute_satisfied_by "1.2", r
+    assert_satisfied_by "1.3", r
 
     assert_raises NoMethodError do
-      assert_equal true,  r1_2.satisfied_by?(nil)
+      r.satisfied_by? nil
     end
   end
 
   def test_satisfied_by_eh_gte
-    r1_2 = Gem::Requirement.new '>= 1.2'
-    v1_1 = Gem::Version.new '1.1'
-    v1_2 = Gem::Version.new '1.2'
-    v1_3 = Gem::Version.new '1.3'
+    r = req ">= 1.2"
 
-    assert_equal false, r1_2.satisfied_by?(v1_1)
-    assert_equal true,  r1_2.satisfied_by?(v1_2)
-    assert_equal true,  r1_2.satisfied_by?(v1_3)
+    refute_satisfied_by "1.1", r
+    assert_satisfied_by "1.2", r
+    assert_satisfied_by "1.3", r
 
     assert_raises NoMethodError do
-      assert_equal true,  r1_2.satisfied_by?(nil)
+      r.satisfied_by? nil
     end
   end
 
   def test_satisfied_by_eh_list
-    r = Gem::Requirement.create(['> 1.1', '< 1.3'])
-    v1_1 = Gem::Version.new '1.1'
-    v1_2 = Gem::Version.new '1.2'
-    v1_3 = Gem::Version.new '1.3'
+    r = req "> 1.1", "< 1.3"
 
-    assert_equal false, r.satisfied_by?(v1_1)
-    assert_equal true,  r.satisfied_by?(v1_2)
-    assert_equal false, r.satisfied_by?(v1_3)
+    refute_satisfied_by "1.1", r
+    assert_satisfied_by "1.2", r
+    refute_satisfied_by "1.3", r
 
     assert_raises NoMethodError do
-      assert_equal true,  r.satisfied_by?(nil)
+      r.satisfied_by? nil
     end
   end
 
   def test_satisfied_by_eh_lt
-    r1_2 = Gem::Requirement.new '< 1.2'
-    v1_1 = Gem::Version.new '1.1'
-    v1_2 = Gem::Version.new '1.2'
-    v1_3 = Gem::Version.new '1.3'
+    r = req "< 1.2"
 
-    assert_equal true,  r1_2.satisfied_by?(v1_1)
-    assert_equal false, r1_2.satisfied_by?(v1_2)
-    assert_equal false, r1_2.satisfied_by?(v1_3)
+    assert_satisfied_by "1.1", r
+    refute_satisfied_by "1.2", r
+    refute_satisfied_by "1.3", r
 
     assert_raises NoMethodError do
-      assert_equal true,  r1_2.satisfied_by?(nil)
+      r.satisfied_by? nil
     end
   end
 
   def test_satisfied_by_eh_lte
-    r1_2 = Gem::Requirement.new '<= 1.2'
-    v1_1 = Gem::Version.new '1.1'
-    v1_2 = Gem::Version.new '1.2'
-    v1_3 = Gem::Version.new '1.3'
+    r = req "<= 1.2"
 
-    assert_equal true,  r1_2.satisfied_by?(v1_1)
-    assert_equal true,  r1_2.satisfied_by?(v1_2)
-    assert_equal false, r1_2.satisfied_by?(v1_3)
+    assert_satisfied_by "1.1", r
+    assert_satisfied_by "1.2", r
+    refute_satisfied_by "1.3", r
 
     assert_raises NoMethodError do
-      assert_equal true,  r1_2.satisfied_by?(nil)
+      r.satisfied_by? nil
     end
   end
 
   def test_satisfied_by_eh_tilde_gt
-    r1_2 = Gem::Requirement.new '~> 1.2'
-    v1_1 = Gem::Version.new '1.1'
-    v1_2 = Gem::Version.new '1.2'
-    v1_3 = Gem::Version.new '1.3'
+    r = req "~> 1.2"
 
-    assert_equal false, r1_2.satisfied_by?(v1_1)
-    assert_equal true,  r1_2.satisfied_by?(v1_2)
-    assert_equal true,  r1_2.satisfied_by?(v1_3)
+    refute_satisfied_by "1.1", r
+    assert_satisfied_by "1.2", r
+    assert_satisfied_by "1.3", r
 
     assert_raises NoMethodError do
-      assert_equal true,  r1_2.satisfied_by?(nil)
+      r.satisfied_by? nil
     end
   end
 
-end
+  def test_satisfied_by_eh_good
+    assert_satisfied_by "0.2.33",      "= 0.2.33"
+    assert_satisfied_by "0.2.34",      "> 0.2.33"
+    assert_satisfied_by "1.0",         "= 1.0"
+    assert_satisfied_by "1.0",         "1.0"
+    assert_satisfied_by "1.8.2",       "> 1.8.0"
+    assert_satisfied_by "1.112",       "> 1.111"
+    assert_satisfied_by "0.2",         "> 0.0.0"
+    assert_satisfied_by "0.0.0.0.0.2", "> 0.0.0"
+    assert_satisfied_by "0.0.1.0",     "> 0.0.0.1"
+    assert_satisfied_by "10.3.2",      "> 9.3.2"
+    assert_satisfied_by "1.0.0.0",     "= 1.0"
+    assert_satisfied_by "10.3.2",      "!= 9.3.4"
+    assert_satisfied_by "10.3.2",      "> 9.3.2"
+    assert_satisfied_by "10.3.2",      "> 9.3.2"
+    assert_satisfied_by " 9.3.2",      ">= 9.3.2"
+    assert_satisfied_by "9.3.2 ",      ">= 9.3.2"
+    assert_satisfied_by "",            "= 0"
+    assert_satisfied_by "",            "< 0.1"
+    assert_satisfied_by "  ",          "< 0.1 "
+    assert_satisfied_by "",            " <  0.1"
+    assert_satisfied_by "  ",          "> 0.a "
+    assert_satisfied_by "",            " >  0.a"
+    assert_satisfied_by "3.1",         "< 3.2.rc1"
+    assert_satisfied_by "3.2.0",       "> 3.2.0.rc1"
+    assert_satisfied_by "3.2.0.rc2",   "> 3.2.0.rc1"
+    assert_satisfied_by "3.0.rc2",     "< 3.0"
+    assert_satisfied_by "3.0.rc2",     "< 3.0.0"
+    assert_satisfied_by "3.0.rc2",     "< 3.0.1"
+  end
 
+  def test_illformed_requirements
+    [ ">>> 1.3.5", "> blah" ].each do |rq|
+      assert_raises ArgumentError, "req [#{rq}] should fail" do
+        Gem::Requirement.new rq
+      end
+    end
+  end
+
+  def test_satisfied_by_eh_boxed
+    refute_satisfied_by "1.3",     "~> 1.4"
+    assert_satisfied_by "1.4",     "~> 1.4"
+    assert_satisfied_by "1.5",     "~> 1.4"
+    refute_satisfied_by "2.0",     "~> 1.4"
+
+    refute_satisfied_by "1.3",     "~> 1.4.4"
+    refute_satisfied_by "1.4",     "~> 1.4.4"
+    assert_satisfied_by "1.4.4",   "~> 1.4.4"
+    assert_satisfied_by "1.4.5",   "~> 1.4.4"
+    refute_satisfied_by "1.5",     "~> 1.4.4"
+    refute_satisfied_by "2.0",     "~> 1.4.4"
+
+    refute_satisfied_by "1.1.pre", "~> 1.0.0"
+    assert_satisfied_by "1.1.pre", "~> 1.1"
+    refute_satisfied_by "2.0.a",   "~> 1.0"
+    assert_satisfied_by "2.0.a",   "~> 2.0"
+  end
+
+  def test_satisfied_by_eh_multiple
+    req = [">= 1.4", "<= 1.6", "!= 1.5"]
+
+    refute_satisfied_by "1.3", req
+    assert_satisfied_by "1.4", req
+    refute_satisfied_by "1.5", req
+    assert_satisfied_by "1.6", req
+    refute_satisfied_by "1.7", req
+    refute_satisfied_by "2.0", req
+  end
+
+  def test_satisfied_by_boxed
+    refute_satisfied_by "1.3",   "~> 1.4"
+    assert_satisfied_by "1.4",   "~> 1.4"
+    assert_satisfied_by "1.5",   "~> 1.4"
+    refute_satisfied_by "2.0",   "~> 1.4"
+
+    refute_satisfied_by "1.3",   "~> 1.4.4"
+    refute_satisfied_by "1.4",   "~> 1.4.4"
+    assert_satisfied_by "1.4.4", "~> 1.4.4"
+    assert_satisfied_by "1.4.5", "~> 1.4.4"
+    refute_satisfied_by "1.5",   "~> 1.4.4"
+    refute_satisfied_by "2.0",   "~> 1.4.4"
+  end
+
+  def test_bad
+    refute_satisfied_by "",            "> 0.1"
+    refute_satisfied_by "1.2.3",       "!= 1.2.3"
+    refute_satisfied_by "1.2.003.0.0", "!= 1.02.3"
+    refute_satisfied_by "4.5.6",       "< 1.2.3"
+    refute_satisfied_by "1.0",         "> 1.1"
+    refute_satisfied_by "",            "= 0.1"
+    refute_satisfied_by "1.1.1",       "> 1.1.1"
+    refute_satisfied_by "1.2",         "= 1.1"
+    refute_satisfied_by "1.40",        "= 1.1"
+    refute_satisfied_by "1.3",         "= 1.40"
+    refute_satisfied_by "9.3.3",       "<= 9.3.2"
+    refute_satisfied_by "9.3.1",       ">= 9.3.2"
+    refute_satisfied_by "9.3.03",      "<= 9.3.2"
+    refute_satisfied_by "1.0.0.1",     "= 1.0"
+  end
+
+  # Assert that two requirements are equal. Handles Gem::Requirements,
+  # strings, arrays, numbers, and versions.
+
+  def assert_requirement_equal expected, actual
+    assert_equal req(expected), req(actual)
+  end
+
+  # Assert that +version+ satisfies +requirement+.
+
+  def assert_satisfied_by version, requirement
+    assert req(requirement).satisfied_by?(v(version)),
+      "#{requirement} is satisfied by #{version}"
+  end
+
+  # Refute the assumption that two requirements are equal.
+
+  def refute_requirement_equal unexpected, actual
+    refute_equal req(unexpected), req(actual)
+  end
+
+  # Refute the assumption that +version+ satisfies +requirement+.
+
+  def refute_satisfied_by version, requirement
+    refute req(requirement).satisfied_by?(v(version)),
+      "#{requirement} is not satisfied by #{version}"
+  end
+end

data/test/test_gem_server.rb

@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
+require File.expand_path('../gemutilities', __FILE__)
 require 'rubygems/server'
 require 'stringio'
 
@@ -78,6 +78,26 @@ class TestGemServer < RubyGemTestCase
                  Marshal.load(Gem.gunzip(@res.body))
   end
 
+  def test_listen
+    util_listen
+
+    out, err = capture_io do
+      @server.listen
+    end
+
+    assert_equal 1, @server.server.listeners.length
+  end
+
+  def test_listen_addresses
+    util_listen
+
+    out, err = capture_io do
+      @server.listen %w[a b]
+    end
+    
+    assert_equal 2, @server.server.listeners.length
+  end
+
   def test_quick_a_1_gemspec_rz
     data = StringIO.new "GET /quick/a-1.gemspec.rz HTTP/1.0\r\n\r\n"
     @req.parse data
@@ -306,5 +326,20 @@ class TestGemServer < RubyGemTestCase
     assert_equal si, YAML.load(Gem.inflate(@res.body))
   end
 
+  def util_listen
+    webrick = Object.new
+    webrick.instance_variable_set :@listeners, []
+    def webrick.listeners() @listeners end
+    def webrick.listen(host, port)
+      socket = Object.new
+      socket.instance_variable_set :@host, host
+      socket.instance_variable_set :@port, port
+      def socket.addr() [nil, @port, @host] end
+      @listeners << socket
+    end
+
+    @server.instance_variable_set :@server, webrick
+  end
+
 end