fluent-plugin-td 0.10.18 → 0.10.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04dd7b7e2f098cf317a600be1125138cc6d9a440
-  data.tar.gz: 3b211b46e282e9e94189dcc4a388223b45bbc72d
+  metadata.gz: 9dcb9b62fef3cddea8e7a04a917f6057f93b776e
+  data.tar.gz: a1555081242c872eec4b0013226309f26b1e07ca
 SHA512:
-  metadata.gz: 3c65e15dcaf7ab967da39f5479088d30a22c37de275e2e50a6fb17577e3eb6202167f0bec453eb5729cd7eab745d3c2a926533aef020cb4093ee779ef3e4e77e
-  data.tar.gz: dc56feaad2c8a2c554a03fc95a64cf8e9dd84941101efd44f43b5af5258da74f3308af54687ad42ed936359770ac5b8b9ee7a7feab4dedc387621dabfec8fe3b
+  metadata.gz: 3266182b98e85d552372919ee83458d6c54ecd5bac7e32cf9f960c9c415592c660a8c8078cec22f488711117c4e88d9373c2a6a0c71c42e9a24025ca30b0064d
+  data.tar.gz: c57828eab6f09ace85f39a4eb7c1b7328cfbd51706864ed6d827a75a82e65bc9374d841e3be39c5b1674faf179a5e50aa3877501d04ed87c68d1b656d512dfe7

data/ChangeLog

@@ -1,3 +1,9 @@
+Release 0.10.19 - 2014/06/04
+
+  * Use treasuredata.com instead of treasure-data.com by default
+  * Update td-client to v0.8.61
+
+
 Release 0.10.18 - 2014/03/31
 
   * use_ssl is true by default

data/VERSION

@@ -1 +1 @@
-0.10.18
+0.10.19

data/fluent-plugin-td.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_dependency "fluentd", "~> 0.10.27"
-  gem.add_dependency "td-client", "~> 0.8.58"
+  gem.add_dependency "td-client", "~> 0.8.61"
   gem.add_development_dependency "rake", ">= 0.9.2"
   gem.add_development_dependency "webmock", "~> 1.16"
 end

data/lib/fluent/plugin/out_tditem.rb

@@ -18,12 +18,14 @@ module Fluent
     config_param :tmpdir, :string, :default => nil
     #config_param :auto_create_table, :bool, :default => true # TODO: implement if user wants this feature
 
-    config_param :endpoint, :string, :default => nil
+    config_param :endpoint, :string, :default => TreasureData::API::NEW_DEFAULT_ENDPOINT
     config_param :use_ssl, :bool, :default => true
     config_param :http_proxy, :string, :default => nil
     config_param :connect_timeout, :integer, :default => nil
     config_param :read_timeout, :integer, :default => nil
     config_param :send_timeout, :integer, :default => nil
+    config_set_default :buffer_type, 'file'
+    config_set_default :flush_interval, 300
 
     def initialize
       super
@@ -33,11 +35,7 @@ module Fluent
       @key_num_limit = 1024  # Item table default limitation
       @record_size_limit = 32 * 1024 * 1024  # TODO
       @empty_gz_data = TreasureData::API.create_empty_gz_data
-      @user_agent = "fluent-plugin-td-item: 0.10.18".freeze  # TODO: automatic increment version
-
-      # overwrite default configurations
-      @buffer_type = 'file'
-      @flush_interval = 300
+      @user_agent = "fluent-plugin-td-item: 0.10.19".freeze  # TODO: automatic increment version
     end
 
     def configure(conf)
@@ -52,11 +50,6 @@ module Fluent
       @key = "#{@database}.#{@table}".freeze
       @use_ssl = parse_bool_parameter(@use_ssl) if @use_ssl.instance_of?(String)
       FileUtils.mkdir_p(@tmpdir) unless @tmpdir.nil?
-
-      if @endpoint.nil?
-        $log.warn "tditem plugin will change the API endpoint from api.treasure-data.com to api.treasuredata.com"
-        $log.warn "If want to keep api.treasure-data.com, please set 'endpoint api.treasure-data.com' in tditem configuration"
-      end
     end
 
     def start

data/lib/fluent/plugin/out_tdlog.rb

@@ -65,11 +65,13 @@ class TreasureDataLogOutput < BufferedOutput
     define_method(:log) { $log }
   end
 
-  config_param :endpoint, :string, :default => nil
+  config_param :endpoint, :string, :default => TreasureData::API::NEW_DEFAULT_ENDPOINT
 
   config_param :connect_timeout, :integer, :default => nil
   config_param :read_timeout, :integer, :default => nil
   config_param :send_timeout, :integer, :default => nil
+  config_set_default :buffer_type, 'file'
+  config_set_default :flush_interval, 300
 
   def initialize
     require 'fileutils'
