samanage 1.9.3 → 1.9.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2546bcfadc5336181263358272703e0d622350a
-  data.tar.gz: 2ca8fd46211877fd877c2a52c015df8f4364af66
+  metadata.gz: bd9c36e5b7dcfa8533463d1efaaf094aaca7c142
+  data.tar.gz: 2d262cf6d6080c799332dbd2121e744b54c829dd
 SHA512:
-  metadata.gz: cf23a86735c95112bb0a02d7c5e7c3fe8868870814684105ef31455e5cfbb0083b909285882ec796452f110aec1cbb5baf086efcd3533fdb7a21f18c824a9ed8
-  data.tar.gz: e7d3f6dc216f39f6ad33bba025dc8c13135cf94668503d1a709bb7957038814ea0b10cb9b0117c8040f939a3e53b9f3dfae6a8d797e4250b77f1307961fd09e0
+  metadata.gz: d04babd705aea3f93c6bbbaf08c61c1adde2dee78748025996a4d0ad236bc5b6111bb7cb98289ce2798f187d03151ad95dded037a5c5b6ade657904f3acaf32b
+  data.tar.gz: 0a398b707e8dd4629f6d81ce06eb59523a1f94a68882ecf06d5cd517dd06bb683d467b63d78aa7a1f285f15289361d6279c31ec43d70e643700fd763d6a2c630

data/changelog.md

@@ -1,3 +1,8 @@
+# 1.9.31
+- Alias original comment method
+- Remove (keyword: nil)
+- Collapse error retry output
+
 # 1.9.3
 - Handle HTTP Read Timeout
 

data/lib/samanage/api.rb

@@ -19,7 +19,7 @@ module Samanage
 		ssl_ca_file "#{File.expand_path('..')}/data/cacert.pem"
 		attr_accessor :datacenter, :content_type, :base_url, :token, :custom_forms, :authorized, :admins, :max_retries
 
-		# Development mode forzes authorization & prepopulates custom forms/fields and admins
+		# Development mode forces authorization & pre-populates admins and custom forms / fields
 		# datacenter should equal 'eu' or blank
 		def initialize(token: , datacenter: nil, development_mode: false, max_retries: MAX_RETRIES)
 			self.token = token
@@ -93,9 +93,8 @@ module Samanage
 				else
 					raise Samanage::Error.new(response: {response: 'Unknown HTTP method'})
 				end
-			rescue Errno::ECONNREFUSED, Net::OpenTimeout, Net::ReadTimeout, Errno::ETIMEDOUT, OpenSSL::SSL::SSLError => e
-				puts "Error: #{e} - #{e.class}"
-				puts "Retry: #{retries}/#{self.max_retries}"
+			rescue Errno::ECONNREFUSED, Net::OpenTimeout, Errno::ETIMEDOUT, OpenSSL::SSL::SSLError => e
+				puts "Error:[#{e.class}] #{e} -  Retry: #{retries}/#{self.max_retries}"
 				sleep 3
 				retries += 1
 				retry if retries < self.max_retries

data/lib/samanage/api/comments.rb

@@ -9,25 +9,12 @@ module Samanage
 		end
 
 		# Add a new comment
-		def create_comment(incident_id: nil, comment: nil, options: {})
+		def create_comment(incident_id: , comment: , options: {})
 			path = "incidents/#{incident_id}/comments.json"
 			self.execute(http_method: 'post', path: path, payload: comment)
 		end
 
-		# Return all comments from the incident_id
-		def collect_comments(incident_id: nil)
 
-			page = 1
-			max_pages = 5
-			comments = Array.new
-			while page <= max_pages
-				path = "incidents/#{incident_id}/comments.json?page=#{page}"
-				comments += self.execute(path: path)[:data]
-				page += 1
-			end
-			comments
-		end
-
-		alias_method :comments, :collect_comments
+		alias_method :comments, :get_comments
 	end
 end

data/lib/samanage/api/contracts.rb

@@ -20,12 +20,12 @@ module Samanage
 		end
 
 		# Create contract given json payload
