papertrail 0.9.11 → 0.9.12

data/lib/papertrail.rb

@@ -1,5 +1,5 @@
 module Papertrail
- VERSION = "0.9.11"
+ VERSION = "0.9.12"
 end
 
 require 'papertrail/connection'

data/lib/papertrail/cli.rb

@@ -128,33 +128,12 @@ module Papertrail
         max_time = parse_time(options[:max_time])
       end
 
-      search_results = connection.query(@query, 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 Papertrail::OkJson.encode(event.data)
-          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
+      connection.each_event(@query, query_options.merge(:min_time => min_time, :max_time => max_time)) do |event|
+        if options[:json]
+          $stdout.puts Papertrail::OkJson.encode(event.data)
+        else
+          $stdout.puts event
         end
-
-        # Perform the next search
-        search_results = connection.query(@query, query_options.merge(:min_id => search_results.max_id, :tail => false)).search
       end
     end
 

data/lib/papertrail/connection.rb

@@ -74,7 +74,7 @@ module Papertrail
       items.each do |item|
         results << item if item['name'] =~ /#{Regexp.escape(name_wanted)}/i
       end
-      
+
       results
     end
 
@@ -160,5 +160,64 @@ module Papertrail
     def query(query = nil, options = {})
       Papertrail::SearchQuery.new(self, query, options)
     end
+
+    def each_event(query_term = nil, options = {}, &block)
+      # If there was no query but there were options, shuffle around
+      # the parameters
+      if query_term.is_a?(Hash)
+        options, query_term = query_term, nil
+      end
+
+      # Remove all of the options that shouldn't be in each query
+      options  = options.dup
+      min_id   = options.delete(:min_id)
+      max_id   = options.delete(:max_id)
+      min_time = options.delete(:min_time)
+      max_time = options.delete(:max_time)
+
+      # Figure out where to start querying
+      if min_id
+        search_results = query(query_term, options.merge(:min_id => min_id, :tail => false)).search
+      elsif min_time
+        search_results = query(query_term, options.merge(:min_time => min_time.to_i, :tail => false)).search
+      else
+        raise ArgumentError, "Either :min_id or :min_time must be specified"
+      end
+
+      # Start processing events
+      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 max_id && event.id > max_id
+            break
+          end
+
+          block.call(event)
+        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 max_id && search_results.max_id > max_id
+          break
+        end
+
+        # If we've reached the most current log message, we're done
+        if search_results.reached_end?
+          break
+        end
+
+        # Perform the next search
+        search_results = query(query_term, options.merge(:min_id => search_results.max_id, :tail => false)).search
+      end
+
+      nil
+    end
   end
 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.11'
-  s.date              = '2014-11-12'
+  s.version           = '0.9.12'
+  s.date              = '2015-01-23'
   s.rubyforge_project = 'papertrail'
 
   ## Make sure your summary is short. The description may be as long

metadata

@@ -1,56 +1,63 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: papertrail
-version: !ruby/object:Gem::Version
-  version: 0.9.11
+version: !ruby/object:Gem::Version 
+  hash: 35
+  prerelease: 
+  segments: 
+  - 0
+  - 9
+  - 12
+  version: 0.9.12
 platform: ruby
-authors:
+authors: 
 - Papertrail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2015-01-23 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: chronic
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-description: Command-line client for Papertrail hosted log management service. Tails
-  and searches app server logs and system syslog. Supports Boolean search and works
-  with grep and pipe output (Unix).
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+description: Command-line client for Papertrail hosted log management service. Tails and searches app server logs and system syslog. Supports Boolean search and works with grep and pipe output (Unix).
 email: troy@sevenscale.com
-executables:
+executables: 
 - papertrail
 - papertrail-add-system
 - papertrail-remove-system
 - papertrail-add-group
 - papertrail-join-group
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - Gemfile
 - LICENSE
 - README.md
@@ -77,26 +84,36 @@ files:
 - papertrail.gemspec
 homepage: http://github.com/papertrail/papertrail-cli
 licenses: []
-metadata: {}
+
 post_install_message: 
-rdoc_options:
-- "--charset=UTF-8"
-require_paths:
+rdoc_options: 
+- --charset=UTF-8
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: papertrail
-rubygems_version: 2.2.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 2
 summary: Command-line client for Papertrail hosted log management service.
 test_files: []
+

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 359b1f7ba488f1336a5b1cd0852db34ef1035d5e
-  data.tar.gz: 4dbe878508c443ac2f388460077eacf20a2ff333
-SHA512:
-  metadata.gz: e5a3119406c02b20d8e1f9f8ef214ed426a55e2c4586eee94fe2c852c12760eddb8d7f95061a1876980013a7da163554789cf49f99c9ebb9523d291661b8ee6e
-  data.tar.gz: 5959953cd70c99729ee1e496019a587d8956440eedd009e291bb07176c25b70c99fbc4c39a949b1af103dd14bfb598d717cf0201d2ddf9ff7c1e3a6b26798c52