fluent-mixin-config-placeholders 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ab16700e39c11b456366d81f51f625686a7889d
-  data.tar.gz: e09c4de8f159953b9500c68c8a77ed614f64282a
+  metadata.gz: dcff4739a970ca07132e3ae96ffff5fd92a11177
+  data.tar.gz: 635fe9488728a0183b19463b341a390f9ebc8cbc
 SHA512:
-  metadata.gz: 63134a44e0f4481383af4a1d36c76670dae38224f221b41e4a24bd13831490782ba4b2995a216a43b98bc5744d06a6e4abdd906557a4ebcf16774b2375265261
-  data.tar.gz: 3317ac5b2db00ca6c06cb3765853959330dbc4ec293aef51a08118faeeb9370a1f7bf0215e866b2636636af03c59f577168951b025cdb99d5dfa3320fe05268f
+  metadata.gz: b07fd967eccd65ba18f3ef5f0ebb3a84df15c247bbb538f3387c8786ea33e3c004c90d8b094efae15257e2b4e35219ac1abeb6a0de6dbf2250c86996a3159a6a
+  data.tar.gz: 457928ef1ccaab4d39ac9b904daebdea4f99d79fcf37575cdec3d68ae31028a9ec6efd1a2cb682c13c7b2069279725ea03c50f17fe8a4adb75f3310b5ea79ed8

data/.travis.yml

@@ -1,4 +1,7 @@
 language: ruby
+sudo: false
 rvm:
-  - 1.9.3
-  - 2.0.0
+  - 2.0
+  - 2.1
+  - 2.2
+  - 2.3.0

data/fluent-mixin-config-placeholders.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
   gem.name          = "fluent-mixin-config-placeholders"
-  gem.version       = "0.3.0"
+  gem.version       = "0.3.1"
   gem.authors       = ["TAGOMORI Satoshi"]
   gem.email         = ["tagomoris@gmail.com"]
   gem.description   = %q{to add various placeholders for plugin configurations}
@@ -17,4 +17,5 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "fluentd"
   gem.add_runtime_dependency "uuidtools", ">= 2.1.5"
   gem.add_development_dependency "rake"
+  gem.add_development_dependency "test-unit"
 end

data/lib/fluent/mixin/config_placeholders.rb

@@ -1,5 +1,6 @@
 require 'fluent/config'
 require 'uuidtools'
+require 'socket'
 
 module Fluent
   module Mixin
@@ -47,11 +48,11 @@ module Fluent
       def configure(conf)
         # Element#has_key? inserts key name into 'used' list, so we should not use that method...
         hostname = if conf.keys.include?('hostname') && has_replace_pattern?( conf.fetch('hostname') )
-                     `hostname`.chomp
+                     Socket.gethostname
                    elsif conf.keys.include?('hostname')
                      conf['hostname']
                    else
-                     `hostname`.chomp
+                     Socket.gethostname
                    end
 
         placeholders = self.respond_to?(:placeholders) ? self.placeholders : PLACEHOLDERS_DEFAULT

data/test/mixin/test_config_placeholders.rb

@@ -1,6 +1,11 @@
 require 'helper'
+require 'socket'
 
 class ConfigPlaceholdersTest < Test::Unit::TestCase
+  def setup
+    Fluent::Test.setup
+  end
+
   def create_plugin_instances(conf)
     [
       Fluent::ConfigPlaceholdersTest0Input, Fluent::ConfigPlaceholdersTest1Input, Fluent::ConfigPlaceholdersTest2Input
@@ -256,7 +261,7 @@ attr1    ${hostname}
     assert_equal "test.host.local", p1.attr1
 
     # this configuration pattern is to set hostname-attribute of plugins
-    #  when 'myhostname' is host name (result of `hostname` shell command),
+    #  when 'myhostname' is host name (result of Socket.gethostname),
     #  - @hostname is set as 'myhostname.fluentd.local'
     #  - @attr1 should be set as 'myhostname' only, it is default of mixin
     conf2 = %[
@@ -264,7 +269,7 @@ hostname ${hostname}.fluentd.local
 attr1    __HOSTNAME__
 ]
     p2 = Fluent::Test::InputTestDriver.new(Fluent::ConfigPlaceholdersTest3Input).configure(conf2).instance
-    hostname_cmd = `hostname`.chomp
+    hostname_cmd = Socket.gethostname
     assert_equal "#{hostname_cmd}.fluentd.local", p2.hostname
     assert_equal hostname_cmd, p2.attr1
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-mixin-config-placeholders
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: to add various placeholders for plugin configurations
 email:
 - tagomoris@gmail.com
@@ -90,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Configuration syntax extension mixin for fluentd plugin