-		def create_contract(payload: nil, options: {})
+		def create_contract(payload: , options: {})
 			self.execute(path: PATHS[:contract], http_method: 'post', payload: payload)
 		end
 
 		# Find contract given id
-		def find_contract(id: nil)
+		def find_contract(id: )
 			path = "contracts/#{id}.json"
 			self.execute(path: path)
 		end
@@ -37,12 +37,12 @@ module Samanage
 		end
 
 		# Update contract given id
-		def update_contract(payload: nil, id: nil, options: {})
+		def update_contract(payload: , id: , options: {})
 			path = "contracts/#{id}.json"
 			self.execute(path: path, http_method: 'put', payload: payload)
 		end
 
-    def add_item_to_contract(id: nil, payload: nil)
+    def add_item_to_contract(id: , payload: )
       path = "contracts/#{id}/items.json"
       self.execute(path: path, http_method: 'post', payload: payload)
 		end

data/lib/samanage/api/departments.rb

@@ -17,7 +17,7 @@ module Samanage
 			departments
 		end
 
-		def create_department(payload: nil, options: {})
+		def create_department(payload: , options: {})
 			self.execute(path: PATHS[:department], http_method: 'post', payload: payload)
 
 		end

data/lib/samanage/api/groups.rb

@@ -16,23 +16,23 @@ module Samanage
 			groups
 		end
 
-		def create_group(payload: nil, options: {})
+		def create_group(payload: , options: {})
 			self.execute(path: PATHS[:group], http_method: 'post', payload: payload)
 		end
 
-		def find_group_id_by_name(group: nil)
+		def find_group_id_by_name(group: )
 			group_api = self.execute(path: "groups.json?name=#{group}")
 			if !group_api[:data].empty? && group == group_api[:data].first['name']
 				return group_api[:data].first['id']
 			end
 		end
 
-		def find_group(id: nil)
+		def find_group(id: )
 			path = "groups/#{id}.json"
 			self.execute(path: path)
 		end
 
-		def add_member_to_group(email: nil, group_id: nil, group_name: nil)
+		def add_member_to_group(email: , group_id: nil, group_name: nil)
 			group_id = group_id ||= self.find_group_id_by_name(group: group_name)
 			user_id = self.find_user_id_by_email(email: email)
 			member_path = "memberships.json?group_id=#{group_id}.json&user_ids=#{user_id}"

data/lib/samanage/api/hardwares.rb

@@ -20,18 +20,18 @@ module Samanage
 		end
 
 		# Create hardware given json payload
-		def create_hardware(payload: nil, options: {})
+		def create_hardware(payload: , options: {})
 			self.execute(path: PATHS[:hardware], http_method: 'post', payload: payload)
 		end
 
 		# Find hardware given id
-		def find_hardware(id: nil)
+		def find_hardware(id: )
 			path = "hardwares/#{id}.json"
 			self.execute(path: path)
 		end
 
 		# Find hardware given a serial number
-		def find_hardwares_by_serial(serial_number: nil)
+		def find_hardwares_by_serial(serial_number: )
 			path = "hardwares.json?serial_number[]=#{serial_number}"
 			self.execute(path: path)
 		end
@@ -44,7 +44,7 @@ module Samanage
 		end
 
 		# Update hardware given id
-		def update_hardware(payload: nil, id: nil, options: {})
+		def update_hardware(payload: , id: , options: {})
 			path = "hardwares/#{id}.json"
 			self.execute(path: path, http_method: 'put', payload: payload)
 		end

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(options: options)[:total_pages]
-			puts "Pulling Incidents with Audit Archives (this may take some time)" if options[:audit_archives] && options[:verbose]
+			total_pages = self.get_incidents[:total_pages]
+			puts "Pulling Incidents with Audit Archives (this may take a while)" 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,9 +27,7 @@ module Samanage
 					end
 				else
 					layout = options[:layout] == 'long' ? '&layout=long' : nil
-					options[:page] = page
-					puts "options: #{options}"
-					incidents += self.get_incidents(options: options)[:data]
+					incidents += self.execute(http_method: 'get', path: "incidents.json?page=#{page}#{layout}")[:data]
 				end
 			end
 			incidents
