fluent-plugin-td 0.9.10 → 0.10.0

data/ChangeLog

@@ -1,4 +1,10 @@
 
+Release 0.10.0 - 2011/10/16
+
+  * Use buf_file by default
+  * Updated to fluentd-0.10.0
+
+
 Release 0.9.10 - 2011/09/21
 
   * Enabled auto_create_table by default

data/Rakefile

@@ -12,7 +12,7 @@ begin
     #gemspec.homepage = "http://fluent.github.com/"
     gemspec.has_rdoc = false
     gemspec.require_paths = ["lib"]
-    gemspec.add_dependency "fluent", "~> 0.9.14"
+    gemspec.add_dependency "fluentd", "~> 0.10.0"
     gemspec.add_dependency "td-client", "~> 0.8.0"
     gemspec.test_files = Dir["test/**/*.rb"]
     gemspec.files = Dir["bin/**/*", "lib/**/*", "test/**/*.rb"] +
@@ -47,5 +47,12 @@ end
 #
 #task :default => [VERSION_FILE, :build]
 
-task :default => [:build]
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.test_files = Dir["test/*.rb"].sort
+  t.verbose = true
+  #t.warning = true
+end
+
+task :default => [:build, :gemspec]
 

data/VERSION

@@ -1 +1 @@
-0.9.10
+0.10.0

data/fluent-plugin-td.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fluent-plugin-td}
-  s.version = "0.9.10"
+  s.version = "0.10.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sadayuki Furuhashi"]
-  s.date = %q{2011-09-21}
+  s.date = %q{2011-10-16}
   s.extra_rdoc_files = [
     "ChangeLog",
      "README.rdoc"
@@ -20,26 +20,30 @@ Gem::Specification.new do |s|
      "VERSION",
      "example.conf",
      "fluent-plugin-td.gemspec",
-     "lib/fluent/plugin/out_tdlog.rb"
+     "lib/fluent/plugin/out_tdlog.rb",
+     "test/out_tdlog.rb"
   ]
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Treasure Data plugin for Fluent event collector}
+  s.test_files = [
+    "test/out_tdlog.rb"
+  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<fluent>, ["~> 0.9.14"])
+      s.add_runtime_dependency(%q<fluentd>, ["~> 0.10.0"])
       s.add_runtime_dependency(%q<td-client>, ["~> 0.8.0"])
     else
-      s.add_dependency(%q<fluent>, ["~> 0.9.14"])
+      s.add_dependency(%q<fluentd>, ["~> 0.10.0"])
       s.add_dependency(%q<td-client>, ["~> 0.8.0"])
     end
   else
-    s.add_dependency(%q<fluent>, ["~> 0.9.14"])
+    s.add_dependency(%q<fluentd>, ["~> 0.10.0"])
     s.add_dependency(%q<td-client>, ["~> 0.8.0"])
   end
 end

data/lib/fluent/plugin/out_tdlog.rb

@@ -4,9 +4,18 @@ module Fluent
 class TreasureDataLogOutput < BufferedOutput
   Plugin.register_output('tdlog', self)
 
-  HOST = ENV['TD_API_SERVER'] || 'api.treasure-data.com'
-  PORT = 80
+  host = 'api.treasure-data.com'
+  port = 80
+  if e = ENV['TD_API_SERVER']
+    host, port_ = e.split(':',2)
+    port_ = port_.to_i
+    port = port_ if port_ != 0
+  end
+
+  HOST = host
+  PORT = port
   USE_SSL = false
+  BASE_URL = ''
 
   def initialize
     require 'fileutils'
@@ -25,7 +34,8 @@ class TreasureDataLogOutput < BufferedOutput
     @record_size_limit = 32*1024*1024  # TODO
     @table_list = []
     @auto_create_table = true
-    @flush_interval = 300  # overwrite default flush_interval from 1min to 5mins
+    @buffer_type = 'file'  # overwrite default buffer_type
+    @flush_interval = 300  # overwrite default flush_interval to 5mins
   end
 
   def configure(conf)
@@ -101,9 +111,8 @@ class TreasureDataLogOutput < BufferedOutput
   def format_stream(tag, es)
     out = ''
     off = out.bytesize
-    es.each {|event|
-      record = event.record
-      record['time'] = event.time
+    es.each {|time,record|
+      record['time'] = time
 
       if record.size > @key_num_limit
         raise "Too many number of keys (#{record.size} keys)"  # TODO include summary of the record

data/test/out_tdlog.rb

@@ -0,0 +1,37 @@
+require 'fluent/test'
+require 'fluent/plugin/out_tdlog'
+
+class TreasureDataLogOutputTest < Test::Unit::TestCase
+  def setup
+    Fluent::Test.setup
+  end
+
+  TMP_DIR = File.dirname(__FILE__) + "/tmp"
+
+  CONFIG = %[
+    apikey testkey
+    buffer_path #{TMP_DIR}/buffer
+  ]
+
+  def create_driver(conf = CONFIG)
+    Fluent::Test::BufferedOutputTestDriver.new(Fluent::TreasureDataLogOutput) do
+      def start
+        super
+      end
+
+      def write(chunk)
+        chunk.read
+      end
+    end.configure(conf)
+  end
+
+  def test_emit
+    d = create_driver
+
+    time = Time.parse("2011-01-02 13:14:15 UTC").to_i
+    d.emit({"a"=>1}, time)
+    d.emit({"a"=>2}, time)
+    d.run
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fluent-plugin-td
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 55
   prerelease: false
   segments: 
   - 0
-  - 9
   - 10
-  version: 0.9.10
+  - 0
+  version: 0.10.0
 platform: ruby
 authors: 
 - Sadayuki Furuhashi
@@ -15,23 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-21 00:00:00 +09:00
+date: 2011-10-16 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: fluent
+  name: fluentd
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 39
+        hash: 55
         segments: 
         - 0
-        - 9
-        - 14
-        version: 0.9.14
+        - 10
+        - 0
+        version: 0.10.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -66,6 +66,7 @@ files:
 - example.conf
 - fluent-plugin-td.gemspec
 - lib/fluent/plugin/out_tdlog.rb
+- test/out_tdlog.rb
 - ChangeLog
 - README.rdoc
 has_rdoc: true
@@ -102,5 +103,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Treasure Data plugin for Fluent event collector
-test_files: []
-
+test_files: 
+- test/out_tdlog.rb