* lib/rubygems: Import RubyGems 2.1

* test/rubygems:  Ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41873 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 13 insertions, 1 deletions

diff --git a/test/rubygems/test_gem_security_signer.rb b/test/rubygems/test_gem_security_signer.rb
index 59c5089fec..c984382947 100644
--- a/test/rubygems/test_gem_security_signer.rb
+++ b/test/rubygems/test_gem_security_signer.rb
@@ -1,5 +1,9 @@
 require 'rubygems/test_case'
 
+unless defined?(OpenSSL::SSL) then
+  warn 'Skipping Gem::Security::Signer tests.  openssl not found.'
+end
+
 class TestGemSecuritySigner < Gem::TestCase
 
   ALTERNATE_KEY  = load_key 'alternate'
@@ -72,6 +76,14 @@ class TestGemSecuritySigner < Gem::TestCase
     assert_equal PRIVATE_KEY.to_s, signer.key.to_s
   end
 
+  def test_initialize_encrypted_key_path
+    key_file = ENCRYPTED_PRIVATE_KEY_PATH
+
+    signer = Gem::Security::Signer.new key_file, nil, PRIVATE_KEY_PASSPHRASE
+
+    assert_equal ENCRYPTED_PRIVATE_KEY.to_s, signer.key.to_s
+  end
+
   def test_load_cert_chain
     Gem::Security.trust_dir.trust_cert PUBLIC_CERT
 
@@ -186,5 +198,5 @@ c7NM7KZZjj7G++SXjYTEI1PHSA7aFQ/i/+qSUvx+Pg==
     end
   end
 
-end
+end if defined?(OpenSSL::SSL)