add delimiter and fix specs on windows

Fixes logstash-plugins#14

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 @@ def register
       :stat_interval => @stat_interval,
       :discover_interval => @discover_interval,
       :sincedb_write_interval => @sincedb_write_interval,
+      :delimiter => @delimiter,
       :logger => @logger,
     }
 

logstash-input-file.gemspec

@@ -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
 

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 @@
       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 @@
   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 @@
   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 @@
       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")