fluent-plugin-concat 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53cd1a90ba28d88202ca99243dc4df5aaff6662a
-  data.tar.gz: 4cba9d7d4c63ef8429c304f4255cbb239c87c8e6
+  metadata.gz: ae4aa01995d47f27e2c79b6e117872d72995e061
+  data.tar.gz: f846be7e55d2bd0029bc2b369fc0a546be8fca6e
 SHA512:
-  metadata.gz: 9161c7af7c16cadd1a991a3e120d87ff681aadfe30b9c493764d993a50d73c00fe3be1b5ac84a712a1484b5d94706c51d9c95939eed510a3ea4fce19675e41f7
-  data.tar.gz: 1521cff3d1a0b54dc22d5e207f679216db987651fe981234a39f43e9d58d8c99342468679e8d0f3a992396721e4dfc1ec919887e5bf92b3d5359acee8876cd44
+  metadata.gz: da41f352fb2d1201c3ae2bc97593590abe11823dcb7c3b561f5d48126510f0c676d772f524ce44fd76d3075082968e7a6793bb2dc94714a83994a717c7466c0f
+  data.tar.gz: 5cf5f9dc762eb74068836f83031dae8a29bbe923e023507830cacaab702cf0fd04a5033a9d97d9664d54b0de7b79cfc29595e701a19a0cc0f03595fab84f2d97

data/.travis.yml

@@ -3,5 +3,10 @@ language: ruby
 
 rvm:
   - 2.1.8
-  - 2.2.4
-  - 2.3.0
+  - 2.2.5
+  - 2.3.1
+
+gemfile:
+  - Gemfile
+  - gemfiles/fluentd_v0.12.gemfile
+  - gemfiles/fluentd_v0.14.gemfile

data/Appraisals

@@ -0,0 +1,8 @@
+appraise "fluentd v0.12" do
+  gem "fluentd", "~> 0.12.0"
+end
+
+appraise "fluentd v0.14" do
+  gem "fluentd", "~> 0.14.0"
+end
+

data/fluent-plugin-concat.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-concat"
-  spec.version       = "0.4.0"
+  spec.version       = "0.4.1"
   spec.authors       = ["Kenji Okimoto"]
   spec.email         = ["okimoto@clear-code.com"]
 
@@ -16,9 +16,10 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject {|f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "fluentd", "~> 0.12.21"
+  spec.add_runtime_dependency "fluentd", [">= 0.12.21", "< 2"]
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "test-unit", ">= 3.1.0"
   spec.add_development_dependency "test-unit-rr"
+  spec.add_development_dependency "appraisal"
 end

data/gemfiles/fluentd_v0.12.gemfile

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

data/gemfiles/fluentd_v0.14.gemfile

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

data/lib/fluent/plugin/filter_concat.rb

@@ -146,9 +146,9 @@ module Fluent
       now = Fluent::Engine.now
       timeout_stream_identities = []
       @timeout_map.each do |stream_identity, previous_timestamp|
-        next unless @flush_interval > (now - previous_timestamp)
-        timeout_stream_identities << stream_identity
+        next if @flush_interval > (now - previous_timestamp)
         flushed_record = flush_buffer(stream_identity)
+        timeout_stream_identities << stream_identity
         tag = stream_identity.split(":").first
         message = "Timeout flush: #{stream_identity}"
         router.emit_error_event(tag, now, flushed_record, TimeoutError.new(message))

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-concat
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Kenji Okimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-21 00:00:00.000000000 Z
+date: 2016-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.21
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.21
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +86,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: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Fluentd Filter plugin to concat multiple event messages
 email:
 - okimoto@clear-code.com
@@ -90,11 +110,14 @@ files:
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
+- Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - fluent-plugin-concat.gemspec
+- gemfiles/fluentd_v0.12.gemfile
+- gemfiles/fluentd_v0.14.gemfile
 - lib/fluent/plugin/filter_concat.rb
 homepage: https://github.com/okkez/fluent-plugin-concat
 licenses:
@@ -116,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Fluentd Filter plugin to concat multiple event messages