papertrail 0.9.7 → 0.9.8

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'rake', '0.8.7'
 

data/README.md

@@ -9,12 +9,17 @@ Supports optional Boolean search queries and polling for new events
     $ papertrail -f "(www OR db) (nginx OR pgsql) -accepted"
 
 Output is line-buffered so it can be fed into a pipe, like for grep.
-See below for colorization setup.
+ANSI color codes are rendered in color on suitable terminals; see below for 
+additional colorization options.
 
 The [Connection] class can be used by other apps to perform one-off
 API searches or follow (tail) events matching a given query. Interface
 may change.
 
+Also includes `papertrail-add-system`, `papertrail-remove-system`, 
+`papertrail-add-group`, and `papertrail-join-group` binaries, which 
+invoke the corresponding Papertrail [HTTP API] call.
+
 
 ## Quick Start
 
@@ -22,7 +27,13 @@ may change.
     $ echo "token: 123456789012345678901234567890ab" > ~/.papertrail.yml
     $ papertrail
 
-Retrieve token from Papertrail [User Profile].
+Retrieve the token from Papertrail [User Profile].
+
+The API token can also be passed in the `PAPERTRAIL_API_TOKEN`
+environment variable instead of a configuration file. Example:
+
+    $ export PAPERTRAIL_API_TOKEN='abc123'
+    $ papertrail
 
 
 ## Installation
@@ -44,7 +55,7 @@ examples/papertrail.yml.example):
 Retrieve token from Papertrail [User Profile]. For compatibility with
 older config files, `username` and `password` keys are also supported.
 
-You may want to alias "trail" to "papertrail", like:
+You may want to alias "pt" to "papertrail", like:
 
     echo "alias pt=papertrail" >> ~/.bashrc
 
@@ -70,18 +81,25 @@ You may want to alias "trail" to "papertrail", like:
     Examples:
       papertrail -f
       papertrail something
-      papertrail 1.2.3 Failure
+      papertrail --min-time "20 minutes ago" 1.2.3 Failure
       papertrail -s ns1 "connection refused"
       papertrail -f "(www OR db) (nginx OR pgsql) -accepted"
       papertrail -f -g Production "(nginx OR pgsql) -accepted"
       papertrail -g Production --min-time 'yesterday at noon' --max-time 'today at 4am'
 
+    Includes 4 binaries to change Papertrail settings: papertrail-add-system, papertrail-remove-system,
+      papertrail-add-group, papertrail-leave-group. Run with --help or see README.
+
     More: http://papertrailapp.com/
+  
 
+### Colors
 
-## Colors
+ANSI color codes are retained, so log messages which are already colorized 
+will automatically render in color on ANSI-capable terminals.
 
