logstash-filter-grok 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3158f473340169e8ae5fb35f0f9652187fb56a2
-  data.tar.gz: 86769e468bd6390225733992a144a3d02942c16d
+  metadata.gz: 4c7ef85c71db3e508eb52f05c8b9afd92b321f0d
+  data.tar.gz: bceaff9b624ba2697491b96b1f09d83b9b376b74
 SHA512:
-  metadata.gz: 61c437111376cf1c171ca07e4698dd5bbb57e84c17663a16b486da82d94a9899376e6242cbbfed6b7bf35489ad1eeb9447a004b334a6a243fdc1423fa7c9482f
-  data.tar.gz: d9578c1e82b73a579560434113db6c5f37e29c05b3ef0ceaf6b8216ece729b3515b756a55620a1b2895fa93fd83b80f6b87b0122b8fc19be58e954601adaa8c9
+  metadata.gz: 51bcb3bd43ba61c78ca4754407fd48828896209e47728174ced3f03aa76bb351bc1b42c032a03c3d7dc6e8219daaf8f2c47b6226876f68e61a8a8e0fdfed2ee9
+  data.tar.gz: 62f1efb38df078c7b529b06146a0cdc2a5c8508ee29f1b2dbb365643aa4e737d3fc9c20d56fbcfca69a184fb7d86f13aa075bbaae0f79eab9787caeb052cd515

data/Gemfile

@@ -1,3 +1,2 @@
 source 'https://rubygems.org'
-gemspec
-gem "logstash", :github => "elasticsearch/logstash", :branch => "1.5"
+gemspec

data/README.md

@@ -22,7 +22,7 @@ Need help? Try #logstash on freenode IRC or the logstash-users@googlegroups.com
 #### Code
 - To get started, you'll need JRuby with the Bundler gem installed.
 
