logstash-input-xmpp 2.0.5 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 306f952bc9eaff2286bae45f4a0704a1389b9562
-  data.tar.gz: 33a0139241338c6ebe692d49ff9914ecdc0856ce
+  metadata.gz: 9644408d68cd842494d35146fe10f44afadd2b8f
+  data.tar.gz: eda12778c470bb6abbed4300003f668b6211e3cd
 SHA512:
-  metadata.gz: fdf35dc3fab53a08ebafde46703a71bf9cfe123164c7d48868cb38142aacaca27035931ec435774df2d695056207d2224991432dc9478b9c718ec09699b798bc
-  data.tar.gz: 45eb5bd403dd4f1439692779c4bbb9cc40e29d1782964715b414196b58681f05e7d6d308ed87d8fe2b812f3227d385091132f6a4f4209fbf7e228f422a41782c
+  metadata.gz: 2ee35af7919c2dff52ac39cec863f01d5dc411a6104167ac8b27769472aa3e154b34f0d97269e4b25e76dfa99189a5fcfb0001cea34b011c61ee38e53bcbc9b4
+  data.tar.gz: c01ac30fb0e98be4ba0a20ba85f8ddf75adabe40fa524fd174318b73281daf4c6a3e96774ba7d3baf83e92eeb882bf9e24af78d0d2a12c39c2a950dc6d5b769b

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
   - Depend on logstash-core-plugin-api instead of logstash-core, removing the need to mass update plugins on major releases of logstash
 # 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

@@ -1,7 +1,6 @@
 # Logstash Plugin
 
-[![Build
-Status](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Inputs/job/logstash-plugin-input-xmpp-unit/badge/icon)](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Inputs/job/logstash-plugin-input-xmpp-unit/)
+[![Travis Build Status](https://travis-ci.org/logstash-plugins/logstash-input-xmpp.svg)](https://travis-ci.org/logstash-plugins/logstash-input-xmpp)
 
 This is a plugin for [Logstash](https://github.com/elastic/logstash).
 
@@ -56,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
@@ -74,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/inputs/xmpp.rb

@@ -62,8 +62,8 @@ class LogStash::Inputs::Xmpp < LogStash::Inputs::Base
         muc.on_message do |time, from, body|
           @codec.decode(body) do |event|
             decorate(event)
-            event["room"] = room
-            event["from"] = from
+            event.set("room", room)
+            event.set("from", from)
             queue << event
           end
         end # @muc.on_message
@@ -80,7 +80,7 @@ class LogStash::Inputs::Xmpp < LogStash::Inputs::Base
           decorate(event)
           # Maybe "from" should just be a hash:
           # { "node" => ..., "domain" => ..., "resource" => ... }
-          event["from"] = "#{msg.from.node}@#{msg.from.domain}/#{msg.from.resource}"
+          event.set("from", "#{msg.from.node}@#{msg.from.domain}/#{msg.from.resource}")
           queue << event
         end
       end

data/logstash-input-xmpp.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-xmpp'
-  s.version         = '2.0.5'
+  s.version         = '3.0.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "This input allows you to receive events over XMPP/Jabber."
-  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" => "input" }
 
   # 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 'logstash-codec-plain'
   s.add_runtime_dependency 'xmpp4r', ['0.5']

data/spec/inputs/xmpp_spec.rb

@@ -43,8 +43,8 @@ describe LogStash::Inputs::Xmpp do
     context "when using Client" do
       it 'pushes normal events into a queue' do
         event = queue.first
-        expect(event['message']).to eq(msg)
-        expect(event['from']).to eq('bar@domain.org/chat')
+        expect(event.get("message")).to eq(msg)
+        expect(event.get("from")).to eq('bar@domain.org/chat')
       end
     end
 
@@ -60,9 +60,9 @@ describe LogStash::Inputs::Xmpp do
       it 'pushes room events into a queue' do
         rooms.each do |room|
           event = queue.shift
-          expect(event['message']).to eq('Hello Foo')
-          expect(event['from']).to eq('bar')
-          expect(event['room']).to eq(room)
+          expect(event.get("message")).to eq('Hello Foo')
+          expect(event.get("from")).to eq('bar')
+          expect(event.get("room")).to eq(room)
         end
       end
     end

metadata

@@ -1,72 +1,74 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-xmpp
 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-03-24 00:00:00.000000000 Z
+date: 2016-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: logstash-core-plugin-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-  name: logstash-core-plugin-api
-  prerelease: false
+        version: '2.0'
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
+  name: logstash-codec-plain
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-codec-plain
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: xmpp4r
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: '0.5'
-  name: xmpp4r
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
+  name: logstash-devutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-devutils
-  prerelease: false
   type: :development
+  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/plugin install gemname. This gem is not a stand-alone program
+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: []
@@ -88,7 +90,7 @@ licenses:
 metadata:
   logstash_plugin: 'true'
   logstash_group: input
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -103,9 +105,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !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 input allows you to receive events over XMPP/Jabber.
 test_files: