logstash-input-file 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 417605ca7bc53cf7e4a03fc248c4573b9b2fa919
-  data.tar.gz: b7e9074f7b0d5cd570a4c7b175001cd91e992abf
+  metadata.gz: a518dc6300f2a903753525dcf94fc0f584c7e649
+  data.tar.gz: da489dd9356805859dca510bb43b22a8d87a619d
 SHA512:
-  metadata.gz: 4b4443562d76d72939e0c2102e514af299dd07e5ec6250caefb8d9e31470b89cba31c19b8d3cb8157a0fd2d902c5e817e772072264128bf7078efa7810a82af5
-  data.tar.gz: f09929bf7d6f240ac7db866083845933d04cb4215b6709c5ad753c7807a266c17c3532d1505472bd69320dfaacf99c6977eec30503db1563125ebdffbacc0a8b
+  metadata.gz: c8f9f23d212d58b1a8fa491ee66d988352877dc9726cd728dc3ac520849985001b3f916c636142fa8a9dd7e5301bb34c95d27a61201e8df0858626995abb5f2a
+  data.tar.gz: 094901654c14d47f5216b9d4382b1006f1f94150c67e3a83ddacfd1f6e086b0d84692c186937c6c57515c455a597cb1f11c3e47cfc4200b25953dc63793773ff

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.1.2
+ - Isolate test helper class in their own namespace
+
 ## 2.1.1
  - Correct LS core dependency version
 

data/lib/logstash/inputs/identity_map_codec_component.rb

@@ -0,0 +1,56 @@
+# encoding: utf-8
+require "logstash/inputs/component"
+require "logstash/codecs/identity_map_codec"
+
+module LogStash module Inputs class IdentityMapCodecComponent
+  include Component
+
+  attr_reader :codec
+
+  def add_codec(codec)
+    @codec = LogStash::Codecs::IdentityMapCodec.new(codec)
+    self
+  end
+
+  def stop
+    @codec.close
+  end
+
+  def do_work(context, data)
+    do_line(context, data) || do_eviction(context, data)
+  end
+
+  def process(context, data)
+    # data should be an event
+    deliver(context, data)
+  end
+
+  private
+
+  def do_line(context, data)
+    return false unless line?(context)
+    @codec.decode_accept(context, data, self)
+    # above should call back on #process
+    true
+  end
+
+  def do_eviction(context, data)
+    return false unless evicting?(context)
+    path = context[:path]
+    @codec.evict(path) if path
+    true
+  end
+
+  def line?(ctx)
+    action(ctx) == "line"
+  end
+
+  def evicting?(ctx)
+    _action = action(ctx)
+    _action == "timed_out" || _action == "deleted"
+  end
+
+  def action(ctx)
+    ctx[:action]
+  end
+end end end

data/logstash-input-file.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-file'
-  s.version         = '2.1.1'
+  s.version         = '2.1.2'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Stream events from files."
   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/file_spec.rb

@@ -147,7 +147,7 @@ describe LogStash::Inputs::File do
     let(:mlconf)       { Hash.new }
     let(:events)       { Array.new }
     let(:mlcodec)      { LogStash::Codecs::Multiline.new(mlconf) }
-    let(:codec)        { CodecTracer.new }
+    let(:codec)        { FileInput::CodecTracer.new }
     let(:tmpfile_path) { Stud::Temporary.pathname }
     let(:sincedb_path) { Stud::Temporary.pathname }
     let(:tmpdir_path)  { Stud::Temporary.directory }

data/spec/spec_helper.rb

@@ -2,78 +2,85 @@
 
 require "logstash/devutils/rspec/spec_helper"
 
-class TracerBase
-  def initialize() @tracer = []; end
+module FileInput
+  class TracerBase
+    def initialize() @tracer = []; end
 
-  def trace_for(symbol)
-    params = @tracer.map {|k,v| k == symbol ? v : nil}.compact
-    params.empty? ? false : params
-  end
+    def trace_for(symbol)
+      params = @tracer.map {|k,v| k == symbol ? v : nil}.compact
+      params.empty? ? false : params
+    end
 
-  def clear()
-    @tracer.clear()
+    def clear()
+      @tracer.clear()
+    end
   end
-end
-
-class FileLogTracer < TracerBase
-  def warn(*args) @tracer.push [:warn, args]; end
-  def error(*args) @tracer.push [:error, args]; end
-  def debug(*args) @tracer.push [:debug, args]; end
-  def info(*args) @tracer.push [:info, args]; end
 
