papertrail 0.9.17 → 0.9.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28ff2f9a9837dba7b3ddc581e56f6424a5bf6eee
-  data.tar.gz: a84aa73e9f04e1cb541b6084f38ffbccdb4b64ea
+  metadata.gz: 973d907611de02622b404c3fd7b1904e1158229c
+  data.tar.gz: 8286cef976ddf379f33b5bea083cfdfcc448e98c
 SHA512:
-  metadata.gz: 4b9c4fa624bea8c32dcf8c7d64ba8600f3ad8b49956a7e56afbf53a247bd9f07981da5b6027f363eb2ce4247264f323ab669b554fe06684ecbd9612271e96134
-  data.tar.gz: 8388b85e42b23005e16881d232b740600b63170adbaa5a0742b5c2c95dd5663923b6683bd8370af612800163f9d33cec8ddf39f4df0c16296895a3c3643d01e6
+  metadata.gz: 6b79a2b28652befee191d8415c879f3c92f7eecb3a92c1a4ba79ea37e871ce4baa21a57cb9cda3d9a6fe6e98b3bf38e5450c5c4e0bf676b1261c58c3fc3f5fac
+  data.tar.gz: 40a8d133cb3c17bb54eecec80ab9086f7c4c9e1edaa1fed9d521f97a3c598d3a2e52b2cc13c93f11e36e351d7b8f8b24153c9799542034adf788b96518049469

data/README.md

@@ -120,7 +120,7 @@ Count by source/system name (field 4):
       2 fastly
 
 For sum, mean, and statistics, see
-[datamash](http://www.gnu.org/software/datamash/).
+[datamash](http://www.gnu.org/software/datamash/) and [one-liners](https://www.gnu.org/software/datamash/alternatives/).
 
 ### Colors
 

data/lib/papertrail.rb

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

data/lib/papertrail/cli.rb

@@ -6,7 +6,6 @@ require 'ansi/core'
 require 'papertrail'
 require 'papertrail/connection'
 require 'papertrail/cli_helpers'
-require 'papertrail/okjson'
 
 module Papertrail
   class Cli
@@ -147,7 +146,7 @@ module Papertrail
 
       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)
+          output_raw_json(event.data)
         else
           display_result(event)
         end
@@ -184,7 +183,7 @@ module Papertrail
 
     def display_results(results)
       if options[:json]
-        $stdout.puts Papertrail::OkJson.encode(results.data)
+        output_raw_json(results.data)
       else
         results.events.each do |event|
           display_result(event)
@@ -194,6 +193,21 @@ module Papertrail
       $stdout.flush
     end
 
+    if RUBY_VERSION < '1.9'
+      # Ruby 1.8 doesn't have json in the standard lib - so we have to use okjson
+      require 'papertrail/okjson'
+
+      def output_raw_json(hash)
+        $stdout.puts Papertrail::OkJson.encode(hash)
+      end
+    else
+      require 'json'
+
+      def output_raw_json(hash)
+        $stdout.puts JSON.generate(hash)
+      end
+    end
+
     def usage
       <<-EOF
 

data/lib/papertrail/http_client.rb

@@ -1,8 +1,6 @@
 require 'delegate'
 require 'net/https'
 
-require 'papertrail/okjson'
-
 module Papertrail
 
   # Used because Net::HTTPOK in Ruby 1.8 has no body= method
@@ -12,14 +10,23 @@ module Papertrail
       super(response)
     end
 
-    def body
-      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)
+    if RUBY_VERSION < '1.9'
+      # Ruby 1.8 doesn't have json in the standard lib - so we have to use okjson
+      require 'papertrail/okjson'
+
+      def body
+        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
+    else
+      require 'json'
+      def body
+        @body ||= JSON.parse(__getobj__.body.dup)
       end
     end
-
   end
 
   class HttpClient

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.17'
-  s.date              = '2016-09-20'
+  s.version           = '0.9.18'
+  s.date              = '2016-11-28'
   s.rubyforge_project = 'papertrail'
 
   ## Make sure your summary is short. The description may be as long

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: papertrail
 version: !ruby/object:Gem::Version
-  version: 0.9.17
+  version: 0.9.18
 platform: ruby
 authors:
 - Papertrail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-20 00:00:00.000000000 Z
+date: 2016-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: papertrail
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 2
 summary: Command-line client for Papertrail hosted log management service.