fluent-plugin-serialport 0.14.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2eac908b71ab8f1d6478d7f6aae8f15c36751fe9
-  data.tar.gz: 380a2b767e70166ebbf454755a3fc0bea30d32fc
+SHA256:
+  metadata.gz: 79c6ad8fab882773e0043b7f87acf24422f3074b172bc65eb87b0c038d133394
+  data.tar.gz: 78d5b0e63d078151bec22d061c8b80bfd378fae304b37a8cad7cdef3c6c49772
 SHA512:
-  metadata.gz: b6d0c68fcd4187054e7fb72f0584c73a695dd20de2784e63dc33d3d892a5519284de4e037081a17f35732a2b55a2c8b7a394f8898612ab9b31921f2f6e88031a
-  data.tar.gz: fcbfb8d4bebaeb120d0ea69ce8085d33df50c9ff4dc385208b1459a0c078fe33850f2ed5e51ca0d2165ca4319d0aeece4a22faf0b9a1baaff06ad37deb8061bf
+  metadata.gz: b6db9dcf07c6264a36de437df35d241718fce3ae703c0251e965fa37dfba2bccedda478885e77c25b039640373ca99a2ac648d3de524650dc0cb6868e1a16663
+  data.tar.gz: 6f2c31fb35d41d16e093fffe43e2bdf6499c723028a01fd9a8114104d9688e42803b74fe513174116c2e6c080f0d2d52fe8176bc2457be8bf0ddfea95989829f

data/fluent-plugin-serialport.gemspec

@@ -3,14 +3,13 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-serialport"
-  s.version     = "0.14.1"
+  s.version     = "1.0.0"
   s.authors     = ["MATSUMOTO Katsuyoshi"]
   s.email       = ["github@katsyoshi.org"]
   s.homepage    = "https://github.com/katsyoshi/fluent-plugin-serialport"
   s.summary     = "fluentd plugin for serial port"
   s.description = "fluentd plugin for serial port"
   s.license     = "Apache License, Version 2.0"
-  s.has_rdoc = false
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -21,5 +20,7 @@ Gem::Specification.new do |s|
   s.add_dependency "serialport"
   s.add_development_dependency "simplecov"
   s.add_development_dependency "test-unit"
+  s.add_development_dependency "test-unit-rr"
+  s.add_development_dependency "timecop"
   s.add_development_dependency "rake"
 end

data/lib/fluent/plugin/in_serialport.rb

@@ -31,15 +31,14 @@ class SerialPortInput < Fluent::Plugin::Input
 
   def run
     loop do
-      unless @serial.closed?
-        begin
-          timenow = @include_time ? Time.now.to_s << ' ' : ''
-          data = {@device => timenow << @serial.readline(@eol)}
-          router.emit(@tag, Engine.now, data)
-        rescue
-          $stderr.puts(caller) unless stopped?
-          break
-        end
+      break if @serial.closed?
+      begin
+        timenow = @include_time ? Time.now.to_s << ' ' : ''
+        data = {@device => timenow << @serial.readline(@eol)}
+        router.emit(@tag, Fluent::EventTime.now, data)
+      rescue => ex
+        log.warn(error: ex) unless stopped?
+        break
       end
     end
   end

data/test/plugin/test_in_serialport.rb

@@ -3,10 +3,16 @@ require 'test_helper'
 class SerialPortInputTest < Test::Unit::TestCase
   def setup
     Fluent::Test.setup
+    @now = event_time("2018-06-04 11:57:00 +0900")
+    Timecop.freeze(Time.parse("2018-06-04 11:57:00 +0900"))
+  end
+
+  def teardown
+    Timecop.return
   end
 
   CONFIG = %[
-    type serial_input
+    @type serial_input
     com_port serialport
     baud_rate 9600
     tag serialport
@@ -23,4 +29,76 @@ class SerialPortInputTest < Test::Unit::TestCase
     assert_equal 9600, d.instance.baud_rate
     assert_equal 'serialport', d.instance.tag
   end
+
+  sub_test_case("serial port") do
+    test "one line" do
+      mock(SerialPort).new("serialport", 9600, 8, 1, SerialPort::NONE) do
+        s = mock(Object.new)
+        n = 0
+        s.closed?.times(2) do
+          n += 1
+          n > 1
+        end
+        s.readline($/) { "This is a test\n" }
+        s.close
+        s
+      end
+      d = create_driver
+      d.run(expect_emits: 1)
+      events = d.events
+      assert_equal(1, events.size)
+      assert_equal(["serialport", @now, { "serialport" => "This is a test\n" }], events.first)
+    end
+
+    test "3 lines" do
+      mock(SerialPort).new("serialport", 9600, 8, 1, SerialPort::NONE) do
+        s = mock(Object.new)
+        n = 0
+        s.closed?.times(4) do
+          n += 1
+          n > 3
+        end
+        line = 0
+        s.readline($/).times(3) do
+          line += 1
+          "This is a test #{line}\n"
+        end
+        s.close
+        s
+      end
+      d = create_driver
+      d.run(expect_emits: 3)
+      events = d.events
+      assert_equal(3, events.size)
+      expected = [
+        ["serialport", @now, { "serialport" => "This is a test 1\n" }],
+        ["serialport", @now, { "serialport" => "This is a test 2\n" }],
+        ["serialport", @now, { "serialport" => "This is a test 3\n" }],
+      ]
+      assert_equal(expected, events)
+    end
+
+    test "raise and break" do
+      mock(SerialPort).new("serialport", 9600, 8, 1, SerialPort::NONE) do
+        s = mock(Object.new)
+        s.closed?.at_least(2) { false }
+        n = 0
+        s.readline($/).times(2) do
+          if n == 0
+            n += 1
+            "This is a test\n"
+          else
+            raise
+          end
+        end
+        s.close
+        s
+      end
+      d = create_driver
+      d.run(expect_emits: 1)
+      events = d.events
+      assert_equal(1, events.size)
+      assert_equal(["serialport", @now, { "serialport" => "This is a test\n" }], events.first)
+    end
+  end
 end

data/test/test_helper.rb

@@ -3,10 +3,15 @@ require 'simplecov'
 SimpleCov.start
 
 require 'test/unit'
+require 'test/unit/rr'
+require 'timecop'
 
 $LOAD_PATH.unshift(File.join(__dir__, '..', 'lib'))
 $LOAD_PATH.unshift(__dir__)
 require 'fluent/test'
+require 'fluent/test/helpers'
 require 'fluent/test/driver/input'
 
 require 'fluent/plugin/in_serialport'
+
+Test::Unit::TestCase.include(Fluent::Test::Helpers)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-serialport
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 1.0.0
 platform: ruby
 authors:
 - MATSUMOTO Katsuyoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-17 00:00:00.000000000 Z
+date: 2018-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -72,6 +72,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit-rr
+  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'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  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'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -123,10 +151,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: fluentd plugin for serial port
-test_files:
-- test/plugin/test_in_serialport.rb
-- test/test_helper.rb
+test_files: []