diff options
| author | Hiroshi SHIBATA <[email protected]> | 2025-01-09 14:25:48 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <[email protected]> | 2025-01-10 10:19:39 +0900 |
| commit | fcecef7752d9d6c760c8ca7f6a7ce12c82988360 (patch) | |
| tree | f78ab74104e97de379cdcd8664864d324345075c | |
| parent | 31855506232194ef15d0b8ed12370e4890f220b8 (diff) | |
Added logger dependency for Bundler's example
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/12537
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | spec/bundled_gems_spec.rb | 2 | ||||
| -rw-r--r-- | spec/bundler/support/artifice/endpoint_500.rb | 2 | ||||
| -rw-r--r-- | spec/bundler/support/artifice/helpers/endpoint.rb | 2 | ||||
| -rw-r--r-- | spec/bundler/support/artifice/windows.rb | 2 | ||||
| -rw-r--r-- | tool/bundler/dev_gems.rb | 1 |
6 files changed, 6 insertions, 5 deletions
@@ -1611,7 +1611,7 @@ yes-install-for-test-bundled-gems: yes-update-default-gemspecs $(XRUBY) -C "$(srcdir)" -r./tool/lib/gem_env.rb bin/gem \ install --no-document --conservative \ "hoe" "json-schema:5.1.0" "test-unit-rr" "simplecov" "simplecov-html" "simplecov-json" "rspec" "zeitwerk" \ - "sinatra" "rack" "tilt" "mustermann" "base64" "compact_index" "rack-test" + "sinatra" "rack" "tilt" "mustermann" "base64" "compact_index" "rack-test" "logger" test-bundled-gems-fetch: yes-test-bundled-gems-fetch yes-test-bundled-gems-fetch: diff --git a/spec/bundled_gems_spec.rb b/spec/bundled_gems_spec.rb index 6744e449d9..d279d2e810 100644 --- a/spec/bundled_gems_spec.rb +++ b/spec/bundled_gems_spec.rb @@ -29,7 +29,7 @@ RSpec.configure do |config| config.around(:each) do |example| FileUtils.cp_r Spec::Path.pristine_system_gem_path, Spec::Path.system_gem_path FileUtils.mkdir_p Spec::Path.base_system_gem_path.join("gems") - %w[sinatra rack tilt rack-protection rack-session rack-test mustermann base64 compact_index].each do |gem| + %w[sinatra rack tilt rack-protection rack-session rack-test mustermann base64 logger compact_index].each do |gem| path = Dir[File.expand_path("../.bundle/gems/#{gem}-*", __dir__)].map(&:to_s).first FileUtils.cp_r path, Spec::Path.base_system_gem_path.join("gems") end diff --git a/spec/bundler/support/artifice/endpoint_500.rb b/spec/bundler/support/artifice/endpoint_500.rb index b1ed1964c8..4dd507348d 100644 --- a/spec/bundler/support/artifice/endpoint_500.rb +++ b/spec/bundler/support/artifice/endpoint_500.rb @@ -2,7 +2,7 @@ require_relative "../path" -$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gem_path.join("gems/{mustermann,rack,tilt,sinatra,ruby2_keywords,base64}-*/lib")].map(&:to_s)) +$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gem_path.join("gems/{mustermann,rack,tilt,sinatra,ruby2_keywords,base64,logger}-*/lib")].map(&:to_s)) require "sinatra/base" diff --git a/spec/bundler/support/artifice/helpers/endpoint.rb b/spec/bundler/support/artifice/helpers/endpoint.rb index 0546c267eb..3861301c59 100644 --- a/spec/bundler/support/artifice/helpers/endpoint.rb +++ b/spec/bundler/support/artifice/helpers/endpoint.rb @@ -2,7 +2,7 @@ require_relative "../../path" -$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gem_path.join("gems/{mustermann,rack,tilt,sinatra,ruby2_keywords,base64}-*/lib")].map(&:to_s)) +$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gem_path.join("gems/{mustermann,rack,tilt,sinatra,ruby2_keywords,base64,logger}-*/lib")].map(&:to_s)) require "sinatra/base" diff --git a/spec/bundler/support/artifice/windows.rb b/spec/bundler/support/artifice/windows.rb index fea991c071..7a51a835e7 100644 --- a/spec/bundler/support/artifice/windows.rb +++ b/spec/bundler/support/artifice/windows.rb @@ -2,7 +2,7 @@ require_relative "../path" -$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gem_path.join("gems/{mustermann,rack,tilt,sinatra,ruby2_keywords,base64}-*/lib")].map(&:to_s)) +$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gem_path.join("gems/{mustermann,rack,tilt,sinatra,ruby2_keywords,base64,logger}-*/lib")].map(&:to_s)) require "sinatra/base" diff --git a/tool/bundler/dev_gems.rb b/tool/bundler/dev_gems.rb index 53c374e973..2ed0fba3c2 100644 --- a/tool/bundler/dev_gems.rb +++ b/tool/bundler/dev_gems.rb @@ -13,6 +13,7 @@ gem "rspec-core", "~> 3.12" gem "rspec-expectations", "~> 3.12" gem "rspec-mocks", "~> 3.12" gem "uri", "~> 0.13.0" +gem "logger", "~> 1.6.4" group :doc do gem "nronn", "~> 0.11.1", platform: :ruby |