embulk-input-pcapng-files 0.1.4 → 0.1.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b846df88bec63c3202e1cee8a135ec907ee914e5
+  data.tar.gz: 7328186d3f07b67bcb41407df722dcc3c2bb5a3d
+SHA512:
+  metadata.gz: 32261a5cbd7dc6852db203e88684fd8be3aab128e335c9614c1a5264a25dbe851cb6919ea65352a36ba57860ea252e3a9d0f5530190494add3c408ef5bbaa1cf
+  data.tar.gz: c166a539b0cff2977bb3c045313e91e885036efb7758cb4a3a3a13b526e7975a8307b2f4a0d3512ace1a8646d4ee7584aff4fbc67860b9f90a5f0aec7e74da06

data/README.md

@@ -16,10 +16,11 @@ Obsoletes enukane/embulk-plugin-input-pcapng-files
 
 |name|type|required?|default|description|
 |:---|:---|:--------|:------|:----------|
-| paths | string | required | [] | paths where pcapng files exist (no recursive searching|
+| paths | array | required | [] | paths where pcapng files exist (no recursive searching|
 | convertdot | string | optional | nil | convert "." in field name (for outputing into DB who doesn't accept "dot" in schema)|
+| use\_basename | bool | optional | false | use basename (w/o ext) as "path" value |
 | schema| array of field hash | required | nil | list of field to extract from pcapng file |
-|field hash| hash ({name, type}) | required | nil | "name" matches field name for tshakr (-e), "type" should be "long", "double", "string" |
+|field hash| hash ({name, type}) | required | nil | "name" matches field name for tshakr (-e), "type" should be "long", "double", "string", "timestamp" |
 
 ## Example
 
@@ -31,7 +32,7 @@ in:
   threads: 2
   schema:
     - { name: frame.number,                 type: long }
-    - { name: frame.time_epoch,             type: double }
+    - { name: frame.time_epoch,             type: timestamp }
     - { name: frame.len,                    type: long }
     - { name: wlan_mgt.ssid,                type: string }
 ```

data/embulk-input-pcapng-files.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "embulk-input-pcapng-files"
-  spec.version       = "0.1.4"
+  spec.version       = "0.1.5"
   spec.authors       = ["enukane"]
   spec.summary       = "Pcapng Files input plugin for Embulk"
   spec.description   = "Pcapng Files input plugin for Embulk"

data/lib/embulk/input/pcapng_files.rb

@@ -2,6 +2,7 @@
 module Embulk
   module Plugin
     require "csv"
+    require "time"
 
     class InputPcapngFiles < InputPlugin
       Plugin.register_input("pcapng_files", self)
@@ -11,6 +12,7 @@ module Embulk
           'paths' => [],
           'done' => config.param('done', :array, default: []),
           'convertdot' => config.param('convertdot', :string, default: nil),
+          'use_basename' => config.param('use_basename', :bool, default: false),
         }
 
         task['paths'] = config.param('paths', :array, default: []).map {|path|
@@ -53,7 +55,9 @@ module Embulk
       def run
         path = task['paths'][@index]
         each_packet(path, schema[1..-1].map{|elm| elm.name}) do |hash|
-          entry = [ path ] + schema[1..-1].map {|c|
+          entry = []
+          entry << (task['use_basename'] ? File.basename(path, File.extname(path)) : path)
+          entry += schema[1..-1].map {|c|
             convert(hash[c.name], c.type)
           }
           @page_builder.add(entry)
@@ -77,6 +81,8 @@ module Embulk
           end
         when :double
           v = v.to_f
+        when :timestamp
+          v = Time.at(v.to_f)
         end
         return v
       end

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-pcapng-files
 version: !ruby/object:Gem::Version
-  version: 0.1.4
-  prerelease: 
+  version: 0.1.5
 platform: ruby
 authors:
 - enukane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-04 00:00:00.000000000 Z
+date: 2015-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
 description: Pcapng Files input plugin for Embulk
@@ -50,7 +45,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -60,32 +55,25 @@ files:
 homepage: https://github.com/enukane/embulk-input-pcapng-files
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4490009824512618125
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4490009824512618125
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Pcapng Files input plugin for Embulk
 test_files: []