summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHomu <homu@barosl.com>2016-08-25 04:24:57 +0900
committerHomu <homu@barosl.com>2016-08-25 04:24:57 +0900
commit85f1987b190416b58680ccf9af2ff116ac6a576f (patch)
tree2b6fa3881ecf0c38f9948306383ecaa0df4ea3cd
parent857c2d8ad042fa1edb3ec67c32c69eca2a95968d (diff)
parent0d2b7ccfeddecba990e1bda2ec14ab6453748eba (diff)
downloadbundler-85f1987b190416b58680ccf9af2ff116ac6a576f.tar.gz
Auto merge of #4624 - chrismo:openssl_version_in_bundle_env, r=segiddins
Add OpenSSL::OPENSSL_VERSION to `bundle env`
-rw-r--r--lib/bundler/env.rb1
-rw-r--r--spec/bundler/env_spec.rb1
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/bundler/env.rb b/lib/bundler/env.rb
index 75edbf2b88..8baf698dff 100644
--- a/lib/bundler/env.rb
+++ b/lib/bundler/env.rb
@@ -20,6 +20,7 @@ module Bundler
out << " GEM_PATH #{ENV["GEM_PATH"]}\n" unless ENV["GEM_PATH"] == ENV["GEM_HOME"]
out << " RVM #{ENV["rvm_version"]}\n" if ENV["rvm_version"]
out << " Git #{git_version}\n"
+ out << " OpenSSL #{OpenSSL::OPENSSL_VERSION}\n" if defined?(OpenSSL::OPENSSL_VERSION)
%w(rubygems-bundler open_gem).each do |name|
specs = Bundler.rubygems.find_name(name)
out << " #{name} (#{specs.map(&:version).join(",")})\n" unless specs.empty?
diff --git a/spec/bundler/env_spec.rb b/spec/bundler/env_spec.rb
index 73d1f1d7df..1be6cf46bc 100644
--- a/spec/bundler/env_spec.rb
+++ b/spec/bundler/env_spec.rb
@@ -15,6 +15,7 @@ describe Bundler::Env do
expect(out).to include(Gem::VERSION)
expect(out).to include(env.send(:ruby_version))
expect(out).to include(env.send(:git_version))
+ expect(out).to include(OpenSSL::OPENSSL_VERSION)
end
context "when there is a Gemfile and a lockfile and print_gemfile is true" do