From 466d3a7344d02a7871e57038f74615181fcf77b7 Mon Sep 17 00:00:00 2001 From: Samuel Giddins Date: Sat, 3 Jun 2017 15:38:27 -0500 Subject: [Env] Print shebang when it doesnt match Gem.ruby --- lib/bundler/env.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/bundler/env.rb b/lib/bundler/env.rb index d78ee1f0c7..ec61b873cb 100644 --- a/lib/bundler/env.rb +++ b/lib/bundler/env.rb @@ -26,6 +26,14 @@ module Bundler specs = Bundler.rubygems.find_name(name) out << "#{name} (#{specs.map(&:version).join(",")})\n" unless specs.empty? end + if (exe = caller.last.split(":").first) && exe =~ %r{(exe|bin)/bundler?\z} + shebang = File.read(exe).lines.first + shebang.sub!(/^#!\s*/, "") + unless shebang.start_with?(Gem.ruby, "/usr/bin/env ruby") + out << "Gem.ruby #{Gem.ruby}\n" + out << "bundle #! #{shebang}\n" + end + end out << "```\n" -- cgit v1.2.1 From 37c888069b68537e5f24802bc3077b5f5fef1b9c Mon Sep 17 00:00:00 2001 From: Samuel Giddins Date: Sat, 3 Jun 2017 15:48:21 -0500 Subject: [Env] Refactor to ensure the environment is always properly aligned --- lib/bundler/env.rb | 57 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 23 deletions(-) diff --git a/lib/bundler/env.rb b/lib/bundler/env.rb index ec61b873cb..ce804f9426 100644 --- a/lib/bundler/env.rb +++ b/lib/bundler/env.rb @@ -13,28 +13,11 @@ module Bundler print_gemspecs = options.delete(:print_gemspecs) { true } out = String.new("## Environment\n\n```\n") - out << "Bundler #{Bundler::VERSION}\n" - out << "RubyGems #{Gem::VERSION}\n" - out << "Ruby #{ruby_version}" - out << "GEM_HOME #{ENV["GEM_HOME"]}\n" unless ENV["GEM_HOME"].nil? || ENV["GEM_HOME"].empty? - 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 << "Platform #{Gem::Platform.local}\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? - end - if (exe = caller.last.split(":").first) && exe =~ %r{(exe|bin)/bundler?\z} - shebang = File.read(exe).lines.first - shebang.sub!(/^#!\s*/, "") - unless shebang.start_with?(Gem.ruby, "/usr/bin/env ruby") - out << "Gem.ruby #{Gem.ruby}\n" - out << "bundle #! #{shebang}\n" - end + env = environment + environment_ljust = env.map {|(k, _v)| k.to_s.length }.max + env.each do |(k, v)| + out << "#{k.to_s.ljust(environment_ljust)} #{v}\n" end - out << "```\n" unless Bundler.settings.all.empty? @@ -84,10 +67,10 @@ module Bundler if RUBY_VERSION < "1.9" str << " (#{RUBY_RELEASE_DATE}" str << " patchlevel #{RUBY_PATCHLEVEL}" if defined? RUBY_PATCHLEVEL - str << ") [#{RUBY_PLATFORM}]\n" + str << ") [#{RUBY_PLATFORM}]" else str << "p#{RUBY_PATCHLEVEL}" if defined? RUBY_PATCHLEVEL - str << " (#{RUBY_RELEASE_DATE} revision #{RUBY_REVISION}) [#{RUBY_PLATFORM}]\n" + str << " (#{RUBY_RELEASE_DATE} revision #{RUBY_REVISION}) [#{RUBY_PLATFORM}]" end end @@ -97,6 +80,34 @@ module Bundler "not installed" end + def self.environment + out = [] + + out << ["Bundler", Bundler::VERSION] + out << ["RubyGems", Gem::VERSION] + out << ["Ruby", ruby_version] + out << ["GEM_HOME", ENV["GEM_HOME"]] unless ENV["GEM_HOME"].nil? || ENV["GEM_HOME"].empty? + out << ["GEM_PATH", ENV["GEM_PATH"]] unless ENV["GEM_PATH"].nil? || ENV["GEM_PATH"].empty? + out << ["RVM", ENV["rvm_version"]] if ENV["rvm_version"] + out << ["Git", git_version] + out << ["Platform", Gem::Platform.local] + out << ["OpenSSL", OpenSSL::OPENSSL_VERSION] 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(",")})"] unless specs.empty? + end + if (exe = caller.last.split(":").first) && exe =~ %r{(exe|bin)/bundler?\z} + shebang = File.read(exe).lines.first + shebang.sub!(/^#!\s*/, "") + unless shebang.start_with?(Gem.ruby, "/usr/bin/env ruby") + out << ["Gem.ruby", Gem.ruby] + out << ["bundle #!", shebang] + end + end + + out + end + private_class_method :read_file, :ruby_version, :git_version end end -- cgit v1.2.1 From b272df089d246f9328768bbe100e3436e4d4bdd3 Mon Sep 17 00:00:00 2001 From: Samuel Giddins Date: Mon, 12 Jun 2017 17:19:25 -0500 Subject: [Env] Extract table formatting into a method --- lib/bundler/env.rb | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/lib/bundler/env.rb b/lib/bundler/env.rb index ce804f9426..325b96fbfa 100644 --- a/lib/bundler/env.rb +++ b/lib/bundler/env.rb @@ -12,13 +12,8 @@ module Bundler print_gemfile = options.delete(:print_gemfile) { true } print_gemspecs = options.delete(:print_gemspecs) { true } - out = String.new("## Environment\n\n```\n") - env = environment - environment_ljust = env.map {|(k, _v)| k.to_s.length }.max - env.each do |(k, v)| - out << "#{k.to_s.ljust(environment_ljust)} #{v}\n" - end - out << "```\n" + out = String.new + append_formatted_table("Environment", environment, out) unless Bundler.settings.all.empty? out << "\n## Bundler settings\n\n```\n" @@ -108,6 +103,17 @@ module Bundler out end - private_class_method :read_file, :ruby_version, :git_version + def self.append_formatted_table(title, pairs, out) + return if pairs.empty? + out << "\n" unless out.empty? + out << "## #{title}\n\n```\n" + ljust = pairs.map {|k, _v| k.to_s.length }.max + pairs.each do |k, v| + out << "#{k.to_s.ljust(ljust)} #{v}\n" + end + out << "```\n" + end + + private_class_method :read_file, :ruby_version, :git_version, :append_formatted_table end end -- cgit v1.2.1