plextail 0.0.1 → 0.0.2

data/README.md

@@ -22,11 +22,11 @@ The line will be sent through to Heroku using the provided details. If you want
 You can customise the following attributes on the yielded line object:
 
 * `token` – the logplex token,
-* `version` – the logplex version, which defaults to '<134>1',
-* `timestamp` – the timestamp for the line, which defaults to the current time, in the following format: '%Y-%m-%dT%H:%M:%S.ms+00:00',
-* `hostname` – host name of the log source (doesn't seem to impact Heroku's output),
+* `version` – the logplex version, which defaults to `<134>1`,
+* `timestamp` – the timestamp for the line, which defaults to the current time, in the following format: `%Y-%m-%dT%H:%M:%S.ms+00:00`,
+* `hostname` – host name of the log source (doesn't seem to impact Heroku's output), defaults to your computer's host name,
 * `process_id` – the source of the log file (e.g. web.1)
-* `message_id` – defaults to '- -', and
+* `message_id` – defaults to `- -`, and
 * `message` – the remainder/core of the log line, which defaults to the entire raw line from the file.
 
 The line also has two attributes available to help any custom logic you may involve in the processing: `file` (the file that has a new line appended) and `raw` (the raw line that has appeared in the file).

data/lib/plextail/line.rb

@@ -8,13 +8,15 @@ class Plextail::Line
   attr_accessor :file, :raw, :token, :version, :timestamp, :hostname,
     :process_id, :message_id, :message
 
-  def initialize(file, raw)
+  def initialize(file, raw, &block)
     @file, @raw = file, raw
     @version    = DEFAULTS[:version]
     @timestamp  = current_timestamp
     @hostname   = DEFAULTS[:hostname]
     @message_id = DEFAULTS[:message_id]
     @message    = raw.dup
+
+    block.call self if block_given?
   end
 
   def to_s

data/lib/plextail/tracker.rb

@@ -9,21 +9,11 @@ class Plextail::Tracker
   end
 
   def pipe(&block)
-    file = Dir[glob].first
-    PTY.spawn("tail -f #{glob}") do |stdin, stdout, pid|
-      stdin.each do |string|
-        string.strip!
-        if string[/^==> (.+) <==$/]
-          file = $1
-        elsif string.length > 0
-          line = Plextail::Line.new file, string
-          block.call line
-          to_plex line
-        end
-      end
+    if @glob.empty?
+      pipe_from_input nil, &block
+    else
+      pipe_from_glob Dir[glob].first, &block
     end
-  rescue PTY::ChildExited
-    puts "The child process exited!"
   end
 
   private
@@ -36,6 +26,31 @@ class Plextail::Tracker
     end
   end
 
+  def pipe_from_glob(file, &block)
+    PTY.spawn("tail -f #{glob}") do |stdin, stdout, pid|
+      stdin.each do |string|
+        file = process_line file, string, &block
+      end
+    end
+  rescue PTY::ChildExited
+    puts "The child process exited!"
+  end
+
+  def pipe_from_input(file, &block)
+    ARGF.each_line do |string|
+      file = process_line file, string, &block
+    end
+  end
+
+  def process_line(file, string, &block)
+    string.strip!
+    return $1 if string[/^==> (.+) <==$/]
+
+    to_plex Plextail::Line.new file, string, &block if string.length > 0
+
+    file
+  end
+
   def to_plex(line)
     connection.basic_auth 'token', line.token
     connection.post('/logs', line.to_s) do |request|

data/plextail.gemspec

@@ -1,7 +1,7 @@
 # encoding: utf-8
 Gem::Specification.new do |spec|
   spec.name          = 'plextail'
-  spec.version       = '0.0.1'
+  spec.version       = '0.0.2'
   spec.authors       = ['Pat Allan']
   spec.email         = ['pat@freelancing-gods.com']
   spec.summary       = 'Pipes tailed files to Heroku Logplex'

data/spec/acceptance/plextail_spec.rb

@@ -67,4 +67,20 @@ describe 'Plextail' do
     yielded_file.should == File.join(directory, 'data.log')
     yielded_line.should == 'stuff'
   end
+
+  it "reads from piped-in input if no path is supplied" do
+    stub_const 'ARGF', `tail #{directory}/*.log`
+
+    yielded_file, yielded_line = nil, nil
+
+    Plextail.track do |line|
+      yielded_file, yielded_line = line.file, line.raw
+
+      line.token      = 'token'
+      line.process_id = 'spec'
+    end
+
+    yielded_file.should == File.join(directory, 'error.log')
+    yielded_line.should == 'nonsense'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plextail
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-18 00:00:00.000000000 Z
+date: 2013-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -125,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -273195946337692726
+      hash: 3380038206689063187
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -273195946337692726
+      hash: 3380038206689063187
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23