mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
7585bc3187
Features: - Add caller information to some deprecation messages to make them easier to fix [#7361](https://github.com/bundler/bundler/pull/7361) - Reconcile `bundle cache` vs `bundle package` everywhere. Now in docs, CLI help and everywhere else `bundle cache` is the preferred version and `bundle package` remains as an alias [#7389](https://github.com/bundler/bundler/pull/7389) - Display some basic `bundler` documentation together with ruby's RDoc based documentation [#7394](https://github.com/bundler/bundler/pull/7394) Bugfixes: - Fix typos deprecation message and upgrading docs [#7374](https://github.com/bundler/bundler/pull/7374) - Deprecation warnings about `taint` usage on ruby 2.7 [#7385](https://github.com/bundler/bundler/pull/7385) - Fix `--help` flag not correctly delegating to `man` when used with command aliases [#7388](https://github.com/bundler/bundler/pull/7388) - `bundle add` should cache newly added gems if an application cache exists [#7393](https://github.com/bundler/bundler/pull/7393) - Stop using an insecure folder as a "fallback home" when user home is not defined [#7416](https://github.com/bundler/bundler/pull/7416) - Fix `bundler/inline` warning about `Bundler.root` redefinition [#7417](https://github.com/bundler/bundler/pull/7417)
270 lines
7.6 KiB
Ruby
270 lines
7.6 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
RSpec.describe "Bundler.with_env helpers" do
|
|
def bundle_exec_ruby!(code, options = {})
|
|
build_bundler_context options
|
|
bundle! "exec '#{Gem.ruby}' -e #{code}", options
|
|
end
|
|
|
|
def build_bundler_context(options = {})
|
|
bundle "config set path vendor/bundle"
|
|
gemfile ""
|
|
bundle "install", options
|
|
end
|
|
|
|
describe "Bundler.original_env" do
|
|
it "should return the PATH present before bundle was activated" do
|
|
code = "print Bundler.original_env['PATH']"
|
|
path = `getconf PATH`.strip + "#{File::PATH_SEPARATOR}/foo"
|
|
with_path_as(path) do
|
|
bundle_exec_ruby!(code.dump)
|
|
expect(last_command.stdboth).to eq(path)
|
|
end
|
|
end
|
|
|
|
it "should return the GEM_PATH present before bundle was activated" do
|
|
code = "print Bundler.original_env['GEM_PATH']"
|
|
gem_path = ENV["GEM_PATH"] + ":/foo"
|
|
with_gem_path_as(gem_path) do
|
|
bundle_exec_ruby!(code.dump)
|
|
expect(last_command.stdboth).to eq(gem_path)
|
|
end
|
|
end
|
|
|
|
it "works with nested bundle exec invocations" do
|
|
create_file("exe.rb", <<-'RB')
|
|
count = ARGV.first.to_i
|
|
exit if count < 0
|
|
STDERR.puts "#{count} #{ENV["PATH"].end_with?(":/foo")}"
|
|
if count == 2
|
|
ENV["PATH"] = "#{ENV["PATH"]}:/foo"
|
|
end
|
|
exec(Gem.ruby, __FILE__, (count - 1).to_s)
|
|
RB
|
|
path = `getconf PATH`.strip + File::PATH_SEPARATOR + File.dirname(Gem.ruby)
|
|
with_path_as(path) do
|
|
build_bundler_context
|
|
bundle! "exec '#{Gem.ruby}' #{bundled_app("exe.rb")} 2"
|
|
end
|
|
expect(err).to eq <<-EOS.strip
|
|
2 false
|
|
1 true
|
|
0 true
|
|
EOS
|
|
end
|
|
|
|
it "removes variables that bundler added", :ruby_repo do
|
|
# Simulate bundler has not yet been loaded
|
|
ENV.replace(ENV.to_hash.delete_if {|k, _v| k.start_with?(Bundler::EnvironmentPreserver::BUNDLER_PREFIX) })
|
|
|
|
original = ruby!('puts ENV.to_a.map {|e| e.join("=") }.sort.join("\n")')
|
|
code = 'puts Bundler.original_env.to_a.map {|e| e.join("=") }.sort.join("\n")'
|
|
bundle_exec_ruby! code.dump
|
|
expect(out).to eq original
|
|
end
|
|
end
|
|
|
|
shared_examples_for "an unbundling helper" do
|
|
it "should delete BUNDLE_PATH" do
|
|
code = "print #{modified_env}.has_key?('BUNDLE_PATH')"
|
|
ENV["BUNDLE_PATH"] = "./foo"
|
|
bundle_exec_ruby! code.dump
|
|
expect(last_command.stdboth).to include "false"
|
|
end
|
|
|
|
it "should remove '-rbundler/setup' from RUBYOPT" do
|
|
code = "print #{modified_env}['RUBYOPT']"
|
|
ENV["RUBYOPT"] = "-W2 -rbundler/setup #{ENV["RUBYOPT"]}"
|
|
bundle_exec_ruby! code.dump, :env => { "BUNDLER_SPEC_DISABLE_DEFAULT_BUNDLER_GEM" => "true" }
|
|
expect(last_command.stdboth).not_to include("-rbundler/setup")
|
|
end
|
|
|
|
it "should restore RUBYLIB", :ruby_repo do
|
|
code = "print #{modified_env}['RUBYLIB']"
|
|
ENV["RUBYLIB"] = lib_dir.to_s + File::PATH_SEPARATOR + "/foo"
|
|
ENV["BUNDLER_ORIG_RUBYLIB"] = lib_dir.to_s + File::PATH_SEPARATOR + "/foo-original"
|
|
bundle_exec_ruby! code.dump
|
|
expect(last_command.stdboth).to include("/foo-original")
|
|
end
|
|
|
|
it "should restore the original MANPATH" do
|
|
code = "print #{modified_env}['MANPATH']"
|
|
ENV["MANPATH"] = "/foo"
|
|
ENV["BUNDLER_ORIG_MANPATH"] = "/foo-original"
|
|
bundle_exec_ruby! code.dump
|
|
expect(last_command.stdboth).to include("/foo-original")
|
|
end
|
|
end
|
|
|
|
describe "Bundler.unbundled_env" do
|
|
let(:modified_env) { "Bundler.unbundled_env" }
|
|
|
|
it_behaves_like "an unbundling helper"
|
|
end
|
|
|
|
describe "Bundler.clean_env", :bundler => 2 do
|
|
let(:modified_env) { "Bundler.clean_env" }
|
|
|
|
it_behaves_like "an unbundling helper"
|
|
end
|
|
|
|
describe "Bundler.with_original_env" do
|
|
it "should set ENV to original_env in the block" do
|
|
expected = Bundler.original_env
|
|
actual = Bundler.with_original_env { ENV.to_hash }
|
|
expect(actual).to eq(expected)
|
|
end
|
|
|
|
it "should restore the environment after execution" do
|
|
Bundler.with_original_env do
|
|
ENV["FOO"] = "hello"
|
|
end
|
|
|
|
expect(ENV).not_to have_key("FOO")
|
|
end
|
|
end
|
|
|
|
describe "Bundler.with_clean_env", :bundler => 2 do
|
|
it "should set ENV to unbundled_env in the block" do
|
|
expected = Bundler.unbundled_env
|
|
|
|
actual = Bundler.ui.silence do
|
|
Bundler.with_clean_env { ENV.to_hash }
|
|
end
|
|
|
|
expect(actual).to eq(expected)
|
|
end
|
|
|
|
it "should restore the environment after execution" do
|
|
Bundler.ui.silence do
|
|
Bundler.with_clean_env { ENV["FOO"] = "hello" }
|
|
end
|
|
|
|
expect(ENV).not_to have_key("FOO")
|
|
end
|
|
end
|
|
|
|
describe "Bundler.with_unbundled_env" do
|
|
it "should set ENV to unbundled_env in the block" do
|
|
expected = Bundler.unbundled_env
|
|
actual = Bundler.with_unbundled_env { ENV.to_hash }
|
|
expect(actual).to eq(expected)
|
|
end
|
|
|
|
it "should restore the environment after execution" do
|
|
Bundler.with_unbundled_env do
|
|
ENV["FOO"] = "hello"
|
|
end
|
|
|
|
expect(ENV).not_to have_key("FOO")
|
|
end
|
|
end
|
|
|
|
describe "Bundler.original_system" do
|
|
let(:code) do
|
|
<<~RUBY
|
|
Bundler.original_system(%([ "\$BUNDLE_FOO" = "bar" ] && exit 42))
|
|
|
|
exit $?.exitstatus
|
|
RUBY
|
|
end
|
|
|
|
it "runs system inside with_original_env" do
|
|
system({ "BUNDLE_FOO" => "bar" }, "ruby -I#{lib_dir} -rbundler -e '#{code}'")
|
|
expect($?.exitstatus).to eq(42)
|
|
end
|
|
end
|
|
|
|
describe "Bundler.clean_system", :bundler => 2 do
|
|
let(:code) do
|
|
<<~RUBY
|
|
Bundler.ui.silence { Bundler.clean_system(%([ "\$BUNDLE_FOO" = "bar" ] || exit 42)) }
|
|
|
|
exit $?.exitstatus
|
|
RUBY
|
|
end
|
|
|
|
it "runs system inside with_clean_env" do
|
|
system({ "BUNDLE_FOO" => "bar" }, "ruby -I#{lib_dir} -rbundler -e '#{code}'")
|
|
expect($?.exitstatus).to eq(42)
|
|
end
|
|
end
|
|
|
|
describe "Bundler.unbundled_system" do
|
|
let(:code) do
|
|
<<~RUBY
|
|
Bundler.unbundled_system(%([ "\$BUNDLE_FOO" = "bar" ] || exit 42))
|
|
|
|
exit $?.exitstatus
|
|
RUBY
|
|
end
|
|
|
|
it "runs system inside with_unbundled_env" do
|
|
system({ "BUNDLE_FOO" => "bar" }, "ruby -I#{lib_dir} -rbundler -e '#{code}'")
|
|
expect($?.exitstatus).to eq(42)
|
|
end
|
|
end
|
|
|
|
describe "Bundler.original_exec" do
|
|
let(:code) do
|
|
<<~RUBY
|
|
Process.fork do
|
|
exit Bundler.original_exec(%(test "\$BUNDLE_FOO" = "bar"))
|
|
end
|
|
|
|
_, status = Process.wait2
|
|
|
|
exit(status.exitstatus)
|
|
RUBY
|
|
end
|
|
|
|
it "runs exec inside with_original_env" do
|
|
skip "Fork not implemented" if Gem.win_platform?
|
|
|
|
system({ "BUNDLE_FOO" => "bar" }, "ruby -I#{lib_dir} -rbundler -e '#{code}'")
|
|
expect($?.exitstatus).to eq(0)
|
|
end
|
|
end
|
|
|
|
describe "Bundler.clean_exec", :bundler => 2 do
|
|
let(:code) do
|
|
<<~RUBY
|
|
Process.fork do
|
|
exit Bundler.ui.silence { Bundler.clean_exec(%(test "\$BUNDLE_FOO" = "bar")) }
|
|
end
|
|
|
|
_, status = Process.wait2
|
|
|
|
exit(status.exitstatus)
|
|
RUBY
|
|
end
|
|
|
|
it "runs exec inside with_clean_env" do
|
|
skip "Fork not implemented" if Gem.win_platform?
|
|
|
|
system({ "BUNDLE_FOO" => "bar" }, "ruby -I#{lib_dir} -rbundler -e '#{code}'")
|
|
expect($?.exitstatus).to eq(1)
|
|
end
|
|
end
|
|
|
|
describe "Bundler.unbundled_exec" do
|
|
let(:code) do
|
|
<<~RUBY
|
|
Process.fork do
|
|
exit Bundler.unbundled_exec(%(test "\$BUNDLE_FOO" = "bar"))
|
|
end
|
|
|
|
_, status = Process.wait2
|
|
|
|
exit(status.exitstatus)
|
|
RUBY
|
|
end
|
|
|
|
it "runs exec inside with_clean_env" do
|
|
skip "Fork not implemented" if Gem.win_platform?
|
|
|
|
system({ "BUNDLE_FOO" => "bar" }, "ruby -I#{lib_dir} -rbundler -e '#{code}'")
|
|
expect($?.exitstatus).to eq(1)
|
|
end
|
|
end
|
|
end
|