-Pipe through [colortail] or [MultiTail]. We recommend colortail:
+To manually colorize monochrome logs, pipe through [colortail] or 
+[MultiTail]. We recommend `colortail``:
 
     $ sudo gem install colortail
 
@@ -103,12 +121,12 @@ Add the function line to your `~/.bashrc`.
 
 For complete control, pipe through anything capable of inserting ANSI
 control characters. Here's an example that colorizes 3 fields separately
-- the first 15 characters for the date, a word for the hostname, and a
-word for the program name:
+(the first 15 characters for the date, a word for the hostname, and a
+word for the program name):
 
     $ papertrail | perl -pe 's/^(.{15})(.)([\S]+)(.)([\S]+)/\e[1;31;43m\1\e[0m\2\e[1;31;43m\3\e[0m\4\e[1;31;43m\5\e[0m/g'
 
-the "1;31;43" are bold (1), foreground red (31), background yellow (43),
+the `1;31;43` are bold (1), foreground red (31), background yellow (43),
 and can be any ANSI [escape characters].
 
 ### UTF-8 (non-English searches)
@@ -126,6 +144,28 @@ at invocation. For example, to persist that in a `.bashrc`:
 
     export RUBYOPT="-E:UTF-8"
 
+### Negation-only queries
+
+Unix shells handle arguments beginning with hyphens (`-`) differently 
+([why](http://unix.stackexchange.com/questions/11376/what-does-double-dash-mean)).
+Usually this is moot because most searches start with a positive match.
+To search only for log messages without a given string, use `--`. For
+example, to search for `-whatever`, run:
+
+    papertrail -- -whatever
+
+
+## Add/Remove Systems, Create Group, Join Group
+
+In addition to tail and search with the `papertrail` binary, the gem includes 
+4 other binaries which wrap other parts of Papertrail's [HTTP API] to explicitly 
+add or remove a system, to create a new group, and to join a system to a group.
+
+In most cases, configuration is automatic and these are not not necessary.
+
+To see usage, run any of these commands with `--help`: `papertrail-add-system`, 
+`papertrail-remove-system`, `papertrail-add-group`, `papertrail-join-group`.
+
 
 ## Contribute
 
@@ -147,6 +187,7 @@ to your enhancement.
 [binary]: https://github.com/papertrail/papertrail-cli/blob/master/bin/papertrail
 [Papertrail]: http://papertrailapp.com/
 [Connection]: https://github.com/papertrail/papertrail-cli/blob/master/lib/papertrail/connection.rb
+[HTTP API]: http://help.papertrailapp.com/kb/how-it-works/http-api
 [User Profile]: https://papertrailapp.com/user/edit
 [RubyGems]: https://rubygems.org/gems/papertrail-cli
 [colortail]: http://rubydoc.info/gems/colortail

data/lib/papertrail.rb

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

data/lib/papertrail/cli.rb

@@ -15,18 +15,14 @@ module Papertrail
       @options = {
         :configfile => nil,
         :delay  => 2,
-        :follow => false
+        :follow => false,
+        :token  => ENV['PAPERTRAIL_API_TOKEN']
       }
 
       @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)
@@ -157,7 +153,7 @@ module Papertrail
     def usage
       <<-EOF
 
-  Usage: 
+  Usage:
     papertrail [-f] [-s system] [-g group] [-d seconds] [-c papertrail.yml] [-j] [--min-time mintime] [--max-time maxtime] [query]
 
   Examples:

data/lib/papertrail/cli_add_group.rb

@@ -9,13 +9,9 @@ module Papertrail
     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
-
       options = {
         :configfile => nil,
+        :token => ENV['PAPERTRAIL_API_TOKEN'],
       }
 
       if configfile = find_configfile
@@ -71,8 +67,8 @@ module Papertrail
     def usage
       <<-EOF
 
-  Usage: 
-    papertrail-add-group [-g group] [-w system-wildcard] [-c papertrail.yml] 
+  Usage:
+    papertrail-add-group [-g group] [-w system-wildcard] [-c papertrail.yml]
 
   Example:
     papertrail-add-group -g mygroup -w mygroup-systems*

data/lib/papertrail/cli_add_system.rb

@@ -11,13 +11,9 @@ module Papertrail
     attr_reader :program_name
 
     def run
-      # Let it slide if we have invalid JSON
-      if JSON.respond_to?(:default_options)
-        JSON.default_options[:check_utf8] = false
-      end
-
       options = {
         :configfile => nil,
+        :token => ENV['PAPERTRAIL_API_TOKEN'],
       }
 
       if configfile = find_configfile

data/lib/papertrail/cli_join_group.rb

@@ -9,13 +9,9 @@ module Papertrail
     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
-
       options = {
         :configfile => nil,
+        :token => ENV['PAPERTRAIL_API_TOKEN'],
       }
 
       if configfile = find_configfile
@@ -67,8 +63,8 @@ module Papertrail
     def usage
       <<-EOF
 
-  Usage: 
-    papertrail-join-group [-s system] [-g group] [-c papertrail.yml] 
+  Usage:
+    papertrail-join-group [-s system] [-g group] [-c papertrail.yml]
 
   Example:
     papertrail-join-group -s mymachine -g mygroup

data/lib/papertrail/cli_remove_system.rb

@@ -9,13 +9,9 @@ module Papertrail
     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
-
       options = {
         :configfile => nil,
+        :token => ENV['PAPERTRAIL_API_TOKEN'],
       }
 
       if configfile = find_configfile
@@ -63,8 +59,8 @@ module Papertrail
     def usage
       <<-EOF
 
-  Usage: 
-    papertrail-remove-system [-s system] [-c papertrail.yml] 
+  Usage:
+    papertrail-remove-system [-s system] [-c papertrail.yml]
 
   Example:
     papertrail-remove-system -s mysystemname

data/lib/papertrail/connection.rb

@@ -1,10 +1,7 @@
-require 'addressable/uri'
-require 'faraday'
+require 'forwardable'
 require 'openssl'
-require 'faraday_middleware'
-require 'yajl/json_gem'
-require 'zlib'
 
+require 'papertrail/http_client'
 require 'papertrail/search_query'
 
 module Papertrail
@@ -32,16 +29,11 @@ module Papertrail
         ssl_options[:ca_file] = '/etc/ssl/certs/ca-certificates.crt'
       end
 
-      @connection = Faraday::Connection.new(:url => 'https://papertrailapp.com/api/v1', :ssl => ssl_options) do |builder|
-        builder.use Faraday::Request::UrlEncoded
-        builder.adapter Faraday.default_adapter
-        builder.use Faraday::Response::RaiseError
-        builder.use FaradayMiddleware::ParseJson, :content_type => /\bjson$/
-      end.tap do |conn|
+      @connection = Papertrail::HttpClient.new(ssl_options).tap do |conn|
         if options[:username] && options[:password]
           conn.basic_auth(options[:username], options[:password])
         else
-          conn.headers['X-Papertrail-Token'] = options[:token]
+          conn.token_auth(options[:token])
         end
       end
     end
@@ -125,8 +117,7 @@ module Papertrail
         request[:destination_port] = options[:destination_port]
       end
 
-      response = @connection.post("systems.json", request)
-      raise response.body.inspect unless response.success?
+      @connection.post("systems.json", request)
     end
 
     def unregister_source(name)

data/lib/papertrail/http_client.rb

@@ -0,0 +1,128 @@
+require 'delegate'
+require 'net/https'
+
+require 'papertrail/okjson'
+
+module Papertrail
+
+  # Used because Net::HTTPOK in Ruby 1.8 hasn't method body=
+  class HttpResponse < SimpleDelegator
+
+    def initialize(response)
+      super(response)
+    end
+
+    def body
+      @body ||= Papertrail::OkJson.decode(__getobj__.body)
+    end
+
+  end
+
+  class HttpClient
+    ESCAPE_RE = /[^a-zA-Z0-9 .~_-]/
+
+    def initialize(ssl)
+      @ssl = ssl
+      @headers = {}
+    end
+
+    def basic_auth(login, pass)
+      @headers['Authorization'] = 'Basic ' + ["#{login}:#{pass}"].pack('m').delete("\r\n")
+    end
+
+    def token_auth(token)
+      @headers['X-Papertrail-Token'] = token
+    end
+
+    def get(path, params = {})
+      if params.size > 0
+        path = "#{path}?#{build_nested_query(params)}"
+      end
+      on_complete(https.get(request_uri(path), @headers))
+    end
+
+    def put(path, params)
+      on_complete(https.put(request_uri(path), build_nested_query(params), @headers))
+    end
+
+    def post(path, params)
+      on_complete(https.post(request_uri(path), build_nested_query(params), @headers))
+    end
+
+    def delete(path)
+      on_complete(https.delete(request_uri(path), @headers))
+    end
+
+    private
+
+    def request_uri(path)
+      path.start_with?('/api/v1/') ? path : "/api/v1/#{path}"
+    end
+
+    def https
+      http = Net::HTTP.new('papertrailapp.com', 443)
+      http.use_ssl      = true
+      http.verify_mode  = ssl_verify_mode
+      http.cert_store   = ssl_cert_store
+
+      http.cert         = @ssl[:client_cert]  if @ssl[:client_cert]
+      http.key          = @ssl[:client_key]   if @ssl[:client_key]
+      http.ca_file      = @ssl[:ca_file]      if @ssl[:ca_file]
+      http.ca_path      = @ssl[:ca_path]      if @ssl[:ca_path]
+      http.verify_depth = @ssl[:verify_depth] if @ssl[:verify_depth]
+      http.ssl_version  = @ssl[:version]      if @ssl[:version]
+
+      http
+    end
+
+    def ssl_verify_mode
+      @ssl[:verify_mode] || begin
+        if @ssl.fetch(:verify, true)
+          OpenSSL::SSL::VERIFY_PEER
+        else
+          OpenSSL::SSL::VERIFY_NONE
+        end
+      end
+    end
+
+    def ssl_cert_store
+      return @ssl[:cert_store] if @ssl[:cert_store]
+      # Use the default cert store by default, i.e. system ca certs
+      cert_store = OpenSSL::X509::Store.new
+      cert_store.set_default_paths
+      cert_store
+    end
+
+    def on_complete(response)
+      case response
+        when Net::HTTPSuccess
+          Papertrail::HttpResponse.new(response)
+        else
+          response.error!
+      end
+    end
+
+    def build_nested_query(value, prefix = nil)
+      case value
+        when Array
+          value.map { |v| build_nested_query(v, "#{prefix}%5B%5D") }.join("&")
+        when Hash
+          value.map { |k, v|
+            build_nested_query(v, prefix ? "#{prefix}%5B#{escape(k)}%5D" : escape(k))
+          }.join("&")
+        when NilClass
+          prefix
+        else
+          raise ArgumentError, "value must be a Hash" if prefix.nil?
+          "#{prefix}=#{escape(value)}"
+      end
+    end
+
+    def escape(s)
+      s.to_s.gsub(ESCAPE_RE) {
+        '%' + $&.unpack('H2' * $&.bytesize).join('%').upcase
+      }.tr(' ', '+')
+    end
+  end
+
+end

data/lib/papertrail/okjson.rb

@@ -0,0 +1,602 @@
+# encoding: UTF-8
+#
+# Copyright 2011, 2012 Keith Rarick
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+# See https://github.com/kr/okjson for updates.
+
+require 'stringio'
+
+module Papertrail
+  # Some parts adapted from
+  # http://golang.org/src/pkg/json/decode.go and
+  # http://golang.org/src/pkg/utf8/utf8.go
+  module OkJson
+    Upstream = '43'
+    extend self
+
+
+    # Decodes a json document in string s and
+    # returns the corresponding ruby value.
+    # String s must be valid UTF-8. If you have
+    # a string in some other encoding, convert
+    # it first.
+    #
+    # String values in the resulting structure
+    # will be UTF-8.
+    def decode(s)
+      ts = lex(s)
+      v, ts = textparse(ts)
+      if ts.length > 0
+        raise Error, 'trailing garbage'
+      end
+      v
+    end
+
+
+    # Encodes x into a json text. It may contain only
+    # Array, Hash, String, Numeric, true, false, nil.
+    # (Note, this list excludes Symbol.)
+    # X itself must be an Array or a Hash.
+    # No other value can be encoded, and an error will
+    # be raised if x contains any other value, such as
+    # Nan, Infinity, Symbol, and Proc, or if a Hash key
+    # is not a String.
+    # Strings contained in x must be valid UTF-8.
+    def encode(x)
+      case x
+      when Hash    then objenc(x)
+      when Array   then arrenc(x)
+      else
+        raise Error, 'root value must be an Array or a Hash'
+      end
+    end
+
+
+    def valenc(x)
+      case x
+      when Hash    then objenc(x)
+      when Array   then arrenc(x)
+      when String  then strenc(x)
+      when Numeric then numenc(x)
+      when true    then "true"
+      when false   then "false"
+      when nil     then "null"
+      else
+        raise Error, "cannot encode #{x.class}: #{x.inspect}"
+      end
+    end
+
+
+  private
+
+
+    # Parses a "json text" in the sense of RFC 4627.
+    # Returns the parsed value and any trailing tokens.
+    # Note: this is almost the same as valparse,
+    # except that it does not accept atomic values.
+    def textparse(ts)
+      if ts.length <= 0
+        raise Error, 'empty'
+      end
+
+      typ, _, val = ts[0]
+      case typ
+      when '{' then objparse(ts)
+      when '[' then arrparse(ts)
+      else
+        raise Error, "unexpected #{val.inspect}"
+      end
+    end
+
+
+    # Parses a "value" in the sense of RFC 4627.
+    # Returns the parsed value and any trailing tokens.
+    def valparse(ts)
+      if ts.length <= 0
+        raise Error, 'empty'
+      end
+
+      typ, _, val = ts[0]
+      case typ
+      when '{' then objparse(ts)
+      when '[' then arrparse(ts)
+      when :val,:str then [val, ts[1..-1]]
+      else
+        raise Error, "unexpected #{val.inspect}"
+      end
+    end
+
+
+    # Parses an "object" in the sense of RFC 4627.
+    # Returns the parsed value and any trailing tokens.
+    def objparse(ts)
+      ts = eat('{', ts)
+      obj = {}
+
+      if ts[0][0] == '}'
+        return obj, ts[1..-1]
+      end
+
+      k, v, ts = pairparse(ts)
+      obj[k] = v
+
+      if ts[0][0] == '}'
+        return obj, ts[1..-1]
+      end
+
+      loop do
+        ts = eat(',', ts)
+
+        k, v, ts = pairparse(ts)
+        obj[k] = v
+
+        if ts[0][0] == '}'
+          return obj, ts[1..-1]
+        end
+      end
+    end
+
+
+    # Parses a "member" in the sense of RFC 4627.
+    # Returns the parsed values and any trailing tokens.
+    def pairparse(ts)
+      (typ, _, k), ts = ts[0], ts[1..-1]
+      if typ != :str
+        raise Error, "unexpected #{k.inspect}"
+      end
+      ts = eat(':', ts)
+      v, ts = valparse(ts)
+      [k, v, ts]
+    end
+
+
+    # Parses an "array" in the sense of RFC 4627.
+    # Returns the parsed value and any trailing tokens.
+    def arrparse(ts)
+      ts = eat('[', ts)
+      arr = []
+
+      if ts[0][0] == ']'
+        return arr, ts[1..-1]
+      end
+
+      v, ts = valparse(ts)
+      arr << v
+
+      if ts[0][0] == ']'
+        return arr, ts[1..-1]
+      end
+
+      loop do
+        ts = eat(',', ts)
+
+        v, ts = valparse(ts)
+        arr << v
+
+        if ts[0][0] == ']'
+          return arr, ts[1..-1]
+        end
+      end
+    end
+
+
+    def eat(typ, ts)
+      if ts[0][0] != typ
+        raise Error, "expected #{typ} (got #{ts[0].inspect})"
+      end
+      ts[1..-1]
+    end
+
+
+    # Scans s and returns a list of json tokens,
+    # excluding white space (as defined in RFC 4627).
+    def lex(s)
+      ts = []
+      while s.length > 0
+        typ, lexeme, val = tok(s)
+        if typ == nil
+          raise Error, "invalid character at #{s[0,10].inspect}"
+        end
+        if typ != :space
+          ts << [typ, lexeme, val]
+        end
+        s = s[lexeme.length..-1]
+      end
+      ts
+    end
+
+
+    # Scans the first token in s and
+    # returns a 3-element list, or nil
+    # if s does not begin with a valid token.
+    #
+    # The first list element is one of
+    # '{', '}', ':', ',', '[', ']',
+    # :val, :str, and :space.
+    #
+    # The second element is the lexeme.
+    #
+    # The third element is the value of the
+    # token for :val and :str, otherwise
+    # it is the lexeme.
+    def tok(s)
+      case s[0]
+      when ?{ then ['{', s[0,1], s[0,1]]
+      when ?} then ['}', s[0,1], s[0,1]]
+      when ?: then [':', s[0,1], s[0,1]]
+      when ?, then [',', s[0,1], s[0,1]]
+      when ?[ then ['[', s[0,1], s[0,1]]
+      when ?] then [']', s[0,1], s[0,1]]
+      when ?n then nulltok(s)
+      when ?t then truetok(s)
+      when ?f then falsetok(s)
+      when ?" then strtok(s)
+      when Spc, ?\t, ?\n, ?\r then [:space, s[0,1], s[0,1]]
+      else
+        numtok(s)
+      end
+    end
+
+
+    def nulltok(s);  s[0,4] == 'null'  ? [:val, 'null',  nil]   : [] end
+    def truetok(s);  s[0,4] == 'true'  ? [:val, 'true',  true]  : [] end
+    def falsetok(s); s[0,5] == 'false' ? [:val, 'false', false] : [] end
+
+
+    def numtok(s)
+      m = /-?([1-9][0-9]+|[0-9])([.][0-9]+)?([eE][+-]?[0-9]+)?/.match(s)
+      if m && m.begin(0) == 0
+        if !m[2] && !m[3]
+          [:val, m[0], Integer(m[0])]
+        elsif m[2]
+          [:val, m[0], Float(m[0])]
+        else
+          [:val, m[0], Integer(m[1])*(10**Integer(m[3][1..-1]))]
+        end
+      else
+        []
+      end
+    end
+
+
+    def strtok(s)
+      m = /"([^"\\]|\\["\/\\bfnrt]|\\u[0-9a-fA-F]{4})*"/.match(s)
+      if ! m
+        raise Error, "invalid string literal at #{abbrev(s)}"
+      end
+      [:str, m[0], unquote(m[0])]
+    end
+
+
+    def abbrev(s)
+      t = s[0,10]
+      p = t['`']
+      t = t[0,p] if p
+      t = t + '...' if t.length < s.length
+      '`' + t + '`'
+    end
+
+
+    # Converts a quoted json string literal q into a UTF-8-encoded string.
+    # The rules are different than for Ruby, so we cannot use eval.
+    # Unquote will raise an error if q contains control characters.
+    def unquote(q)
+      q = q[1...-1]
+      a = q.dup # allocate a big enough string
+      # In ruby >= 1.9, a[w] is a codepoint, not a byte.
+      if rubydoesenc?
+        a.force_encoding('UTF-8')
+      end
+      r, w = 0, 0
+      while r < q.length
+        c = q[r]
+        if c == ?\\
+          r += 1
+          if r >= q.length
+            raise Error, "string literal ends with a \"\\\": \"#{q}\""
+          end
+
+          case q[r]
+          when ?",?\\,?/,?'
+            a[w] = q[r]
+            r += 1
+            w += 1
+          when ?b,?f,?n,?r,?t
+            a[w] = Unesc[q[r]]
+            r += 1
+            w += 1
+          when ?u
+            r += 1
+            uchar = begin
+              hexdec4(q[r,4])
+            rescue RuntimeError => e
+              raise Error, "invalid escape sequence \\u#{q[r,4]}: #{e}"
+            end
+            r += 4
+            if surrogate? uchar
+              if q.length >= r+6
+                uchar1 = hexdec4(q[r+2,4])
+                uchar = subst(uchar, uchar1)
+                if uchar != Ucharerr
+                  # A valid pair; consume.
+                  r += 6
+                end
+              end
+            end
+            if rubydoesenc?
+              a[w] = '' << uchar
+              w += 1
+            else
+              w += ucharenc(a, w, uchar)
+            end
+          else
+            raise Error, "invalid escape char #{q[r]} in \"#{q}\""
+          end
+        elsif c == ?" || c < Spc
+          raise Error, "invalid character in string literal \"#{q}\""
+        else
+          # Copy anything else byte-for-byte.
+          # Valid UTF-8 will remain valid UTF-8.
+          # Invalid UTF-8 will remain invalid UTF-8.
+          # In ruby >= 1.9, c is a codepoint, not a byte,
+          # in which case this is still what we want.
+          a[w] = c
+          r += 1
+          w += 1
+        end
+      end
+      a[0,w]
+    end
+
+
+    # Encodes unicode character u as UTF-8
+    # bytes in string a at position i.
+    # Returns the number of bytes written.
+    def ucharenc(a, i, u)
+      if u <= Uchar1max
+        a[i] = (u & 0xff).chr
+        1
+      elsif u <= Uchar2max
+        a[i+0] = (Utag2 | ((u>>6)&0xff)).chr
+        a[i+1] = (Utagx | (u&Umaskx)).chr
+        2
+      elsif u <= Uchar3max
+        a[i+0] = (Utag3 | ((u>>12)&0xff)).chr
+        a[i+1] = (Utagx | ((u>>6)&Umaskx)).chr
+        a[i+2] = (Utagx | (u&Umaskx)).chr
+        3
+      else
+        a[i+0] = (Utag4 | ((u>>18)&0xff)).chr
+        a[i+1] = (Utagx | ((u>>12)&Umaskx)).chr
+        a[i+2] = (Utagx | ((u>>6)&Umaskx)).chr
+        a[i+3] = (Utagx | (u&Umaskx)).chr
+        4
+      end
+    end
+
+
+    def hexdec4(s)
+      if s.length != 4
+        raise Error, 'short'
+      end
+      (nibble(s[0])<<12) | (nibble(s[1])<<8) | (nibble(s[2])<<4) | nibble(s[3])
+    end
+
+
+    def subst(u1, u2)
+      if Usurr1 <= u1 && u1 < Usurr2 && Usurr2 <= u2 && u2 < Usurr3
+        return ((u1-Usurr1)<<10) | (u2-Usurr2) + Usurrself
+      end
+      return Ucharerr
+    end
+
+
+    def surrogate?(u)
+      Usurr1 <= u && u < Usurr3
+    end
+
+
+    def nibble(c)
+      if ?0 <= c && c <= ?9 then c.ord - ?0.ord
+      elsif ?a <= c && c <= ?z then c.ord - ?a.ord + 10
+      elsif ?A <= c && c <= ?Z then c.ord - ?A.ord + 10
+      else
+        raise Error, "invalid hex code #{c}"
+      end
+    end
+
+
+    def objenc(x)
+      '{' + x.map{|k,v| keyenc(k) + ':' + valenc(v)}.join(',') + '}'
+    end
+
+
+    def arrenc(a)
+      '[' + a.map{|x| valenc(x)}.join(',') + ']'
+    end
+
+
+    def keyenc(k)
+      case k
+      when String then strenc(k)
+      else
+        raise Error, "Hash key is not a string: #{k.inspect}"
+      end
+    end
+
+
+    def strenc(s)
+      t = StringIO.new
+      t.putc(?")
+      r = 0
+
+      while r < s.length
+        case s[r]
+        when ?"  then t.print('\\"')
+        when ?\\ then t.print('\\\\')
+        when ?\b then t.print('\\b')
+        when ?\f then t.print('\\f')
+        when ?\n then t.print('\\n')
+        when ?\r then t.print('\\r')
+        when ?\t then t.print('\\t')
+        else
+          c = s[r]
+          # In ruby >= 1.9, s[r] is a codepoint, not a byte.
+          if rubydoesenc?
+            begin
+              # c.ord will raise an error if c is invalid UTF-8
+              if c.ord < Spc.ord
+                c = "\\u%04x" % [c.ord]
+              end
+              t.write(c)
+            rescue
+              t.write(Ustrerr)
+            end
+          elsif c < Spc
+            t.write("\\u%04x" % c)
+          elsif Spc <= c && c <= ?~
+            t.putc(c)
+          else
+            n = ucharcopy(t, s, r) # ensure valid UTF-8 output
+            r += n - 1 # r is incremented below
+          end
+        end
+        r += 1
+      end
+      t.putc(?")
+      t.string
+    end
+
+
+    def numenc(x)
+      if ((x.nan? || x.infinite?) rescue false)
+        raise Error, "Numeric cannot be represented: #{x}"
+      end
+      "#{x}"
+    end
+
+
+    # Copies the valid UTF-8 bytes of a single character
+    # from string s at position i to I/O object t, and
+    # returns the number of bytes copied.
+    # If no valid UTF-8 char exists at position i,
+    # ucharcopy writes Ustrerr and returns 1.
+    def ucharcopy(t, s, i)
+      n = s.length - i
+      raise Utf8Error if n < 1
+
+      c0 = s[i].ord
+
+      # 1-byte, 7-bit sequence?
+      if c0 < Utagx
+        t.putc(c0)
+        return 1
+      end
+
+      raise Utf8Error if c0 < Utag2 # unexpected continuation byte?
+
+      raise Utf8Error if n < 2 # need continuation byte
+      c1 = s[i+1].ord
+      raise Utf8Error if c1 < Utagx || Utag2 <= c1
+
+      # 2-byte, 11-bit sequence?
+      if c0 < Utag3
+        raise Utf8Error if ((c0&Umask2)<<6 | (c1&Umaskx)) <= Uchar1max
+        t.putc(c0)
+        t.putc(c1)
+        return 2
+      end
+
+      # need second continuation byte
+      raise Utf8Error if n < 3
+
+      c2 = s[i+2].ord
+      raise Utf8Error if c2 < Utagx || Utag2 <= c2
+
+      # 3-byte, 16-bit sequence?
+      if c0 < Utag4
+        u = (c0&Umask3)<<12 | (c1&Umaskx)<<6 | (c2&Umaskx)
+        raise Utf8Error if u <= Uchar2max
+        t.putc(c0)
+        t.putc(c1)
+        t.putc(c2)
+        return 3
+      end
+
+      # need third continuation byte
+      raise Utf8Error if n < 4
+      c3 = s[i+3].ord
+      raise Utf8Error if c3 < Utagx || Utag2 <= c3
+
+      # 4-byte, 21-bit sequence?
+      if c0 < Utag5
+        u = (c0&Umask4)<<18 | (c1&Umaskx)<<12 | (c2&Umaskx)<<6 | (c3&Umaskx)
+        raise Utf8Error if u <= Uchar3max
+        t.putc(c0)
+        t.putc(c1)
+        t.putc(c2)
+        t.putc(c3)
+        return 4
+      end
+
+      raise Utf8Error
+    rescue Utf8Error
+      t.write(Ustrerr)
+      return 1
+    end
+
+
+    def rubydoesenc?
+      ::String.method_defined?(:force_encoding)
+    end
+
+
+    class Utf8Error < ::StandardError
+    end
+
+
+    class Error < ::StandardError
+    end
+
+
+    Utagx = 0b1000_0000
+    Utag2 = 0b1100_0000
+    Utag3 = 0b1110_0000
+    Utag4 = 0b1111_0000
+    Utag5 = 0b1111_1000
+    Umaskx = 0b0011_1111
+    Umask2 = 0b0001_1111
+    Umask3 = 0b0000_1111
+    Umask4 = 0b0000_0111
+    Uchar1max = (1<<7) - 1
+    Uchar2max = (1<<11) - 1
+    Uchar3max = (1<<16) - 1
+    Ucharerr = 0xFFFD # unicode "replacement char"
+    Ustrerr = "\xef\xbf\xbd" # unicode "replacement char"
+    Usurrself = 0x10000
+    Usurr1 = 0xd800
+    Usurr2 = 0xdc00
+    Usurr3 = 0xe000
+
+    Spc = ' '[0]
+    Unesc = {?b=>?\b, ?f=>?\f, ?n=>?\n, ?r=>?\r, ?t=>?\t}
+  end
+end

data/lib/papertrail/search_query.rb

@@ -9,15 +9,13 @@ module Papertrail
     end
 
     def search
-      response = @connection.get('/api/v1/events/search.json') do |r|
-        r.params = @options.dup
-
-        r.params[:q]      = @query  if @query
-        r.params[:min_id] = @max_id if @max_id
-      end
+      params = @options.dup
+      params[:q] = @query  if @query
+      params[:min_id] = @max_id if @max_id
 
+      response = @connection.get('/api/v1/events/search.json', params)
       @max_id = response.body['max_id']
       Papertrail::SearchResult.new(response.body)
     end
   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.7'
-  s.date              = '2013-02-18'
+  s.version           = '0.9.8'
+  s.date              = '2014-03-04'
   s.rubyforge_project = 'papertrail'
 
   ## Make sure your summary is short. The description may be as long
@@ -49,11 +49,7 @@ Gem::Specification.new do |s|
 
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
-  s.add_dependency('addressable')
-  s.add_dependency('yajl-ruby')
   s.add_dependency('chronic')
-  s.add_dependency('faraday', [ '>= 0.6', '< 0.9' ])
-  s.add_dependency('faraday_middleware', [ '~> 0.8.4' ])
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development
@@ -83,6 +79,8 @@ Gem::Specification.new do |s|
     lib/papertrail/cli_remove_system.rb
     lib/papertrail/connection.rb
     lib/papertrail/event.rb
+    lib/papertrail/http_client.rb
+    lib/papertrail/okjson.rb
     lib/papertrail/search_query.rb
     lib/papertrail/search_result.rb
     papertrail.gemspec

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: papertrail
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 43
+  prerelease: 
   segments: 
   - 0
   - 9
-  - 7
-  version: 0.9.7
+  - 8
+  version: 0.9.8
 platform: ruby
 authors: 
 - Papertrail
@@ -14,78 +15,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-18 00:00:00 -08:00
-default_executable: papertrail
+date: 2014-03-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  name: addressable
-  requirement: *id001
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  name: yajl-ruby
-  requirement: *id002
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
   name: chronic
-  requirement: *id003
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
-        - 6
-        version: "0.6"
-    - - <
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        version: "0.9"
-  name: faraday
-  requirement: *id004
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+        version: "0"
   type: :runtime
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 8
-        - 4
-        version: 0.8.4
-  name: faraday_middleware
-  requirement: *id005
-  prerelease: false
+  version_requirements: *id001
 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: 
@@ -118,10 +63,11 @@ files:
 - lib/papertrail/cli_remove_system.rb
 - lib/papertrail/connection.rb
 - lib/papertrail/event.rb
+- lib/papertrail/http_client.rb
+- lib/papertrail/okjson.rb
 - lib/papertrail/search_query.rb
 - lib/papertrail/search_result.rb
 - papertrail.gemspec
-has_rdoc: true
 homepage: http://github.com/papertrail/papertrail-cli
 licenses: []
 
@@ -131,23 +77,27 @@ rdoc_options:
 require_paths: 
 - lib
 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 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: papertrail
-rubygems_version: 1.3.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 2
 summary: Command-line client for Papertrail hosted log management service.