1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added logger dependency for Bundler's example

Browse Source
This commit is contained in:
Hiroshi SHIBATA 2025-01-09 14:25:48 +09:00
parent 3185550623
commit fcecef7752
Notes: git 2025-01-10 01:20:01 +00:00 
Merged: https://github.com/ruby/ruby/pull/12537
6 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.mk
View File

@ -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 \ $(XRUBY) -C "$(srcdir)" -r./tool/lib/gem_env.rb bin/gem \
install --no-document --conservative \ install --no-document --conservative \
"hoe" "json-schema:5.1.0" "test-unit-rr" "simplecov" "simplecov-html" "simplecov-json" "rspec" "zeitwerk" \ "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 test-bundled-gems-fetch: yes-test-bundled-gems-fetch
yes-test-bundled-gems-fetch: yes-test-bundled-gems-fetch:

2
spec/bundled_gems_spec.rb
View File

@ -29,7 +29,7 @@ RSpec.configure do |config|
config.around(:each) do |example| config.around(:each) do |example|
FileUtils.cp_r Spec::Path.pristine_system_gem_path, Spec::Path.system_gem_path 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") 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 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") FileUtils.cp_r path, Spec::Path.base_system_gem_path.join("gems")
end end

2
spec/bundler/support/artifice/endpoint_500.rb
View File

@ -2,7 +2,7 @@
require_relative "../path" 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" require "sinatra/base"

2
spec/bundler/support/artifice/helpers/endpoint.rb
View File

@ -2,7 +2,7 @@
require_relative "../../path" 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" require "sinatra/base"

2
spec/bundler/support/artifice/windows.rb
View File

@ -2,7 +2,7 @@
require_relative "../path" 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" require "sinatra/base"

1
tool/bundler/dev_gems.rb
View File

@ -13,6 +13,7 @@ gem "rspec-core", "~> 3.12"
gem "rspec-expectations", "~> 3.12" gem "rspec-expectations", "~> 3.12"
gem "rspec-mocks", "~> 3.12" gem "rspec-mocks", "~> 3.12"
gem "uri", "~> 0.13.0" gem "uri", "~> 0.13.0"
gem "logger", "~> 1.6.4"
group :doc do group :doc do
gem "nronn", "~> 0.11.1", platform: :ruby gem "nronn", "~> 0.11.1", platform: :ruby