papertrail 0.9.6 → 0.9.7

data/lib/papertrail.rb

@@ -1,5 +1,5 @@
 module Papertrail
- VERSION = "0.9.6"
+ VERSION = "0.9.7"
 end
 
 require 'papertrail/search_client'

data/lib/papertrail/cli.rb

@@ -9,18 +9,24 @@ module Papertrail
   class Cli
     include Papertrail::CliHelpers
 
-    def run
-      # Let it slide if we have invalid JSON
-      if JSON.respond_to?(:default_options)
-        JSON.default_options[:check_utf8] = false
-      end
+    attr_reader :options, :query_options, :connection
 
-      options = {
+    def initialize
+      @options = {
         :configfile => nil,
         :delay  => 2,
         :follow => false
       }
 
+      @query_options = {}
+    end
+
+    def run
+      # Let it slide if we have invalid JSON
+      if JSON.respond_to?(:default_options)
+        JSON.default_options[:check_utf8] = false
+      end
+
       if configfile = find_configfile
         configfile_options = load_configfile(configfile)
         options.merge!(configfile_options)
@@ -66,9 +72,7 @@ module Papertrail
         options.merge!(configfile_options)
       end
 
-      connection = Papertrail::Connection.new(options)
-
-      query_options = {}
+      @connection = Papertrail::Connection.new(options)
 
       if options[:system]
         query_options[:system_id] = connection.find_id_for_source(options[:system])
@@ -84,33 +88,72 @@ module Papertrail
         end
       end
 
-      set_min_max_time!(options, query_options)
-
-      search_query = connection.query(ARGV[0], query_options)
-
       if options[:follow]
+        search_query = connection.query(ARGV[0], query_options)
+
         loop do
-          if options[:json]
-            $stdout.puts search_query.search.data.to_json
-          else
-            search_query.search.events.each do |event|
-              $stdout.puts event
-            end
-          end
-          $stdout.flush
+          display_results(search_query.search)
           sleep options[:delay]
         end
+      elsif options[:min_time]
+        query_time_range
       else
-        if options[:json]
-          $stdout.puts search_query.search.data.to_json
-        else
-          search_query.search.events.each do |event|
+        set_min_max_time!(options, query_options)
+        search_query = connection.query(ARGV[0], query_options)
+        display_results(search_query.search)
+      end
+    end
+
+    def query_time_range
+      min_time = parse_time(options[:min_time])
+
+      if options[:max_time]
+        max_time = parse_time(options[:max_time])
+      end
+
+      search_results = connection.query(ARGV[0], query_options.merge(:min_time => min_time.to_i, :tail => false)).search
+
+      loop do
+        search_results.events.each do |event|
+          # If we've found an event beyond what we were looking for, we're done
+          if max_time && event.received_at > max_time
+            break
+          end
+
+          if options[:json]
+            $stdout.puts event.data.to_json
+          else
             $stdout.puts event
           end
         end
+
+        # If we've found the end of what we're looking for, we're done
+        if max_time && search_results.max_time_at > max_time
+          break
+        end
+
+        if search_results.reached_end?
+          break
+        end
+
+        # Perform the next search
+        search_results = connection.query(ARGV[0], query_options.merge(:min_id => search_results.max_id, :tail => false)).search
+      end
+    end
+
+    def display_results(results)
+      if options[:json]
+        $stdout.puts results.data.to_json
+      else
+        results.events.each do |event|
+          $stdout.puts event
+        end
       end
+
+      $stdout.flush
     end
 
+
     def usage
       <<-EOF
 

data/lib/papertrail/event.rb

@@ -8,8 +8,12 @@ module Papertrail
       @data = data
     end
 
+    def received_at
+      @received_at ||= Time.parse(data['received_at'])
+    end
+
     def to_s
-      "#{Time.parse(data['received_at']).strftime('%b %e %X')} #{data['hostname']} #{data['program']}: #{data['message']}"
+      "#{received_at.strftime('%b %e %X')} #{data['hostname']} #{data['program']}: #{data['message']}"
     end
   end
 end

data/lib/papertrail/search_result.rb

@@ -12,6 +12,14 @@ module Papertrail
       end
     end
 
+    def reached_end?
+      @data['reached_end']
+    end
+
+    def max_time_at
+      @max_time_at ||= Time.parse(@data['max_time_at'])
+    end
+
     def max_id
       @data['max_id']
     end

data/papertrail.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'papertrail'
-  s.version           = '0.9.6'
-  s.date              = '2012-10-05'
+  s.version           = '0.9.7'
+  s.date              = '2013-02-18'
   s.rubyforge_project = 'papertrail'
 
   ## Make sure your summary is short. The description may be as long

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 6
-  version: 0.9.6
+  - 7
+  version: 0.9.7
 platform: ruby
 authors: 
 - Papertrail
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-05 00:00:00 -07:00
+date: 2013-02-18 00:00:00 -08:00
 default_executable: papertrail
 dependencies: 
 - !ruby/object:Gem::Dependency