fluent-plugin-sakuraio 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e4048610939f4ee51631219d5f0e08a43c4d66a339e5527a6f6fdcdcedc0ad2
-  data.tar.gz: 4cd1c9fb745886a0927276c88068f7252e25ae254fdab3dcfd5c040b79ebcf47
+  metadata.gz: 2133a1990142c8af8b45606a6c4da9dcbcfda3e03acadd54fd1a0d6a32fe7071
+  data.tar.gz: d470a453155ca5e7e43a340002f57d4a083c0ba34b89c612b4354c21d0620749
 SHA512:
-  metadata.gz: a3e10d9c21538474d6b6a57cf6a729b874b796c23a7c9f1e260f213c64da43d196e7a87d08fe89d455388399267348802419840e151e54be00656a4b7fcf7f6a
-  data.tar.gz: 5c00a268963655a5508f62bc162c76e320d2dc465ebc0b4886f5e28daac09bbc5421199378ca70136b11452e33b455a1e1506badee6a35adb869629b7a3b3ee7
+  metadata.gz: 2a753e2252f6e642220d6704319d359fb589b0679a6d8ad2505ac7f62e22f3277934e134e7d02048ee5c08927ab5ac97d10c8347446e3ca088c711b048d2a5e2
+  data.tar.gz: 047b19c1f4424c8bea013fa513b2d01eaf4ef1acef08094d22ca7a1a1c40d77ab68f5ecf6259e569d55d2b8766714fe625bc8a86470eb44f1694c696c68ae754

data/.github/workflows/test.yml

@@ -0,0 +1,34 @@
+name: test
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Ruby
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.6.x
+    - uses: actions/cache@v1
+      with:
+        path: vendor/bundle
+        key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-gem-
+    - name: Bundle install
+      run: |
+        gem install bundler -v 2.1.4
+        bundle config path vendor/bundle
+        bundle install --jobs 4 --retry 3
+    - name: rubocop
+      run: |
+        bundle exec rubocop
+    - name: test
+      run: |
+        bundle exec rake test
+      env:
+        CI: true
+        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

data/.gitignore

@@ -1,6 +1,5 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/.rubocop.yml

@@ -13,6 +13,9 @@ Style/ClassAndModuleChildren:
 Style/Documentation:
   Enabled: false
 
+Metrics/AbcSize:
+  Max: 25
+
 Metrics/BlockLength:
   Exclude:
     - 'test/**/*'

data/Gemfile.lock

@@ -0,0 +1,100 @@
+PATH
+  remote: .
+  specs:
+    fluent-plugin-sakuraio (0.1.3)
+      eventmachine
+      faye-websocket
+      fluentd (>= 0.14, < 2)
+      yajl-ruby
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.0)
+    codecov (0.1.16)
+      json
+      simplecov
+      url
+    concurrent-ruby (1.1.5)
+    cool.io (1.5.4)
+    daemons (1.3.1)
+    dig_rb (1.0.1)
+    docile (1.3.2)
+    eventmachine (1.2.7)
+    faye-websocket (0.10.9)
+      eventmachine (>= 0.12.0)
+      websocket-driver (>= 0.5.1)
+    fluentd (1.8.1)
+      cool.io (>= 1.4.5, < 2.0.0)
+      dig_rb (~> 1.0.0)
+      http_parser.rb (>= 0.5.1, < 0.7.0)
+      msgpack (>= 1.2.0, < 2.0.0)
+      serverengine (>= 2.0.4, < 3.0.0)
+      sigdump (~> 0.2.2)
+      strptime (>= 0.2.2, < 1.0.0)
+      tzinfo (>= 1.0, < 3.0)
+      tzinfo-data (~> 1.0)
+      yajl-ruby (~> 1.0)
+    http_parser.rb (0.6.0)
+    jaro_winkler (1.5.4)
+    json (2.3.0)
+    msgpack (1.3.1)
+    parallel (1.19.1)
+    parser (2.7.0.1)
+      ast (~> 2.4.0)
+    power_assert (1.1.5)
+    rack (2.0.8)
+    rainbow (3.0.0)
+    rake (13.0.1)
+    rubocop (0.79.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    rubocop-performance (1.5.2)
+      rubocop (>= 0.71.0)
+    ruby-progressbar (1.10.1)
+    serverengine (2.2.0)
+      sigdump (~> 0.2.2)
+    sigdump (0.2.4)
+    simplecov (0.17.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    strptime (0.2.3)
+    test-unit (3.3.4)
+      power_assert
+    thin (1.7.2)
+      daemons (~> 1.0, >= 1.0.9)
+      eventmachine (~> 1.0, >= 1.0.4)
+      rack (>= 1, < 3)
+    tzinfo (2.0.1)
+      concurrent-ruby (~> 1.0)
+    tzinfo-data (1.2019.3)
+      tzinfo (>= 1.0.0)
+    unicode-display_width (1.6.0)
+    url (0.3.2)
+    websocket-driver (0.7.1)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.4)
+    yajl-ruby (1.4.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  codecov
+  fluent-plugin-sakuraio!
+  rack
+  rake
+  rubocop
+  rubocop-performance
+  test-unit
+  thin
+
+BUNDLED WITH
+   2.1.4

data/README.md

@@ -21,6 +21,7 @@ gem install 'fluent-plugin-sakuraio'
 <source>
   @type sakuraio
   url wss://api.sakura.io/ws/v1/xxxxxxxxxxxxxxxxxxxxxxx
+  ping 60
 </source>
 ```
 
@@ -45,6 +46,7 @@ The details of sakura.io message spec: https://sakura.io/docs/pages/platform-spe
   url wss://api.sakura.io/ws/v1/xxxxxxxxxxxxxxxxxxxxxxx
   modules ["uXXXXXXXXXXX"] # array of modules
   channels {"0": ["key", "i"]} # hash of channels {"channel number": ["key in record", "data type"]}
+  ping 60
 </match>
 ```
 

data/Rakefile

@@ -7,6 +7,7 @@ Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
   test.pattern = 'test/**/test_*.rb'
   test.verbose = true
+  test.ruby_opts += ['-W1']
 end
 
 task default: :test

data/codecov.yml

@@ -0,0 +1,2 @@
+ignore:
+  - "test"

data/fluent-plugin-sakuraio.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'fluent-plugin-sakuraio'
-  spec.version       = '0.1.3'
+  spec.version       = '0.2.0'
   spec.authors       = ['Yuya Kusakabe']
   spec.email         = ['yuya.kusakabe@gmail.com']
 
@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'fluentd', '>= 0.14', '< 2'
   spec.add_runtime_dependency 'yajl-ruby'
   spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'codecov'
   spec.add_development_dependency 'rack'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rubocop'

data/lib/fluent/plugin/in_sakuraio.rb

@@ -12,6 +12,7 @@ module Fluent::Plugin
     helpers :thread
 
     config_param :url, :string, secret: true
+    config_param :ping, :integer, default: 60
 
     def configure(conf)
       super
@@ -41,7 +42,9 @@ module Fluent::Plugin
     end
 
     def run
-      client = Faye::WebSocket::Client.new(@url)
+      options = {}
+      @ping.positive? options[:ping] = @ping
+      client = Faye::WebSocket::Client.new(@url, nil, options)
       EM.next_tick do
         client.on :open do
           log.info "sakuraio: starting websocket connection for #{@url}."
@@ -55,8 +58,9 @@ module Fluent::Plugin
           log.warn "sakuraio: #{event.message}"
         end
 
-        client.on :close do
-          client = nil
+        client.on :close do |event|
+          log.warn "sakuraio: #{event.code} #{event.reason}"
+          run
         end
       end
     end

data/lib/fluent/plugin/out_sakuraio.rb

@@ -12,6 +12,7 @@ module Fluent::Plugin
     config_param :modules, :array, value_type: :string, secret: true
     # channels {"channel_number": ["key", "type"]}
     config_param :channels, :hash
+    config_param :ping, :integer, default: 60
 
     def configure(conf)
       super
@@ -29,7 +30,9 @@ module Fluent::Plugin
     end
 
     def run
-      @client = Faye::WebSocket::Client.new(@url)
+      options = {}
+      @ping.positive? options[:ping] = @ping
+      @client = Faye::WebSocket::Client.new(@url, nil, options)
       EM.next_tick do
         @client.on :open do
           log.info "sakuraio: starting websocket connection for #{@url}."
@@ -43,8 +46,9 @@ module Fluent::Plugin
           log.warn "sakuraio: #{event.message}"
         end
 
-        @client.on :close do
-          @client = nil
+        @client.on :close do |event|
+          log.warn "sakuraio: #{event.code} #{event.reason}"
+          run
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-sakuraio
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Yuya Kusakabe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-08 00:00:00.000000000 Z
+date: 2020-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -86,6 +86,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: codecov
+  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: rack
   requirement: !ruby/object:Gem::Requirement
@@ -177,14 +191,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
+- codecov.yml
 - fluent-plugin-sakuraio.gemspec
 - lib/fluent/plugin/in_sakuraio.rb
 - lib/fluent/plugin/out_sakuraio.rb

data/.travis.yml

@@ -1,13 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.1
-  - 2.2
-  - 2.3.5
-  - 2.4.2
-  - ruby-head
-script:
-  - bundle exec rake test
-matrix:
-  allow_failures:
-    - rvm: ruby-head