samanage 2.1.16 → 2.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ba9d49fb26927fd2cf98b118da982990a5ffb64
-  data.tar.gz: 976b9b27dd7174d1b8e7d820d46c522122ad7aa3
+  metadata.gz: ffc172624f62a1fd88be55e019f8e60e578a74c1
+  data.tar.gz: a5ffc35b4b1b15c7e57f7ff41cab78915790b936
 SHA512:
-  metadata.gz: 9f99a5ba09aa8f979df8211a43449588ce94429abda7df8ecfe6f2126e7493c6ece8d8a965ee67be9e33ddd3cbd859bfc9935d63bfecb7173372204e3a214e9a
-  data.tar.gz: 64c92b5d364400c5ce6ded2c2d7b5c0f9056193aa0369daa40b5d35377500d6e33e7f4177f4ad4828fc4135180205a6a08b6d78d20cd545ccfab4cfb873c41bf
+  metadata.gz: 2ba6fa8ce196713d263785ed9a45ea8e303b34c1134cc8a24b7cbdfe870d85d6e157a7f3b1d8825a0967bfe0f1256f4b7365de4a313cbf5fe53b3e1b8832c6df
+  data.tar.gz: ac4fcd8180ddb9beb45a5c6bf360be90bb459616d645ec8d51b8c693db2291af7e7ae2bbd0189069f02dde940ab6c8d859eef6806f6718e90bc50d86a78415a5

data/changelog.md

@@ -1,3 +1,14 @@
+### 2.1.18
+- Force multipart for attachments
+- Custom sleep time
+- Added catching all errors
+- Normalizing stout
+
+### 2.1.17
+- Retry all errors
+- Ability to configure retry count & wait time.
+- Normalize messages
+
 ### 2.1.16
 - Use options where callbacks could be sent
 

data/lib/samanage/api.rb

@@ -3,8 +3,7 @@ require 'open-uri'
 module Samanage
   class Api
     include HTTParty
-    attr_accessor :datacenter, :content_type, :base_url, :token, :custom_forms, :authorized, :admins, :max_retries
-    MAX_RETRIES = 3
+    attr_accessor :datacenter, :content_type, :base_url, :token, :custom_forms, :authorized, :admins, :max_retries, :sleep_time
     PATHS = {
       attachment: 'attachments.json',
       category: 'categories.json',
@@ -28,7 +27,7 @@ module Samanage
     }
     # 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, content_type: 'json')
+    def initialize(token: , datacenter: nil, development_mode: false, max_retries: 3, content_type: 'json', sleep_time: 5)
       self.token = token
       if !datacenter.nil? && datacenter.to_s.downcase != 'eu'
         datacenter = nil
@@ -38,6 +37,7 @@ module Samanage
       self.content_type = content_type || 'json'
       self.admins = []
       self.max_retries = max_retries
+      self.sleep_time = sleep_time
       if development_mode
         if self.authorized? != true
           self.authorize
@@ -58,7 +58,7 @@ module Samanage
     end
 
     # Calling execute without a method defaults to GET
-    def execute(http_method: 'get', path: nil, payload: nil, verbose: nil, headers: {}, options: {})
+    def execute(http_method: 'get', path: nil, payload: nil, verbose: nil, headers: {}, options: {}, multipart: false)
       if payload.class == Hash && self.content_type == 'json'
         begin
           if path != 'attachments.json'
@@ -87,7 +87,7 @@ module Samanage
         when 'get'
           api_call = self.class.get(full_path, headers: headers, query: options)
         when 'post'
-          api_call = self.class.post(full_path, body: payload, headers: headers, query: options)
+          api_call = self.class.post(full_path, multipart: multipart,  body: payload, headers: headers, query: options)
         when 'put'
           api_call = self.class.put(full_path, body: payload, headers: headers, query: options)
         when 'delete'
@@ -95,14 +95,28 @@ module Samanage
         else
           raise Samanage::Error.new(response: {response: 'Unknown HTTP method'})
         end
-      rescue Errno::ECONNREFUSED, Net::OpenTimeout, Errno::ETIMEDOUT, OpenSSL::SSL::SSLError, Errno::ENETDOWN, Errno::ECONNRESET, Errno::ENOENT, EOFError, Net::HTTPTooManyRequests, SocketError => e
-        puts "[Warning] #{e.class}: #{e} -  Retry: #{retries}/#{self.max_retries}"
-        sleep 5
+      rescue Errno::ECONNREFUSED, Net::OpenTimeout, Errno::ETIMEDOUT, Net::ReadTimeout, OpenSSL::SSL::SSLError, Errno::ENETDOWN, Errno::ECONNRESET, Errno::ENOENT, EOFError, Net::HTTPTooManyRequests, SocketError => e
         retries += 1
