fluent-mixin-config-placeholders 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcff4739a970ca07132e3ae96ffff5fd92a11177
-  data.tar.gz: 635fe9488728a0183b19463b341a390f9ebc8cbc
+  metadata.gz: c7a2fe0e7f28bf92a6aed3c3cf5a0f66a00a767f
+  data.tar.gz: d1eb3d95d934817acc48a4e045903f0844ab1acf
 SHA512:
-  metadata.gz: b07fd967eccd65ba18f3ef5f0ebb3a84df15c247bbb538f3387c8786ea33e3c004c90d8b094efae15257e2b4e35219ac1abeb6a0de6dbf2250c86996a3159a6a
-  data.tar.gz: 457928ef1ccaab4d39ac9b904daebdea4f99d79fcf37575cdec3d68ae31028a9ec6efd1a2cb682c13c7b2069279725ea03c50f17fe8a4adb75f3310b5ea79ed8
+  metadata.gz: c8f65e4d625b2f951ac8d51b0922f428a2d6a4c1c433828c3513f8e7d881d95eaba6a90b8e711117d8c8010537175e9abe76fc3d2cda62be26321c1e27d7959e
+  data.tar.gz: 7f29b1f4cd01c41e17f998adf72cb3f43ce63204fb9ad7bacdd65087cd0c300525e850987a002bad19757547dc75f0746625595c88d24aac207f7b27c71a2725

data/fluent-mixin-config-placeholders.gemspec

@@ -1,13 +1,13 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
   gem.name          = "fluent-mixin-config-placeholders"
-  gem.version       = "0.3.1"
+  gem.version       = "0.4.0"
   gem.authors       = ["TAGOMORI Satoshi"]
   gem.email         = ["tagomoris@gmail.com"]
   gem.description   = %q{to add various placeholders for plugin configurations}
   gem.summary       = %q{Configuration syntax extension mixin for fluentd plugin}
   gem.homepage      = "https://github.com/tagomoris/fluent-mixin-config-placeholders"
-  gem.license       = "APLv2"
+  gem.license       = "Apache-2.0"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/fluent/mixin/config_placeholders.rb

@@ -1,5 +1,4 @@
 require 'fluent/config'
-require 'uuidtools'
 require 'socket'
 
 module Fluent
@@ -24,14 +23,17 @@ module Fluent
       # => #<UUID:0x2adfdc UUID:64a5189c-25b3-11da-a97b-00c04fd430c8>
 
       def uuid_random
+        require 'uuidtools'
         UUIDTools::UUID.random_create.to_s
       end
 
       def uuid_hostname(hostname)
+        require 'uuidtools'
         UUIDTools::UUID.sha1_create(UUIDTools::UUID_DNS_NAMESPACE, hostname).to_s
       end
 
       def uuid_timestamp
+        require 'uuidtools'
         UUIDTools::UUID.timestamp_create.to_s
       end
 
@@ -90,7 +92,7 @@ module Fluent
           end
         end
 
-        def check_element(map,c)
+        check_element = ->(map, c) {
           c.arg = replace(map, c.arg)
           c.keys.each do |k|
             v = c.fetch(k, nil)
@@ -98,10 +100,9 @@ module Fluent
               c[k] = replace(map, v)
             end
           end
-          c.elements.each{|e| check_element(map,e)}
-        end
-
-        check_element(mapping,conf)
+          c.elements.each{|e| check_element.call(map,e)}
+        }
+        check_element.call(mapping,conf)
 
         super
       end

data/test/helper.rb

@@ -23,6 +23,7 @@ unless ENV.has_key?('VERBOSE')
   $log = nulllogger
 end
 
+require 'fluent/input'
 require 'fluent/mixin/config_placeholders'
 require_relative 'plugin'
 

data/test/mixin/test_config_placeholders.rb

@@ -218,7 +218,7 @@ path /path/to/file.log
     require 'uuidtools'
     uuid = UUIDTools::UUID.sha1_create(UUIDTools::UUID_DNS_NAMESPACE, "test.host.local").to_s
 
-    p1, p2, p3 = create_plugin_instances(conf)
+    _p1, _p2, p3 = create_plugin_instances(conf)
     assert_equal "config", p3.conf.elements.first.name
     assert_equal "test.host.local", p3.conf.elements.first.arg
     assert_equal "val1." + uuid, p3.conf.elements.first['var']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-mixin-config-placeholders
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -86,7 +86,7 @@ files:
 - test/plugin.rb
 homepage: https://github.com/tagomoris/fluent-mixin-config-placeholders
 licenses:
-- APLv2
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []