logstash-patterns-core 2.0.2 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c8db4babadc512568ecb807f83d2d729d12a3d4
-  data.tar.gz: 57e6bcdc22cb0845fabe2c0f047290483391a605
+  metadata.gz: 55bf54c1d6189841876b985ca38a5cadc944413b
+  data.tar.gz: 20a0e51f362e461ebefdfafccc661392a3f9e248
 SHA512:
-  metadata.gz: 692401b3b09e9e081af84aaeafa35eed21015761c8b1ee1fd993d18599fa9c0f3808639436bcef47be48c2e8e32ec976415e52299804e4cdd7dc0ae099ee7942
-  data.tar.gz: 09e7198f5522c0ef816464aadb9ed64fd3802b80a38cde5f820dec78266181934726b234f4809dbb90f92f2bcc5753c0acde8b0a466913d857afe52bb2195be6
+  metadata.gz: 0528b130b7bb83fcd5b4872326796e227a610010a5ca1b93be42cdae29076f552d021b893a82f0bdb7ad1a1f2296db8e14a40a81ccbecb4277ae3b520bd47c91
+  data.tar.gz: 8c449c43ee1ca8132207534c0f3ffa2d4aeaa64f92cc1bc784a1ae735c991841ad288d3224e5569a491a438629beefad32dc240a1bf40a2add3dda39320d045e

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.0.4
+  - Depend on logstash-core-plugin-api instead of logstash-core, removing the need to mass update plugins on major releases of logstash
+# 2.0.3
+  - New dependency requirements for logstash-core for the 5.0 release
 ## 2.0.0
  - Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully, 
    instead of using Thread.raise on the plugins' threads. Ref: https://github.com/elastic/logstash/pull/3895

data/README.md

@@ -1,5 +1,7 @@
 # Logstash Plugin
 
+[![Build Status](http://build-eu-00.elastic.co/view/LS%20Other/job/logstash_patterns_core_commit/badge/icon)](http://build-eu-00.elastic.co/view/LS%20Other/job/logstash_patterns_core_commit/)
+
 This is a plugin for [Logstash](https://github.com/elastic/logstash).
 
 It is fully free and fully open source. The license is Apache 2.0, meaning you are pretty much free to use it however you want in whatever way.
@@ -83,4 +85,4 @@ Programming is not a required skill. Whatever you've seen about open source and
 
 It is more important to the community that you are able to contribute.
 
-For more information about contributing, see the [CONTRIBUTING](https://github.com/elastic/logstash/blob/master/CONTRIBUTING.md) file.
+For more information about contributing, see the [CONTRIBUTING](https://github.com/elastic/logstash/blob/master/CONTRIBUTING.md) file.

data/logstash-patterns-core.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-patterns-core'
-  s.version         = '2.0.2'
+  s.version         = '2.0.4'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Patterns to be used in logstash"
   s.description     = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core", ">= 2.0.0.beta2", "< 3.0.0"
+  s.add_runtime_dependency "logstash-core-plugin-api", "~> 1.0"
 
   s.add_development_dependency 'logstash-devutils'
   s.add_development_dependency 'logstash-filter-grok'

data/patterns/grok-patterns

@@ -40,7 +40,7 @@ URIPROTO [A-Za-z]+(\+[A-Za-z+]+)?
 URIHOST %{IPORHOST}(?::%{POSINT:port})?
 # uripath comes loosely from RFC1738, but mostly from what Firefox
 # doesn't turn into %XX
-URIPATH (?:/[A-Za-z0-9$.+!*'(){},~:;=@#%_\-]*)+
+URIPATH (?:/[A-Za-z0-9$.+!*'(){},~:;=@#%&_\-]*)+
 #URIPARAM \?(?:[A-Za-z0-9]+(?:=(?:[^&]*))?(?:&(?:[A-Za-z0-9]+(?:=(?:[^&]*))?)?)*)?
 URIPARAM \?[A-Za-z0-9$.+!*'|(){},~@#%&/=:;_?\-\[\]<>]*
 URIPATHPARAM %{URIPATH}(?:%{URIPARAM})?

data/spec/patterns/core_spec.rb

@@ -113,6 +113,62 @@ describe "UNIXPATH" do
   end
 end
 
+describe "URIPATH" do
+  let(:pattern) { 'URIPATH' }
+
+  context "when matching valid URIs" do
+    context "and the URI is simple" do
+      let(:value) { '/foo' }
+
+      it "should match the path" do
+        expect(grok_match(pattern,value)).to pass
+      end
+    end
+
+    context "and the URI has a trailing slash" do
+      let(:value) { '/foo/' }
+
+      it "should match the path" do
+        expect(grok_match(pattern,value)).to pass
+      end
+    end
+
+    context "and the URI has multiple levels" do
+      let(:value) { '/foo/bar' }
+
+      it "should match the path" do
+        expect(grok_match(pattern,value)).to pass
+      end
+    end
+
+    context "and the URI has fancy characters" do
+      let(:value) { '/aA1$.+!*\'(){},~:;=@#%&|-' }
+
+      it "should match the path" do
+        expect(grok_match(pattern,value)).to pass
+      end
+    end
+  end
+
+  context "when matching invalid URIs" do
+    context "and the URI has no leading slash" do
+      let(:value) { 'foo' }
+
+      it "should not match the path" do
+        expect(grok_match(pattern,value)).not_to pass
+      end
+    end
+
+    context "and the URI has invalid characters" do
+      let(:value) { '/`' }
+
+      it "should not match the path" do
+        expect(grok_match(pattern,value)).not_to pass
+      end
+    end
+  end
+end
+
 describe "IPV4" do
 
   let(:pattern) { 'IPV4' }

data/spec/spec_helper.rb

@@ -19,7 +19,7 @@ module GrokHelpers
   end
 
   def build_grok(label)
-    grok = LogStash::Filters::Grok.new("match" => ["message", "%{#{label}}"])
+    grok = LogStash::Filters::Grok.new("match" => ["message", "\A%{#{label}}\z"])
     grok.register
     grok
   end

metadata

@@ -1,39 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: logstash-patterns-core
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.4
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
-    - - <
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  name: logstash-core
+        version: '1.0'
+  name: logstash-core-plugin-api
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
-    - - <
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   name: logstash-devutils
@@ -41,13 +35,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   name: logstash-filter-grok
@@ -55,7 +49,7 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program
@@ -113,12 +107,12 @@ 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: []