fluent-plugin-stdout-pp 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b61c7757d5d658aa171a9026b8102f5b4a2b8d23
-  data.tar.gz: f16d7c86c25ac86659c629260bd64d18a3df38cf
+  metadata.gz: 22d8905b6b920b7ad4d927cce2012bb4b0424e1d
+  data.tar.gz: ee54f2fa1d41a358e5888eee66390155e2777fb2
 SHA512:
-  metadata.gz: 357e69f7a0adcbe3c83b5a3d71b96dede94d2f05406ac276f884ec6339aeae38494f578abe5f5a23806ef4524e1f2e5286bef180dbbf42c3836a408ff83b5343
-  data.tar.gz: cb1980091799ed9712942829c7d778612a4ca7d4fb1073c5f9ab741fcc8bd5714b8b17a39d51ea05e4156eb1c968efec665d43e447465c7c1e023ff3009ea585
+  metadata.gz: f4c95e90597115f1df35ce05bf047a2b0b1a326c36730f900d9bd90395d335a8425a31bfbe61e7d1cb47bc532e19a8ef2a8d95a144edd0a98724ccf5f91ff261
+  data.tar.gz: a088f56d35d9548e95eb413e57f30c1605759108d0777d4a89fc78f34e14dc164f2ae7479dcdf26048120f14aacdb51749f89b7eb6db7424095bccb4fa8ff234

data/README.md

