rubygems-update 3.0.9 → 3.1.0.pre1

data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb

@@ -6,6 +6,7 @@ require 'rubygems/request_set/lockfile/tokenizer'
 require 'rubygems/request_set/lockfile/parser'
 
 class TestGemRequestSetLockfileTokenizer < Gem::TestCase
+
   def setup
     super
 
@@ -303,4 +304,5 @@ GEM
   def tokenize_lockfile
     Gem::RequestSet::Lockfile::Tokenizer.from_file(@lock_file).to_a
   end
+
 end

data/test/rubygems/test_gem_requirement.rb

@@ -35,7 +35,6 @@ class TestGemRequirement < Gem::TestCase
     assert_requirement_equal "= 2", ["2"]
     assert_requirement_equal "= 2", v(2)
     assert_requirement_equal "2.0", "2"
-    assert_requirement_equal ["= 2", ">= 2"], [">= 2", "= 2"]
   end
 
   def test_create
@@ -266,6 +265,12 @@ class TestGemRequirement < Gem::TestCase
     assert_satisfied_by "3.0.rc2",     "< 3.0.1"
 
     assert_satisfied_by "3.0.rc2",     "> 0"
+
+    assert_satisfied_by "5.0.0.rc2",   "~> 5.a"
+    refute_satisfied_by "5.0.0.rc2",   "~> 5.x"
+
+    assert_satisfied_by "5.0.0",       "~> 5.a"
+    assert_satisfied_by "5.0.0",       "~> 5.x"
   end
 
   def test_illformed_requirements
@@ -416,4 +421,5 @@ class TestGemRequirement < Gem::TestCase
     refute req(requirement).satisfied_by?(v(version)),
       "#{requirement} is not satisfied by #{version}"
   end
+
 end

data/test/rubygems/test_gem_resolver.rb

@@ -71,7 +71,7 @@ class TestGemResolver < Gem::TestCase
   end
 
   def test_self_compose_sets_nil
-    index_set  = @DR::IndexSet.new
+    index_set = @DR::IndexSet.new
 
     composed = @DR.compose_sets index_set, nil
 
@@ -85,7 +85,7 @@ class TestGemResolver < Gem::TestCase
   end
 
   def test_self_compose_sets_single
-    index_set  = @DR::IndexSet.new
+    index_set = @DR::IndexSet.new
 
     composed = @DR.compose_sets index_set
 
@@ -97,7 +97,7 @@ class TestGemResolver < Gem::TestCase
 
     r1 = Gem::Resolver::DependencyRequest.new dep('a', '= 1'), nil
 
-    act = Gem::Resolver::ActivationRequest.new a1, r1, false
+    act = Gem::Resolver::ActivationRequest.new a1, r1
 
     res = Gem::Resolver.new [a1]
 
@@ -118,7 +118,7 @@ class TestGemResolver < Gem::TestCase
 
     r1 = Gem::Resolver::DependencyRequest.new dep('a', '= 1'), nil
 
-    act = Gem::Resolver::ActivationRequest.new spec, r1, false
+    act = Gem::Resolver::ActivationRequest.new spec, r1
 
     res = Gem::Resolver.new [act]
     res.development = true
@@ -137,7 +137,7 @@ class TestGemResolver < Gem::TestCase
 
     r1 = Gem::Resolver::DependencyRequest.new dep('a', '= 1'), nil
 
-    act = Gem::Resolver::ActivationRequest.new a1, r1, false
+    act = Gem::Resolver::ActivationRequest.new a1, r1
 
     res = Gem::Resolver.new [a1]
     res.ignore_dependencies = true
@@ -151,16 +151,31 @@ class TestGemResolver < Gem::TestCase
 
   def test_resolve_conservative
     a1_spec = util_spec 'a', 1
+
     a2_spec = util_spec 'a', 2 do |s|
       s.add_dependency 'b', 2
       s.add_dependency 'c'
     end
+
     b1_spec = util_spec 'b', 1
     b2_spec = util_spec 'b', 2
-    c1_spec = util_spec 'c', 1 do |s| s.add_dependency 'd', 2 end
-    c2_spec = util_spec 'c', 2 do |s| s.add_dependency 'd', 2 end
-    d1_spec = util_spec 'd', 1 do |s| s.add_dependency 'e' end
-    d2_spec = util_spec 'd', 2 do |s| s.add_dependency 'e' end
+
+    c1_spec = util_spec 'c', 1 do |s|
+      s.add_dependency 'd', 2
+    end
+
+    c2_spec = util_spec 'c', 2 do |s|
+      s.add_dependency 'd', 2
+    end
+
+    d1_spec = util_spec 'd', 1 do |s|
+      s.add_dependency 'e'
+    end
+
+    d2_spec = util_spec 'd', 2 do |s|
+      s.add_dependency 'e'
+    end
+
     e1_spec = util_spec 'e', 1
     e2_spec = util_spec 'e', 2
 
