papertrail 0.8.3 → 0.8.4

data/README.md

@@ -1,4 +1,4 @@
-# papertrail Command-line tail & search client for Papertrail log management service
+# papertrail command-line tail & search client for Papertrail log management service
 
 Small standalone [binary] to retrieve, search, and tail recent app
 server log and system syslog messages from [Papertrail].
@@ -6,19 +6,19 @@ server log and system syslog messages from [Papertrail].
 Supports optional Boolean search queries and polling for new events
 (like "tail -f"). Example:
 
-    papertrail -f "(www OR db) (nginx OR pgsql) -accepted"
+    $ 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.
 
-The [SearchClient] class can be used by other apps to perform one-off
+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.
 
 
 ## Quick Start
 
-    $ [sudo] gem install papertrail-cli
+    $ [sudo] gem install papertrail
     $ echo "token: 123456789012345678901234567890ab" > ~/.papertrail.yml
     $ papertrail
 
@@ -27,10 +27,10 @@ Retrieve token from Papertrail [User Profile].
 
 ## Installation
 
-Install the gem (details on [RubyGems]), which includes a binary called 
+Install the gem (details on [RubyGems]), which includes a binary called
 "papertrail":
 
-    $ [sudo] gem install papertrail-cli
+    $ [sudo] gem install papertrail
 
 
 ## Configuration
@@ -41,7 +41,7 @@ examples/papertrail.yml.example):
 
     token: 123456789012345678901234567890ab
 
-Retrieve token from Papertrail [User Profile]. For compatibility with 
+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:
@@ -82,7 +82,7 @@ Save [colortailrc] as `~/.colortailrc` and edit it to enable:
 
 ### Shorthand
 
-If you're using bash, create a function that accepts arguments, then 
+If you're using bash, create a function that accepts arguments, then
 invoke `pt` with optional search operators:
 
     $ function pt() { papertrail -f -d 5 $_ | colortail -g papertrail }
@@ -116,13 +116,13 @@ Enhancement or fix:
 1. Fork the project:
    http://github.com/papertrail/papertrail-cli
 2. Make your changes with tests.
-3. Commit the changes without changing the Rakefile or other files unrelated 
+3. Commit the changes without changing the Rakefile or other files unrelated
 to your enhancement.
 4. Send a pull request.
 
 [binary]: https://github.com/papertrail/papertrail-cli/blob/master/bin/papertrail
 [Papertrail]: http://papertrailapp.com/
-[SearchClient]: https://github.com/papertrail/papertrail-cli/blob/master/lib/papertrail/search_client.rb
+[Connection]: https://github.com/papertrail/papertrail-cli/blob/master/lib/papertrail/connection.rb
 [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.8.3"
+ VERSION = "0.8.4"
 end
 
 require 'papertrail/search_client'

data/lib/papertrail/connection.rb

@@ -1,6 +1,7 @@
 require 'faraday'
 require 'openssl'
-require 'faraday_stack'
+require 'faraday_middleware'
+require 'yajl/json_gem'
 
 require 'papertrail/search_query'
 
@@ -25,7 +26,8 @@ module Papertrail
 
       @connection = Faraday::Connection.new(:url => 'https://papertrailapp.com', :ssl => ssl_options) do |builder|
         builder.adapter Faraday.default_adapter
-        builder.use     FaradayStack::ResponseJSON
+        builder.use Faraday::Response::RaiseError
+        builder.use FaradayMiddleware::ParseJson, :content_type => /\bjson$/
       end.tap do |conn|
         if options[:username] && options[:password]
           conn.basic_auth(options[:username], options[:password])

data/papertrail.gemspec

@@ -13,7 +13,7 @@ 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.3'
+  s.version           = '0.8.4'
   s.date              = '2012-02-11'
   s.rubyforge_project = 'papertrail'
 
@@ -50,8 +50,8 @@ 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('yajl-ruby')
-  s.add_dependency('faraday', [ '~> 0.6' ])
-  s.add_dependency('faraday-stack', [ '~> 0.1' ])
+  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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 3
-  version: 0.8.3
+  - 4
+  version: 0.8.4
 platform: ruby
 authors: 
 - Papertrail
@@ -34,16 +34,22 @@ dependencies:
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         - 6
         version: "0.6"
+    - - <
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        version: "0.9"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: faraday-stack
+  name: faraday_middleware
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
@@ -51,8 +57,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
-        version: "0.1"
+        - 8
+        - 4
+        version: 0.8.4
   type: :runtime
   version_requirements: *id003
 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).