fluent-plugin-s3 0.3.3 → 0.3.4

data/.travis.yml

@@ -0,0 +1,13 @@
+language: ruby
+
+rvm:
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - rbx-19mode
+
+branches:
+  only:
+    - master
+
+script: bundle exec rake test

data/ChangeLog

@@ -1,3 +1,9 @@
+Release 0.3.4 - 2013/07/31
+
+  * Add dynamic path slicing by time formatted string
+    https://github.com/fluent/fluent-plugin-s3/pull/24
+
+
 Release 0.3.3 - 2013/06/18
 
   * Fix require bug on case-sensitive environment

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/fluent-plugin-s3.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name        = "fluent-plugin-s3"
-  gem.description = "Amazon S3 output plugin for Fluent event collector"
+  gem.description = "Amazon S3 output plugin for Fluentd event collector"
   gem.homepage    = "https://github.com/fluent/fluent-plugin-s3"
   gem.summary     = gem.description
   gem.version     = File.read("VERSION").strip

data/lib/fluent/plugin/out_s3.rb

@@ -77,6 +77,17 @@ class S3Output < Fluent::TimeSlicedOutput
     end
 
     @timef = TimeFormatter.new(@time_format, @localtime)
+
+    if @localtime
+      @path_slicer = Proc.new {|path|
+        Time.now.strftime(path)
+      }
+    else
+      @path_slicer = Proc.new {|path|
+        Time.now.utc.strftime(path)
+      }
+    end
+
   end
 
   def start
@@ -121,8 +132,9 @@ class S3Output < Fluent::TimeSlicedOutput
     i = 0
 
     begin
+      path = @path_slicer.call(@path)
       values_for_s3_object_key = {
-        "path" => @path,
+        "path" => path,
         "time_slice" => chunk.key,
         "file_extension" => @ext,
         "index" => i

data/test/out_s3.rb

@@ -70,6 +70,25 @@ class S3OutputTest < Test::Unit::TestCase
     assert(e.is_a?(Fluent::ConfigError))
   end
 
+  def test_path_slicing
+    config = CONFIG.clone.gsub(/path\slog/, "path log/%Y/%m/%d")
+    d = create_driver(config)
+    path_slicer = d.instance.instance_variable_get(:@path_slicer)
+    path = d.instance.instance_variable_get(:@path)
+    slice = path_slicer.call(path)
+    assert_equal slice, Time.now.strftime("log/%Y/%m/%d")
+  end
+
+  def test_path_slicing_utc
+    config = CONFIG.clone.gsub(/path\slog/, "path log/%Y/%m/%d")
+    config << "\nutc\n"
+    d = create_driver(config)
+    path_slicer = d.instance.instance_variable_get(:@path_slicer)
+    path = d.instance.instance_variable_get(:@path)
+    slice = path_slicer.call(path)
+    assert_equal slice, Time.now.utc.strftime("log/%Y/%m/%d")
+  end
+
   def test_format
     d = create_driver
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-s3
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -107,12 +107,13 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
-description: Amazon S3 output plugin for Fluent event collector
+description: Amazon S3 output plugin for Fluentd event collector
 email: frsyuki@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .travis.yml
 - AUTHORS
 - ChangeLog
 - Gemfile
@@ -136,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3746525337841491520
+      hash: 586296874409098593
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -145,12 +146,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3746525337841491520
+      hash: 586296874409098593
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Amazon S3 output plugin for Fluent event collector
+summary: Amazon S3 output plugin for Fluentd event collector
 test_files:
 - test/out_s3.rb