papertrail 0.9.9 → 0.9.10

data/README.md

@@ -154,6 +154,25 @@ example, to search for `-whatever`, run:
 
     papertrail -- -whatever
 
+### Quoted phrases
+
+Because the Unix shell parses and strips one set of quotes around a
+phrase, to search for a phrase, wrap the string in both single-quotes
+and double-quotes. For example:
+
+    papertrail -f '"Connection reset by peer"'
+
+Use one set of double-quotes and one set of single-quotes. The order
+does not matter as long as the pairs are consistent.
+
+Note that many phrases are unique enough that searching for the
+words yields the same results as searching for the quoted phrase. As a
+result, quoting strings twice is often not actually necessary. For
+example, these two searches are likely to yield the same log messages,
+even though one is for 4 words (AND) while the other is for a phrase:
+
+    papertrail -f Connection reset by peer
+    papertrail -f '"Connection reset by peer"'
 
 ## Add/Remove Systems, Create Group, Join Group
 

data/Rakefile

@@ -64,7 +64,7 @@ task :coverage do
   sh "open coverage/index.html"
 end
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "#{name} #{version}"

data/lib/papertrail/cli.rb

@@ -20,6 +20,7 @@ module Papertrail
       }
 
       @query_options = {}
+      @query = nil
     end
 
     def run
@@ -50,6 +51,9 @@ module Papertrail
         opts.on("-g", "--group GROUP", "Group to search") do |v|
           options[:group] = v
         end
+        opts.on("-S", "--search SEARCH", "Saved search to search") do |v|
+          options[:search] = v
+        end
         opts.on("-j", "--json", "Output raw json data") do |v|
           options[:json] = true
         end
@@ -67,6 +71,10 @@ module Papertrail
         configfile_options = load_configfile(options[:configfile])
         options.merge!(configfile_options)
       end
+      
+      unless options[:token]
+        abort 'Authentication token not found. Set config file "token" attribute or PAPERTRAIL_API_TOKEN.'
+      end
 
       @connection = Papertrail::Connection.new(options)
 
@@ -84,8 +92,20 @@ module Papertrail
         end
       end
 
+      if options[:search]
+        search = connection.find_search(options[:search], query_options[:group_id])
+        unless search
+          abort "Search \"#{options[:search]}\" not found"
+        end
+
+        query_options[:group_id] ||= search['group_id']
+        @query = search['query']
+      end
+
+      @query ||= ARGV[0]
+
       if options[:follow]
-        search_query = connection.query(ARGV[0], query_options)
+        search_query = connection.query(@query, query_options)
 
         loop do
           display_results(search_query.search)
@@ -95,7 +115,7 @@ module Papertrail
         query_time_range
       else
         set_min_max_time!(options, query_options)
-        search_query = connection.query(ARGV[0], query_options)
+        search_query = connection.query(@query, query_options)
         display_results(search_query.search)
       end
     end
@@ -107,7 +127,7 @@ module Papertrail
         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
+      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|
@@ -133,7 +153,7 @@ module Papertrail
         end
 
         # Perform the next search
-        search_results = connection.query(ARGV[0], query_options.merge(:min_id => search_results.max_id, :tail => false)).search
+        search_results = connection.query(@query, query_options.merge(:min_id => search_results.max_id, :tail => false)).search
       end
     end
 
@@ -154,7 +174,8 @@ module Papertrail
       <<-EOF
 
   Usage:
-    papertrail [-f] [-s system] [-g group] [-d seconds] [-c papertrail.yml] [-j] [--min-time mintime] [--max-time maxtime] [query]
+    papertrail [-f] [-s system] [-g group] [-S search] [-d seconds] \
+      [-c papertrail.yml] [-j] [--min-time time] [--max-time time] [query]
 
   Examples:
     papertrail -f

data/lib/papertrail/cli_add_group.rb

@@ -62,6 +62,9 @@ module Papertrail
       puts "Error: #{e}"
       puts usage
       exit 1
+    rescue Net::HTTPServerException => e
+      output_http_error(e)
+      exit 1
     end
 
     def usage

data/lib/papertrail/cli_add_system.rb

@@ -103,6 +103,9 @@ module Papertrail
     rescue OptionParser::ParseError => e
       error(e, true)
       exit 1
+    rescue Net::HTTPServerException => e
+      output_http_error(e)
+      exit 1
     end
 
     def error(message, try_help = false)

data/lib/papertrail/cli_helpers.rb

@@ -1,11 +1,14 @@
 module Papertrail
   module CliHelpers
     def find_configfile
