fluent-plugin-script 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d65cd428e94420db53c0bb98d13c70c3bcc77b38
-  data.tar.gz: 06342a822a3c23facd9ea046e1923f91f02bf940
+  metadata.gz: 8b7c2a59a03a4142ff2215547ad71758f0e5dd7f
+  data.tar.gz: e722d96124e96dfedf35b423ab69911053349c4c
 SHA512:
-  metadata.gz: 5eb1fe8c00da41a6cc46b7ecb79af5d8ef24c45a90db6062c31a3e917038121a7da51e5948025df3d3f07e12ad94c63de91d3d25e4c3aea3ffca65b19e884719
-  data.tar.gz: d5a7a4cd81dd8cb41d0248c874770992692849fdc75e729d97a7d34bccfbbabb735997923a40a078e3863edf288498a02d0640e002c48e2a1ccc8811c0944fdc
+  metadata.gz: 9851a8d70d497e63d03c9f1d659700cd39a0735ac07017429f5caa82d1780086122e5279302e53a2e218a80d276e4d92b45569252130ec6da8f0db81c029d332
+  data.tar.gz: de4ac6ced65451d860dbc569a22fdd68cabc05c0653196bfe0994f20bae36ca5157b080092d7d20ba3367539ce80bf7787262121222792fce44ad9d29e23bef0

data/.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
 rvm:
-  - "2.2.2"
-  - "2.1.6"
+  - 2.4.2
+  - 2.3.5
+  - 2.2
+  - 2.1

data/README.md

@@ -11,6 +11,13 @@ Fluent filter plugin to external ruby script.
 gem install fluent-plugin-filter-script
 ``
 
+### Requirements
+
+| fluent-plugin-script | fluentd    |
+|----------------------|------------|
+| >= 0.1.0             | >= v0.14.0 |
+| <  0.0.4             | <  v0.14.0 |
+
 ## Configuration
 
 #### fluent.conf
@@ -27,7 +34,7 @@ gem install fluent-plugin-filter-script
 def start
   super
   # This is the first method to be called when it starts running
-  # Use it to allocate resources, etc.  
+  # Use it to allocate resources, etc.
 end
 
 def shutdown

data/fluent-plugin-script.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = "fluent-plugin-script"
-  s.version       = "0.0.4"
+  s.version       = "0.1.0"
   s.licenses      = ["MIT"]
   s.summary       = "Fluentd filter plugin to external ruby script"
   s.description   = s.summary
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- test/*`.split("\n")
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "fluentd", "~> 0.12.0"
+  s.add_runtime_dependency "fluentd", [">= 0.14.0", "< 2"]
   s.add_development_dependency "rake", "~> 10.4.2"
   s.add_development_dependency "test-unit", "~> 3.1.3"
 end

data/lib/fluent/plugin/filter_script.rb

@@ -1,6 +1,8 @@
-module Fluent
+require 'fluent/plugin/filter'
+
+module Fluent::Plugin
   class ScriptFilter < Filter
-    Plugin.register_filter('script', self)
+    Fluent::Plugin.register_filter('script', self)
 
     config_param :path, :string
 
@@ -10,9 +12,12 @@ module Fluent
     end
 
     def load_script_file(path)
-      raise ConfigError, "Ruby script file does not exist: #{path}" unless File.exist?(path)
+      raise Fluent::ConfigError, "Ruby script file does not exist: #{path}" unless File.exist?(path)
       eval "self.instance_eval do;" + IO.read(path) + ";\nend"
     end
+
+    def filter(tag, time, record)
+      # Overwritten by evaluated script.
+    end
   end
 end
-

data/test/plugin/test_filter_script.rb

@@ -1,6 +1,7 @@
 require 'test/unit'
 require 'fluent/log'
 require 'fluent/test'
+require 'fluent/test/driver/filter'
 require 'fluent/plugin/filter_script'
 
 class RubyFilterTest < Test::Unit::TestCase
@@ -11,7 +12,7 @@ class RubyFilterTest < Test::Unit::TestCase
   end
 
   def create_driver(conf = '')
-    Test::FilterTestDriver.new(ScriptFilter).configure(conf, true)
+    Test::Driver::Filter.new(Plugin::ScriptFilter).configure(conf)
   end
 
   sub_test_case 'configure' do
@@ -32,9 +33,10 @@ class RubyFilterTest < Test::Unit::TestCase
   sub_test_case 'filter' do
     def emit(conf, msg)
       d = create_driver(conf)
-      d.run {
-        d.emit({'foo' => 'bar', 'message' => msg}, Fluent::Engine.now)
-      }.filtered
+      d.run(default_tag: 'test') {
+        d.feed(Fluent::Engine.now, {'foo' => 'bar', 'message' => msg})
+      }
+      d.filtered
     end
     test 'execute filter' do
       conf = "path #{__dir__}/example.rb"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-script
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - SNakano
@@ -14,16 +14,22 @@ dependencies:
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement