papertrail 0.10.1 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb401f55f2bc32e9e011d42c3581a31d0968e177
-  data.tar.gz: 310b8a52dd4940489df86183e6086802813cf766
+  metadata.gz: 14aa6e94744379e81f4f8685a5661e0d458598ae
+  data.tar.gz: 05ae27cf65df698866a0f3e597133b45e447a065
 SHA512:
-  metadata.gz: 87b529e95bb3d3a32d8b7ec4f42f970b8b5ca41a585430578c5331690e96a640ac060bb76b844dfcbfda4fcac8927775a18c31e44b2085d9b3ae3ec16280544e
-  data.tar.gz: f40be823af90e8b15e871a77452e1e03edd9e3399447bf8ce1a465a70b9b8c4eb5623ef436dab168403e9fe76fa69dd2cd1376a18d620f56a262d4d77fdb1149
+  metadata.gz: 157ce473f08894c3a1b1b8d953b24c964b8a9f389476e6eb62250da397897e2cc19da23e9c196fe604fde9a10ae9305f7208bea5cab7b1f0a228375918e9650f
+  data.tar.gz: 4e997ad6cd9a0ec29fbdc5121b60ecbe60db581686a92c64d4c7fbd073ba59f049b1d994e24f176cb920a5741af1bc49383a9860377c7ce0ada10e9846ac5226

data/README.md

@@ -298,7 +298,7 @@ to your enhancement.
 [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
+[User Profile]: https://papertrailapp.com/account/profile
 [RubyGems]: https://rubygems.org/gems/papertrail-cli
 [lnav]: http://lnav.org/
 [escape characters]: http://en.wikipedia.org/wiki/ANSI_escape_code#Colors

data/bin/papertrail-add-group

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

data/bin/papertrail-add-system

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

data/bin/papertrail-join-group

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

data/bin/papertrail-leave-group

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

data/bin/papertrail-remove-system

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

data/lib/papertrail.rb

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

data/lib/papertrail/http_client.rb

@@ -46,46 +46,32 @@ module Papertrail
     end
 
     def get(path, params = {})
-      if params.size > 0
-        path = "#{path}?cli_version=#{Papertrail::VERSION}&#{build_nested_query(params)}"
-      end
-      attempts = 0
-      begin
-        on_complete(https.get(request_uri(path), @headers))
-      rescue SystemCallError, Net::HTTPFatalError => e
-        sleep 5.0
-        attempts += 1
-        retry if (attempts < 3)
-        raise e
-      end
+      request(:get, path, params)
     end
 
     def put(path, params)
-      attempts = 0
-      begin
-        on_complete(https.put(request_uri(path), build_nested_query(params), @headers))
-      rescue SystemCallError, Net::HTTPFatalError => e
-        attempts += 1
-        retry if (attempts < 3)
-        raise e
-      end
+      request(:put, path, params)
     end
 
     def post(path, params)
-      attempts = 0
-      begin
-        on_complete(https.post(request_uri(path), build_nested_query(params), @headers))
-      rescue SystemCallError, Net::HTTPFatalError => e
-        attempts += 1
-        retry if (attempts < 3)
-        raise e
-      end
+      request(:post, path, params)
     end
 
     def delete(path)
+      request(:delete, path)
+    end
+
+    private
+
+    def request(http_method, path, params = {})
       attempts = 0
+      uri = "#{request_uri(path)}?cli_version=#{Papertrail::VERSION}&"
       begin
-        on_complete(https.delete(request_uri(path), @headers))
+        if http_method == :get || http_method == :delete
+          on_complete(https.send(http_method, uri + build_nested_query(params.merge(cli_version)), @headers))
+        else
+          on_complete(https.send(http_method, uri, build_nested_query(params), @headers))
+        end
       rescue SystemCallError, Net::HTTPFatalError => e
         attempts += 1
         retry if (attempts < 3)
@@ -93,8 +79,6 @@ module Papertrail
       end
     end
 
-    private
-
     def request_uri(path)
       path.start_with?('/api/v1/') ? path : "/api/v1/#{path}"
     end
@@ -115,6 +99,10 @@ module Papertrail
       http
     end
 
+    def cli_version
+      { :cli_version => Papertrail::VERSION }
+    end
+
     def ssl_verify_mode
       @ssl[:verify_mode] || begin
         if @ssl.fetch(:verify, true)

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.1'
-  s.date              = '2016-12-08'
+  s.version           = '0.10.3'
+  s.date              = '2017-07-10'
   s.rubyforge_project = 'papertrail'
 
   ## Make sure your summary is short. The description may be as long
@@ -55,6 +55,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency('minitest')
   s.add_development_dependency('mocha')
 
+  if RUBY_VERSION > '1.9'
+    s.add_development_dependency('addressable',  '~> 2.4.0')
+    s.add_development_dependency('webmock',  '~> 1.24.6')
+  end
   if RUBY_VERSION > '2.2.4' # ruby_dep dependency
     s.add_development_dependency('guard', '~> 2.14.0')
     s.add_development_dependency('guard-minitest', '~> 2.4.6')
@@ -93,6 +97,7 @@ Gem::Specification.new do |s|
     lib/papertrail/search_result.rb
     papertrail.gemspec
     test/connection_test.rb
+    test/http_client_test.rb
     test/search_query_test.rb
     test/test_helper.rb
   ]

data/test/http_client_test.rb

@@ -0,0 +1,35 @@
+require 'test_helper'
+
+class HttpClientTest < Minitest::Test
+  let(:http) { Papertrail::HttpClient.new({}) }
+  describe "http methods" do
+
+    def test_cli_version_present_in_http_methods
+      return if RUBY_VERSION < '2.0'
+      # if webmock.disable_net_connect intervenes with a stack trace,
+      # we know the http methods are not sending cli_version in params
+      stub_request(:get, "https://papertrailapp.com/api/v1/some-path?cli_version=#{Papertrail::VERSION}&").to_return(:status => 200, :body => '', :headers => {})
+      http.get('some-path')
+
+      stub_request(:post, "https://papertrailapp.com/api/v1/some-path?cli_version=#{Papertrail::VERSION}&").to_return(:status => 200, :body => '', :headers => {})
+      http.post('some-path', {})
+
+
+      stub_request(:put, "https://papertrailapp.com/api/v1/some-path?cli_version=#{Papertrail::VERSION}&").to_return(:status => 200, :body => '', :headers => {})
+      http.put('some-path', {})
+
+      stub_request(:delete, "https://papertrailapp.com/api/v1/some-path?cli_version=#{Papertrail::VERSION}&").to_return(:status => 200, :body => '', :headers => {})
+      http.delete('some-path')
+    end
+  end
+  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")
+    end
+    def test_value_accepts_array
+      assert_equal(http.send(:build_nested_query, []), "")
+      assert_equal(http.send(:build_nested_query, [1,2]), "%5B%5D=1&%5B%5D=2")
+    end
+  end
+end

data/test/test_helper.rb

@@ -1,6 +1,11 @@
+gem "minitest"
 require 'minitest/autorun'
 require 'minitest/pride' # Color!
 require 'mocha/mini_test'
+unless RUBY_VERSION < '1.9'
+  require 'webmock/minitest'
+  WebMock.disable_net_connect!
+end
 
 require 'pp'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: papertrail
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.3
 platform: ruby
 authors:
 - Papertrail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-08 00:00:00.000000000 Z
+date: 2017-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -80,6 +80,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.24.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.24.6
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +178,7 @@ files:
 - lib/papertrail/search_result.rb
 - papertrail.gemspec
 - test/connection_test.rb
+- test/http_client_test.rb
 - test/search_query_test.rb
 - test/test_helper.rb
 homepage: http://github.com/papertrail/papertrail-cli