From 3c11338b319d499fd442c48017a77d036909f791 Mon Sep 17 00:00:00 2001 From: Yuta Iwama Date: Tue, 7 Jan 2020 12:08:42 +0900 Subject: [PATCH 1/2] Update development_dependency to latest version Signed-off-by: Yuta Iwama --- fluentd.gemspec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fluentd.gemspec b/fluentd.gemspec index cd942d72c1..6da1c471ce 100644 --- a/fluentd.gemspec +++ b/fluentd.gemspec @@ -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 From c7a76cedc727d39e61cafc984f857a1aa8a4c178 Mon Sep 17 00:00:00 2001 From: Yuta Iwama Date: Fri, 10 Jan 2020 12:31:57 +0900 Subject: [PATCH 2/2] ruby 2.4's URI doesn't have URI.open as public method https://docs.ruby-lang.org/en/2.7.0/OpenURI.html https://docs.ruby-lang.org/en/2.4.0/OpenURI.html Signed-off-by: Yuta Iwama --- lib/fluent/command/plugin_generator.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/fluent/command/plugin_generator.rb b/lib/fluent/command/plugin_generator.rb index e020c8998e..dc11eb92d9 100644 --- a/lib/fluent/command/plugin_generator.rb +++ b/lib/fluent/command/plugin_generator.rb @@ -281,7 +281,8 @@ def initialize @text = "" @preamble_source = "" @preamble = nil - URI.open(LICENSE_URL) do |io| + uri = URI.parse(LICENSE_URL) + uri.open do |io| @text = io.read end @preamble_source = @text[/^(\s*Copyright.+)/m, 1]