logstash-output-redis 2.0.5 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5521e16c30f64515f0280b3dac67304d69704a0
-  data.tar.gz: 0cdffaddc9e1d3347be833351cb6a31981061174
+  metadata.gz: c5c13509cbc26b9035d72338d3d6574c13182101
+  data.tar.gz: 58926f84596b131fa5edf89284a2df9e1c9ad1f8
 SHA512:
-  metadata.gz: 7e489069572645b18d6db062d0cf4712ac4087d92fa88b5c54b9f78485407085bd18bc4cca54a15de908ed6657b5a37596dce2f11fa5805acb7de2a64d4882ec
-  data.tar.gz: b398711520f6e4667f5c18a487c6efeea300058152c6b31bf7b659bbd85a5ec7c6ac6c0e90feba3ec0c1024191579ffd067c7b2053c5b516e54e4b96f10fdac8
+  metadata.gz: 5b141ab3cf820d2d63f93491d97da8a8f28d0ea4ab7cac6315f5a8165e1e686bc1ee01c2a8276183a5fa6360e728e30db1d1c22090675f71a6d27f02267b921c
+  data.tar.gz: 8e478f47e1b6227b244452291c0d1b41c427be79b383679faa7694dca05697ecec55a8d6b69d248b6be330b3e83ec51ea0c62578c727e31c4fff3617ca38959e

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+## 3.0.0
+  - Update the plugin to the version 2.0 of the plugin api, this change is required for Logstash 5.0 compatibility. See https://github.com/elastic/logstash/issues/5141
 # 2.0.5
   - Fix LocalJumpError exception see https://github.com/logstash-plugins/logstash-output-redis/pull/27
 # 2.0.4

data/Gemfile

@@ -1,2 +1,4 @@
 source 'https://rubygems.org'
-gemspec
+
+# Specify your gem's dependencies in logstash-mass_effect.gemspec
+gemspec

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012–2015 Elasticsearch <http://www.elastic.co>
+Copyright (c) 2012–2016 Elasticsearch <http://www.elastic.co>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/README.md

@@ -55,7 +55,12 @@ gem "logstash-filter-awesome", :path => "/your/local/logstash-filter-awesome"
 ```
 - Install plugin
 ```sh
+# Logstash 2.3 and higher
+bin/logstash-plugin install --no-verify
+
+# Prior to Logstash 2.3
 bin/plugin install --no-verify
+
 ```
 - Run Logstash with your plugin
 ```sh
@@ -73,7 +78,12 @@ gem build logstash-filter-awesome.gemspec
 ```
 - Install the plugin from the Logstash home
 ```sh
