fluent-plugin-exec_cron 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbbcf3f7345626fd259b551bebfca72f62a994cd
-  data.tar.gz: 24ca495172005d6079578070c02ad81a371023ad
+  metadata.gz: 8ed39014693c6b28aff7376560860aacd9e0f088
+  data.tar.gz: 84c75335858b24f125a699932e9affd05d283bae
 SHA512:
-  metadata.gz: f4f551d1ef67f94df3df94f9b1423c1157cd1c9e4e2c57c4b8d1f1ab1e4e2715442075e6158076426eca32688aab17b6132f4166d2d079eae166e10a46982a3b
-  data.tar.gz: 98b8abdcf12ef59e76b02b2b9c01b609eaeee4016cf55a89e6a10172d9d2c925fd2f96b1c069f54243c45f9227a044f72b0da2289c629f419114aa28a579a6ad
+  metadata.gz: a6d28ede95c5abfca5f58546ac652949f7e9d302dafecd28f262c9bd4fd0bd0377458a6d6f9f05845dda0fa1004212ff3d146c0e29cd02e6217e0c293136f0fe
+  data.tar.gz: 8df766d445cfcb65da07aca3122378255b46075634fbf1baa2006ea19fa19ed2541374d8df600907b9913d3b7efc4a5e18c175052842f5eb0f77405ad3636332

data/.travis.yml

@@ -3,13 +3,13 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1
-
-os:
-  - linux
-  - osx
+  - 2.1.*
+  - 2.2.*
 
 gemfile:
   - Gemfile
 
+before_install:
+  - gem update bundler
+
 script: 'bundle exec rake test'

data/fluent-plugin-exec_cron.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-exec_cron"
-  gem.version       = "0.0.2"
+  gem.version       = "0.0.3"
   gem.summary       = %q{executes external programs with cron syntax.}
   gem.description   = %q{executes external programs with cron syntax.}
   gem.license       = "MIT"
@@ -16,11 +16,12 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_runtime_dependency "parse-cron"
-  gem.add_development_dependency 'bundler', '~> 1.7.2'
+  gem.add_development_dependency 'bundler'
   gem.add_development_dependency 'fluentd'
   gem.add_development_dependency 'pry', '~> 0.10.1'
   gem.add_development_dependency 'rake', '~> 10.3.2'
   gem.add_development_dependency 'rubocop', '~> 0.24.1'
   gem.add_development_dependency 'rubygems-tasks', '~> 0.2'
   gem.add_development_dependency 'yard', '~> 0.8'
+  gem.add_development_dependency "test-unit"
 end

data/lib/fluent/plugin/in_exec_cron.rb

@@ -10,22 +10,12 @@ module Fluent
       require 'erb'
     end
 
-    SUPPORTED_FORMAT = {
-      'tsv' => :tsv,
-      'json' => :json,
-      'msgpack' => :msgpack,
-    }
-
     unless method_defined?(:router)
       define_method("router") { Fluent::Engine }
     end
 
     config_param :command, :string
-    config_param :format, :default => :tsv do |val|
-      f = SUPPORTED_FORMAT[val]
-      raise ConfigError, "Unsupported format '#{val}'" unless f
-      f
-    end
+		config_param :format, :string, :default => 'tsv'
     config_param :keys, :default => [] do |val|
       val.split(',')
     end
@@ -64,17 +54,7 @@ module Fluent
         end
       end
 
-      case @format
-      when :tsv
-        if @keys.empty?
-          raise ConfigError, "keys option is required on exec input for tsv format"
-        end
-        @parser = ExecUtil::TSVParser.new(@keys, method(:on_message))
-      when :json
-        @parser = ExecUtil::JSONParser.new(method(:on_message))
-      when :msgpack
-        @parser = ExecUtil::MessagePackParser.new(method(:on_message))
-      end
+			@parser = setup_parser(conf)
 
       begin
         @cron_parser = CronParser.new(@cron)
@@ -84,6 +64,22 @@ module Fluent
       @command = ERB.new(@command.gsub(/\$\{([^}]+)\}/, '<%= \1 %>'))
     end
 
+    def setup_parser(conf)
+      case @format
+      when 'tsv'
+        if @keys.empty?
+          raise ConfigError, "keys option is required on exec input for tsv format"
+        end
+        ExecUtil::TSVParser.new(@keys, method(:on_message))
+      when 'json'
+        ExecUtil::JSONParser.new(method(:on_message))
+      when 'msgpack'
+        ExecUtil::MessagePackParser.new(method(:on_message))
+      else
+        ExecUtil::TextParserWrapperParser.new(conf, method(:on_message))
+      end
+    end
+
     def start
       @finished = false
       @thread = Thread.new(&method(:run_periodic))
@@ -115,19 +111,23 @@ module Fluent
 
     private
 
-    def on_message(record)
+    def on_message(record, parsed_time = nil)
       if val = record.delete(@tag_key)
         tag = val
       else
         tag = @tag
       end
-
-      if val = record.delete(@time_key)
-        time = @time_parse_proc.call(val)
+  
+      if parsed_time
+        time = parsed_time
       else
-        time = Engine.now
+        if val = record.delete(@time_key)
+          time = @time_parse_proc.call(val)
+        else
+          time = Engine.now
+        end
       end
-
+  
       router.emit(tag, time, record)
     rescue => e
       log.error "exec failed to emit", :error => e.to_s, :error_class => e.class.to_s, :tag => tag, :record => Yajl.dump(record)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-exec_cron
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Hiroshi Toyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-02 00:00:00.000000000 Z
+date: 2016-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parse-cron
@@ -28,16 +28,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  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: executes external programs with cron syntax.
 email: toyama0919@gmail.com
 executables: []
@@ -160,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: executes external programs with cron syntax.