Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update development_dependency to latest version #2763

Merged
merged 2 commits into from
Jan 10, 2020
Merged

Update development_dependency to latest version #2763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c11338
Update development_dependency to latest version
ganmacs Jan 7, 2020
c7a76ce
ruby 2.4's URI doesn't have URI.open as public method
ganmacs Jan 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions fluentd.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ Gem::Specification.new do |gem|
gem.add_runtime_dependency("certstore_c", ["~> 0.1.2"])
end

gem.add_development_dependency("rake", ["~> 12.0"])
gem.add_development_dependency("rake", ["~> 13.0"])
gem.add_development_dependency("flexmock", ["~> 2.0"])
gem.add_development_dependency("parallel_tests", ["~> 0.15.3"])
gem.add_development_dependency("simplecov", ["~> 0.7"])
gem.add_development_dependency("rr", ["~> 1.0"])
gem.add_development_dependency("timecop", ["~> 0.3"])
gem.add_development_dependency("test-unit", ["~> 3.2"])
gem.add_development_dependency("timecop", ["~> 0.9"])
gem.add_development_dependency("test-unit", ["~> 3.3"])
gem.add_development_dependency("test-unit-rr", ["~> 1.0"])
gem.add_development_dependency("oj", [">= 2.14", "< 4"])
end
3 changes: 2 additions & 1 deletion lib/fluent/command/plugin_generator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,8 @@ def initialize
@text = ""
@preamble_source = ""
@preamble = nil
URI.open(LICENSE_URL) do |io|
uri = URI.parse(LICENSE_URL)
Copy link
Member Author

@ganmacs ganmacs Jan 10, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note: this change breaks tests in ruby 2.4 due to NoMethodError(`open' called for URI:Module' ). however I couldn't get the error message since stdout was captured ....

fluentd/test/command/test_plugin_generator.rb

Line 102 in 8610cd7

capture_stdout do

uri.open do |io|
@text = io.read
end
@preamble_source = @text[/^(\s*Copyright.+)/m, 1]
Expand Down