fluent-plugin-s3 0.1.2 → 0.2.0

data/ChangeLog

@@ -1,4 +1,9 @@
 
+Release 0.2.0 - 2011/10/16
+
+  * Updated to fluentd-0.10.0
+
+
 Release 0.1.1 - 2011/09/27
 
   * First release

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 "aws-sdk", "~> 1.1.3"
     gemspec.test_files = Dir["test/**/*.rb"]
     gemspec.files = Dir["bin/**/*", "lib/**/*", "test/**/*.rb"] +
@@ -49,3 +49,12 @@ end
 
 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.1.2
+0.2.0

data/lib/fluent/plugin/out_s3.rb

@@ -11,6 +11,8 @@ class S3Output < Fluent::TimeSlicedOutput
     require 'time'
   end
 
+  attr_accessor :aws_key_id, :aws_sec_key, :s3_bucket, :path
+
   def configure(conf)
     super
 
@@ -18,37 +20,37 @@ class S3Output < Fluent::TimeSlicedOutput
       @aws_key_id = aws_key_id
     end
     unless @aws_key_id
-      raise ConfigError, "'aws_key_id' parameter is required on file output"
+      raise ConfigError, "'aws_key_id' parameter is required on s3 output"
     end
 
     if aws_sec_key = conf['aws_sec_key']
       @aws_sec_key = aws_sec_key
     end
     unless @aws_sec_key
-      raise ConfigError, "'aws_sec_key' parameter is required on file output"
+      raise ConfigError, "'aws_sec_key' parameter is required on s3 output"
     end
 
     if s3_bucket = conf['s3_bucket']
       @s3_bucket = s3_bucket
     end
     unless @s3_bucket
-      raise ConfigError, "'s3_bucket' parameter is required on file output"
+      raise ConfigError, "'s3_bucket' parameter is required on s3 output"
     end
 
     if path = conf['path']
       @path = path
     end
     unless @path
-      raise ConfigError, "'path' parameter is required on file output"
+      @path = ''
     end
 
     if @localtime
-      @formatter = Proc.new {|tag,event|
-        "#{Time.at(event.time).iso8601}\t#{tag}\t#{event.record.to_json}\n"
+      @formatter = Proc.new {|tag,time,record|
+        "#{Time.at(time).iso8601}\t#{tag}\t#{record.to_json}\n"
       }
     else
-      @formatter = Proc.new {|tag,event|
-        "#{Time.at(event.time).utc.iso8601}\t#{tag}\t#{event.record.to_json}\n"
+      @formatter = Proc.new {|tag,time,record|
+        "#{Time.at(time).utc.iso8601}\t#{tag}\t#{record.to_json}\n"
       }
     end
   end
@@ -61,8 +63,8 @@ class S3Output < Fluent::TimeSlicedOutput
     @bucket = @s3.buckets[@s3_bucket]
   end
 
-  def format(tag, event)
-    @formatter.call(tag, event)
+  def format(tag, time, record)
+    @formatter.call(tag, time, record)
   end
 
   def write(chunk)

data/test/out_s3.rb

@@ -0,0 +1,63 @@
+require 'fluent/test'
+require 'fluent/plugin/out_s3'
+
+class S3OutputTest < Test::Unit::TestCase
+  def setup
+    Fluent::Test.setup
+  end
+
+  CONFIG = %[
+    aws_key_id test_key_id
+    aws_sec_key test_sec_key
+    s3_bucket test_bucket
+    path log
+    utc
+    buffer_type memory
+  ]
+
+  def create_driver(conf = CONFIG)
+    Fluent::Test::BufferedOutputTestDriver.new(Fluent::S3Output) do
+      def write(chunk)
+        chunk.read
+      end
+    end.configure(conf)
+  end
+
+  def test_configure
+    d = create_driver
+    assert_equal 'test_key_id', d.instance.aws_key_id
+    assert_equal 'test_sec_key', d.instance.aws_sec_key
+    assert_equal 'test_bucket', d.instance.s3_bucket
+    assert_equal 'log', d.instance.path
+  end
+
+  def test_format
+    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.expect_format %[2011-01-02T13:14:15Z\ttest\t{"a":1}\n]
+    d.expect_format %[2011-01-02T13:14:15Z\ttest\t{"a":2}\n]
+
+    d.run
+  end
+
+  def test_write
+    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)
+
+    # S3OutputTest#write returns chunk.read
+    data = d.run
+
+    assert_equal %[2011-01-02T13:14:15Z\ttest\t{"a":1}\n] +
+                    %[2011-01-02T13:14:15Z\ttest\t{"a":2}\n],
+                 data
+  end
+
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fluent-plugin-s3
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Sadayuki Furuhashi
@@ -15,23 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-06 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 
@@ -64,6 +64,7 @@ files:
 - Rakefile
 - VERSION
 - lib/fluent/plugin/out_s3.rb
+- test/out_s3.rb
 - ChangeLog
 - README.rdoc
 has_rdoc: true
@@ -100,5 +101,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Amazon S3 output plugin for Fluent event collector
-test_files: []
-
+test_files: 
+- test/out_s3.rb