@@ -177,7 +192,7 @@ class TestGemResolver < Gem::TestCase
 
     # With the following gems already installed:
     # a-1, b-1, c-1, e-1
-    res.skip_gems = {'a'=>[a1_spec], 'b'=>[b1_spec], 'c'=>[c1_spec], 'e'=>[e1_spec]}
+    res.skip_gems = {'a' => [a1_spec], 'b' => [b1_spec], 'c' => [c1_spec], 'e' => [e1_spec]}
 
     # Make sure the following gems end up getting used/installed/upgraded:
     # a-2 (upgraded)
@@ -189,8 +204,14 @@ class TestGemResolver < Gem::TestCase
   end
 
   def test_resolve_development
-    a_spec = util_spec 'a', 1 do |s| s.add_development_dependency 'b' end
-    b_spec = util_spec 'b', 1 do |s| s.add_development_dependency 'c' end
+    a_spec = util_spec 'a', 1 do |s|
+      s.add_development_dependency 'b'
+    end
+
+    b_spec = util_spec 'b', 1 do
+      |s| s.add_development_dependency 'c'
+    end
+
     c_spec = util_spec 'c', 1
 
     a_dep = make_dep 'a', '= 1'
@@ -212,10 +233,16 @@ class TestGemResolver < Gem::TestCase
       s.add_runtime_dependency 'd'
     end
 
-    b_spec = util_spec 'b', 1 do |s| s.add_development_dependency 'c' end
+    b_spec = util_spec 'b', 1 do |s|
+      s.add_development_dependency 'c'
+    end
+
     c_spec = util_spec 'c', 1
 
-    d_spec = util_spec 'd', 1 do |s| s.add_development_dependency 'e' end
+    d_spec = util_spec 'd', 1 do |s|
+      s.add_development_dependency 'e'
+    end
+
     e_spec = util_spec 'e', 1
 
     a_dep = make_dep 'a', '= 1'
@@ -300,8 +327,14 @@ class TestGemResolver < Gem::TestCase
 
     spec_fetcher do |fetcher|
       fetcher.spec 'a', 2
-      a2_p1 = fetcher.spec 'a', 2 do |s| s.platform = Gem::Platform.local end
-      a3_p2 = fetcher.spec 'a', 3 do |s| s.platform = unknown end
+
+      a2_p1 = fetcher.spec 'a', 2 do |s|
+        s.platform = Gem::Platform.local
+      end
+
+      a3_p2 = fetcher.spec 'a', 3 do |s|
+        s.platform = unknown
+      end
     end
 
     v2 = v(2)
@@ -643,7 +676,6 @@ class TestGemResolver < Gem::TestCase
   # activesupport 2.3.5, 2.3.4
   # Activemerchant needs activesupport >= 2.3.2. When you require activemerchant, it will activate the latest version that meets that requirement which is 2.3.5. Actionmailer on the other hand needs activesupport = 2.3.4. When rubygems tries to activate activesupport 2.3.4, it will raise an error.
 
-
   def test_simple_activesupport_problem
     sup1  = util_spec "activesupport", "2.3.4"
     sup2  = util_spec "activesupport", "2.3.5"
@@ -708,9 +740,15 @@ class TestGemResolver < Gem::TestCase
   def test_select_local_platforms
     r = Gem::Resolver.new nil, nil
 
-    a1    = util_spec 'a', 1
-    a1_p1 = util_spec 'a', 1 do |s| s.platform = Gem::Platform.local end
-    a1_p2 = util_spec 'a', 1 do |s| s.platform = 'unknown'           end
+    a1 = util_spec 'a', 1
+
+    a1_p1 = util_spec 'a', 1 do |s|
+      s.platform = Gem::Platform.local
+    end
+
+    a1_p2 = util_spec 'a', 1 do |s|
+      s.platform = 'unknown'
+    end
 
     selected = r.select_local_platforms [a1, a1_p1, a1_p2]
 
@@ -718,9 +756,15 @@ class TestGemResolver < Gem::TestCase
   end
 
   def test_search_for_local_platform_partial_string_match