-        retry if retries < self.max_retries
-        error = e
-        response = e.class
-        raise Samanage::InvalidRequest.new(error: error, response: response)
+        if retries < self.max_retries
+          puts "[Warning] #{e.class}: #{e} -  Retry: #{retries}/#{self.max_retries}"
+          sleep sleep_time
+          retry
+        else
+          error = e
+          response = e.class
+          raise Samanage::InvalidRequest.new(error: error, response: response)
+        end
+      rescue => e
+        retries += 1
+        if retries < self.max_retries
+          puts "[Warning] #{e.class}: #{e} -  Retry: #{retries}/#{self.max_retries}"
+          sleep sleep_time
+          retry
+        else
+          error = e
+          response = e.class
+          raise Samanage::InvalidRequest.new(error: error, response: response)
+        end
       end
 
       response = Hash.new

data/lib/samanage/api/attachments.rb

@@ -26,17 +26,17 @@ module Samanage
       req = self.execute(
         path: 'attachments.json',
         http_method: 'post',
+        multipart: true,
         payload: {
           'file[attachable_type]' =>  attachable_type,
           'file[attachable_id]' =>  attachable_id,
-          'file[attachment]' =>  file = File.open(filepath, 'r')
+          'file[attachment]' =>  File.open(filepath, 'rb')
         },
         headers: {
           'Content-Type' => 'multipart/form-data',
           'X-Samanage-Authorization' => 'Bearer ' + self.token
         }
       )
-      file.close
       req
     end
 

data/lib/samanage/api/changes.rb

@@ -18,7 +18,7 @@ module Samanage
       1.upto(total_pages) do |page|
         options[:page] = page
         
-        puts "Collecting changes page: #{page}/#{total_pages}" if options[:verbose]
+        puts "Collecting Changes page: #{page}/#{total_pages}" if options[:verbose]
         path = "changes.json?"
         request = self.execute(http_method: 'get', path: path, options: options)
         request[:data].each do |change|

data/lib/samanage/api/contracts.rb

@@ -15,7 +15,7 @@ module Samanage
       1.upto(total_pages) do |page|
         options[:page] = page
         
-        puts "Collecting contracts page: #{page}/#{total_pages}" if options[:verbose]
+        puts "Collecting Contracts page: #{page}/#{total_pages}" if options[:verbose]
         path = "contracts.json?"
         self.execute(path: path, options: options)[:data].each do |contract|
           if block_given?

data/lib/samanage/api/incidents.rb

@@ -16,7 +16,7 @@ module Samanage
     def collect_incidents(options: {})
       incidents = Array.new
       total_pages = self.get_incidents(options: options.except(:audit_archives,:audit_archive,:layout))[:total_pages]
-      puts "Pulling Incidents with Audit Archives (this may take a while)" if options[:audit_archives] && options[:verbose]
+      puts "Requesting 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]

data/lib/samanage/api/mobiles.rb

@@ -34,7 +34,7 @@ module Samanage
     end
 
     # Find mobile given id
-    def find_mobile(id: nil)
+    def find_mobile(id: , options: {})
       path = "mobiles/#{id}.json"
       self.execute(path: path)
     end

data/lib/samanage/api/problems.rb

@@ -19,7 +19,7 @@ module Samanage
       1.upto(total_pages) do |page|
         options[:page] = page
         
-        puts "Collecting problems page: #{page}/#{total_pages}" if options[:verbose]
+        puts "Collecting Problems page: #{page}/#{total_pages}" if options[:verbose]
         path = "problems.json?"
         request = self.execute(http_method: 'get', path: path, options: options)
         request[:data].each do |problem|

data/lib/samanage/api/purchase_orders.rb

@@ -19,7 +19,7 @@ module Samanage
       1.upto(total_pages) do |page|
         options[:page] = page
         
-        puts "Collecting purchase_orders page: #{page}/#{total_pages}" if options[:verbose]
+        puts "Collecting Purchase Orders page: #{page}/#{total_pages}" if options[:verbose]
         path = "purchase_orders.json?"
         request = self.execute(http_method: 'get', path: path, options: options)
         request[:data].each do |purchase_order|

data/lib/samanage/api/solutions.rb

@@ -24,6 +24,12 @@ module Samanage
       solutions
     end
 
+    def find_solution(id: , options: {})
+      path = "solutions/#{id}.json"
+      self.execute(path: path)
+    end
+
+
     def create_solution(payload: , options: {})
       self.execute(path: PATHS[:solution], http_method: 'post', payload: payload)
     end

data/lib/samanage/api/vendors.rb

@@ -12,7 +12,7 @@ module Samanage
       1.upto(total_pages) do |page|
         options[:page] = page
         
-        puts "Collecting vendors page: #{page}/#{total_pages}" if options[:verbose]
+        puts "Collecting Vendors page: #{page}/#{total_pages}" if options[:verbose]
         path = "vendors.json?"
         self.execute(http_method: 'get', path: path, options: options)[:data].each do |vendor|
           if block_given?

data/lib/samanage/version.rb

@@ -1,3 +1,3 @@
 module Samanage
-  VERSION = '2.1.16'
+  VERSION = '2.1.18'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: samanage
 version: !ruby/object:Gem::Version
-  version: 2.1.16
+  version: 2.1.18
 platform: ruby
 authors:
 - Chris Walls
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-14 00:00:00.000000000 Z
+date: 2019-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty