logstash-devutils 0.0.10-java → 0.0.12-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7877431f083dc1534560d324bf0994c3b478e71d
-  data.tar.gz: 401a884b10e972e32c763cb1acda91906686166e
+  metadata.gz: 635b306c54063f2e4908bd6d0e6cc86569f6c066
+  data.tar.gz: 48f2292b2d850eb31dd7e6b281c318d72ed544b8
 SHA512:
-  metadata.gz: c1c16e56f9c05385d1dcfd8d7f34bece76fcbdde383bbfc5c6d865193fca3f5c24bbce5167a3c083fa3c124c9cdf463962e95baf162cd39156c257d81f37db28
-  data.tar.gz: d37a5649c96f9537b493413721fd0389d77b39a3daf075849a16628bd34fbb70a3c6d4cb1ade2f49b64b28bcdc33f3b3f82149e00c5fa240e1a4d4d283476ecd
+  metadata.gz: c772bf38abd45e9193745343db06510b7bc6246e230777f2cfc6d4f68c858f9ed897cc72fa8c023fddf5737098e8b59b870abcfbf779b3a0a855101d7c7a4ca1
+  data.tar.gz: 2acefbfe05c98abeeec884e326017a037f61c63257ba1d417077bf19cacc43eb9bb36987d30201afbe81e0e870767771f8e0b0ec1551f19c22c31ec6437869b7

data/lib/logstash/devutils/rspec/logstash_helpers.rb

@@ -1,6 +1,7 @@
 require "logstash/agent"
 require "logstash/pipeline"
 require "logstash/event"
+require "thread"
 
 module LogStashHelper
 
@@ -36,32 +37,45 @@ module LogStashHelper
         pipeline.instance_eval { @filters.each(&:register) }
 
         event.each do |e|
-          pipeline.filter(e) {|new_event| results << new_event }
+          # filter call the block on all filtered events, included new events added by the filter
+          pipeline.filter(e) { |filtered_event| results << filtered_event }
         end
 
-        pipeline.flush_filters(:final => true) do |e|
-          results << e unless e.cancelled?
-        end
+        # flush makes sure to empty any buffered events in the filter
+        pipeline.flush_filters(:final => true) { |flushed_event| results << flushed_event }
 
-        results
+        results.select { |e| !e.cancelled? }
       end
 
-      subject { results.length > 1 ? results: results.first }
+      subject { results.length > 1 ? results : results.first }
 
       it("when processed", &block)
     end
   end # def sample
 
-  def input(&block)
-    it "inputs" do
-      pipeline = LogStash::Pipeline.new(config)
-      queue = Queue.new
-      pipeline.instance_eval do
-        @output_func = lambda { |event| queue << event }
+  def input(config, &block)
+    pipeline = LogStash::Pipeline.new(config)
+    queue = Queue.new
+
+    pipeline.instance_eval do
+      # create closure to capture queue
+      @output_func = lambda { |event| queue << event }
+
+      # output_func is now a method, call closure
+      def output_func(event)
+        @output_func.call(event)
       end
-      block.call(pipeline, queue)
-      pipeline.shutdown
     end
+
+    pipeline_thread = Thread.new { pipeline.run }
+    sleep 0.1 while !pipeline.ready?
+
+    result = block.call(pipeline, queue)
+
+    pipeline.shutdown
+    pipeline_thread.join
+
+    result
   end # def input
 
   def agent(&block)

data/lib/logstash/devutils/rspec/spec_helper.rb

@@ -43,8 +43,12 @@ class LogStash::Event
 end
 
 RSpec.configure do |config|
+  # for now both include and extend are required because the newly refactored "input" helper method need to be visible in a "it" block
+  # and this is only possible by calling include on LogStashHelper
+  config.include LogStashHelper
   config.extend LogStashHelper
-  exclude_tags = { :redis => true, :socket => true, :performance => true, :couchdb => true, :elasticsearch => true, :elasticsearch_secure => true, :broken => true, :export_cypher => true, :integration => true }
+
+  exclude_tags = { :redis => true, :socket => true, :performance => true, :couchdb => true, :elasticsearch => true, :elasticsearch_secure => true, :export_cypher => true, :integration => true }
 
   if LogStash::Environment.windows?
     exclude_tags[:unix] = true

data/logstash-devutils.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |spec|
   files = %x{git ls-files}.split("\n")
 
   spec.name = "logstash-devutils"
-  spec.version = "0.0.10"
+  spec.version = "0.0.12"
   spec.summary = "logstash-devutils"
   spec.description = "logstash-devutils"
   spec.license = "Apache 2.0"

metadata

@@ -1,99 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: logstash-devutils
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.12
 platform: java
 authors:
 - Jordan Sissel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.14.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.0
+  name: rspec
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: jar-dependencies
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: jar-dependencies
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: rake
   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: rake
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: gem_publisher
   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: gem_publisher
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: minitar
   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: minitar
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: insist
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.0
+  name: insist
   prerelease: false
   type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: logstash-devutils
 email:
 - jls@semicomplete.com