-    a1    = util_spec 'a', 1
-    a1_p1 = util_spec 'a', 1 do |s| s.platform = Gem::Platform.local.os end
-    a1_p2 = util_spec 'a', 1 do |s| s.platform = 'unknown'              end
+    a1 = util_spec 'a', 1
+
+    a1_p1 = util_spec 'a', 1 do |s|
+      s.platform = Gem::Platform.local.os
+    end
+
+    a1_p2 = util_spec 'a', 1 do |s|
+      s.platform = 'unknown'
+    end
 
     s = set(a1_p1, a1_p2, a1)
     d = [make_dep('a')]

data/test/rubygems/test_gem_resolver_activation_request.rb

@@ -13,11 +13,9 @@ class TestGemResolverActivationRequest < Gem::TestCase
     source   = Gem::Source::Local.new
     platform = Gem::Platform::RUBY
 
-    @a1 = @DR::IndexSpecification.new nil, 'a', v(1), source, platform
-    @a2 = @DR::IndexSpecification.new nil, 'a', v(2), source, platform
     @a3 = @DR::IndexSpecification.new nil, 'a', v(3), source, platform
 
-    @req = @DR::ActivationRequest.new @a3, @dep, [@a1, @a2]
+    @req = @DR::ActivationRequest.new @a3, @dep
   end
 
   def test_development_eh
@@ -25,7 +23,7 @@ class TestGemResolverActivationRequest < Gem::TestCase
 
     dep_req = @DR::DependencyRequest.new dep('a', '>= 0', :development), nil
 
-    act_req = @DR::ActivationRequest.new @a3, dep_req, [@a1, @a2]
+    act_req = @DR::ActivationRequest.new @a3, dep_req
 
     assert act_req.development?
   end
@@ -33,41 +31,14 @@ class TestGemResolverActivationRequest < Gem::TestCase
   def test_inspect
     assert_match 'a-3',                         @req.inspect
     assert_match 'from a (>= 0)',               @req.inspect
-    assert_match '(others possible: a-1, a-2)', @req.inspect
-  end
-
-  def test_inspect_legacy
-    req = @DR::ActivationRequest.new @a3, @dep, true
-
-    assert_match '(others possible)', req.inspect
-
-    req = @DR::ActivationRequest.new @a3, @dep, false
-
-    refute_match '(others possible)', req.inspect
   end
 
   def test_installed_eh
     v_spec = Gem::Resolver::VendorSpecification.new nil, @a3
 
-    @req = @DR::ActivationRequest.new v_spec, @dep, [@a1, @a2]
+    @req = @DR::ActivationRequest.new v_spec, @dep
 
     assert @req.installed?
   end
 
-  def test_others_possible_eh
-    assert @req.others_possible?
-
-    req = @DR::ActivationRequest.new @a3, @dep, []
-
-    refute req.others_possible?
-
-    req = @DR::ActivationRequest.new @a3, @dep, true
-
-    assert req.others_possible?
-
-    req = @DR::ActivationRequest.new @a3, @dep, false
-
-    refute req.others_possible?
-  end
-
 end

data/test/rubygems/test_gem_resolver_conflict.rb

@@ -3,10 +3,6 @@ require 'rubygems/test_case'
 
 class TestGemResolverConflict < Gem::TestCase
 
-  def test_self_compatibility
-    assert_same Gem::Resolver::Conflict, Gem::Resolver::DependencyConflict
-  end
-
   def test_explanation
     root  =
       dependency_request dep('net-ssh', '>= 2.0.13'), 'rye', '0.9.8'

data/test/rubygems/test_gem_resolver_git_specification.rb

@@ -63,6 +63,7 @@ class TestGemResolverGitSpecification < Gem::TestCase
   # functional test for Gem::Ext::Builder
 
   def test_install_extension
+    skip if Gem.java_platform?
     name, _, repository, = git_gem 'a', 1 do |s|
       s.extensions << 'ext/extconf.rb'
     end

data/test/rubygems/test_gem_resolver_index_specification.rb

@@ -55,7 +55,9 @@ class TestGemResolverIndexSpecification < Gem::TestCase
   def test_spec
     specs = spec_fetcher do |fetcher|
       fetcher.spec 'a', 2
-      fetcher.spec 'a', 2 do |s| s.platform = Gem::Platform.local end
+      fetcher.spec 'a', 2 do |s|
+        s.platform = Gem::Platform.local
+      end
     end
 
     source = Gem::Source.new @gem_repo
@@ -71,7 +73,10 @@ class TestGemResolverIndexSpecification < Gem::TestCase
   end
 
   def test_spec_local
-    a_2_p = util_spec 'a', 2 do |s| s.platform = Gem::Platform.local end
+    a_2_p = util_spec 'a', 2 do |s|
+      s.platform = Gem::Platform.local
+    end
+
     Gem::Package.build a_2_p
 
     source = Gem::Source::Local.new

data/test/rubygems/test_gem_resolver_installed_specification.rb

@@ -45,5 +45,4 @@ class TestGemResolverInstalledSpecification < Gem::TestCase
     assert b_spec.installable_platform?
   end
 
-
 end

data/test/rubygems/test_gem_resolver_installer_set.rb

@@ -173,7 +173,9 @@ class TestGemResolverInstallerSet < Gem::TestCase
   def test_load_spec
     specs = spec_fetcher do |fetcher|
       fetcher.spec 'a', 2
-      fetcher.spec 'a', 2 do |s| s.platform = Gem::Platform.local end
+      fetcher.spec 'a', 2 do |s|
+        s.platform = Gem::Platform.local
+      end
     end
 
     source = Gem::Source.new @gem_repo

data/test/rubygems/test_gem_resolver_specification.rb

@@ -4,6 +4,7 @@ require 'rubygems/test_case'
 class TestGemResolverSpecification < Gem::TestCase
 
   class TestSpec < Gem::Resolver::Specification
+
     attr_writer :source
     attr_reader :spec
 
@@ -12,6 +13,7 @@ class TestGemResolverSpecification < Gem::TestCase
 
       @spec = spec
     end
+
   end
 
   def test_install

data/test/rubygems/test_gem_security.rb

@@ -6,6 +6,10 @@ unless defined?(OpenSSL::SSL)
   warn 'Skipping Gem::Security tests.  openssl not found.'
 end
 
+if Gem.java_platform?
+  warn 'Skipping Gem::Security tests on jruby.'
+end
+
 class TestGemSecurity < Gem::TestCase
 
   CHILD_KEY = load_key 'child'
@@ -280,7 +284,7 @@ class TestGemSecurity < Gem::TestCase
 
     assert_path_exists path
 
-    key_from_file =  OpenSSL::PKey::RSA.new File.read(path), passphrase
+    key_from_file = OpenSSL::PKey::RSA.new File.read(path), passphrase
 
     assert_equal key.to_pem, key_from_file.to_pem
   end
@@ -307,4 +311,4 @@ class TestGemSecurity < Gem::TestCase
     assert_equal key.to_pem, key_from_file.to_pem
   end
 
-end if defined?(OpenSSL::SSL)
+end if defined?(OpenSSL::SSL) && !Gem.java_platform?

data/test/rubygems/test_gem_security_signer.rb

@@ -143,6 +143,7 @@ toqvglr0kdbknSRRjBVLK6tsgr07aLT9gNP7mTW2PA==
   end
 
   def test_sign_expired_auto_update
+    skip if Gem.java_platform?
     FileUtils.mkdir_p File.join(Gem.user_home, '.gem'), :mode => 0700
 
     private_key_path = File.join(Gem.user_home, '.gem', 'gem-private_key.pem')

data/test/rubygems/test_gem_server.rb

@@ -4,10 +4,13 @@ require 'rubygems/server'
 require 'stringio'
 
 class Gem::Server
+
   attr_reader :server
+
 end
 
 class TestGemServer < Gem::TestCase
+
   def process_based_port
     0
   end
@@ -242,7 +245,9 @@ class TestGemServer < Gem::TestCase
   end
 
   def test_quick_marshal_a_1_mswin32_gemspec_rz
-    quick_gem 'a', '1' do |s| s.platform = Gem::Platform.local end
+    quick_gem 'a', '1' do |s|
+      s.platform = Gem::Platform.local
+    end
 
     data = StringIO.new "GET /quick/Marshal.#{Gem.marshal_version}/a-1-#{Gem::Platform.local}.gemspec.rz HTTP/1.0\r\n\r\n"
     @req.parse data
@@ -353,7 +358,6 @@ class TestGemServer < Gem::TestCase
     assert_match 'z 9', @res.body
   end
 
-
   def test_xss_homepage_fix_289313
     data = StringIO.new "GET / HTTP/1.0\r\n\r\n"
     dir = "#{@gemhome}2"
@@ -604,4 +608,5 @@ class TestGemServer < Gem::TestCase
 
     @server.instance_variable_set :@server, webrick
   end
+
 end

data/test/rubygems/test_gem_silent_ui.rb

@@ -114,4 +114,5 @@ class TestGemSilentUI < Gem::TestCase
     assert_empty out, 'No output'
     assert_empty err, 'No output'
   end
+
 end