-  def info?() true; end
-  def debug?() true; end
-  def warn?() true; end
-  def error?() true; end
-end
-
-class ComponentTracer < TracerBase
-  def accept(*args) @tracer.push [:accept, args]; end
-  def deliver(*args) @tracer.push [:deliver, args]; end
-end
+  class FileLogTracer < TracerBase
+    def warn(*args) @tracer.push [:warn, args]; end
+    def error(*args) @tracer.push [:error, args]; end
+    def debug(*args) @tracer.push [:debug, args]; end
+    def info(*args) @tracer.push [:info, args]; end
 
-class CodecTracer < TracerBase
-  def decode_accept(ctx, data, listener)
-    @tracer.push [:decode_accept, [ctx, data]]
-    listener.process(ctx, {"message" => data})
-  end
-  def accept(listener)
-    @tracer.push [:accept, true]
-  end
-  def auto_flush()
-    @tracer.push [:auto_flush, true]
+    def info?() true; end
+    def debug?() true; end
+    def warn?() true; end
+    def error?() true; end
   end
-  def close
-    @tracer.push [:close, true]
+
+  class ComponentTracer < TracerBase
+    def accept(*args) @tracer.push [:accept, args]; end
+    def deliver(*args) @tracer.push [:deliver, args]; end
   end
-  def clone
-    self.class.new
+
+  class CodecTracer < TracerBase
+    def decode_accept(ctx, data, listener)
+      @tracer.push [:decode_accept, [ctx, data]]
+      listener.process(ctx, {"message" => data})
+    end
+    def accept(listener)
+      @tracer.push [:accept, true]
+    end
+    def auto_flush()
+      @tracer.push [:auto_flush, true]
+    end
+    def close
+      @tracer.push [:close, true]
+    end
+    def clone
+      self.class.new
+    end
   end
 end
 
-module Kernel
-  def pause_until(nap = 5, &block)
-    sq = SizedQueue.new(1)
-    th1 = Thread.new(sq) {|q| sleep nap; q.push(false) }
-    th2 = Thread.new(sq) do |q|
-      success = false
-      iters = nap * 5 + 1
-      iters.times do
-        break if !!(success = block.call)
-        sleep(0.2)
+unless Kernel.method_defined?(:pause_until)
+  module Kernel
+    def pause_until(nap = 5, &block)
+      sq = SizedQueue.new(1)
+      th1 = Thread.new(sq) {|q| sleep nap; q.push(false) }
+      th2 = Thread.new(sq) do |q|
+        success = false
+        iters = nap * 5 + 1
+        iters.times do
+          break if !!(success = block.call)
+          sleep(0.2)
+        end
+        q.push(success)
       end
-      q.push(success)
+      sq.pop
     end
-    sq.pop
   end
 end
 
-RSpec::Matchers.define(:receive_call_and_args) do |m, args|
-  match do |actual|
-    actual.trace_for(m) == args
-   end
+unless RSpec::Matchers.method_defined?(:receive_call_and_args)
+  RSpec::Matchers.define(:receive_call_and_args) do |m, args|
+    match do |actual|
+      actual.trace_for(m) == args
+     end
 
-  failure_message do
-    "Expecting method #{m} to receive: #{args} but got: #{actual.trace_for(m)}"
+    failure_message do
+      "Expecting method #{m} to receive: #{args} but got: #{actual.trace_for(m)}"
+    end
   end
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-file
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Elastic
@@ -11,8 +11,7 @@ cert_chain: []
 date: 2015-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: logstash-core
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -20,7 +19,10 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 3.0.0
-  requirement: !ruby/object:Gem::Requirement
+  name: logstash-core
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -28,46 +30,35 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 3.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: addressable
   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: addressable
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: filewatch
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.7.0
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -76,64 +67,73 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
+  name: filewatch
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: logstash-codec-multiline
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.0
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: '0.7'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.5
+  name: logstash-codec-multiline
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: stud
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.19
+        version: 2.0.5
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.19
+  name: stud
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.19
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: logstash-devutils
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: logstash-codec-json
   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-codec-json
   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@elastic.co
 executables: []
@@ -147,6 +147,7 @@ files:
 - NOTICE.TXT
 - README.md
 - lib/logstash/inputs/file.rb
+- lib/logstash/inputs/identity_map_codec_component.rb
 - logstash-input-file.gemspec
 - spec/inputs/file_spec.rb
 - spec/spec_helper.rb
@@ -172,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key:
 specification_version: 4
 summary: Stream events from files.