@@ -1,9 +1,16 @@
-# fluent-plugin-stdout-pp
+# fluent-plugin-stdout-pp, a plugin for [Fluentd](https://www.fluentd.org)
 
 [![Build Status](https://travis-ci.org/sabottenda/fluent-plugin-stdout-pp.svg)](https://travis-ci.org/sabottenda/fluent-plugin-stdout-pp)
 
 A fluentd plugin to pretty print json with color to stdout
 
+## Requirements
+
+| fluent-plugin-stdout-pp | fluentd    | ruby   |
+|-------------------------|------------|--------|
+| >= 0.2.0                | >= v0.14.0 | >= 2.1 |
+| < 0.2.0                 | >= v0.12.0 | >= 1.9 |
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -22,7 +29,7 @@ Or install it yourself as:
 
 ```
 <match **>
-  type stdout_pp
+  @type stdout_pp
   time_color blue
   tag_color yellow
 </match>

data/fluent-plugin-stdout-pp.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-stdout-pp"
-  spec.version       = "0.1.0"
+  spec.version       = "0.2.0"
   spec.authors       = ["Masahiro Sano"]
   spec.email         = ["sabottenda@gmail.com"]
   spec.description   = %q{A fluentd plugin to pretty print json with color to stdout}
@@ -17,7 +17,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "fluentd"
+  spec.add_dependency "fluentd", ">= 0.14.12", "< 2"
   spec.add_dependency "coderay"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "test-unit", "> 3"
 end

data/lib/fluent/plugin/out_stdout_pp.rb

@@ -1,13 +1,13 @@
 require 'coderay'
 
-module Fluent
-  class StdoutPPOutput < Output
+module Fluent::Plugin
+  class StdoutPPOutput < Fluent::Plugin::Output
     Fluent::Plugin.register_output('stdout_pp', self)
 
-    config_param :pp, :bool, :default => true
-    config_param :time_color, :string, :default => 'blue'
-    config_param :tag_color, :string, :default => 'yellow'
-    config_param :record_colored, :bool, :default => true
+    config_param :pp, :bool, default: true
+    config_param :time_color, :string, default: 'blue'
+    config_param :tag_color, :string, default: 'yellow'
+    config_param :record_colored, :bool, default: true
 
     TTY_COLOR = {
       normal:  "\033[0;39m",
@@ -20,10 +20,6 @@ module Fluent
       white:   "\033[1;37m",
     }
 
-    def initialize
-      super
-    end
-
     def configure(conf)
       super
 
@@ -38,7 +34,7 @@ module Fluent
       end
     end
 
-    def emit(tag, es, chain)
+    def process(tag, es)
       tag_colored = TTY_COLOR[@tag_color] + tag + TTY_COLOR[:normal]
       es.each do |time, record|
         time_colored = TTY_COLOR[@time_color] + Time.at(time).localtime.to_s + TTY_COLOR[:normal]
@@ -48,10 +44,13 @@ module Fluent
           json = Yajl.dump(record)
         end
         json = CodeRay.scan(json, :json).terminal if @record_colored
-        $log.write "#{time_colored} #{tag_colored}: #{json}\n"
+        log.write "#{time_colored} #{tag_colored}: #{json}\n"
       end
-      $log.flush
-      chain.next
+      log.flush
+    end
+
+    def multi_workers_ready?
+      true
     end
   end
 end

data/test/helper.rb

@@ -1,23 +1,9 @@
 require 'test/unit'
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(__dir__, '..', 'lib'))
+$LOAD_PATH.unshift(__dir__)
 require 'fluent/test'
+require 'fluent/test/driver/output'
+require 'fluent/test/helpers'
 
-def capture(&block)
-  old = $log
-  $log = StringIO.new
-  yield
-  return $log.string
-ensure
-  $log = old
-end
-
-# def capture
-#   old = $stdout
-#   $stdout = StringIO.new('','w')
-#   yield
-#   $stdout.string
-# ensure
-#   $stdout = old
-# end
+Test::Unit::TestCase.include(Fluent::Test::Helpers)

data/test/plugin/test_out_stdout_pp.rb

@@ -10,7 +10,7 @@ class StdoutOutputPPTest < Test::Unit::TestCase
   ]
 
   def create_driver(conf = CONFIG)
-    Fluent::Test::OutputTestDriver.new(Fluent::StdoutPPOutput).configure(conf)
+    Fluent::Test::Driver::Output.new(Fluent::Plugin::StdoutPPOutput).configure(conf)
   end
 
   def test_configure
@@ -19,28 +19,37 @@ class StdoutOutputPPTest < Test::Unit::TestCase
     assert_equal Symbol, d.instance.tag_color.class
   end
 
-  def test_emit
+  def test_process
     d = create_driver
-    time = Time.now
-    out = capture { d.emit({'test' => 'test'}, time) }
-    assert_equal "\e[1;34m#{time.localtime}\e[0;39m \e[1;33mtest\e[0;39m: {\n  \e[35m\e[1;35m\"\e[0m\e[35mtest\e[1;35m\"\e[0m\e[35m\e[0m: \e[31m\e[1;31m\"\e[0m\e[31mtest\e[1;31m\"\e[0m\e[31m\e[0m\n}\n", out
+    time = event_time
+    localtime = time2str(time, localtime: true, format: '%Y-%m-%d %H:%M:%S %z')
+    d.run(default_tag: 'test') do
+      d.feed(time, {'test' => 'test'})
+    end
+    assert_equal "\e[1;34m#{localtime}\e[0;39m \e[1;33mtest\e[0;39m: {\n  \e[35m\e[1;35m\"\e[0m\e[35mtest\e[1;35m\"\e[0m\e[35m\e[0m: \e[31m\e[1;31m\"\e[0m\e[31mtest\e[1;31m\"\e[0m\e[31m\e[0m\n}\n", d.logs.first
   end
 
-  def test_emit_no_color
+  def test_process_no_color
     d = create_driver(CONFIG + "record_colored false\n")
-    time = Time.now
+    time = event_time
+    localtime = time2str(time, localtime: true, format: '%Y-%m-%d %H:%M:%S %z')
     record = {'test' => 'test'}
-    out = capture { d.emit(record, time) }
-    assert_equal "\e[1;34m#{time.localtime}\e[0;39m \e[1;33mtest\e[0;39m: #{JSON.pretty_generate(record)}\n", out
+    d.run(default_tag: 'test') do
+      d.feed(time, record)
+    end
+    assert_equal "\e[1;34m#{localtime}\e[0;39m \e[1;33mtest\e[0;39m: #{JSON.pretty_generate(record)}\n", d.logs.first
   end
 
-  def test_emit_without_pp
+  def test_process_without_pp
     d = create_driver(CONFIG + "pp false\n")
-    time = Time.now
+    time = event_time
+    localtime = time2str(time, localtime: true, format: '%Y-%m-%d %H:%M:%S %z')
     record = {'test' => 'test'}
-    out = capture { d.emit(record, time) }
+    d.run(default_tag: 'test') do
+      d.feed(time, record)
+    end
 
-    assert_equal "\e[1;34m#{time.localtime}\e[0;39m \e[1;33mtest\e[0;39m: {\e[35m\e[1;35m\"\e[0m\e[35mtest\e[1;35m\"\e[0m\e[35m\e[0m:\e[31m\e[1;31m\"\e[0m\e[31mtest\e[1;31m\"\e[0m\e[31m\e[0m}\n", out
+    assert_equal "\e[1;34m#{localtime}\e[0;39m \e[1;33mtest\e[0;39m: {\e[35m\e[1;35m\"\e[0m\e[35mtest\e[1;35m\"\e[0m\e[35m\e[0m:\e[31m\e[1;31m\"\e[0m\e[31mtest\e[1;31m\"\e[0m\e[31m\e[0m}\n", d.logs.first
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-stdout-pp
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Masahiro Sano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-10 00:00:00.000000000 Z
+date: 2017-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.12
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.12
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: coderay
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +58,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '3'
 description: A fluentd plugin to pretty print json with color to stdout
 email:
 - sabottenda@gmail.com
@@ -88,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A fluentd plugin to pretty print json with color to stdout