From 990e11b60eae06d7e8205405fc99320267b5843b Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Mon, 25 Mar 2024 13:31:19 +0900 Subject: Bootsnap and Zeitwerk are working correctly now --- tool/test_for_warn_bundled_gems/test.sh | 12 ++++++------ tool/test_for_warn_bundled_gems/test_no_warn_bootsnap.rb | 11 ----------- tool/test_for_warn_bundled_gems/test_no_warn_zeitwerk.rb | 12 ------------ tool/test_for_warn_bundled_gems/test_warn_bootsnap.rb | 11 +++++++++++ tool/test_for_warn_bundled_gems/test_warn_zeitwerk.rb | 12 ++++++++++++ 5 files changed, 29 insertions(+), 29 deletions(-) delete mode 100644 tool/test_for_warn_bundled_gems/test_no_warn_bootsnap.rb delete mode 100644 tool/test_for_warn_bundled_gems/test_no_warn_zeitwerk.rb create mode 100644 tool/test_for_warn_bundled_gems/test_warn_bootsnap.rb create mode 100644 tool/test_for_warn_bundled_gems/test_warn_zeitwerk.rb diff --git a/tool/test_for_warn_bundled_gems/test.sh b/tool/test_for_warn_bundled_gems/test.sh index adeccae405..ef5007f320 100755 --- a/tool/test_for_warn_bundled_gems/test.sh +++ b/tool/test_for_warn_bundled_gems/test.sh @@ -24,16 +24,16 @@ echo "* Show warning when bundle exec with shebang's script" bundle exec ./test_warn_bundle_exec_shebang.rb echo -echo "* Don't show warning bundled gems on Gemfile" -ruby test_no_warn_dependency.rb +echo "* Show warning with bootsnap" +ruby test_warn_bootsnap.rb echo -echo "* Don't show warning with bootsnap" -ruby test_no_warn_bootsnap.rb +echo "* Show warning with zeitwerk" +ruby test_warn_zeitwerk.rb echo -echo "* Don't show warning with zeitwerk" -ruby test_no_warn_zeitwerk.rb +echo "* Don't show warning bundled gems on Gemfile" +ruby test_no_warn_dependency.rb echo echo "* Don't show warning with net/smtp when net-smtp on Gemfile" diff --git a/tool/test_for_warn_bundled_gems/test_no_warn_bootsnap.rb b/tool/test_for_warn_bundled_gems/test_no_warn_bootsnap.rb deleted file mode 100644 index eac58de974..0000000000 --- a/tool/test_for_warn_bundled_gems/test_no_warn_bootsnap.rb +++ /dev/null @@ -1,11 +0,0 @@ -require "bundler/inline" - -gemfile do - source "https://rubygems.org" - gem "bootsnap", require: false -end - -require 'bootsnap' -Bootsnap.setup(cache_dir: 'tmp/cache') - -require 'csv' diff --git a/tool/test_for_warn_bundled_gems/test_no_warn_zeitwerk.rb b/tool/test_for_warn_bundled_gems/test_no_warn_zeitwerk.rb deleted file mode 100644 index d554a0e675..0000000000 --- a/tool/test_for_warn_bundled_gems/test_no_warn_zeitwerk.rb +++ /dev/null @@ -1,12 +0,0 @@ -require "bundler/inline" - -gemfile do - source "https://rubygems.org" - gem "zeitwerk", require: false -end - -require "zeitwerk" -loader = Zeitwerk::Loader.for_gem(warn_on_extra_files: false) -loader.setup - -require 'csv' diff --git a/tool/test_for_warn_bundled_gems/test_warn_bootsnap.rb b/tool/test_for_warn_bundled_gems/test_warn_bootsnap.rb new file mode 100644 index 0000000000..eac58de974 --- /dev/null +++ b/tool/test_for_warn_bundled_gems/test_warn_bootsnap.rb @@ -0,0 +1,11 @@ +require "bundler/inline" + +gemfile do + source "https://rubygems.org" + gem "bootsnap", require: false +end + +require 'bootsnap' +Bootsnap.setup(cache_dir: 'tmp/cache') + +require 'csv' diff --git a/tool/test_for_warn_bundled_gems/test_warn_zeitwerk.rb b/tool/test_for_warn_bundled_gems/test_warn_zeitwerk.rb new file mode 100644 index 0000000000..d554a0e675 --- /dev/null +++ b/tool/test_for_warn_bundled_gems/test_warn_zeitwerk.rb @@ -0,0 +1,12 @@ +require "bundler/inline" + +gemfile do + source "https://rubygems.org" + gem "zeitwerk", require: false +end + +require "zeitwerk" +loader = Zeitwerk::Loader.for_gem(warn_on_extra_files: false) +loader.setup + +require 'csv' -- cgit v1.2.3