papertrail 0.8.4 → 0.9.0

data/README.md

@@ -46,7 +46,7 @@ older config files, `username` and `password` keys are also supported.
 
 You may want to alias "trail" to "papertrail", like:
 
-    echo "alias trail=papertrail" >> ~/.bashrc
+    echo "alias pt=papertrail" >> ~/.bashrc
 
 
 ## Usage & Examples
@@ -55,17 +55,21 @@ You may want to alias "trail" to "papertrail", like:
     papertrail - command-line tail and search for Papertrail log management service
         -h, --help                       Show usage
         -f, --follow                     Continue running and print new events (off)
-        -d, --delay SECONDS              Delay between refresh (3)
+        -d, --delay SECONDS              Delay between refresh (2)
         -c, --configfile PATH            Path to config (~/.papertrail.yml)
+        -s, --system SYSTEM              System to search
+        -g, --group GROUP                Group to search
 
-    Usage: papertrail [-f] [-d seconds] [-c /path/to/papertrail.yml] [query]
+    Usage: 
+      papertrail [-f] [-s system] [-g group] [-d seconds] [-c papertrail.yml] [query]
 
     Examples:
       papertrail -f
       papertrail something
       papertrail 1.2.3 Failure
+      papertrail -s ns1 "connection refused"
       papertrail -f "(www OR db) (nginx OR pgsql) -accepted"
-      papertrail -f -d 10 "ns1 OR 'connection refused'"
+      papertrail -f -g Production "(nginx OR pgsql) -accepted"
 
     More: http://papertrailapp.com/
 

data/bin/papertrail

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-
 require 'papertrail/cli'
 
 begin

data/lib/papertrail/cli.rb

@@ -7,11 +7,16 @@ module Papertrail
   class Cli
     def run
       options = {
-        :configfile => File.expand_path('~/.papertrail.yml'),
+        :configfile => nil,
         :delay  => 2,
         :follow => false
       }
 
+      if configfile = find_configfile
+        configfile_options = load_configfile(configfile)
+        options.merge!(configfile_options)
+      end
+
       OptionParser.new do |opts|
         opts.banner = "papertrail - command-line tail and search for Papertrail log management service"
 
@@ -38,15 +43,12 @@ module Papertrail
         opts.separator usage
       end.parse!
 
-      credentials = open(options[:configfile]) do |f|
-        YAML.load(f)
+      if options[:configfile]
+        configfile_options = load_configfile(options[:configfile])
+        options.merge!(configfile_options)
       end
 
-      if credentials['token']
-        connection = Papertrail::Connection.new(:token => credentials['token'])
-      else
-        connection = Papertrail::Connection.new(:username => credentials['username'], :password => credentials['password'])
-      end
+      connection = Papertrail::Connection.new(options)
 
       query_options = {}
 
@@ -75,17 +77,41 @@ module Papertrail
       end
     end
 
+    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
+      end
+    end
+
+    def load_configfile(file_path)
+      symbolize_keys(YAML.load_file(file_path))
+    end
+
+    def symbolize_keys(hash)
+      new_hash = {}
+      hash.each do |(key, value)|
+        new_hash[(key.to_sym rescue key) || key] = value
+      end
+
+      new_hash
+    end
+
     def usage
       <<-EOF
 
-  Usage: papertrail [-f] [-d seconds] [-c /path/to/papertrail.yml] [query]
+  Usage: 
+    papertrail [-f] [-s system] [-g group] [-d seconds] [-c papertrail.yml] [query]
 
   Examples:
     papertrail -f
     papertrail something
     papertrail 1.2.3 Failure
+    papertrail -s ns1 "connection refused"
     papertrail -f "(www OR db) (nginx OR pgsql) -accepted"
-    papertrail -f -d 10 "ns1 OR 'connection refused'"
+    papertrail -f -g Production "(nginx OR pgsql) -accepted"
 
   More: https://papertrailapp.com/
 

data/lib/papertrail/connection.rb

@@ -14,7 +14,9 @@ module Papertrail
     def_delegators :@connection, :get, :put, :post
 
     def initialize(options)
-      ssl_options = { :verify => OpenSSL::SSL::VERIFY_PEER }
+      ssl_options = {
+        :verify => options.fetch(:verify_ssl) { OpenSSL::SSL::VERIFY_PEER }
+      }
 
       # Make Ubuntu OpenSSL work
       #

data/lib/papertrail.rb

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

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.8.4'
-  s.date              = '2012-02-11'
+  s.version           = '0.9.0'
+  s.date              = '2012-02-27'
   s.rubyforge_project = 'papertrail'
 
   ## Make sure your summary is short. The description may be as long

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 8
-  - 4
-  version: 0.8.4
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Papertrail
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-11 00:00:00 -08:00
+date: 2012-02-27 00:00:00 -08:00
 default_executable: papertrail
 dependencies: 
 - !ruby/object:Gem::Dependency