fluent-plugin-kestrel 0.1.0 → 0.1.1

data/Gemfile

@@ -7,7 +7,7 @@ source "http://rubygems.org"
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
+  gem "bundler", ">= 1.0.0"
   gem "rdoc", "~> 3.12"
   gem "jeweler", "~> 1.8.3"
   gem "rcov", ">= 0" if RUBY_VERSION < "1.9.0"

data/README.rdoc

@@ -8,6 +8,10 @@ see https://github.com/fluent/fluentd
 kestrel is a simple, distributed message queue.
 see https://github.com/robey/kestrel
 
+== Installation
+
+  gem install fluent-plugin-kestrel
+
 == Fluentd Configuration
 
   <match kestrel.**>
@@ -19,6 +23,24 @@ see https://github.com/robey/kestrel
     port 22133         # optional, default 22133
   </match>
 
+== Data Format
+
+    [time]\t[tag]\t[resource(JSON)]
+
+you can see its data format like so:
+    $ telnet localhost 22133
+
+    get test
+
+    VALUE test 0 125
+    2012-02-11T16:38:54Z apache.access   {"host":"::1","user":"-","method":"GET","path":"/test/","code":"304","size":"-"}
+    END
+
+
+== ToDo
+
+Data format customizable.
+
 
 == Contributing to fluent-plugin-kestrel
 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/fluent-plugin-kestrel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fluent-plugin-kestrel"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Junichiro Takagi"]
-  s.date = "2012-02-11"
+  s.date = "2012-05-20"
   s.description = "fluentd output plugin for kestrel queue."
   s.email = "t.junichiro@gmail.com"
   s.extra_rdoc_files = [
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/tjun/fluent-plugin-kestrel"
   s.licenses = ["Apache License, Version 2.0"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.15"
+  s.rubygems_version = "1.8.24"
   s.summary = "fluentd output plugin for kestrel."
 
   if s.respond_to? :specification_version then
@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<kestrel-client>, [">= 0.7.1"])
       s.add_runtime_dependency(%q<fluentd>, [">= 0.10.10"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_development_dependency(%q<simplecov>, [">= 0.3.5"])
@@ -50,7 +50,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<kestrel-client>, [">= 0.7.1"])
       s.add_dependency(%q<fluentd>, [">= 0.10.10"])
       s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_dependency(%q<simplecov>, [">= 0.3.5"])
@@ -60,7 +60,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<kestrel-client>, [">= 0.7.1"])
     s.add_dependency(%q<fluentd>, [">= 0.10.10"])
     s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
     s.add_dependency(%q<simplecov>, [">= 0.3.5"])

data/lib/fluent/plugin/out_kestrel.rb

@@ -7,7 +7,7 @@ module Fluent
     config_param :port,         :integer,   :default => 22133
     config_param :queue,        :string,    :default => nil
     config_param :ttl,          :integer,   :default => 0
-    config_param :raw,          :bool,      :default => false
+    config_param :raw,          :bool,      :default => true
     config_param :time_format,  :string,    :default => nil
 
 
@@ -45,13 +45,13 @@ module Fluent
       chunk.open { |io|
         begin
           MessagePack::Unpacker.new(io).each{ |tag, time, record|
-            time_str = @timef.format(time)          
+            time_str = @timef.format(time)
             data = "#{time_str}\t#{tag}\t#{record.to_json}"
-            
+
             @kestrel.set(@queue, data, ttl=@ttl, raw=@raw)
           }
         rescue EOFError
-          # EOFError always occured when reached end of chunk.          
+          # EOFError always occured when reached end of chunk.
         end
       }
     end

data/test/plugin/test_out_kestrel.rb

@@ -10,7 +10,7 @@ class TestFluentPluginKestrel < Test::Unit::TestCase
     type kestrel
     host localhost
     port 22133
-    queue test
+    queue fluent-test
   ]
 
   def create_driver(conf = CONFIG)
@@ -22,12 +22,13 @@ class TestFluentPluginKestrel < Test::Unit::TestCase
       type kestrel
       host localhost
       port 22133
-      queue test
+      queue fluent-test
     ])
 
     assert_equal 'localhost', d.instance.host
     assert_equal 22133, d.instance.port
-    assert_equal "test", d.instance.queue
+    assert_equal "fluent-test", d.instance.queue
+
   end
 
   def test_format
@@ -48,11 +49,11 @@ class TestFluentPluginKestrel < Test::Unit::TestCase
     d.emit({"a"=>3}, time)
     d.run
 
-    assert_equal "2011-01-02T13:14:15Z\ttest\t{\"a\":1}", d.instance.kestrel.get("test")
-    assert_equal "2011-01-02T13:14:15Z\ttest\t{\"a\":2}", d.instance.kestrel.get("test")
-    assert_equal "2011-01-02T13:14:15Z\ttest\t{\"a\":3}", d.instance.kestrel.get("test")
-    
-    
+    get_opt = { :raw => true }.freeze
+
+    assert_equal "2011-01-02T13:14:15Z\ttest\t{\"a\":1}", d.instance.kestrel.get("fluent-test", opts=get_opt)
+    assert_equal "2011-01-02T13:14:15Z\ttest\t{\"a\":2}", d.instance.kestrel.get("fluent-test", opts=get_opt)
+    assert_equal "2011-01-02T13:14:15Z\ttest\t{\"a\":3}", d.instance.kestrel.get("fluent-test", opts=get_opt)
 
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kestrel
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-11 00:00:00.000000000Z
+date: 2012-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kestrel-client
-  requirement: &70152932627300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 0.7.1
   type: :runtime
   prerelease: false
-  version_requirements: *70152932627300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &70152932624980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 0.10.10
   type: :runtime
   prerelease: false
-  version_requirements: *70152932624980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.10.10
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70152932623080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,21 +53,31 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70152932623080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70152932621340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70152932621340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70152932619720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +85,15 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *70152932619720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70152932617180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +101,15 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70152932617180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.3
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70152932615540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *70152932615540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
-  requirement: &70152932614040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +133,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70152932614040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: fluentd output plugin for kestrel queue.
 email: t.junichiro@gmail.com
 executables: []
@@ -132,7 +172,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 391376077064872023
+      hash: 3129241088669939202
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -141,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: fluentd output plugin for kestrel.