fluent-plugin-cat-sweep 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c416b3c5df83179c396c4343661ca0d6edabf9c
-  data.tar.gz: 99f032ae97d3276572f4d83c986a2b8cf9ed47bd
+  metadata.gz: a1a1bc310740299a8f62e3f801ba1715b5bbe7b6
+  data.tar.gz: 3d9b318ff11fc7f90ab805d7d10101dd93800555
 SHA512:
-  metadata.gz: 7e04a78004b577267659870f282bca66eb6212892a013db0f2c1ada39d1c7b4829264afe1c2183c499e9b3a339f5da179fce52162119c8a5f17e564c5b595873
-  data.tar.gz: 29e6a7cc393cb249f9008c387f4b7d42740177b6c1908aecbce54b31b8181ca910bae46a1d282eea19707e9bb01cb1aff802984316e079988812b46061ea92f0
+  metadata.gz: 8f74d5c1faf9b9f5190b58c219ed2d3c982a3779cb7d7d5fccc86637b1e000b718a420b97120bf37eaa61d2664bf1706cea693c469d99621229da170625802f8
+  data.tar.gz: 175666731ebeb4c8f7b1115b46f0437f7ccfafcca820d47beacd8cfa1e20bc5b20d4024eae3b6af471678192ef7c652d08390598e2b51c966fe36172ca9c7cd6

data/.travis.yml

@@ -5,4 +5,6 @@ rvm:
   - 2.1.*
   - 2.2.*
 gemfile:
-  - Gemfile
+  - gemfiles/Gemfile.fluentd.0.12
+  - gemfiles/Gemfile.fluentd.0.10
+  - gemfiles/Gemfile.fluentd.0.10.45

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.1.3
+
+Enhancements:
+
+* Supported fluentd versions fixed (from fluentd v0.10.45)
+* Add messages for end of support fluentd version
+
 # 0.1.2
 
 Enhancements:

data/README.md

@@ -1,6 +1,6 @@
 # fluent-plugin-cat-sweep
 
