зеркало из https://github.com/github/ruby.git
s/sys_exec!/sys_exec
This commit is contained in:
Родитель
77df7ccc10
Коммит
9cc7847849
|
@ -120,7 +120,7 @@ RSpec.describe "bundle binstubs <gem>" do
|
||||||
let(:system_bundler_version) { Bundler::VERSION }
|
let(:system_bundler_version) { Bundler::VERSION }
|
||||||
|
|
||||||
it "runs bundler" do
|
it "runs bundler" do
|
||||||
sys_exec! "bin/bundle install", :env => { "DEBUG" => "1" }
|
sys_exec "bin/bundle install", :env => { "DEBUG" => "1" }
|
||||||
expect(out).to include %(Using bundler #{system_bundler_version}\n)
|
expect(out).to include %(Using bundler #{system_bundler_version}\n)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -196,7 +196,7 @@ RSpec.describe "bundle binstubs <gem>" do
|
||||||
before { lockfile.gsub(system_bundler_version, "1.1.1") }
|
before { lockfile.gsub(system_bundler_version, "1.1.1") }
|
||||||
|
|
||||||
it "calls through to the latest bundler version" do
|
it "calls through to the latest bundler version" do
|
||||||
sys_exec! "bin/bundle update --bundler", :env => { "DEBUG" => "1" }
|
sys_exec "bin/bundle update --bundler", :env => { "DEBUG" => "1" }
|
||||||
expect(out).to include %(Using bundler #{system_bundler_version}\n)
|
expect(out).to include %(Using bundler #{system_bundler_version}\n)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -211,14 +211,14 @@ RSpec.describe "bundle binstubs <gem>" do
|
||||||
context "without a lockfile" do
|
context "without a lockfile" do
|
||||||
it "falls back to the latest installed bundler" do
|
it "falls back to the latest installed bundler" do
|
||||||
FileUtils.rm bundled_app_lock
|
FileUtils.rm bundled_app_lock
|
||||||
sys_exec! "bin/bundle install", :env => { "DEBUG" => "1" }
|
sys_exec "bin/bundle install", :env => { "DEBUG" => "1" }
|
||||||
expect(out).to include "Using bundler #{system_bundler_version}\n"
|
expect(out).to include "Using bundler #{system_bundler_version}\n"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context "using another binstub" do
|
context "using another binstub" do
|
||||||
it "loads all gems" do
|
it "loads all gems" do
|
||||||
sys_exec! bundled_app("bin/print_loaded_gems").to_s
|
sys_exec bundled_app("bin/print_loaded_gems").to_s
|
||||||
expect(out).to eq %(["bundler-#{Bundler::VERSION}", "prints_loaded_gems-1.0", "rack-1.2"])
|
expect(out).to eq %(["bundler-#{Bundler::VERSION}", "prints_loaded_gems-1.0", "rack-1.2"])
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -249,7 +249,7 @@ RSpec.describe "bundle gem" do
|
||||||
load_paths = [lib_dir, spec_dir]
|
load_paths = [lib_dir, spec_dir]
|
||||||
load_path_str = "-I#{load_paths.join(File::PATH_SEPARATOR)}"
|
load_path_str = "-I#{load_paths.join(File::PATH_SEPARATOR)}"
|
||||||
|
|
||||||
sys_exec! "#{Gem.ruby} #{load_path_str} #{bindir.join("bundle")} gem #{gem_name}", :env => { "PATH" => "" }
|
sys_exec "#{Gem.ruby} #{load_path_str} #{bindir.join("bundle")} gem #{gem_name}", :env => { "PATH" => "" }
|
||||||
end
|
end
|
||||||
|
|
||||||
it "creates the gem without the need for git" do
|
it "creates the gem without the need for git" do
|
||||||
|
|
|
@ -290,7 +290,7 @@ RSpec.shared_examples "bundle install --standalone" do
|
||||||
skip "exec format error" if Gem.win_platform?
|
skip "exec format error" if Gem.win_platform?
|
||||||
|
|
||||||
require "tmpdir"
|
require "tmpdir"
|
||||||
sys_exec!(%(#{bundled_app("bin/rails")} -v), :dir => Dir.tmpdir)
|
sys_exec(%(#{bundled_app("bin/rails")} -v), :dir => Dir.tmpdir)
|
||||||
expect(out).to eq("2.3.2")
|
expect(out).to eq("2.3.2")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -302,7 +302,7 @@ RSpec.shared_examples "bundle install --standalone" do
|
||||||
symlink = File.join(symlink_dir, "rails")
|
symlink = File.join(symlink_dir, "rails")
|
||||||
|
|
||||||
File.symlink(bundled_app("bin/rails"), symlink)
|
File.symlink(bundled_app("bin/rails"), symlink)
|
||||||
sys_exec!("#{symlink} -v")
|
sys_exec("#{symlink} -v")
|
||||||
expect(out).to eq("2.3.2")
|
expect(out).to eq("2.3.2")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -235,7 +235,7 @@ RSpec.describe "The library itself" do
|
||||||
files_to_require.reject! {|f| f.start_with?("lib/bundler/vendor") }
|
files_to_require.reject! {|f| f.start_with?("lib/bundler/vendor") }
|
||||||
files_to_require.map! {|f| File.expand_path(f, source_root) }
|
files_to_require.map! {|f| File.expand_path(f, source_root) }
|
||||||
files_to_require.sort!
|
files_to_require.sort!
|
||||||
sys_exec!("ruby -w") do |input, _, _|
|
sys_exec("ruby -w") do |input, _, _|
|
||||||
files_to_require.each do |f|
|
files_to_require.each do |f|
|
||||||
input.puts "require '#{f}'"
|
input.puts "require '#{f}'"
|
||||||
end
|
end
|
||||||
|
|
|
@ -88,7 +88,7 @@ RSpec.describe "require 'bundler/gem_tasks'" do
|
||||||
|
|
||||||
it "adds 'pkg' to rake/clean's CLOBBER" do
|
it "adds 'pkg' to rake/clean's CLOBBER" do
|
||||||
with_gem_path_as(base_system_gems.to_s) do
|
with_gem_path_as(base_system_gems.to_s) do
|
||||||
sys_exec! %(#{rake} -e 'load "Rakefile"; puts CLOBBER.inspect'), :env => { "GEM_HOME" => system_gem_path.to_s }
|
sys_exec %(#{rake} -e 'load "Rakefile"; puts CLOBBER.inspect'), :env => { "GEM_HOME" => system_gem_path.to_s }
|
||||||
end
|
end
|
||||||
expect(out).to eq '["pkg"]'
|
expect(out).to eq '["pkg"]'
|
||||||
end
|
end
|
||||||
|
|
|
@ -240,7 +240,7 @@ module Spec
|
||||||
def git_ls_files(glob)
|
def git_ls_files(glob)
|
||||||
skip "Not running on a git context, since running tests from a tarball" if ruby_core_tarball?
|
skip "Not running on a git context, since running tests from a tarball" if ruby_core_tarball?
|
||||||
|
|
||||||
sys_exec!("git ls-files -z -- #{glob}", :dir => source_root).split("\x0")
|
sys_exec("git ls-files -z -- #{glob}", :dir => source_root).split("\x0")
|
||||||
end
|
end
|
||||||
|
|
||||||
def tracked_files_glob
|
def tracked_files_glob
|
||||||
|
|
|
@ -67,8 +67,8 @@ private
|
||||||
def switch_local_copy_if_needed
|
def switch_local_copy_if_needed
|
||||||
return unless local_copy_switch_needed?
|
return unless local_copy_switch_needed?
|
||||||
|
|
||||||
sys_exec!("git remote update", :dir => local_copy_path)
|
sys_exec("git remote update", :dir => local_copy_path)
|
||||||
sys_exec!("git checkout #{target_tag} --quiet", :dir => local_copy_path)
|
sys_exec("git checkout #{target_tag} --quiet", :dir => local_copy_path)
|
||||||
|
|
||||||
ENV["RGV"] = local_copy_path.to_s
|
ENV["RGV"] = local_copy_path.to_s
|
||||||
end
|
end
|
||||||
|
@ -86,7 +86,7 @@ private
|
||||||
end
|
end
|
||||||
|
|
||||||
def local_copy_tag
|
def local_copy_tag
|
||||||
sys_exec!("git rev-parse --abbrev-ref HEAD", :dir => local_copy_path)
|
sys_exec("git rev-parse --abbrev-ref HEAD", :dir => local_copy_path)
|
||||||
end
|
end
|
||||||
|
|
||||||
def local_copy_path
|
def local_copy_path
|
||||||
|
@ -100,7 +100,7 @@ private
|
||||||
|
|
||||||
unless rubygems_path.directory?
|
unless rubygems_path.directory?
|
||||||
rubygems_path.parent.mkpath
|
rubygems_path.parent.mkpath
|
||||||
sys_exec!("git clone https://github.com/rubygems/rubygems.git #{rubygems_path}")
|
sys_exec("git clone https://github.com/rubygems/rubygems.git #{rubygems_path}")
|
||||||
end
|
end
|
||||||
|
|
||||||
rubygems_path
|
rubygems_path
|
||||||
|
|
Загрузка…
Ссылка в новой задаче