@@ -91,8 +93,6 @@ class TreasureDataLogOutput < BufferedOutput
     @table_list = {}
     @auto_create_table = true
     @use_ssl = true
-    @buffer_type = 'file'  # overwrite default buffer_type
-    @flush_interval = 300  # overwrite default flush_interval to 5mins
     @empty_gz_data = create_empty_gz_data
   end
 
@@ -166,12 +166,7 @@ class TreasureDataLogOutput < BufferedOutput
     @anonymizes = nil if @anonymizes.empty?
 
     @http_proxy = conf['http_proxy']
-    @user_agent = "fluent-plugin-td: 0.10.18"  # TODO: automatic increment version
-
-    if @endpoint.nil?
-      $log.warn "tdlog plugin will change the API endpoint from api.treasure-data.com to api.treasuredata.com"
-      $log.warn "If want to keep api.treasure-data.com, please set 'endpoint api.treasure-data.com' in tdlog configuration"
-    end
+    @user_agent = "fluent-plugin-td: 0.10.19"  # TODO: automatic increment version
   end
 
   def start

data/test/plugin/test_out_tditem.rb

@@ -29,10 +29,12 @@ class TreasureDataItemOutputTest < Test::Unit::TestCase
   def test_configure
     d = create_driver
 
-    assert_equal(d.instance.apikey, 'testkey')
-    assert_equal(d.instance.database, 'test')
-    assert_equal(d.instance.table, 'table')
-    assert_equal(d.instance.use_ssl, true)
+    assert_equal('testkey', d.instance.apikey)
+    assert_equal('test', d.instance.database)
+    assert_equal('table', d.instance.table)
+    assert_equal(true, d.instance.use_ssl)
+    assert_equal('memory', d.instance.buffer_type)
+    assert_equal(300, d.instance.flush_interval)
   end
 
   def test_configure_with_invalid_database
@@ -64,7 +66,7 @@ class TreasureDataItemOutputTest < Test::Unit::TestCase
     }
     d.run
 
-    assert_equal(@auth_header, 'TD1 testkey')
+    assert_equal('TD1 testkey', @auth_header)
   end
 
   def test_emit
@@ -79,6 +81,6 @@ class TreasureDataItemOutputTest < Test::Unit::TestCase
     }
     d.run
 
-    assert_equal(@auth_header, 'TD1 testkey')
+    assert_equal('TD1 testkey', @auth_header)
   end
 end

data/test/plugin/test_out_tdlog.rb

@@ -54,7 +54,7 @@ class TreasureDataLogOutputTest < Test::Unit::TestCase
     }
     d.run
 
-    assert_equal(@auth_header, 'TD1 testkey')
+    assert_equal('TD1 testkey', @auth_header)
   end
 
   def test_emit_with_endpoint

data/test/test_helper.rb

@@ -45,7 +45,7 @@ class Test::Unit::TestCase
     opts[:use_ssl] = true unless opts.has_key?(:use_ssl)
     schema = opts[:use_ssl] ? 'https' : 'http'
     response = {"database" => database, "table" => table}.to_json
-    endpoint = opts[:endpoint] ? opts[:endpoint] : TreasureData::API::DEFAULT_ENDPOINT
+    endpoint = opts[:endpoint] ? opts[:endpoint] : TreasureData::API::NEW_DEFAULT_ENDPOINT
 
     url = "#{schema}://#{endpoint}/v3/table/create/#{e(database)}/#{e(table)}/log"
     stub_request(:post, url).to_return(:status => 200, :body => response)
@@ -56,7 +56,7 @@ class Test::Unit::TestCase
     format = opts[:format] || 'msgpack.gz'
     schema = opts[:use_ssl] ? 'https' : 'http'
     response = {"database" => db, "table" => table, "elapsed_time" => 0}.to_json
-    endpoint = opts[:endpoint] ? opts[:endpoint] : TreasureData::API::DEFAULT_IMPORT_ENDPOINT
+    endpoint = opts[:endpoint] ? opts[:endpoint] : TreasureData::API::NEW_DEFAULT_IMPORT_ENDPOINT
 
     # for check_table_existence
     url_with_empty = "#{schema}://#{endpoint}//v3/table/import/#{e(db)}/#{e(table)}/#{format}"

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-td
 version: !ruby/object:Gem::Version
-  version: 0.10.18
+  version: 0.10.19
 platform: ruby
 authors:
 - Treasure Data, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2014-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.27
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.27
 - !ruby/object:Gem::Dependency
   name: td-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.58
+        version: 0.8.61
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.58
+        version: 0.8.61
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
 description: Treasure Data Cloud Data Service plugin for Fluentd
@@ -72,8 +72,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - AUTHORS
 - ChangeLog
 - Gemfile
@@ -98,17 +98,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Treasure Data Cloud Data Service plugin for Fluentd