samanage 1.9.2 → 1.9.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 61b3cd246eb47ed7e7bc1e1deeaf71ff161f3d76
4
- data.tar.gz: 10693a057ee1e12dafbec5deeb24a5a022cdf159
3
+ metadata.gz: a2546bcfadc5336181263358272703e0d622350a
4
+ data.tar.gz: 2ca8fd46211877fd877c2a52c015df8f4364af66
5
5
  SHA512:
6
- metadata.gz: dcf577a3c638a8cce8388513baa63c282baa31ea255e57488e58c9395bc08b37b3bc014f28f2b63333d4e0f008eac2d9835bab150c0e91d03e6c0297489e8246
7
- data.tar.gz: 25f2205853674ef6a6bf093c5abf02d14c1ef98d1672347bf4f0d2d0677ac901efe309a34dab194e4fac9930d2664d62b9fc595419c50494a933f8716ca6ca31
6
+ metadata.gz: cf23a86735c95112bb0a02d7c5e7c3fe8868870814684105ef31455e5cfbb0083b909285882ec796452f110aec1cbb5baf086efcd3533fdb7a21f18c824a9ed8
7
+ data.tar.gz: e7d3f6dc216f39f6ad33bba025dc8c13135cf94668503d1a709bb7957038814ea0b10cb9b0117c8040f939a3e53b9f3dfae6a8d797e4250b77f1307961fd09e0
data/changelog.md CHANGED
@@ -1,3 +1,6 @@
1
+ # 1.9.3
2
+ - Handle HTTP Read Timeout
3
+
1
4
  # 1.9.2
2
5
  - Adding delete functionality for modules Contracts, Departments, Groups, Hardwares, Incidents, Mobiles, Other_assets, Sites, Users
3
6
 
data/lib/samanage/api.rb CHANGED
@@ -93,7 +93,7 @@ module Samanage
93
93
  else
94
94
  raise Samanage::Error.new(response: {response: 'Unknown HTTP method'})
95
95
  end
96
- rescue Errno::ECONNREFUSED, Net::OpenTimeout, Errno::ETIMEDOUT, OpenSSL::SSL::SSLError => e
96
+ rescue Errno::ECONNREFUSED, Net::OpenTimeout, Net::ReadTimeout, Errno::ETIMEDOUT, OpenSSL::SSL::SSLError => e
97
97
  puts "Error: #{e} - #{e.class}"
98
98
  puts "Retry: #{retries}/#{self.max_retries}"
99
99
  sleep 3
@@ -14,8 +14,8 @@ module Samanage
14
14
  # - layout: 'long'
15
15
  def collect_incidents(options: {})
16
16
  incidents = Array.new
17
- total_pages = self.get_incidents[:total_pages]
18
- puts "Pulling Incidents with Audit Archives (this may take a while)" if options[:audit_archives] && options[:verbose]
17
+ total_pages = self.get_incidents(options: options)[:total_pages]
18
+ puts "Pulling Incidents with Audit Archives (this may take some time)" if options[:audit_archives] && options[:verbose]
19
19
  1.upto(total_pages) do |page|
20
20
  puts "Collecting Incidents page: #{page}/#{total_pages}" if options[:verbose]
21
21
  if options[:audit_archives]
@@ -27,7 +27,9 @@ module Samanage
27
27
  end
28
28
  else
29
29
  layout = options[:layout] == 'long' ? '&layout=long' : nil
30
- incidents += self.execute(http_method: 'get', path: "incidents.json?page=#{page}#{layout}")[:data]
30
+ options[:page] = page
31
+ puts "options: #{options}"
32
+ incidents += self.get_incidents(options: options)[:data]
31
33
  end
32
34
  end
33
35
  incidents
@@ -1,3 +1,3 @@
1
1
  module Samanage
2
- VERSION = '1.9.2'
2
+ VERSION = '1.9.3'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: samanage
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.9.2
4
+ version: 1.9.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Chris Walls
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-01-24 00:00:00.000000000 Z
11
+ date: 2018-01-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: httparty