fluent-plugin-elb-access-log 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bcfed4ac9a254031fd9a23f2cf9439c5beeb4e8
-  data.tar.gz: f3e0a91ff1c7d76cf4d238b08863978bd181b31f
+  metadata.gz: e6cf91d3c27190b1dc3433a92e5710e803616256
+  data.tar.gz: 60e98a16ff1535f1a3bf57807255aa8403eaac01
 SHA512:
-  metadata.gz: 64e309331c88bf9735c27bf3d99921c37398e4c34f178dbfb067291d8973b86a45d4c7213467c68360b8192a37c63e07ca5dc57d3ef0ad183a555b76df6a7aa7
-  data.tar.gz: caecfbe52f8471cf1f061212a92511a26538dc2f72246b3d12e29af00976c739a884b70fb8e5cee32890d80acde0c69e4754f979fdbb45bac8f84a1c8a255211
+  metadata.gz: 1e1945d726b97db0f0ad9b7038b98958bac3196ec51d77dbf72e04afaf078064c68a7dcb1132df0709f9d1921bc00d7d1e6360a2fad93f6446d4043f903ffa2c
+  data.tar.gz: '0495808a43015a235ba716d5bd43a36f40111014f25bfa4960da80dfd7cb3da7e1174ee0c67e5d6f6b678a900d76cd5f5ec6325604321acdc90727db3bcf39ec'

data/.gitignore

@@ -13,3 +13,4 @@
 *.a
 mkmf.log
 test.rb
+/gemfiles/*.lock

data/.travis.yml

@@ -10,3 +10,6 @@ before_install:
 script:
 - bundle install
 - bundle exec rake
+gemfile:
+- gemfiles/fluentd_0.12.gemfile
+- gemfiles/fluentd_0.14.gemfile

data/Appraisals

@@ -0,0 +1,7 @@
+appraise 'fluentd-0.12' do
+  gem 'fluentd', '>= 0.12', '< 0.14'
+end
+
+appraise 'fluentd-0.14' do
+  gem 'fluentd', '>= 0.14'
+end

data/fluent-plugin-elb-access-log.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'fluentd', '>= 0.14'
+  spec.add_dependency 'fluentd'
   spec.add_dependency 'aws-sdk-s3', '~> 1.8'
   spec.add_dependency 'addressable'
   spec.add_dependency 'multiple_files_gzip_reader'
@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'test-unit', '>= 3.1.0'
   spec.add_development_dependency 'rspec-match_table', '>= 0.1.1'
   spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'appraisal', '>= 2.2'
 end

data/gemfiles/fluentd_0.12.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "fluentd", ">= 0.12", "< 0.14"
+
+gemspec path: "../"

data/gemfiles/fluentd_0.14.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "fluentd", ">= 0.14"
+
+gemspec path: "../"

data/lib/fluent/plugin/in_elb_access_log.rb

@@ -9,7 +9,7 @@ require 'multiple_files_gzip_reader'
 require 'fluent/input'
 require 'fluent_plugin_elb_access_log/version'
 
-class Fluent::Plugin::ElbAccessLogInput < Fluent::Input
+class FluentPluginElbAccessLogInput < Fluent::Input
   Fluent::Plugin.register_input('elb_access_log', self)
 
   USER_AGENT_SUFFIX = "fluent-plugin-elb-access-log/#{FluentPluginElbAccessLog::VERSION}"
@@ -473,4 +473,4 @@ class Fluent::Plugin::ElbAccessLogInput < Fluent::Input
       @log.error_backtrace(e.backtrace)
     end
   end # TimerWatcher
-end # Fluent::Plugin::ElbAccessLogInput
+end # FluentPluginElbAccessLogInput

data/lib/fluent_plugin_elb_access_log/version.rb

@@ -1,3 +1,3 @@
 module FluentPluginElbAccessLog
-  VERSION = '0.4.4'
+  VERSION = '0.5.0'
 end

data/spec/in_elb_access_log_alb_spec.rb

@@ -1,4 +1,4 @@
-describe Fluent::Plugin::ElbAccessLogInput do
+describe FluentPluginElbAccessLogInput do
   let(:account_id) { '123456789012' }
   let(:s3_bucket) { 'my-bucket' }
   let(:region) { 'us-west-1' }
@@ -31,8 +31,8 @@ describe Fluent::Plugin::ElbAccessLogInput do
   before do
     Timecop.freeze(today)
     allow(Aws::S3::Client).to receive(:new) { client }
-    allow_any_instance_of(Fluent::Plugin::ElbAccessLogInput).to receive(:load_history) { [] }
-    allow_any_instance_of(Fluent::Plugin::ElbAccessLogInput).to receive(:parse_tsfile) { nil }
+    allow_any_instance_of(FluentPluginElbAccessLogInput).to receive(:load_history) { [] }
+    allow_any_instance_of(FluentPluginElbAccessLogInput).to receive(:parse_tsfile) { nil }
     allow(FileUtils).to receive(:touch)
     expect(driver.instance.log).to_not receive(:error)
   end
@@ -41,7 +41,7 @@ describe Fluent::Plugin::ElbAccessLogInput do
     Timecop.return
   end
 
-  subject { driver.events }
+  subject { driver_events }
 
   context 'when access log does not exist' do
     before do

data/spec/in_elb_access_log_clb_spec.rb

@@ -1,4 +1,4 @@
-describe Fluent::Plugin::ElbAccessLogInput do
+describe FluentPluginElbAccessLogInput do
   let(:account_id) { '123456789012' }
   let(:s3_bucket) { 'my-bucket' }
   let(:region) { 'us-west-1' }
@@ -30,8 +30,8 @@ describe Fluent::Plugin::ElbAccessLogInput do
   before do
     Timecop.freeze(today)
     allow(Aws::S3::Client).to receive(:new) { client }
-    allow_any_instance_of(Fluent::Plugin::ElbAccessLogInput).to receive(:load_history) { [] }
-    allow_any_instance_of(Fluent::Plugin::ElbAccessLogInput).to receive(:parse_tsfile) { nil }
+    allow_any_instance_of(FluentPluginElbAccessLogInput).to receive(:load_history) { [] }
+    allow_any_instance_of(FluentPluginElbAccessLogInput).to receive(:parse_tsfile) { nil }
     allow(FileUtils).to receive(:touch)
     expect(driver.instance.log).to_not receive(:error)
   end
@@ -40,7 +40,7 @@ describe Fluent::Plugin::ElbAccessLogInput do
     Timecop.return
   end
 
-  subject { driver.events }
+  subject { driver_events }
 
   context 'when access log does not exist' do
     before do

data/spec/in_elb_access_log_client_spec.rb

@@ -1,4 +1,4 @@
-describe 'Fluent::Plugin::ElbAccessLogInput#client' do
+describe 'FluentPluginElbAccessLogInput#client' do
   let(:account_id) { '123456789012' }
   let(:s3_bucket) { 'my-bucket' }
   let(:region) { 'us-west-1' }
@@ -28,8 +28,8 @@ describe 'Fluent::Plugin::ElbAccessLogInput#client' do
 
   before do
     Timecop.freeze(today)
-    allow_any_instance_of(Fluent::Plugin::ElbAccessLogInput).to receive(:load_history) { [] }
-    allow_any_instance_of(Fluent::Plugin::ElbAccessLogInput).to receive(:parse_tsfile) { nil }
+    allow_any_instance_of(FluentPluginElbAccessLogInput).to receive(:load_history) { [] }
+    allow_any_instance_of(FluentPluginElbAccessLogInput).to receive(:parse_tsfile) { nil }
     expect(client).to receive(:list_objects).with(bucket: s3_bucket, prefix: yesterday_prefix) { [] }
     expect(client).to receive(:list_objects).with(bucket: s3_bucket, prefix: today_prefix) { [] }
     expect(client).to receive(:list_objects).with(bucket: s3_bucket, prefix: tomorrow_prefix) { [] }
@@ -48,7 +48,7 @@ describe 'Fluent::Plugin::ElbAccessLogInput#client' do
     specify do
       expect(Aws::S3::Client).to receive(:new).with(
         region: region,
-        user_agent_suffix: Fluent::Plugin::ElbAccessLogInput::USER_AGENT_SUFFIX,
+        user_agent_suffix: FluentPluginElbAccessLogInput::USER_AGENT_SUFFIX,
       ).and_return(client)
 
       driver_run(driver)
@@ -73,7 +73,7 @@ describe 'Fluent::Plugin::ElbAccessLogInput#client' do
     specify do
       expect(Aws::S3::Client).to receive(:new).with(
         region: region,
-        user_agent_suffix: Fluent::Plugin::ElbAccessLogInput::USER_AGENT_SUFFIX,
+        user_agent_suffix: FluentPluginElbAccessLogInput::USER_AGENT_SUFFIX,
         access_key_id: aws_key_id,
         secret_access_key: aws_sec_key,
       ).and_return(client)

data/spec/in_elb_access_log_config_spec.rb

@@ -1,4 +1,4 @@
-describe 'Fluent::Plugin::ElbAccessLogInput#configure' do
+describe 'FluentPluginElbAccessLogInput#configure' do
   let(:account_id) { '123456789012' }
   let(:s3_bucket) { 'my-bucket' }
   let(:region) { 'us-west-1' }
@@ -11,8 +11,8 @@ describe 'Fluent::Plugin::ElbAccessLogInput#configure' do
     Timecop.freeze(today)
     allow(FileUtils).to receive(:touch)
     allow(File).to receive(:read) { nil }
-    allow_any_instance_of(Fluent::Plugin::ElbAccessLogInput).to receive(:load_history) { [] }
-    allow_any_instance_of(Fluent::Plugin::ElbAccessLogInput).to receive(:parse_tsfile) { nil }
+    allow_any_instance_of(FluentPluginElbAccessLogInput).to receive(:load_history) { [] }
+    allow_any_instance_of(FluentPluginElbAccessLogInput).to receive(:parse_tsfile) { nil }
   end
 
   context 'when default' do
@@ -157,7 +157,7 @@ describe 'Fluent::Plugin::ElbAccessLogInput#configure' do
     end
 
     before do
-      allow_any_instance_of(Fluent::Plugin::ElbAccessLogInput).to receive(:parse_tsfile) { Time.parse(tsfile_datetime) }
+      allow_any_instance_of(FluentPluginElbAccessLogInput).to receive(:parse_tsfile) { Time.parse(tsfile_datetime) }
     end
 
     it do
@@ -179,7 +179,7 @@ describe 'Fluent::Plugin::ElbAccessLogInput#configure' do
     end
 
     before do
-      allow_any_instance_of(Fluent::Plugin::ElbAccessLogInput).to receive(:parse_tsfile) { Time.parse(tsfile_datetime) }
+      allow_any_instance_of(FluentPluginElbAccessLogInput).to receive(:parse_tsfile) { Time.parse(tsfile_datetime) }
       allow_any_instance_of(Fluent::Test::TestLogger).to receive(:warn).with("start_datetime(#{start_datetime}) is set. but tsfile datetime(#{tsfile_datetime}) is used")
     end
 

data/spec/spec_helper.rb

@@ -1,8 +1,13 @@
 require 'coveralls'
 Coveralls.wear!
 
+require 'fluent/version'
 require 'fluent/test'
-require 'fluent/test/driver/input'
+
+if Gem::Version.new(Fluent::VERSION) >= Gem::Version.new('0.14')
+  require 'fluent/test/driver/input'
+end
+
 require 'fluent/plugin/in_elb_access_log'
 
 require 'aws-sdk-s3'
@@ -40,7 +45,11 @@ region #{region}
 #{additional_options}
   EOS
 
-  Fluent::Test::Driver::Input.new(Fluent::Plugin::ElbAccessLogInput).configure(fluentd_conf)
+  if Gem::Version.new(Fluent::VERSION) >= Gem::Version.new('0.14')
+    Fluent::Test::Driver::Input.new(FluentPluginElbAccessLogInput).configure(fluentd_conf)
+  else
+    Fluent::Test::OutputTestDriver.new(FluentPluginElbAccessLogInput).configure(fluentd_conf)
+  end
 end
 
 def driver_run(driver)
@@ -51,6 +60,15 @@ def driver_run(driver)
   end
 end
 
+
+def driver_events
+  if Gem::Version.new(Fluent::VERSION) >= Gem::Version.new('0.14')
+    driver.events
+  else
+    driver.emits
+  end
+end
+
 def gzip(str)
   io = StringIO.new
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elb-access-log
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-05 00:00:00.000000000 Z
+date: 2018-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.2'
 description: Fluentd input plugin for AWS ELB Access Logs.
 email:
 - sugawara@cookpad.com
@@ -176,11 +190,14 @@ files:
 - ".rspec"
 - ".simplecov"
 - ".travis.yml"
+- Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - fluent-plugin-elb-access-log.gemspec
+- gemfiles/fluentd_0.12.gemfile
+- gemfiles/fluentd_0.14.gemfile
 - lib/fluent/plugin/in_elb_access_log.rb
 - lib/fluent_plugin_elb_access_log/version.rb
 - spec/in_elb_access_log_alb_spec.rb