@@ -42,13 +40,13 @@ module Samanage
 		end
 
 		# Find incident by ID
-		def find_incident(id: nil)
+		def find_incident(id: )
 			path = "incidents/#{id}.json"
 			self.execute(path: path)
 		end
 
 		# Update an incident given id and json
-		def update_incident(payload: nil, id: nil, options: {})
+		def update_incident(payload: , id: , options: {})
 			path = "incidents/#{id}.json"
 			self.execute(path: path, http_method: 'put', payload: payload)
 		end

data/lib/samanage/api/mobiles.rb

@@ -37,7 +37,7 @@ module Samanage
 		end
 
 		# Update mobile given id
-		def update_mobile(payload: nil, id: nil, options: {})
+		def update_mobile(payload: , id: , options: {})
 			path = "mobiles/#{id}.json"
 			self.execute(path: path, http_method: 'put', payload: payload)
 		end

data/lib/samanage/api/other_assets.rb

@@ -22,19 +22,19 @@ module Samanage
 
 
 		# Create an other_asset given json
-		def create_other_asset(payload: nil, options: {})
+		def create_other_asset(payload: , options: {})
 			self.execute(path: PATHS[:other_asset], http_method: 'post', payload: payload)
 		end
 
 
 		# Find other_asset by id
-		def find_other_asset(id: nil)
+		def find_other_asset(id: )
 			path = "other_assets/#{id}.json"
 			self.execute(path: path)
 		end
 
  		# Update other_asset given json and id
-		def update_other_asset(payload: nil, id: nil, options: {})
+		def update_other_asset(payload: , id: , options: {})
 			path = "other_assets/#{id}.json"
 			self.execute(path: path, http_method: 'put', payload: payload)
 		end

data/lib/samanage/api/requester.rb

@@ -1,7 +1,7 @@
 module Samanage
 	class Api
 		# Get requester from value (email)
-		def get_requester_id(value: nil)
+		def get_requester_id(value: )
 			api_call = self.execute(path: "requesters.json?name=#{value}")
 			api_call[:data].size == 1 ? api_call[:data][0] : nil
 		end

data/lib/samanage/api/sites.rb

@@ -16,7 +16,7 @@ module Samanage
 			sites
 		end
 
-		def create_site(payload: nil, options: {})
+		def create_site(payload: , options: {})
 			self.execute(path: PATHS[:site], http_method: 'post', payload: payload)
 		end
 

data/lib/samanage/api/users.rb

@@ -20,12 +20,12 @@ module Samanage
 		end
 
 		# Create user given JSON
-		def create_user(payload: nil, options: {})
+		def create_user(payload: , options: {})
 			self.execute(path: PATHS[:user], http_method: 'post', payload: payload)
 		end
 
     # Return user by ID
-		def find_user(id: nil)
+		def find_user(id: )
 			path = "users/#{id}.json"
 			self.execute(path: path)
 		end
@@ -50,16 +50,16 @@ module Samanage
 		end
 
     # Check for user by field (ex: users.json?field=value)
-		def check_user(field: 'email', value: nil)
+		def check_user(field: 'email', value: )
 			if field.to_s.downcase == 'email'
-				value = value.gsub("+",'%2B')
+				value = value.to_s.gsub("+",'%2B')
 			end
 			url = "users.json?#{field}=#{value}"
 			self.execute(path: url)
 		end
 
     # Update user by id
-		def update_user(payload: nil, id: nil)
+		def update_user(payload: , id: )
 			path = "users/#{id}.json"
 			self.execute(path: path, http_method: 'put', payload: payload)
 		end

data/lib/samanage/version.rb

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

data/spec/api/samanage_comments_spec.rb

@@ -28,7 +28,7 @@ describe Samanage::Api do
 
 			it 'collects all comments' do
 				incident_id = @incidents.sample.dig('id')
-				comments = @samanage.collect_comments(incident_id: incident_id)
+				comments = @samanage.comments(incident_id: incident_id)
 				# Total count bug
 				# expect(comments).to be(Array)
 			end

metadata

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