logstash-input-websocket 2.0.2 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e13a8bf9750bfcce42c29328e05b2d4ee0de96a
-  data.tar.gz: ee2412e5a4e2457a4ec6db2234b7d2e9cb09e078
+  metadata.gz: 55c979849c73f57ac7e0fcf3daefde070b7d5fe0
+  data.tar.gz: d00d6e3f54a442143bbe88d9d54a126ccb55276a
 SHA512:
-  metadata.gz: a4652dccb0fa6c75b21896ef0d1e81bc36e4c6462add346052a4ea6ac1891171264453f33f7bcc9d201b9a6217017b7f655d8353f5338bcc425fc99860322e8c
-  data.tar.gz: 0fd8c74e24ba1d1c522ea0ac8ee4dfd1c57d7a1c8e30ca89a6275a6c9f456abed0155f51386d0412bc29ceaabbb0224930ed86c291de4fb163826c334e86b074
+  metadata.gz: 3451a3e6f5f57f1613787271177ca6e0b7584562b93736c9280704da79ff120db03bcb1d6632e8a1a207cca0565f44a6e3919f86146041404163634d4288c2ee
+  data.tar.gz: 8ec566d3cf416a541a9cd05eff763219a4ae76ccd5079a15595ac2354b7caaee726491570015deab0a5c33270b52ca1d23c6bc07c8db5a1054c07b60e69df66e

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# 3.0.2
+  - Depend on logstash-core-plugin-api instead of logstash-core, removing the need to mass update plugins on major releases of logstash
+# 3.0.1
+  - New dependency requirements for logstash-core for the 5.0 release
+## 3.0.0
+ - The "mode" option's "server" value has been removed since server mode
+   isn't supported (and never has been). This could potentially affect
+   existing users who have had "mode => server" set but in reality have
+   been using client mode all along.
+ - The "url" option is now mandatory.
+
 ## 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/CONTRIBUTORS

@@ -1,6 +1,9 @@
 The following is a list of people who have contributed ideas, code, bug
 reports, or in general have helped logstash along its way.
 
+Maintainers:
+* Magnus Bäck (magnusbaeck)
+
 Contributors:
 * Aaron Mildenstein (untergeek)
 * Jordan Sissel (jordansissel)

data/README.md

@@ -1,5 +1,8 @@
 # Logstash Plugin
 
+[![Build
+Status](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Inputs/job/logstash-plugin-input-websocket-unit/badge/icon)](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Inputs/job/logstash-plugin-input-websocket-unit/)
+
 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.

data/lib/logstash/inputs/websocket.rb

@@ -10,18 +10,13 @@ class LogStash::Inputs::Websocket < LogStash::Inputs::Base
 
   default :codec, "json"
 
-  # The url to connect to or serve from
-  config :url, :validate => :string, :default => "0.0.0.0"
-
-  # Operate as a client or a server.
-  #
-  # Client mode causes this plugin to connect as a websocket client
-  # to the URL given. It expects to receive events as websocket messages.
-  #
-  # (NOT IMPLEMENTED YET) Server mode causes this plugin to listen on
-  # the given URL for websocket clients. It expects to receive events
-  # as websocket messages from these clients.
-  config :mode, :validate => [ "server", "client" ], :default => "client"
+  # The URL to connect to.
+  config :url, :validate => :string, :required => true
+
+  # Select the plugin's mode of operation. Right now only client mode
+  # is supported, i.e. this plugin connects to a websocket server and
+  # receives events from the server as websocket messages.
+  config :mode, :validate => ["client"], :default => "client"
 
   def register
     require "ftw"
@@ -29,7 +24,6 @@ class LogStash::Inputs::Websocket < LogStash::Inputs::Base
 
   public
   def run(output_queue)
-    # TODO(sissel): Implement server mode.
     agent = FTW::Agent.new
     begin
       websocket = agent.websocket!(@url)

data/logstash-input-websocket.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-websocket'
-  s.version         = '2.0.2'
+  s.version         = '3.0.2'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Read events over the websocket protocol."
   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", "logstash_group" => "input" }
 
   # 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_runtime_dependency 'logstash-codec-json'
   s.add_runtime_dependency 'ftw', ['~> 0.0.40']

data/spec/inputs/websocket_spec.rb

@@ -1 +1,25 @@
 require "logstash/devutils/rspec/spec_helper"
+require "logstash/inputs/websocket"
+
+describe LogStash::Inputs::Websocket do
+
+  context "when url option isn't set" do
+    subject { LogStash::Inputs::Websocket.new() }
+
+    it "should raise exception" do
+      expect { subject.register }.to raise_error(LogStash::ConfigurationError)
+    end
+  end
+
+  context "when attempting to enable server mode" do
+    subject {
+      LogStash::Inputs::Websocket.new("url" => "http://example.com",
+                                      "mode" => "server")
+    }
+
+    it "should raise exception" do
+      expect { subject.register }.to raise_error(LogStash::ConfigurationError)
+    end
+  end
+
+end

metadata

@@ -1,39 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-websocket
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 3.0.2
 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-codec-json
@@ -41,13 +35,13 @@ dependencies:
   type: :runtime
   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.0.40
   name: ftw
@@ -55,13 +49,13 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.40
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   name: logstash-devutils
@@ -69,7 +63,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
@@ -99,12 +93,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: []