Moving required gems into gemspec

Author: madebydna

Gemfile

@@ -2,13 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in fluent-plugin-kafka.gemspec
 gemspec
-
-if ENV['USE_RDKAFKA']
-  gem 'rdkafka', ENV['RDKAFKA_VERSION_MIN_RANGE'], ENV['RDKAFKA_VERSION_MAX_RANGE']
-  min_version = Gem::Version.new('0.16.0')
-  min_range_version = Gem::Version.new(ENV['RDKAFKA_VERSION_MIN_RANGE'].split(' ').last)
-  if min_range_version >= min_version
-    gem 'aws-msk-iam-sasl-signer'
-    gem 'json', '2.7.3' # override of 2.7.4 version
-  end
-end

fluent-plugin-kafka.gemspec

@@ -19,6 +19,12 @@ Gem::Specification.new do |gem|
   gem.add_dependency "fluentd", [">= 0.10.58", "< 2"]
   gem.add_dependency 'ltsv'
   gem.add_dependency 'ruby-kafka', '>= 1.5.0', '< 2'
+
+  if ENV['USE_RDKAFKA']
+    gem.add_dependency 'rdkafka', [ENV['RDKAFKA_VERSION_MIN_RANGE'], ENV['RDKAFKA_VERSION_MAX_RANGE']]
+    gem.add_dependency 'aws-msk-iam-sasl-signer', '~> 0.1.1'
+  end
+
   gem.add_development_dependency "rake", ">= 0.9.2"
   gem.add_development_dependency "test-unit", ">= 3.0.8"
   gem.add_development_dependency "test-unit-rr", "~> 1.0"

lib/fluent/plugin/out_rdkafka2.rb

@@ -15,8 +15,8 @@
     require_relative 'rdkafka_patch/0_14_0'
   elsif rdkafka_version >= Gem::Version.create('0.16.0')
     require_relative 'rdkafka_patch/0_16_0'
-    require 'aws_msk_iam_sasl_signer'
   end
+  require 'aws_msk_iam_sasl_signer' if rdkafka_version >= Gem::Version.create('0.16.0')
 rescue LoadError, NameError
   raise "unable to patch rdkafka."
 end