From 8e6eb93b32fce6b10d2aae2dfae88f89c39629ed Mon Sep 17 00:00:00 2001
From: Masahiro Nakagawa <repeatedly@gmail.com>
Date: Thu, 26 Dec 2019 17:27:21 +0900
Subject: [PATCH] Drop ruby 2.1/2.2/2.3 support

Signed-off-by: Masahiro Nakagawa <repeatedly@gmail.com>
---
 .travis.yml                                 | 14 --------------
 Gemfile                                     |  5 +----
 fluentd.gemspec                             |  3 +--
 lib/fluent/plugin_helper/http_server.rb     |  1 -
 lib/fluent/plugin_helper/record_accessor.rb |  8 --------
 lib/fluent/plugin_helper/server.rb          | 17 +----------------
 6 files changed, 3 insertions(+), 45 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ce66cd82e2..97224d1626 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,12 +7,6 @@ cache: bundler
 # See here for osx_image -> OSX versions: https://docs.travis-ci.com/user/languages/objective-c
 matrix:
   include:
-    - rvm: 2.1.10
-      os: linux
-    - rvm: 2.2.10
-      os: linux
-    - rvm: 2.2.10
-      os: linux-ppc64le
     - rvm: 2.4.9
       os: linux
     - rvm: 2.4.9
@@ -29,9 +23,6 @@ matrix:
       os: linux
     - rvm: ruby-head
       os: linux-ppc64le
-    - rvm: 2.1.10
-      os: osx
-      osx_image: xcode8.3 # OSX 10.12
     - rvm: 2.4.6
       os: osx
       osx_image: xcode8.3 # OSX 10.12
@@ -39,9 +30,6 @@ matrix:
       os: osx
       osx_image: xcode8.3 # OSX 10.12
   allow_failures:
-    - rvm: 2.1.10
-      os: osx
-      osx_image: xcode8.3
     - rvm: 2.4.6
       os: osx
       osx_image: xcode8.3
@@ -54,8 +42,6 @@ matrix:
 branches:
   only:
     - master
-    - v0.12
-    - v0.14
 
 before_install:
   - gem update --system=2.7.8
diff --git a/Gemfile b/Gemfile
index 846728054f..5f1b8a650a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,10 +2,7 @@ source 'https://rubygems.org/'
 
 gemspec
 
-# https://github.com/socketry/async-io/blob/v1.23.1/async-io.gemspec#L21
-if Gem::Version.create(RUBY_VERSION) >= Gem::Version.create('2.3.0')
-  gem 'async-http', '~> 0.42'
-end
+gem 'async-http', '~> 0.42'
 
 local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
 if File.exist?(local_gemfile)
diff --git a/fluentd.gemspec b/fluentd.gemspec
index 2263821ff2..ba30154d13 100644
--- a/fluentd.gemspec
+++ b/fluentd.gemspec
@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.license = "Apache-2.0"
 
-  gem.required_ruby_version = '>= 2.1'
+  gem.required_ruby_version = '>= 2.4'
 
   gem.add_runtime_dependency("msgpack", [">= 1.2.0", "< 2.0.0"])
   gem.add_runtime_dependency("yajl-ruby", ["~> 1.0"])
@@ -27,7 +27,6 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency("tzinfo", [">= 1.0", "< 3.0"])
   gem.add_runtime_dependency("tzinfo-data", ["~> 1.0"])
   gem.add_runtime_dependency("strptime", [">= 0.2.2", "< 1.0.0"])
-  gem.add_runtime_dependency("dig_rb", ["~> 1.0.0"])
 
   # build gem for a certain platform. see also Rakefile
   fake_platform = ENV['GEM_BUILD_FAKE_PLATFORM'].to_s
diff --git a/lib/fluent/plugin_helper/http_server.rb b/lib/fluent/plugin_helper/http_server.rb
index f9d5ce5192..acf609ec52 100644
--- a/lib/fluent/plugin_helper/http_server.rb
+++ b/lib/fluent/plugin_helper/http_server.rb
@@ -15,7 +15,6 @@
 #
 
 begin
-  # raise if RUBY_VERSION < 2.3.x. see Gemfile
   require 'async'
   require 'fluent/plugin_helper/http_server/server'
 rescue LoadError => _
diff --git a/lib/fluent/plugin_helper/record_accessor.rb b/lib/fluent/plugin_helper/record_accessor.rb
index 31c9ede215..e1185d3dac 100644
--- a/lib/fluent/plugin_helper/record_accessor.rb
+++ b/lib/fluent/plugin_helper/record_accessor.rb
@@ -15,14 +15,6 @@
 #
 
 require 'fluent/config/error'
-unless {}.respond_to?(:dig)
-  begin
-    # backport_dig is faster than dig_rb so prefer backport_dig.
-    require 'backport_dig'
-  rescue LoadError
-    require 'dig_rb'
-  end
-end
 
 module Fluent
   module PluginHelper
diff --git a/lib/fluent/plugin_helper/server.rb b/lib/fluent/plugin_helper/server.rb
index 7b9cea0649..ecd7c5bd2f 100644
--- a/lib/fluent/plugin_helper/server.rb
+++ b/lib/fluent/plugin_helper/server.rb
@@ -693,26 +693,11 @@ def write(data)
             end
           end
 
-          if RUBY_VERSION.to_f >= 2.3
-            NONBLOCK_ARG = { exception: false }
-            def try_handshake
-              @_handler_socket.accept_nonblock(**NONBLOCK_ARG)
-            end
-          else
-            def try_handshake
-              @_handler_socket.accept_nonblock
-            rescue IO::WaitReadable
-              :wait_readable
-            rescue IO::WaitWritable
-              :wait_writable
-            end
-          end
-
           def try_tls_accept
             return true if @_handler_accepted
 
             begin
-              result = try_handshake # this method call actually try to do handshake via TLS
+              result = @_handler_socket.accept_nonblock(exception: false) # this method call actually try to do handshake via TLS
               if result == :wait_readable || result == :wait_writable
                 # retry accept_nonblock: there aren't enough data in underlying socket buffer
               else