-bin/plugin install /your/local/plugin/logstash-filter-awesome.gem
+# Logstash 2.3 and higher
+bin/logstash-plugin install --no-verify
+
+# Prior to Logstash 2.3
+bin/plugin install --no-verify
+
 ```
 - Start Logstash and proceed to test the plugin
 

data/lib/logstash/outputs/redis.rb

@@ -21,7 +21,6 @@ class LogStash::Outputs::Redis < LogStash::Outputs::Base
   default :codec, "json"
 
   # Name is used for logging in case there are multiple instances.
-  # TODO: delete
   config :name, :validate => :string, :default => 'default',
     :deprecated => true
 
@@ -52,17 +51,14 @@ class LogStash::Outputs::Redis < LogStash::Outputs::Base
 
   # The name of the Redis queue (we'll use RPUSH on this). Dynamic names are
   # valid here, for example `logstash-%{type}`
-  # TODO: delete
   config :queue, :validate => :string, :deprecated => true
 
   # The name of a Redis list or channel. Dynamic names are
   # valid here, for example `logstash-%{type}`.
-  # TODO set required true
   config :key, :validate => :string, :required => false
 
   # Either list or channel.  If `redis_type` is list, then we will set
   # RPUSH to key. If `redis_type` is channel, then we will PUBLISH to `key`.
-  # TODO set required true
   config :data_type, :validate => [ "list", "channel" ], :required => false
 
   # Set to true if you want Redis to batch up values and send 1 RPUSH command

data/logstash-output-redis.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-redis'
-  s.version         = '2.0.5'
+  s.version         = '3.0.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "This output will send events to a Redis queue using RPUSH"
-  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"
+  s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
   s.authors         = ["Elastic"]
   s.email           = 'info@elastic.co'
   s.homepage        = "http://www.elastic.co/guide/en/logstash/current/index.html"
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "output" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core-plugin-api", "~> 1.0"
+  s.add_runtime_dependency "logstash-core-plugin-api", "~> 2.0"
 
   s.add_runtime_dependency 'redis'
   s.add_runtime_dependency 'stud'

data/spec/{outputs → integration/outputs}/redis_spec.rb

@@ -6,7 +6,7 @@ require "flores/random"
 
 describe LogStash::Outputs::Redis do
 
-  context "integration tests", :redis => true do
+  context "integration tests", :integration => true do
     shared_examples_for "writing to redis list" do |extra_config|
       let(:key) { 10.times.collect { rand(10).to_s }.join("") }
       let(:event_count) { Flores::Random.integer(0..10000) }
@@ -42,8 +42,8 @@ describe LogStash::Outputs::Redis do
         event_count.times do |value|
           id, element = redis.blpop(key, 0)
           event = LogStash::Event.new(LogStash::Json.load(element))
-          insist { event["sequence"] } == value
-          insist { event["message"] } == message
+          insist { event.get("sequence") } == value
+          insist { event.get("message") } == message
         end
 
         # The list should now be empty
@@ -73,36 +73,5 @@ describe LogStash::Outputs::Redis do
       end
     end
   end
-
-  context "Redis#receive in batch mode" do
-    # this is a regression test harness to verify fix for https://github.com/logstash-plugins/logstash-output-redis/issues/26
-    # TODO: refactor specs above and probably rely on a Redis mock to correctly test the code expected behaviour, the actual
-    # tests agains Redis should be moved into integration tests.
-    let(:key) { "thekey" }
-    let(:payload) { "somepayload"}
-    let(:event) { LogStash::Event.new({"message" => "test"}) }
-    let(:config) {
-      {
-        "key" => key,
-        "data_type" => "list",
-        "batch" => true,
-        "batch_events" => 50,
-       }
-    }
-    let(:redis) { described_class.new(config) }
-
-    it "should call buffer_receive" do
-      redis.register
-      expect(redis).to receive(:buffer_receive).exactly(10000).times.and_call_original
-      expect(redis).to receive(:flush).exactly(200).times
-
-      # I was able to reproduce the LocalJumpError: unexpected next exception at around 50
-      # consicutive invocations. setting to 10000 should reproduce it for any environment
-      # I have no clue at this point why this problem does not happen at every invocation
-      1.upto(10000) do
-        expect{redis.receive(event)}.to_not raise_error
-      end
-    end
-  end
 end
 

data/spec/unit/outputs/redis_spec.rb

@@ -0,0 +1,40 @@
+require "logstash/devutils/rspec/spec_helper"
+require "logstash/outputs/redis"
+require "logstash/json"
+require "redis"
+require "flores/random"
+
+describe LogStash::Outputs::Redis do
+
+  context "Redis#receive in batch mode" do
+    # this is a regression test harness to verify fix for https://github.com/logstash-plugins/logstash-output-redis/issues/26
+    # TODO: refactor specs above and probably rely on a Redis mock to correctly test the code expected behaviour, the actual
+    # tests agains Redis should be moved into integration tests.
+    let(:key) { "thekey" }
+    let(:payload) { "somepayload"}
+    let(:event) { LogStash::Event.new({"message" => "test"}) }
+    let(:config) {
+      {
+        "key" => key,
+        "data_type" => "list",
+        "batch" => true,
+        "batch_events" => 50,
+       }
+    }
+    let(:redis) { described_class.new(config) }
+
+    it "should call buffer_receive" do
+      redis.register
+      expect(redis).to receive(:buffer_receive).exactly(10000).times.and_call_original
+      expect(redis).to receive(:flush).exactly(200).times
+
+      # I was able to reproduce the LocalJumpError: unexpected next exception at around 50
+      # consicutive invocations. setting to 10000 should reproduce it for any environment
+      # I have no clue at this point why this problem does not happen at every invocation
+      1.upto(10000) do
+        expect{redis.receive(event)}.to_not raise_error
+      end
+    end
+  end
+end
+

metadata

@@ -1,114 +1,116 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-redis
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 3.0.0
 platform: ruby
 authors:
 - Elastic
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-14 00:00:00.000000000 Z
+date: 2016-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core-plugin-api
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-  prerelease: false
+        version: '2.0'
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: redis
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: stud
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: stud
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: logstash-devutils
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: logstash-devutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: logstash-input-generator
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: logstash-input-generator
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: logstash-codec-json
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: logstash-codec-json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: flores
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: flores
   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
+  prerelease: false
+  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/logstash-plugin install gemname. This
+  gem is not a stand-alone program
 email: info@elastic.co
 executables: []
 extensions: []
@@ -122,32 +124,34 @@ files:
 - README.md
 - lib/logstash/outputs/redis.rb
 - logstash-output-redis.gemspec
-- spec/outputs/redis_spec.rb
+- spec/integration/outputs/redis_spec.rb
+- spec/unit/outputs/redis_spec.rb
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)
 metadata:
   logstash_plugin: 'true'
   logstash_group: output
-post_install_message:
+post_install_message: 
 rdoc_options: []
 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: []
-rubyforge_project:
-rubygems_version: 2.4.8
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.5.1
+signing_key: 
 specification_version: 4
 summary: This output will send events to a Redis queue using RPUSH
 test_files:
-- spec/outputs/redis_spec.rb
+- spec/integration/outputs/redis_spec.rb
+- spec/unit/outputs/redis_spec.rb