-[![Circle CI](https://circleci.com/gh/civitaspo/fluent-plugin-cat-sweep.svg?style=svg)](https://circleci.com/gh/civitaspo/fluent-plugin-cat-sweep) [![Build Status](https://secure.travis-ci.org/civitaspo/fluent-plugin-cat-sweep.png?branch=master)](http://travis-ci.org/civitaspo/fluent-plugin-cat-sweep)
+[![Build Status](https://secure.travis-ci.org/civitaspo/fluent-plugin-cat-sweep.png?branch=master)](http://travis-ci.org/civitaspo/fluent-plugin-cat-sweep)
 
 Fluentd plugin to read data from files and to remove or move after processing.
 
@@ -93,6 +93,12 @@ Our assumption is that this mechanism should provide more durability than `in_ta
 
 [CHANGELOG.md](CHANGELOG.md)
 
+## Warning
+
+* This plugin supports fluentd from v0.10.45
+* The support for fluentd v0.10 will end near future
+* The support for fluentd v0.14 is not yet
+
 ## Contributing
 
 1. Fork it ( https://github.com/civitaspo/fluent-plugin-cat-sweep/fork )

data/fluent-plugin-cat-sweep.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-cat-sweep"
-  spec.version       = "0.1.2"
+  spec.version       = "0.1.3"
   spec.authors       = ["Civitaspo(takahiro.nakayama)", "Naotoshi Seo"]
   spec.email         = ["civitaspo@gmail.com", "sonots@gmail.com"]
 
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "fluentd"
+  spec.add_runtime_dependency "fluentd", ">= 0.10.45"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "test-unit"

data/gemfiles/Gemfile.fluentd.0.10

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+gem 'fluentd', '~> 0.10.45'
+gemspec :path => "../"

data/gemfiles/Gemfile.fluentd.0.10.45

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+gem 'fluentd', '= 0.10.45'
+gemspec :path => "../"

data/gemfiles/Gemfile.fluentd.0.12

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+gem 'fluentd', '~> 0.12.0'
+gemspec :path => "../"

data/lib/fluent/plugin/in_cat_sweep.rb

@@ -35,8 +35,10 @@ module Fluent
     def configure(conf)
       super
 
-      @parser = Plugin.new_parser(@format)
-      @parser.configure(conf)
+      # Message for users about supported fluentd versions
+      supported_versions_information
+
+      configure_parser(conf)
 
       if @processing_file_suffix.empty?
         raise Fluent::ConfigError, "in_cat_sweep: `processing_file_suffix` must has some letters."
@@ -104,6 +106,56 @@ module Fluent
 
     private
 
+    def configure_parser(conf)
+      if Plugin.respond_to?(:new_parser)
+        @parser = Plugin.new_parser(@format)
+        @parser.configure(conf)
+      else # For supporting fluentd lower than v0.10.58
+        @parser = TextParser.new
+        @parser.configure(conf)
+        # In lower version of fluentd than v0.10.50,
+        # `Fluent::Parser#parse` does not support block based API.
+        # cf. https://github.com/fluent/fluentd/blob/v0.10.49/lib/fluent/parser.rb#L270
+        # On the other hand, in newer version(like v0.14) of fluentd,
+        # `Fluent::Parser#parse` only supports block based API.
+        # cf. https://github.com/fluent/fluentd/blob/v0.14.0.rc.3/lib/fluent/plugin/parser_tsv.rb#L33
+        # So, lower version of `Fluent::Parser#parse` extends the way to call by block based API.
+        @parser.extend(Module.new {
+          def parse(line)
+            time, record = super
+            yield(time, record)
+            return
+          end
+        })
+      end
+    end
+
+    def supported_versions_information
+      if current_fluent_version < fluent_version('0.12.0')
+        log.warn "in_cat_sweep: the support for fluentd v0.10 will end near future. Please upgrade your fluentd or fix this plugin version."
+      end
+      if current_fluent_version < fluent_version('0.10.58')
+        log.warn "in_cat_sweep: fluentd officially supports Plugin.new_parser/Plugin.register_parser APIs from v0.10.58." \
+          " The support for v0.10.58 will end near future." \
+          " Please upgrade your fluentd or fix this plugin version."
+      end
+      if current_fluent_version < fluent_version('0.10.46')
+        log.warn "in_cat_sweep: fluentd officially supports parser plugin from v0.10.46." \
+          " If you use `time_key` parameter and fluentd v0.10.45, doesn't work properly." \
+          " The support for v0.10.45 will end near future." \
+          " Please upgrade your fluentd or fix this plugin version."
+      end
+    end
+
+    def current_fluent_version
+      parse_version_comparable(Fluent::VERSION)
+    end
+    
+    def parse_version_comparable(v)
+      Gem::Version.new(v)
+    end
+    alias :fluent_version :parse_version_comparable # For the readability
+
     def will_process?(filename)
       !(processing?(filename) or error_file?(filename) or sufficient_waiting?(filename))
     end

data/test/helper.rb

@@ -1,4 +1,5 @@
 require 'test/unit'
+require 'fluent/version'
 require 'fluent/log'
 require 'fluent/test'
 
@@ -26,3 +27,12 @@ module Fluent
     end
   end
 end
+
+
+def current_fluent_version
+  fluent_version(Fluent::VERSION)
+end
+
+def fluent_version(v)
+  Gem::Version.new(v)
+end

data/test/test_in_cat_sweep.rb

@@ -1,5 +1,6 @@
 require_relative 'helper'
 require 'rr'
+require 'fluent/input'
 require 'fluent/plugin/in_cat_sweep'
 
 class CatSweepInputTest < Test::Unit::TestCase
@@ -22,13 +23,28 @@ class CatSweepInputTest < Test::Unit::TestCase
     run_interval 0.05
   ]
 
-  CONFIG_MINIMUM_REQUIRED = CONFIG_BASE + %[
-    format tsv
-    waiting_seconds 5
-  ]
+  CONFIG_MINIMUM_REQUIRED =
+    if current_fluent_version < fluent_version('0.12.0')
+      CONFIG_BASE + %[
+        format tsv
+        keys ""
+        waiting_seconds 5
+      ]
+    else
+      CONFIG_BASE + %[
+        format tsv
+        waiting_seconds 5
+      ]
+    end
 
   def create_driver(conf, use_v1 = true)
-    Fluent::Test::InputTestDriver.new(Fluent::CatSweepInput).configure(conf, use_v1)
+    driver = Fluent::Test::InputTestDriver.new(Fluent::CatSweepInput)
+    if current_fluent_version < fluent_version('0.10.51')
+      driver.configure(conf)
+    else
+      driver.configure(conf, use_v1)
+    end
+    driver
   end
 
   def test_required_configure

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-cat-sweep
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Civitaspo(takahiro.nakayama)
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-04 00:00:00.000000000 Z
+date: 2016-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.45
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.45
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -127,6 +127,9 @@ files:
 - Rakefile
 - example.conf
 - fluent-plugin-cat-sweep.gemspec
+- gemfiles/Gemfile.fluentd.0.10
+- gemfiles/Gemfile.fluentd.0.10.45
+- gemfiles/Gemfile.fluentd.0.12
 - lib/fluent/plugin/in_cat_sweep.rb
 - test/helper.rb
 - test/test_in_cat_sweep.rb
@@ -150,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Fluentd plugin to cat files and move them.