logstash-input-file 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5c737328c9ce9cac009113fb98dc7c3c83afb29
-  data.tar.gz: 06894d12c757cd21c3897c8fbaea21c21c603d6a
+  metadata.gz: 1ff9aeae9099c3ab7bb3cff6584f411a09224b74
+  data.tar.gz: bbf914865a3def9835a798db7ccf73681899f4e6
 SHA512:
-  metadata.gz: 262054cc486d7396e9ddd91735f37da14e4afe3b537e8e42433b3d2552f1a700ddcc3ccab4eef7345a05cfa20540b3200267a8eb5a18395d45a54e41334af681
-  data.tar.gz: 853d71f80cbe1013e0e53422e9b904b4e9e94a8461ce45b9eac0105cc23e3d7da05f0a46de6b7db8a0908bae09afb128988b529ddf4dd485546b97801415f61a
+  metadata.gz: e8322dea005cfd7337dab2bf78a538bcad1332eb9329e7e340398bf4a9f43f9764a1b36539bac8378e226b5862b297676803746396349981f145385d7423d2c3
+  data.tar.gz: 18358e94256c11112acfa3b5132176078ad1ae2ad043fcce5f86950fc8b5d1c72a6cb06128bb44ebc87bad4df0c9b0376eac97b3d30a438aa77785600ea0eb64

data/lib/logstash/inputs/file.rb

@@ -65,6 +65,9 @@ class LogStash::Inputs::File < LogStash::Inputs::Base
   # has no effect.
   config :start_position, :validate => [ "beginning", "end"], :default => "end"
 
+  # set the new line delimiter, defaults to "\n"
+  config :delimiter, :validate => :string, :default => "\n"
+
   public
   def register
     require "addressable/uri"
@@ -77,6 +80,7 @@ class LogStash::Inputs::File < LogStash::Inputs::Base
       :stat_interval => @stat_interval,
       :discover_interval => @discover_interval,
       :sincedb_write_interval => @sincedb_write_interval,
+      :delimiter => @delimiter,
       :logger => @logger,
     }
 

data/logstash-input-file.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-file'
-  s.version         = '0.1.4'
+  s.version         = '0.1.5'
   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"
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'addressable'
   s.add_runtime_dependency 'filewatch', ['0.6.1']
 
+  s.add_development_dependency 'stud', ['~> 0.0.19']
   s.add_development_dependency 'logstash-devutils'
 end
 

data/spec/inputs/file_spec.rb

@@ -2,25 +2,29 @@
 
 require "logstash/devutils/rspec/spec_helper"
 require "tempfile"
+require "stud/temporary"
 
 describe "inputs/file" do
-  
+
+  delimiter = (LogStash::Environment.windows? ? "\r\n" : "\n")
 
   describe "starts at the end of an existing file" do
-    tmp_file = Tempfile.new('logstash-spec-input-file')
+    tmpfile_path = Stud::Temporary.pathname
+    sincedb_path = Stud::Temporary.pathname
 
     config <<-CONFIG
       input {
         file {
           type => "blah"
-          path => "#{tmp_file.path}"
-          sincedb_path => "/dev/null"
+          path => "#{tmpfile_path}"
+          sincedb_path => "#{sincedb_path}"
+          delimiter => "#{delimiter}"
         }
       }
     CONFIG
 
     input do |pipeline, queue|
-      File.open(tmp_file, "w") do |fd|
+      File.open(tmpfile_path, "w") do |fd|
         fd.puts("ignore me 1")
         fd.puts("ignore me 2")
       end
@@ -38,7 +42,7 @@ describe "inputs/file" do
       loop do
         insist { retries } < 20 # 2 secs should be plenty?
 
-        File.open(tmp_file, "a") do |fd|
+        File.open(tmpfile_path, "a") do |fd|
           fd.puts("hello")
           fd.puts("world")
         end
@@ -57,21 +61,23 @@ describe "inputs/file" do
   end
 
   describe "can start at the beginning of an existing file" do
-    tmp_file = Tempfile.new('logstash-spec-input-file')
+    tmpfile_path = Stud::Temporary.pathname
+    sincedb_path = Stud::Temporary.pathname
 
     config <<-CONFIG
       input {
         file {
           type => "blah"
-          path => "#{tmp_file.path}"
+          path => "#{tmpfile_path}"
           start_position => "beginning"
-          sincedb_path => "/dev/null"
+          sincedb_path => "#{sincedb_path}"
+          delimiter => "#{delimiter}"
         }
       }
     CONFIG
 
     input do |pipeline, queue|
-      File.open(tmp_file, "a") do |fd|
+      File.open(tmpfile_path, "a") do |fd|
         fd.puts("hello")
         fd.puts("world")
       end
@@ -86,22 +92,23 @@ describe "inputs/file" do
   end
 
   describe "restarts at the sincedb value" do
-    tmp_file = Tempfile.new('logstash-spec-input-file')
-    tmp_sincedb = Tempfile.new('logstash-spec-input-file-sincedb')
+    tmpfile_path = Stud::Temporary.pathname
+    sincedb_path = Stud::Temporary.pathname
 
     config <<-CONFIG
       input {
         file {
           type => "blah"
-          path => "#{tmp_file.path}"
-          start_position => "beginning"
-          sincedb_path => "#{tmp_sincedb.path}"
+          path => "#{tmpfile_path}"
+	  start_position => "beginning"
+          sincedb_path => "#{sincedb_path}"
+          delimiter => "#{delimiter}"
         }
       }
     CONFIG
 
     input do |pipeline, queue|
-      File.open(tmp_file, "w") do |fd|
+      File.open(tmpfile_path, "w") do |fd|
         fd.puts("hello")
         fd.puts("world")
       end
@@ -113,7 +120,7 @@ describe "inputs/file" do
       pipeline.shutdown
       t.join
 
-      File.open(tmp_file, "a") do |fd|
+      File.open(tmpfile_path, "a") do |fd|
         fd.puts("foo")
         fd.puts("bar")
         fd.puts("baz")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-file
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Elasticsearch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-19 00:00:00.000000000 Z
+date: 2015-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -72,6 +72,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.6.1
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.19
+  name: stud
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.19
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: