diff options
| author | Hiroshi SHIBATA <[email protected]> | 2021-04-15 12:47:04 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <[email protected]> | 2021-04-15 15:36:15 +0900 |
| commit | ed149dbf46d1a8b16e6de9c3dbbcc10f72c9c019 (patch) | |
| tree | 1c8c755fa592e280dc7718dc8a9317d1ac368394 /spec/bundler/support/helpers.rb | |
| parent | 0d9496f924d36534bd524791554d49dc0026b0e0 (diff) | |
Merge the master branch of Bundler
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/4383
Diffstat (limited to 'spec/bundler/support/helpers.rb')
| -rw-r--r-- | spec/bundler/support/helpers.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/bundler/support/helpers.rb b/spec/bundler/support/helpers.rb index a7cc1ce810..d896b5276e 100644 --- a/spec/bundler/support/helpers.rb +++ b/spec/bundler/support/helpers.rb @@ -10,7 +10,7 @@ module Spec def reset! Dir.glob("#{tmp}/{gems/*,*}", File::FNM_DOTMATCH).each do |dir| - next if %w[base base_system remote1 gems rubygems . ..].include?(File.basename(dir)) + next if %w[base base_system remote1 rubocop standard gems rubygems . ..].include?(File.basename(dir)) FileUtils.rm_rf(dir) end FileUtils.mkdir_p(home) @@ -130,7 +130,7 @@ module Spec def ruby(ruby, options = {}) ruby_cmd = build_ruby_cmd - escaped_ruby = RUBY_PLATFORM == "java" ? ruby.shellescape.dump : ruby.shellescape + escaped_ruby = ruby.shellescape sys_exec(%(#{ruby_cmd} -w -e #{escaped_ruby}), options) end |