logstash-devutils 1.1.0-java → 1.3.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bf89ebe536a356fc1e416963b01ad71c45e0dea3
-  data.tar.gz: 742264e06310a926019f954d40ece84bd50cbed5
+SHA256:
+  metadata.gz: 86e45cdddc78a4bb753fbef368b665469e85a066000bfd7232be414b61d0646b
+  data.tar.gz: 7d687ce51ca99eb47fb7fa323eb1ea5462dac616660c204779dd9c3e9ec730ab
 SHA512:
-  metadata.gz: 44e5c372227c650f4bfa13def94fa21315af358424d415cd652cae12305956e0420bb1b10a56ff2a483965d014ccd6347df580070e7fff8375eb7ab8472f05a8
-  data.tar.gz: 02b9af7e77a99a3175033fa20def92bbcc52738212969f2a3778cc2878630f531feecf4658b73d4b89a96bf689eff8839689211351bfb47cbe7576bb09f5138c
+  metadata.gz: 7de72acab490dcfcd0187bbba26c583b7ddf1ec3a54b8f03b6d8df65029c11b8e6c40e85c3569ea824b15242fa7563b3d9121e5cda71af839cd794958b37b9ca
+  data.tar.gz: 8b8fc95b98bf02ba2feac3da115303521629c581aff861bfe40a75d14a68385fdbb3585c6dd28e4d6f4aa7628a4a6c76868bad53489308238897f72c9c3f178b

data/CHANGELOG.md

@@ -0,0 +1,22 @@
+## 1.3.5
+ - Fix spec helper method `input` generating an invalid `output_func` that returned `nil` instead of an array
+ - Remove spec helper log4j explicit initialization and rely on logstash-core default log4j initialization
+
+## 1.3.4
+ - Pin kramdown gem to support ruby 1.x syntax for LS 5.x
+
+## 1.3.3
+ - Make input function support different pipeline constructor signatures - for compatibility with logstash-core 6.0
+ - Make return of lambda used in input helpers explicit
+
+## 1.3.2
+ - Make sample function support different pipeline constructor signatures - for compatibility with logstash-core 6.0
+
+## 1.3.1
+ - Close pipeline after #sample helper - for compatibility with logstash-core 5.3
+
+## 1.3.0
+ - Temporary add more visibility into the pipeline to make the #sample method work
+
+## 1.2.1
+ - require logstash-core gem manually to make all the jars available to the plugin unit tests

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

@@ -6,6 +6,11 @@ require "rspec/expectations"
 require "thread"
 
 module LogStashHelper
+  class TestPipeline < LogStash::Pipeline
+    public :filter
+    public :flush_filters
+  end
+
   DEFAULT_NUMBER_OF_TRY = 5
   DEFAULT_EXCEPTIONS_FOR_TRY = [RSpec::Expectations::ExpectationNotMetError]
 
@@ -31,7 +36,7 @@ module LogStashHelper
     name = name[0..50] + "..." if name.length > 50
 
     describe "\"#{name}\"" do
-      let(:pipeline) { LogStash::Pipeline.new(config) }
+      let(:pipeline) { new_pipeline_from_string(config) }
       let(:event) do
         sample_event = [sample_event] unless sample_event.is_a?(Array)
         next sample_event.collect do |e|
@@ -55,6 +60,11 @@ module LogStashHelper
         results.select { |e| !e.cancelled? }
       end
 
+      # starting at logstash-core 5.3 an initialized pipeline need to be closed
+      after do
+        pipeline.close if pipeline.respond_to?(:close)
+      end
+
       subject { results.length > 1 ? results : results.first }
 
       it("when processed", &block)
@@ -62,7 +72,7 @@ module LogStashHelper
   end # def sample
 
   def input(config, &block)
-    pipeline = LogStash::Pipeline.new(config)
+    pipeline = new_pipeline_from_string(config)
     queue = Queue.new
 
     pipeline.instance_eval do
@@ -72,6 +82,10 @@ module LogStashHelper
       # output_func is now a method, call closure
       def output_func(event)
         @output_func.call(event)
+        # We want to return nil or [] since outputs aren't used here
+        # NOTE: In Ruby 1.9.x, Queue#<< returned nil, but in 2.x it returns the queue itself
+        # So we need to be explicit about the return
+        []
       end
     end
 
@@ -102,11 +116,23 @@ module LogStashHelper
   def agent(&block)
 
     it("agent(#{caller[0].gsub(/ .*/, "")}) runs") do
-      pipeline = LogStash::Pipeline.new(config)
+      pipeline = new_pipeline_from_string(config)
       pipeline.run
       block.call
     end
   end # def agent
 
+  def new_pipeline_from_string(string)
+    if TestPipeline.instance_methods.include?(:pipeline_config)
+      settings = ::LogStash::SETTINGS.clone
+
+      config_part = org.logstash.common.SourceWithMetadata.new("config_string", "config_string", string)
+
+      pipeline_config = LogStash::Config::PipelineConfig.new(LogStash::Config::Source::Local, :main, config_part, settings)
+      TestPipeline.new(pipeline_config)
+    else
+      TestPipeline.new(string)
+    end
+  end
 end # module LogStash
 

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

@@ -12,6 +12,7 @@ if ENV['COVERAGE']
   end
 end
 
+require "logstash-core"
 require "logstash/logging"
 require "logstash/environment"
 require "logstash/devutils/rspec/logstash_helpers"
@@ -20,12 +21,6 @@ require "insist"
 
 Thread.abort_on_exception = true
 
-# set log4j configuration
-unless java.lang.System.getProperty("log4j.configurationFile")
-  log4j2_properties = "#{File.dirname(__FILE__)}/log4j2.properties"
-  LogStash::Logging::Logger::initialize(log4j2_properties)
-end
-
 $TESTING = true
 if RUBY_VERSION < "1.9.2"
   $stderr.puts "Ruby 1.9.2 or later is required. (You are running: " + RUBY_VERSION + ")"

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 = "1.1.0"
+  spec.version = "1.3.5"
   spec.licenses = ["Apache License (2.0)"]
   spec.summary = "logstash-devutils"
   spec.description = "logstash-devutils"
@@ -35,13 +35,13 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "rake" # MIT License
   spec.add_runtime_dependency "gem_publisher" # MIT License
   spec.add_runtime_dependency "minitar" # GPL2|Ruby License
-  spec.add_runtime_dependency "logstash-core-plugin-api", "~> 2.0"
+  spec.add_runtime_dependency "logstash-core-plugin-api", "<= 2.99", ">= 2.0"
 
   # Should be removed as soon as the plugins are using insist by their
   # own, and not relying on being required by the spec helper.
   # (some plugins does it, some use insist throw spec_helper)
   spec.add_runtime_dependency "insist", "1.0.0" # (Apache 2.0 license)
-  spec.add_runtime_dependency "kramdown"
+  spec.add_runtime_dependency "kramdown", '1.14.0'
   spec.add_runtime_dependency "stud", " >= 0.0.20"
   spec.add_runtime_dependency "fivemat"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-devutils
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.5
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-09-13 00:00:00.000000000 Z
+date: 2017-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -83,7 +83,10 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '2.99'
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   name: logstash-core-plugin-api
@@ -91,7 +94,10 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '2.99'
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
@@ -111,17 +117,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.14.0
   name: kramdown
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.14.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -156,6 +162,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - lib/logstash/devutils/rake.rb
@@ -187,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 2.6.11
 signing_key:
 specification_version: 4
 summary: logstash-devutils