diff options
author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2017-09-17 15:15:49 +0900 |
---|---|---|
committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2017-09-17 15:23:38 +0900 |
commit | 0bc59ff7d4c4a76f3fadac314b4d23d37076e467 (patch) | |
tree | 35ddf102db247033c47d92b5e87bcaa826d4991a | |
parent | 4fc8fe968ff61ece41f5a74ebc117f84cf22f827 (diff) | |
download | bundler-0bc59ff7d4c4a76f3fadac314b4d23d37076e467.tar.gz |
Call IO.popen instead of backticks
IO.popen with the command in an array doesn't need command line
quotes, and is safer.
-rw-r--r-- | lib/bundler/gem_helper.rb | 49 |
1 files changed, 29 insertions, 20 deletions
diff --git a/lib/bundler/gem_helper.rb b/lib/bundler/gem_helper.rb index 1d7fc508d5..2d354a5ecb 100644 --- a/lib/bundler/gem_helper.rb +++ b/lib/bundler/gem_helper.rb @@ -2,6 +2,7 @@ require "bundler/vendored_thor" unless defined?(Thor) require "bundler" +require "shellwords" module Bundler class GemHelper @@ -74,7 +75,7 @@ module Bundler def build_gem file_name = nil - sh("gem build -V '#{spec_path}'") do + sh(%W"gem build -V #{spec_path}") do file_name = File.basename(built_gem_path) SharedHelpers.filesystem_access(File.join(base, "pkg")) {|p| FileUtils.mkdir_p(p) } FileUtils.mv(built_gem_path, "pkg") @@ -85,17 +86,19 @@ module Bundler def install_gem(built_gem_path = nil, local = false) built_gem_path ||= build_gem - out, _ = sh_with_code("gem install '#{built_gem_path}'#{" --local" if local}") - raise "Couldn't install gem, run `gem install #{built_gem_path}' for more detailed output" unless out[/Successfully installed/] + cmd = %W"gem install #{built_gem_path}" + cmd << "--local" if local + out, status = sh_with_status(cmd) + raise "Couldn't install gem, run `gem install #{built_gem_path}' for more detailed output" unless status.success? and out[/Successfully installed/] Bundler.ui.confirm "#{name} (#{version}) installed." end protected def rubygem_push(path) - gem_command = "gem push '#{path}'" - gem_command += " --key #{gem_key}" if gem_key - gem_command += " --host #{allowed_push_host}" if allowed_push_host + gem_command = %W"gem push #{path}" + gem_command << "--key" << gem_key if gem_key + gem_command << "--host" << allowed_push_host if allowed_push_host unless allowed_push_host || Bundler.user_home.join(".gem/credentials").file? raise "Your rubygems.org credentials aren't set. Run `gem push` to set them." end @@ -127,12 +130,14 @@ module Bundler def perform_git_push(options = "") cmd = "git push #{options}" - out, code = sh_with_code(cmd) - raise "Couldn't git push. `#{cmd}' failed with the following output:\n\n#{out}\n" unless code == 0 + out, status = sh_with_status(cmd) + return if status.success? + cmd = cmd.shelljoin if cmd.respond_to?(:shelljoin) + raise "Couldn't git push. `#{cmd}' failed with the following output:\n\n#{out}\n" end def already_tagged? - return false unless sh("git tag").split(/\n/).include?(version_tag) + return false unless sh(%W"git tag").split(/\n/).include?(version_tag) Bundler.ui.confirm "Tag #{version_tag} has already been created." true end @@ -142,20 +147,20 @@ module Bundler end def clean? - sh_with_code("git diff --exit-code")[1] == 0 + sh_with_status(%W"git diff --exit-code")[1].success? end def committed? - sh_with_code("git diff-index --quiet --cached HEAD")[1] == 0 + sh_with_status(%W"git diff-index --quiet --cached HEAD")[1].success? end def tag_version - sh "git tag -m \"Version #{version}\" #{version_tag}" + sh %W"git tag -m Version\ #{version} #{version_tag}" Bundler.ui.confirm "Tagged #{version_tag}." yield if block_given? rescue Bundler.ui.error "Untagging #{version_tag} due to error." - sh_with_code "git tag -d #{version_tag}" + sh_with_status %W"git tag -d #{version_tag}" raise end @@ -172,21 +177,25 @@ module Bundler end def sh(cmd, &block) - out, code = sh_with_code(cmd, &block) - unless code.zero? + out, status = sh_with_status(cmd, &block) + unless status.success? + cmd = cmd.shelljoin if cmd.respond_to?(:shelljoin) raise(out.empty? ? "Running `#{cmd}` failed. Run this command directly for more detailed output." : out) end out end def sh_with_code(cmd, &block) - cmd += " 2>&1" - outbuf = String.new + out, status = sh_with_code(cmd, &block) + [outbuf, (status&&status.exitstatus)||-1] + end + + def sh_with_status(cmd, &block) Bundler.ui.debug(cmd) SharedHelpers.chdir(base) do - outbuf = `#{cmd}` - status = $?.exitstatus - block.call(outbuf) if status.zero? && block + outbuf = IO.popen(cmd, err: %i[child out], &:read) + status = $? + block.call(outbuf) if status.success? && block [outbuf, status] end end |