papertrail 0.10.4 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 78e1cee299b431dfb6467aa16086c5b9fa4ac651
-  data.tar.gz: a82f9f3341af1811328d45b89b87d59162da11f7
+SHA256:
+  metadata.gz: 19f8502944f2149f181050b434539d27f5a01a72682c787beaad70f07aa3fe60
+  data.tar.gz: f1c37f9ad6d77dc618174becd614c4c185493fef917d12f74b7df2f050271c22
 SHA512:
-  metadata.gz: 2ca1e90d8afe8f6750694dcea9a0b31954b1d3f4912ad5f2a6e8377f85f4409d1e6c2f1e1be3c52279dd678c83c2e75f13e07c3dab9fe76b763b9e7591157be4
-  data.tar.gz: 2ac0f36dc3a4e52496a35cae9904b7d206dd8c997c0d0e04ba984640f6c41ee3f124c4ad9ef2569529d0fe08158bb82926136918079db2be0922e49aba6b700d
+  metadata.gz: bffe601811d165aa07ef028bd74304babf322c518e7fbf492d2453974363f7e26ad9a2e73ce2c871f583fbf961765004f2371eceeb5575f762bddf7645d26450
+  data.tar.gz: 7b43d937751f7cdb8b46dc95dac721b4625b70f3a1fab0019ec3f1ea94ef34d95f7ab2271fea9684477120fe247501ccb3c00483eb43fa682001005a5f5d5dae

data/lib/papertrail.rb

@@ -1,5 +1,5 @@
 module Papertrail
-  VERSION = '0.10.4'
+  VERSION = '0.11.0'
 end
 
 require 'papertrail/connection'

data/lib/papertrail/cli.rb

@@ -95,6 +95,9 @@ module Papertrail
 
       @connection = Papertrail::Connection.new(options)
 
+      # Use HTTP Keep-Alive unless delay is too long
+      connection.start if options[:delay] < 10
+
       if options[:system]
         query_options[:system_id] = connection.find_id_for_source(options[:system])
         unless query_options[:system_id]

data/lib/papertrail/cli_add_group.rb

@@ -46,15 +46,15 @@ module Papertrail
 
       raise OptionParser::MissingArgument, 'group' if options[:group].nil?
 
-      connection = Papertrail::Connection.new(options)
-
-      # Bail if group already exists
-      if connection.show_group(options[:group])
-        exit 0
-      end
+      Papertrail::Connection.new(options).start do |connection|
+        # Bail if group already exists
+        if connection.show_group(options[:group])
+          exit 0
+        end
 
-      if connection.create_group(options[:group], options[:wildcard])
-        exit 0
+        if connection.create_group(options[:group], options[:wildcard])
+          exit 0
+        end
       end
 
       exit 1

data/lib/papertrail/cli_add_system.rb

@@ -84,19 +84,19 @@ module Papertrail
         error 'Either --ip-address or --destination-port most be provided'
       end
 
-      connection = Papertrail::Connection.new(options)
-
-      # Bail if system already exists
-      if connection.show_source(options[:system])
-        exit 0
-      end
+      Papertrail::Connection.new(options).start do |connection|
+        # Bail if system already exists
+        if connection.show_source(options[:system])
+          exit 0
+        end
 
-      if options[:destination_port] && !options[:hostname]
-        options[:hostname] = options[:system]
-      end
+        if options[:destination_port] && !options[:hostname]
+          options[:hostname] = options[:system]
+        end
 
-      if connection.register_source(options[:system], options)
-        exit 0
+        if connection.register_source(options[:system], options)
+          exit 0
+        end
       end
 
       exit 1

data/lib/papertrail/connection.rb

@@ -38,6 +38,19 @@ module Papertrail
       end
     end
 
+    def start
+      if block_given?
+        @connection.start { yield self }
+      else
+        @connection.start
+        self
+      end
+    end
+
+    def finish
+      @connection.finish
+    end
+
     def find_id_for_source(name)
       response = @connection.get('systems.json', :system_name => name)
 

data/lib/papertrail/http_client.rb

@@ -37,6 +37,19 @@ module Papertrail
       @headers = {}
     end
 
+    def start
+      if block_given?
+        https.start { yield self }
+      else
+        https.start
+        self
+      end
+    end
+
+    def finish
+      https.finish
+    end
+
     def basic_auth(login, pass)
       @headers['Authorization'] = 'Basic ' + ["#{login}:#{pass}"].pack('m').delete("\r\n")
     end
@@ -72,7 +85,7 @@ module Papertrail
         else
           on_complete(https.send(http_method, uri, build_nested_query(params), @headers))
         end
-      rescue SystemCallError, Net::HTTPFatalError => e
+      rescue IOError, SystemCallError, Net::HTTPFatalError => e
         attempts += 1
         retry if (attempts < 3)
         raise e
@@ -84,19 +97,20 @@ module Papertrail
     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
+      @https ||= Net::HTTP.new('papertrailapp.com', 443).tap do |http|
+        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.keep_alive_timeout = 10 if http.respond_to?(:keep_alive_timeout=)
+      end
     end
 
     def cli_version

data/papertrail.gemspec

@@ -9,8 +9,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.10.4'
-  s.date              = '2017-11-02'
+  s.version           = '0.11.0'
+  s.date              = '2018-05-16'
   s.rubyforge_project = 'papertrail'
 
   ## Make sure your summary is short. The description may be as long

data/test/connection_test.rb

@@ -4,6 +4,17 @@ class ConnectionTest < Minitest::Test
   let(:connection_options) { { :token => 'dummy' } }
   let(:connection) { Papertrail::Connection.new(connection_options) }
 
+  def test_start_finish
+    assert_same connection, connection.start
+    assert_nil connection.finish
+
+    block_args = nil
+    connection.start {|*args| block_args = args}
+    assert_equal [connection], block_args
+
+    assert_raises { connection.finish }
+  end
+
   def test_each_event
     skip
   end

data/test/http_client_test.rb

@@ -2,7 +2,17 @@ require 'test_helper'
 
 class HttpClientTest < Minitest::Test
   let(:http) { Papertrail::HttpClient.new({}) }
-  describe "http methods" do
+  describe 'http methods' do
+    def test_start_finish
+      assert_same http, http.start
+      assert_nil http.finish
+
+      block_args = nil
+      http.start {|*args| block_args = args}
+      assert_equal [http], block_args
+
+      assert_raises { http.finish }
+    end
 
     def test_cli_version_present_in_http_methods
       return if RUBY_VERSION < '2.0'
@@ -22,7 +32,8 @@ class HttpClientTest < Minitest::Test
       http.delete('some-path')
     end
   end
-  describe "build_nested_query" do
+
+  describe 'build nested query' do
     def test_value_accepts_hash
       assert_equal(http.send(:build_nested_query, {}), "")
       assert_equal(http.send(:build_nested_query, {:a => 1}), "a=1")
@@ -32,4 +43,4 @@ class HttpClientTest < Minitest::Test
       assert_equal(http.send(:build_nested_query, [1,2]), "%5B%5D=1&%5B%5D=2")
     end
   end
-end
+end

data/test/test_helper.rb

@@ -1,7 +1,7 @@
 gem "minitest"
 require 'minitest/autorun'
 require 'minitest/pride' # Color!
-require 'mocha/mini_test'
+require 'mocha/minitest'
 unless RUBY_VERSION < '1.9'
   require 'webmock/minitest'
   WebMock.disable_net_connect!
@@ -13,4 +13,4 @@ class Minitest::Test
   extend Minitest::Spec::DSL # Add let blocks
 end
 
-require './lib/papertrail'
+require './lib/papertrail'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: papertrail
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.11.0
 platform: ruby
 authors:
 - Papertrail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-02 00:00:00.000000000 Z
+date: 2018-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -202,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: papertrail
-rubygems_version: 2.6.12
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 2
 summary: Command-line client for Papertrail hosted log management service.