fluent-plugin-config-expander 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c41142ef4394c1060bfc0514b8888ec3fb5d774a
-  data.tar.gz: 4ff74b9689ca7314831e1771370066388efcabdf
+  metadata.gz: 5ad6529782532130678cbbd6bc03aa335e8564f9
+  data.tar.gz: a639204ce86d477002d5f126fc721e3a12e1a27f
 SHA512:
-  metadata.gz: de75f176625cc2aea4b0ae46db44f148d04fbaef5f5d880566085669ad5d45d372c95e56fbae42347a3efa15b96791b8303bddeccfedc29d92319c33f7fd9bf8
-  data.tar.gz: 84a0a068041bb569043d8a37eccff683a29b1908f74aa098e831d5d9eb5daed5dc74c6f443fdc3cf3633864c2cf736f99ae92a147e71739bc0f0702bbe50c81a
+  metadata.gz: e174212a0444eae13a6c3d737f9afb3cb4eaa2ee05642f433ffc00c3d60f188a2c59668a03e4750543d1f0e7aa408655cb8e1265148aaea828c8f3f52680718b
+  data.tar.gz: 116d14ebd7709762c41853d8f76d56a3f2cb3d3daddddae7ef2946eb9fed885d725c585748a3c331b726e6dad5d56229e9025f28229086edaaa82dd8c7f4ea2d

data/.travis.yml

@@ -1,4 +1,9 @@
 language: ruby
+sudo: false
 rvm:
-  - 1.9.3
   - 2.0.0
+  - 2.1
+  - 2.2
+  - 2.3.0
+before_install:
+  - gem update bundler

data/README.md

@@ -15,9 +15,9 @@ And also supports built-in placeholders below:
 For both of input and output (for <source> and <match>), you can use 'config_expander' and its 'for' directive like below:
 
     <match example.**>
-      type config_expander
+      @type config_expander
       <config>
-        type forward
+        @type forward
         flush_interval 30s
         <for x in 01 02 03>
           <server>
@@ -31,7 +31,7 @@ For both of input and output (for <source> and <match>), you can use 'config_exp
 Configuration above is equal to below:
 
     <match example.**>
-      type forward
+      @type forward
       flush_interval 30s
       <server>
         host worker01.local
@@ -50,9 +50,9 @@ Configuration above is equal to below:
 As placeholder, you can use '${varname}' style:
 
     <match example.**>
-      type config_expander
+      @type config_expander
       <config>
-        type forward
+        @type forward
         flush_interval 30s
         <for node in 01 02 03>
           <server>
@@ -66,9 +66,9 @@ As placeholder, you can use '${varname}' style:
 Nested 'for' directive is valid:
 
     <match example.**>
-      type config_expander
+      @type config_expander
       <config>
-        type forward
+        @type forward
         flush_interval 30s
         <for x in 01 02 03>
           <for p in 24221 24222 24223 24224
@@ -84,9 +84,9 @@ Nested 'for' directive is valid:
 Set hostname into tag in 'tail' input plugin:
 
     <source>
-      type config_expander
+      @type config_expander
       <config>
-        type tail
+        @type tail
         format /..../
         path /var/log/access.log
         tag access.log.${hostname}

data/fluent-plugin-config-expander.gemspec

@@ -2,13 +2,13 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-config-expander"
-  gem.version       = "0.1.5"
+  gem.version       = "0.2.0"
   gem.authors       = ["TAGOMORI Satoshi"]
   gem.email         = ["tagomoris@gmail.com"]
   gem.description   = %q{This plugin provides directives for loop extraction}
   gem.summary       = %q{Fluentd plugin to serve some DSL directives in configuration}
   gem.homepage      = "https://github.com/tagomoris/fluent-plugin-config-expander"
-  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) }
@@ -16,5 +16,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_development_dependency "rake"
+  gem.add_development_dependency "test-unit", "~> 3.1.7"
   gem.add_runtime_dependency "fluentd"
 end

data/lib/fluent/plugin/in_config_expander.rb

@@ -35,7 +35,8 @@ class Fluent::ConfigExpanderInput < Fluent::Input
       raise Fluent::ConfigError, "config_expander needs just one <config> ... </config> section"
     end
     ex = expand_config(configs.first)
-    @plugin = Fluent::Plugin.new_input(ex['type'])
+    type = ex['@type'] || ex['type']
+    @plugin = Fluent::Plugin.new_input(type)
     @plugin.configure(ex)
 
     mark_used(configs.first)

data/lib/fluent/plugin/out_config_expander.rb

@@ -37,7 +37,8 @@ class Fluent::ConfigExpanderOutput < Fluent::MultiOutput
       raise Fluent::ConfigError, "config_expander needs just one <config> ... </config> section"
     end
     ex = expand_config(configs.first)
-    @plugin = Fluent::Plugin.new_output(ex['type'])
+    type = ex['@type'] || ex['type']
+    @plugin = Fluent::Plugin.new_output(type)
     @plugin.configure(ex)
 
     @outputs = [@plugin]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-config-expander
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -24,6 +24,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: 3.1.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.7
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
@@ -62,7 +76,7 @@ files:
 - test/plugins.rb
 homepage: https://github.com/tagomoris/fluent-plugin-config-expander
 licenses:
-- APLv2
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -80,7 +94,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: Fluentd plugin to serve some DSL directives in configuration
@@ -90,3 +104,4 @@ test_files:
 - test/plugin/test_in_config_expander.rb
 - test/plugin/test_out_config_expander.rb
 - test/plugins.rb
+has_rdoc: