logstash-input-heroku 2.0.4 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 999a35432867e5729776d2a23aa4d0653c580a1a
-  data.tar.gz: b475a4f519c3c8008b1a86433d6e7b28e6092715
+  metadata.gz: 38e77dc87cdea75ea5825bb84bdd5c57ab87d74f
+  data.tar.gz: a10f8b643ce9802856add35a77b8abf98d6f37e7
 SHA512:
-  metadata.gz: d163616dedbc4ad102a665050bda3e256fac6e403216bd2d16b38aee626ebe8b91a17155a45170978f43401c8292fd5cbd99a51714fc58fa797a914e52c2a4ed
-  data.tar.gz: bd3285365b05a398aadc9a1ac3c05ee049d0f415bf74747d421e52b3cd4b867bfe566de4634e6089d994fdf8b3022449dceee2183f4179e0170ace8086409335
+  metadata.gz: 546ecee0a2fa62505659dd79580f0907744f127404171872323f5748fae95b4a8289f0c5c5aaad6005c5219de27116a71a49a576181d726b9401c0e1eb54d1c8
+  data.tar.gz: 81cd79966fdf268fbcb93caecd0662cd1b28f7de6a94774f02e17ff6d22aa50c42ecc76af2658ac1eeff3cbf52f378b06f15053231106db98d17329fe65ae5b7

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 3.0.0
+ - Breaking: depend on logstash-core-plugin-api between 1.60 and 2.99
+
 # 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

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-heroku-unit/badge/icon)](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Inputs/job/logstash-plugin-input-heroku-unit/)
+[![Travis Build Status](https://travis-ci.org/logstash-plugins/logstash-input-heroku.svg)](https://travis-ci.org/logstash-plugins/logstash-input-heroku)
 
 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/heroku.rb

@@ -27,7 +27,7 @@ class LogStash::Inputs::Heroku < LogStash::Inputs::Base
 
   public
   def register
-    require "heroku"
+    require "heroku/client"
     require "logstash/util/buftok"
   end # def register
 
@@ -43,7 +43,7 @@ class LogStash::Inputs::Heroku < LogStash::Inputs::Base
     client.read_logs(@app, ["tail=1", "num=1"]) do |chunk|
       @codec.decode(chunk) do |event|
         decorate(event)
-        event["app"] = @app
+        event.set("app", @app)
         queue << event
       end
     end

data/logstash-input-heroku.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-heroku'
-  s.version         = '2.0.4'
+  s.version         = '3.0.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Stream events from a heroku app's logs."
-  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", ">= 1.60", "<= 2.99"
 
   s.add_runtime_dependency 'logstash-codec-plain'
   s.add_runtime_dependency 'heroku'

data/spec/inputs/heroku_spec.rb

@@ -1 +1,31 @@
-require "logstash/devutils/rspec/spec_helper"
+require_relative "../spec_helper"
+
+describe LogStash::Inputs::Heroku do
+
+  before :each do
+    @client = Heroku::Client.new("test", "pw")
+    allow(Heroku::Client).to receive(:new).and_return(@client)
+    allow(Heroku::Auth).to receive(:user).and_return("test")
+    allow(Heroku::Auth).to receive(:password).and_return("pw")
+    @input = LogStash::Plugin.lookup("input","heroku").new("app" => "test")
+  end
+
+  it "should register" do
+    expect{ @input.register }.to_not raise_error
+  end
+
+  context "when operating" do
+
+    before :each do
+      @queue = []
+    end
+
+    it "should read logs" do 
+      allow(@client).to receive(:read_logs).and_yield("LOG LOG LOG LOG")
+      allow(LogStash::Event).to receive(:validate_value).and_return(true)
+      @input.run(@queue)
+      expect(@queue.length).to eq 1
+      expect(@queue.first.to_hash["message"]).to eq "LOG LOG LOG LOG"
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,5 @@
+# encoding: utf-8
+require "logstash/devutils/rspec/spec_helper"
+require "logstash/inputs/heroku"
+require "heroku/helpers"
+require "heroku/client"

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-heroku
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 3.0.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-24 00:00:00.000000000 Z
+date: 2016-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.60'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.99'
   name: logstash-core-plugin-api
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.60'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.99'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -66,7 +72,7 @@ dependencies:
     - - ">="
       - !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: []
@@ -81,6 +87,7 @@ files:
 - lib/logstash/inputs/heroku.rb
 - logstash-input-heroku.gemspec
 - spec/inputs/heroku_spec.rb
+- spec/spec_helper.rb
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)
@@ -109,3 +116,4 @@ specification_version: 4
 summary: Stream events from a heroku app's logs.
 test_files:
 - spec/inputs/heroku_spec.rb
+- spec/spec_helper.rb