logstash-input-generator 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e40475a4b1cad1f47c7a0cc1a7ee63f4433db0ad
-  data.tar.gz: 8256f1cb4949e7894f8d352f0e6dbd1c2548418e
+  metadata.gz: cb4ddc5e92fa5212d4e9b92a5c9c4a1caa47cd9a
+  data.tar.gz: 9bdb0a4c64b683c349ebe2321df11b2b4fa234cc
 SHA512:
-  metadata.gz: 92d34d54a5f7df68430c75a66acfb4d4dfdf527bda8462cd5f05ad3f64d474bdb2674d33c2fe7d60f65f477e5e0512fe02769900821fe96a0341eedc5c225a1a
-  data.tar.gz: 3cc76aa3b1df563019c9a7aeba108ee49fe94db3a87272da4e19db7b0b983bf8ab284edf36b317d5587aa5ad50dd9e8bef545ad9bcaaef916ecb582e3a152a5d
+  metadata.gz: f8bb1dbdeaf0824ce5f71a52724415acb3236f17581d392c0b3b828bc485f99bdf21a89354553a34cc9315a95ee0ab629c767264eb1b85a9ab94d0d1debc1d36
+  data.tar.gz: afa1ce20c66ae9a8f3a99604b93876c81b43e4c372176977dc5ecd0a64e854242a53f0c574bed856e371457d516cf270a1954fa3c0899f8d9604de1085252df1

data/lib/logstash/inputs/generator.rb

@@ -49,7 +49,7 @@ class LogStash::Inputs::Generator < LogStash::Inputs::Threadable
   public
   def register
     @host = Socket.gethostname
-    @count = @count.first if @count.is_a?(Array)
+    @count = Array(@count).first
   end # def register
 
   def run(queue)
@@ -85,10 +85,12 @@ class LogStash::Inputs::Generator < LogStash::Inputs::Threadable
 
   public
   def teardown
-    @codec.flush do |event|
-      decorate(event)
-      event["host"] = @host
-      queue << event
+    if @codec.respond_to?(:flush)
+      @codec.flush do |event|
+        decorate(event)
+        event["host"] = @host
+        queue << event
+      end
     end
     finished
   end # def teardown

data/logstash-input-generator.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-generator'
-  s.version         = '0.1.3'
+  s.version         = '0.1.4'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Generate random log events."
   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"

data/spec/inputs/generator_spec.rb

@@ -1,86 +1,54 @@
 require "logstash/devutils/rspec/spec_helper"
+require "logstash/inputs/generator"
 
 describe "inputs/generator" do
-  
 
-  context "performance", :performance => true do
-    event_count = 100000 + rand(50000)
-
-    config <<-CONFIG
+  it "should generate configured message" do
+    conf = <<-CONFIG
       input {
         generator {
-          type => "blah"
-          count => #{event_count}
+          count => 2
+          message => "foo"
         }
       }
     CONFIG
 
-    input do |pipeline, queue|
-      start = Time.now
-      Thread.new { pipeline.run }
-      event_count.times do |i|
-        event = queue.pop
-        insist { event["sequence"] } == i
-      end
-      duration = Time.now - start
-      puts "inputs/generator rate: #{"%02.0f/sec" % (event_count / duration)}, elapsed: #{duration}s"
-      pipeline.shutdown
-    end # input
+    events = input(conf) do |pipeline, queue|
+      2.times.map{queue.pop}
+    end
+
+    insist { events[0]["sequence"] } == 0
+    insist { events[0]["message"] } == "foo"
+
+    insist { events[1]["sequence"] } == 1
+    insist { events[1]["message"] } == "foo"
   end
 
-  context "generate configured message" do
-    config <<-CONFIG
+  it "should generate message from stdin" do
+    conf = <<-CONFIG
       input {
         generator {
           count => 2
-          message => "foo"
+          message => "stdin"
         }
       }
     CONFIG
 
-    input do |pipeline, queue|
-      Thread.new { pipeline.run }
-      event = queue.pop
-      insist { event["sequence"] } == 0
-      insist { event["message"] } == "foo"
+    saved_stdin = $stdin
+    stdin_mock = StringIO.new
+    $stdin = stdin_mock
+    stdin_mock.should_receive(:readline).once.and_return("bar")
 
-      event = queue.pop
-      insist { event["sequence"] } == 1
-      insist { event["message"] } == "foo"
-
-      insist { queue.size } == 0
-      pipeline.shutdown
-    end # input
-
-    context "generate message from stdin" do
-      config <<-CONFIG
-        input {
-          generator {
-            count => 2
-            message => "stdin"
-          }
-        }
-      CONFIG
-
-      input do |pipeline, queue|
-        saved_stdin = $stdin
-        stdin_mock = StringIO.new
-        $stdin = stdin_mock
-        stdin_mock.should_receive(:readline).once.and_return("bar")
+    events = input(conf) do |pipeline, queue|
+      2.times.map{queue.pop}
+    end
 
-        Thread.new { pipeline.run }
-        event = queue.pop
-        insist { event["sequence"] } == 0
-        insist { event["message"] } == "bar"
+    insist { events[0]["sequence"] } == 0
+    insist { events[0]["message"] } == "bar"
 
-        event = queue.pop
-        insist { event["sequence"] } == 1
-        insist { event["message"] } == "bar"
+    insist { events[1]["sequence"] } == 1
+    insist { events[1]["message"] } == "bar"
 
-        insist { queue.size } == 0
-        pipeline.shutdown
-        $stdin = saved_stdin
-      end # input
-    end
+    $stdin = saved_stdin
   end
 end

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-generator
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Elasticsearch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  name: logstash-core
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -19,10 +20,7 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
-  name: logstash-core
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -30,34 +28,36 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: logstash-codec-plain
+  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'
-  name: logstash-codec-plain
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: logstash-devutils
   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'
-  name: logstash-devutils
   prerelease: false
   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
 email: info@elasticsearch.com
 executables: []
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.5
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: Generate random log events.