summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVít Ondruch <vondruch@redhat.com>2018-09-06 10:20:14 +0200
committerVít Ondruch <vondruch@redhat.com>2018-09-06 10:20:14 +0200
commit2bb4455bd78c3ab028240de531d7c373d8225e31 (patch)
tree67ea78960fe8e5cb9f88056d7de26376c8c1be7b
parentc4892480aba36d31a3b6e232f17a705aaad1b730 (diff)
downloadbundler-2bb4455bd78c3ab028240de531d7c373d8225e31.tar.gz
Output OpenSSL information only when OpenSSL is available.
-rw-r--r--lib/bundler/env.rb12
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/bundler/env.rb b/lib/bundler/env.rb
index 171b6520ad..51738139fa 100644
--- a/lib/bundler/env.rb
+++ b/lib/bundler/env.rb
@@ -110,11 +110,13 @@ module Bundler
out << [" Gem Path", ENV.fetch("GEM_PATH") { Gem.path.join(File::PATH_SEPARATOR) }]
out << [" User Path", Gem.user_dir]
out << [" Bin Dir", Gem.bindir]
- out << ["OpenSSL"] if defined?(OpenSSL)
- out << [" Compiled", OpenSSL::OPENSSL_VERSION] if defined?(OpenSSL::OPENSSL_VERSION)
- out << [" Loaded", OpenSSL::OPENSSL_LIBRARY_VERSION] if defined?(OpenSSL::OPENSSL_LIBRARY_VERSION)
- out << [" Cert File", OpenSSL::X509::DEFAULT_CERT_FILE] if defined?(OpenSSL::X509::DEFAULT_CERT_FILE)
- out << [" Cert Dir", OpenSSL::X509::DEFAULT_CERT_DIR] if defined?(OpenSSL::X509::DEFAULT_CERT_DIR)
+ if defined?(OpenSSL)
+ out << ["OpenSSL"]
+ out << [" Compiled", OpenSSL::OPENSSL_VERSION] if defined?(OpenSSL::OPENSSL_VERSION)
+ out << [" Loaded", OpenSSL::OPENSSL_LIBRARY_VERSION] if defined?(OpenSSL::OPENSSL_LIBRARY_VERSION)
+ out << [" Cert File", OpenSSL::X509::DEFAULT_CERT_FILE] if defined?(OpenSSL::X509::DEFAULT_CERT_FILE)
+ out << [" Cert Dir", OpenSSL::X509::DEFAULT_CERT_DIR] if defined?(OpenSSL::X509::DEFAULT_CERT_DIR)
+ end
out << ["Tools"]
out << [" Git", git_version]
out << [" RVM", ENV.fetch("rvm_version") { version_of("rvm") }]