-- Create a new plugin or clone and existing from the GitHub [logstash-plugins](https://github.com/logstash-plugins) organization.
+- Create a new plugin or clone and existing from the GitHub [logstash-plugins](https://github.com/logstash-plugins) organization. We also provide [example plugins](https://github.com/logstash-plugins?query=example).
 
 - Install dependencies
 ```sh
@@ -31,26 +31,15 @@ bundle install
 
 #### Test
 
-```sh
-bundle exec rspec
-```
+- Update your dependencies
 
-The Logstash code required to run the tests/specs is specified in the `Gemfile` by the line similar to:
-```ruby
-gem "logstash", :github => "elasticsearch/logstash", :branch => "1.5"
-```
-To test against another version or a local Logstash, edit the `Gemfile` to specify an alternative location, for example:
-```ruby
-gem "logstash", :github => "elasticsearch/logstash", :ref => "master"
-```
-```ruby
-gem "logstash", :path => "/your/local/logstash"
+```sh
+bundle install
 ```
 
-Then update your dependencies and run your tests:
+- Run tests
 
 ```sh
-bundle install
 bundle exec rspec
 ```
 
@@ -58,13 +47,13 @@ bundle exec rspec
 
 #### 2.1 Run in a local Logstash clone
 
-- Edit Logstash `tools/Gemfile` and add the local plugin path, for example:
+- Edit Logstash `Gemfile` and add the local plugin path, for example:
 ```ruby
 gem "logstash-filter-awesome", :path => "/your/local/logstash-filter-awesome"
 ```
-- Update Logstash dependencies
+- Install plugin
 ```sh
-rake vendor:gems
+bin/plugin install --no-verify
 ```
 - Run Logstash with your plugin
 ```sh
@@ -74,6 +63,8 @@ At this point any modifications to the plugin code will be applied to this local
 
 #### 2.2 Run in an installed Logstash
 
+You can use the same **2.1** method to run your plugin in an installed Logstash by editing its `Gemfile` and pointing the `:path` to your local plugin development directory or you can build the gem and install it using:
+
 - Build your plugin gem
 ```sh
 gem build logstash-filter-awesome.gemspec
@@ -90,6 +81,6 @@ All contributions are welcome: ideas, patches, documentation, bug reports, compl
 
 Programming is not a required skill. Whatever you've seen about open source and maintainers or community members  saying "send patches or die" - you will not see that here.
 
-It is more important to me that you are able to contribute.
+It is more important to the community that you are able to contribute.
 
-For more information about contributing, see the [CONTRIBUTING](https://github.com/elasticsearch/logstash/blob/master/CONTRIBUTING.md) file.
+For more information about contributing, see the [CONTRIBUTING](https://github.com/elasticsearch/logstash/blob/master/CONTRIBUTING.md) file.

data/logstash-filter-grok.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-filter-grok'
-  s.version         = '0.1.5'
+  s.version         = '0.1.7'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Parse arbitrary text and structure it."
   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,11 +20,10 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "filter" }
 
   # Gem dependencies
-  s.add_runtime_dependency 'logstash', '>= 1.4.0', '< 2.0.0'
+  s.add_runtime_dependency "logstash-core", '>= 1.4.0', '< 2.0.0'
 
   s.add_runtime_dependency 'jls-grok', '~> 0.11.1'
   s.add_runtime_dependency 'logstash-patterns-core'
-  s.add_development_dependency 'logstash-devutils'
 
   s.add_development_dependency 'logstash-devutils'
 end

data/spec/filters/grok_spec.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
-require "logstash/devutils/rspec/spec_helper"
-require "logstash/filters/grok"
+require 'spec_helper'
 
 describe LogStash::Filters::Grok do
 
@@ -648,8 +647,11 @@ describe LogStash::Filters::Grok do
     require 'tmpdir'
     require 'tempfile'
 
+    let(:pattern_dir) { File.join(LogStash::Environment::LOGSTASH_HOME, "patterns") }
+    let(:has_pattern_dir?) { Dir.exist?(pattern_dir) }
+
     before do
-      pattern_dir = File.join(LogStash::Environment::LOGSTASH_HOME, "patterns")
+      FileUtils.mkdir(pattern_dir) unless has_pattern_dir?
       @file = Tempfile.new('grok', pattern_dir);
       @file.write('WORD \b[2-5]\b')
       @file.close
@@ -665,6 +667,7 @@ describe LogStash::Filters::Grok do
 
     after do
       @file.unlink
+      FileUtils.rm_rf(pattern_dir) if has_pattern_dir?
     end
   end
 
@@ -673,9 +676,11 @@ describe LogStash::Filters::Grok do
     require 'tempfile'
 
     let(:tmpdir) { Dir.mktmpdir }
+    let(:pattern_dir) { File.join(LogStash::Environment::LOGSTASH_HOME, "patterns") }
+    let(:has_pattern_dir?) { Dir.exist?(pattern_dir) }
 
     before do
-      pattern_dir = File.join(LogStash::Environment::LOGSTASH_HOME, "patterns")
+      FileUtils.mkdir(pattern_dir) unless has_pattern_dir?
       @file1 = Tempfile.new('grok', pattern_dir);  @file1.write('WORD \b[2-5]\b'); @file1.close
       @file2 = Tempfile.new('grok', tmpdir);       @file2.write('WORD \b[0-1]\b'); @file2.close
     end
@@ -692,6 +697,7 @@ describe LogStash::Filters::Grok do
       @file1.unlink
       @file2.unlink
       FileUtils.remove_entry tmpdir
+      FileUtils.rm_rf(pattern_dir) unless has_pattern_dir?
     end
   end
 

data/spec/spec_helper.rb

@@ -0,0 +1,5 @@
+# encoding: utf-8
+require "logstash/devutils/rspec/spec_helper"
+require "logstash/filters/grok"
+
+PLUGIN_HOME = ::File.expand_path(::File.join(::File.dirname(__FILE__), ".."))

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-grok
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Elasticsearch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2015-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: logstash
+  name: logstash-core
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -72,20 +72,6 @@ dependencies:
         version: '0'
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: logstash-devutils
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  prerelease: false
-  type: :development
 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
 email: info@elasticsearch.com
 executables: []
@@ -101,6 +87,7 @@ files:
 - lib/logstash/filters/grok.rb
 - logstash-filter-grok.gemspec
 - spec/filters/grok_spec.rb
+- spec/spec_helper.rb
 homepage: http://www.elasticsearch.org/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)
@@ -129,3 +116,4 @@ specification_version: 4
 summary: Parse arbitrary text and structure it.
 test_files:
 - spec/filters/grok_spec.rb
+- spec/spec_helper.rb