fluent-plugin-grep 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01a71925261dd9465cd10f28acf6af28861d9f6b
-  data.tar.gz: cfacc3cb357efeacff1d486f0451ec3952db8a61
+  metadata.gz: 08a91d586b4f1b69b5859a4b504d6f20a2dcb885
+  data.tar.gz: 8b1e714a1fcc6121d1ea8b5cdbefb88b76866a67
 SHA512:
-  metadata.gz: d885ec8a7c2180fdbc581b821fa826240b5aef21c120a5425f29f283d491f300f2fb84ea7abbfd7b2e76b555f69aa951833da598b6d35ebc5ac3359861547111
-  data.tar.gz: 0c88d08c8f7e6a3f40191d54db854e59f47e13c2ec7259dac9de768f14eaf2df2c013d0eb4229aed50c186be623a2392fdb43d47e723dac135f9af9e60a641ac
+  metadata.gz: 0abf3dd5a6c4638eb2d27d36435844a164c74f0fc94faf551aa24d8cbccc8b29fdfcb5c4bdec3d3aca71f959fa701b7224cbd2200ca9572e8ef1ad67c8dc1ca9
+  data.tar.gz: c59f53e395fc5b0b14082c14452a977ac49e0ee925cfa32e3c99554c1e4d8a3c89d36c827d7c2e3e2ef08ef44302bcf8d0022522321494738227b02692d472fd

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.3.1 (2013/12/16)
+
+Changes:
+
+- Make it possible that regexp to contain a heading space on `regexpN` and `excludeN` option.
+
 ## 0.3.0 (2013/12/15)
 
 Features:

data/fluent-plugin-grep.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-grep"
-  s.version     = "0.3.0"
+  s.version     = "0.3.1"
   s.authors     = ["Naotoshi Seo"]
   s.email       = ["sonots@gmail.com"]
   s.homepage    = "https://github.com/sonots/fluent-plugin-grep"
@@ -22,5 +22,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
   s.add_development_dependency "pry"
+  s.add_development_dependency "pry-nav"
   s.add_development_dependency 'coveralls'
 end

data/lib/fluent/plugin/out_grep.rb

@@ -13,6 +13,10 @@ class Fluent::GrepOutput < Fluent::Output
   (1..REGEXP_MAX_NUM).each {|i| config_param :"regexp#{i}",  :string, :default => nil }
   (1..REGEXP_MAX_NUM).each {|i| config_param :"exclude#{i}", :string, :default => nil }
 
+  # for test
+  attr_reader :regexps
+  attr_reader :excludes
+
   def configure(conf)
     super
 
@@ -20,8 +24,9 @@ class Fluent::GrepOutput < Fluent::Output
     @regexps[@input_key] = Regexp.compile(@regexp) if @input_key and @regexp
     (1..REGEXP_MAX_NUM).each do |i|
       next unless conf["regexp#{i}"]
-      key, regexp = conf["regexp#{i}"].split(/ +/, 2)
+      key, regexp = conf["regexp#{i}"].split(/ /, 2)
       raise Fluent::ConfigError, "regexp#{i} does not contain 2 parameters" unless regexp
+      raise Fluent::ConfigError, "regexp#{i} contains a duplicated key, #{key}" if @regexps[key]
       @regexps[key] = Regexp.compile(regexp)
     end
 
@@ -29,8 +34,9 @@ class Fluent::GrepOutput < Fluent::Output
     @excludes[@input_key] = Regexp.compile(@exclude) if @input_key and @exclude
     (1..REGEXP_MAX_NUM).each do |i|
       next unless conf["exclude#{i}"]
-      key, exclude = conf["exclude#{i}"].split(/ +/, 2)
+      key, exclude = conf["exclude#{i}"].split(/ /, 2)
       raise Fluent::ConfigError, "exclude#{i} does not contain 2 parameters" unless exclude
+      raise Fluent::ConfigError, "exclude#{i} contains a duplicated key, #{key}" if @excludes[key]
       @excludes[key] = Regexp.compile(exclude)
     end
 

data/spec/out_grep_spec.rb

@@ -11,6 +11,22 @@ describe Fluent::GrepOutput do
 
   describe 'test configure' do
     describe 'bad configuration' do
+      context 'regexp contains a duplicated key' do
+        let(:config) { CONFIG + %[
+          input_key message
+          regexp foo
+          regexp1 message foo
+        ]}
+        it { expect { driver }.to raise_error(Fluent::ConfigError) }
+      end
+      context 'exclude contains a duplicated key' do
+        let(:config) { CONFIG + %[
+          input_key message
+          exclude foo
+          exclude1 message foo
+        ]}
+        it { expect { driver }.to raise_error(Fluent::ConfigError) }
+      end
     end
 
     describe 'good configuration' do
@@ -24,6 +40,16 @@ describe Fluent::GrepOutput do
         its(:tag) { should be_nil }
         its(:add_tag_prefix) { should == 'greped' }
       end
+
+      context "regexpN can contain a space" do
+        let(:config) { CONFIG + %[regexp1 message  foo] }
+        it { subject.regexps['message'].should == Regexp.compile(/ foo/) }
+      end
+
+      context "excludeN can contain a space" do
+        let(:config) { CONFIG + %[exclude1 message  foo] }
+        it { subject.excludes['message'].should == Regexp.compile(/ foo/) }
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-grep
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-14 00:00:00.000000000 Z
+date: 2013-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -66,6 +66,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-nav
+  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'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement