samanage 1.9.2 → 1.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61b3cd246eb47ed7e7bc1e1deeaf71ff161f3d76
-  data.tar.gz: 10693a057ee1e12dafbec5deeb24a5a022cdf159
+  metadata.gz: a2546bcfadc5336181263358272703e0d622350a
+  data.tar.gz: 2ca8fd46211877fd877c2a52c015df8f4364af66
 SHA512:
-  metadata.gz: dcf577a3c638a8cce8388513baa63c282baa31ea255e57488e58c9395bc08b37b3bc014f28f2b63333d4e0f008eac2d9835bab150c0e91d03e6c0297489e8246
-  data.tar.gz: 25f2205853674ef6a6bf093c5abf02d14c1ef98d1672347bf4f0d2d0677ac901efe309a34dab194e4fac9930d2664d62b9fc595419c50494a933f8716ca6ca31
+  metadata.gz: cf23a86735c95112bb0a02d7c5e7c3fe8868870814684105ef31455e5cfbb0083b909285882ec796452f110aec1cbb5baf086efcd3533fdb7a21f18c824a9ed8
+  data.tar.gz: e7d3f6dc216f39f6ad33bba025dc8c13135cf94668503d1a709bb7957038814ea0b10cb9b0117c8040f939a3e53b9f3dfae6a8d797e4250b77f1307961fd09e0

data/changelog.md

@@ -1,3 +1,6 @@
+# 1.9.3
+- Handle HTTP Read Timeout
+
 # 1.9.2 
 - Adding delete functionality for modules Contracts, Departments, Groups, Hardwares, Incidents, Mobiles, Other_assets, Sites, Users
 

data/lib/samanage/api.rb

@@ -93,7 +93,7 @@ module Samanage
 				else
 					raise Samanage::Error.new(response: {response: 'Unknown HTTP method'})
 				end
-			rescue Errno::ECONNREFUSED, Net::OpenTimeout, Errno::ETIMEDOUT, OpenSSL::SSL::SSLError => e
+			rescue Errno::ECONNREFUSED, Net::OpenTimeout, Net::ReadTimeout, Errno::ETIMEDOUT, OpenSSL::SSL::SSLError => e
 				puts "Error: #{e} - #{e.class}"
 				puts "Retry: #{retries}/#{self.max_retries}"
 				sleep 3

data/lib/samanage/api/incidents.rb

@@ -14,8 +14,8 @@ module Samanage
 		#   - layout: 'long'
 		def collect_incidents(options: {})
 			incidents = Array.new
-			total_pages = self.get_incidents[:total_pages]
-			puts "Pulling Incidents with Audit Archives (this may take a while)" if options[:audit_archives] && options[:verbose]
+			total_pages = self.get_incidents(options: options)[:total_pages]
+			puts "Pulling Incidents with Audit Archives (this may take some time)" if options[:audit_archives] && options[:verbose]
 			1.upto(total_pages) do |page|
 				puts "Collecting Incidents page: #{page}/#{total_pages}" if options[:verbose]
 				if options[:audit_archives]
@@ -27,7 +27,9 @@ module Samanage
 					end
 				else
 					layout = options[:layout] == 'long' ? '&layout=long' : nil
-					incidents += self.execute(http_method: 'get', path: "incidents.json?page=#{page}#{layout}")[:data]
+					options[:page] = page
+					puts "options: #{options}"
+					incidents += self.get_incidents(options: options)[:data]
 				end
 			end
 			incidents

data/lib/samanage/version.rb

@@ -1,3 +1,3 @@
 module Samanage
-  VERSION = '1.9.2'
+  VERSION = '1.9.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: samanage
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.9.3
 platform: ruby
 authors:
 - Chris Walls
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-24 00:00:00.000000000 Z
+date: 2018-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty