fluent-plugin-serialport 0.1.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba4f2e4c7d56244479db582ef6965d322b4c725a
-  data.tar.gz: bdec7475b49599dfe44509de28a2d3dd73ed796e
+  metadata.gz: 1d30caee6ecd937883c1072505107f41f207b65c
+  data.tar.gz: 4cbc230c9d0aa38738dd596380728901be04dc6e
 SHA512:
-  metadata.gz: dd753c46fc9106340bd8f5bb052403d9a4ca28c1c2c12ab787031572ebb9698b3680cf91678d968449c0561b8a6394da61d8cb974e7a9057e98bd842f02a8e11
-  data.tar.gz: fc41a0f672b0151b4d21ae5bc35bc66ce7b8feeb54e156903b91775ad46e5930da9c1b30dbba7c7411fde8e145d0a57f6d79b25544d0ea5abaf87b11ed650ec4
+  metadata.gz: 596feb2a869f42ccd0af4d5cdd8f0c0e24aaca53254dbede892b646dab121a7e18118c9976b4627a39dbf3c9148f923a53facf2bcdcf42c8eef8a39f99ee981b
+  data.tar.gz: cff51fcecc7eaba5e901d13ac843ee64bb6a43e87fe343d3fd42b6670668e65b778c2888fadce3e09fd2b18639ffd330e56be3ceac37ecfd302eafbae9cad0b7

data/.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
 rvm:
-  - 2.1.5
-  - 2.2.2
+  - 2.1
+  - 2.2
+  - 2.3.4
+  - 2.4.1

data/fluent-plugin-serialport.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-serialport"
-  s.version     = "0.1.0"
+  s.version     = "0.14.0"
   s.authors     = ["MATSUMOTO Katsuyoshi"]
   s.email       = ["github@katsyoshi.org"]
   s.homepage    = "https://github.com/katsyoshi/fluent-plugin-serialport"
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "fluentd"
+  s.add_dependency "fluentd", ">= 0.14", "< 2"
   s.add_dependency "serialport"
   s.add_development_dependency "simplecov"
   s.add_development_dependency "test-unit"

data/lib/fluent/plugin/in_serialport.rb

@@ -1,19 +1,17 @@
 require 'fluent/input'
-module Fluent
-class SerialPortInput < Input
-  Plugin.register_input('serialport', self)
-  config_param :com_port, :string
-  config_param :baud_rate, :integer
-  config_param :tag, :string, :default => "serial"
-  config_param :eol, :string, :default => $/
-  config_param :include_time, :bool, :default => false
+require 'serialport'
 
-  define_method("router") { Fluent::Engine } unless method_defined?(:router)
+module Fluent::Plugin
+class SerialPortInput < Fluent::Plugin::Input
+  Fluent::Plugin.register_input('serialport', self)
 
-  def initialize
-    require 'serialport'
-    super
-  end
+  helpers :thread
+
+  config_param :com_port, :string
+  config_param :baud_rate, :integer
+  config_param :tag, :string, default: "serial"
+  config_param :eol, :string, default: $/
+  config_param :include_time, :bool, default: false
 
   def configure(conf)
     super
@@ -21,13 +19,14 @@ class SerialPortInput < Input
   end
 
   def start
+    super
     @serial = SerialPort.new(@com_port, @baud_rate, 8, 1, SerialPort::NONE)
-    @thread = Thread.new(&method(:run))
+    thread_create(:in_serialport, &method(:run))
   end
 
   def shutdown
     @serial.close
-    @thread.join
+    super
   end
 
   def run
@@ -38,7 +37,7 @@ class SerialPortInput < Input
           data = {@device => timenow << @serial.readline(@eol)}
           router.emit(@tag, Engine.now, data)
         rescue
-          STDERR.puts caller()
+          $stderr.puts(caller) unless stopped?
           break
         end
       end

data/test/plugin/test_in_serialport.rb

@@ -1,9 +1,8 @@
-require 'fluent/test'
+require 'test_helper'
 
 class SerialPortInputTest < Test::Unit::TestCase
   def setup
     Fluent::Test.setup
-    require 'fluent/plugin/in_serialport'
   end
 
   CONFIG = %[
@@ -15,7 +14,7 @@ class SerialPortInputTest < Test::Unit::TestCase
   ]
 
   def create_driver(conf=CONFIG)
-    Fluent::Test::InputTestDriver.new(Fluent::SerialPortInput).configure(conf)
+    Fluent::Test::Driver::Input.new(Fluent::Plugin::SerialPortInput).configure(conf)
   end
 
   def test_configure_test_driver

data/test/test_helper.rb

@@ -1,30 +1,12 @@
-require 'bundler'
+require 'bundler/setup'
 require 'simplecov'
 SimpleCov.start
 
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
 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'
-unless ENV.has_key?('VERBOSE')
-  nulllogger = Object.new
-  nulllogger.instance_eval {|obj|
-    def method_missing(method, *args)
-      # pass
-    end
-  }
-  $log = nulllogger
-end
+require 'fluent/test/driver/input'
 
 require 'fluent/plugin/in_serialport'
-
-class Test::Unit::TestCase
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-serialport
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.14.0
 platform: ruby
 authors:
 - MATSUMOTO Katsuyoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-24 00:00:00.000000000 Z
+date: 2017-05-11 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'
+    - - "<"
+      - !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'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: serialport
   requirement: !ruby/object:Gem::Requirement
@@ -117,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: fluentd plugin for serial port