-      if File.exists?(path = File.expand_path('.papertrail.yml'))
-        return path
-      end
-      if File.exists?(path = File.expand_path('~/.papertrail.yml'))
-        return path
+      begin
+        if File.exists?(path = File.expand_path('.papertrail.yml'))
+          return path
+        end
+        if File.exists?(path = File.expand_path('~/.papertrail.yml'))
+          return path
+        end
+      rescue ArgumentError => e
       end
     end
 
@@ -32,5 +35,12 @@ module Papertrail
         raise(ArgumentError, "Could not parse time string '#{tstring}'")
     end
 
+    def output_http_error(e)
+      if e.response && e.response.body
+        puts "Error: #{e.response.body}\n\n"
+      end
+
+      puts e
+    end
   end
 end

data/lib/papertrail/cli_join_group.rb

@@ -58,6 +58,9 @@ module Papertrail
       puts "Error: #{e}"
       puts usage
       exit 1
+    rescue Net::HTTPServerException => e
+      output_http_error(e)
+      exit 1
     end
 
     def usage

data/lib/papertrail/cli_remove_system.rb

@@ -54,6 +54,9 @@ module Papertrail
       puts "Error: #{e}"
       puts usage
       exit 1
+    rescue Net::HTTPServerException => e
+      output_http_error(e)
+      exit 1
     end
 
     def usage

data/lib/papertrail/connection.rb

@@ -49,14 +49,45 @@ module Papertrail
       find_id_for_item(response.body, name)
     end
 
-    def find_id_for_item(items, name_wanted)
+    def find_search(name, group_id = nil)
+      response = @connection.get('searches.json')
+
+      candidates = find_items_by_name(response.body, name)
+      return nil if candidates.empty?
+
+      candidates.each do |item|
+        if !group_id || group_id == item['group_id']
+          return item
+        end
+      end
+
+      return candidates.first
+    end
+
+    def find_items_by_name(items, name_wanted)
+      results = []
+
       items.each do |item|
-        return item['id'] if item['name'] == name_wanted
+        results << item if item['name'] == name_wanted
       end
 
       items.each do |item|
-        return item['id'] if item['name'] =~ /#{Regexp.escape(name_wanted)}/i
+        results << item if item['name'] =~ /#{Regexp.escape(name_wanted)}/i
+      end
+      
+      results
+    end
+
+    def find_item_by_name(items, name_wanted)
+      find_items_by_name(items, name_wanted).first
+    end
+
+    def find_id_for_item(items, name_wanted)
+      item = find_item_by_name(items, name_wanted)
+      if item
+        return item['id']
       end
+
       return nil
     end
 

data/lib/papertrail/http_client.rb

@@ -5,7 +5,7 @@ require 'papertrail/okjson'
 
 module Papertrail
 
-  # Used because Net::HTTPOK in Ruby 1.8 hasn't method body=
+  # Used because Net::HTTPOK in Ruby 1.8 has no body= method
   class HttpResponse < SimpleDelegator
 
     def initialize(response)
@@ -13,7 +13,11 @@ module Papertrail
     end
 
     def body
-      @body ||= Papertrail::OkJson.decode(__getobj__.body.dup.force_encoding('UTF-8'))
+      if __getobj__.body.respond_to?(:force_encoding)
+        @body ||= Papertrail::OkJson.decode(__getobj__.body.dup.force_encoding('UTF-8'))
+      else
+        @body ||= Papertrail::OkJson.decode(__getobj__.body.dup)
+      end
     end
 
   end

data/lib/papertrail.rb

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

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.9'
-  s.date              = '2014-04-02'
+  s.version           = '0.9.10'
+  s.date              = '2014-06-05'
   s.rubyforge_project = 'papertrail'
 
   ## Make sure your summary is short. The description may be as long

metadata

@@ -1,49 +1,45 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: papertrail
-version: !ruby/object:Gem::Version 
-  hash: 41
+version: !ruby/object:Gem::Version
+  version: 0.9.10
   prerelease: 
-  segments: 
-  - 0
-  - 9
-  - 9
-  version: 0.9.9
 platform: ruby
-authors: 
+authors:
 - Papertrail
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-04-02 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2014-06-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: chronic
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id001
-  name: chronic
-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).
+  prerelease: false
+  version_requirements: !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).
 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
@@ -70,36 +66,28 @@ files:
 - papertrail.gemspec
 homepage: http://github.com/papertrail/papertrail-cli
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: papertrail
-rubygems_version: 1.8.25
+rubygems_version: 1.8.29
 signing_key: 
 specification_version: 2
 summary: Command-line client for Papertrail hosted log management service.
 test_files: []
-
+has_rdoc: