quickmox 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46d7e3daec579a8cd6f27fa5a9524599f3a1722d
-  data.tar.gz: dfdae97399909240415720fa7c6a6cde9459a143
+  metadata.gz: eb5b87ff68ff6bc96b3f8d8d24d4b893fa4892bd
+  data.tar.gz: 7780b26ea35c907cee856ae85571d7ca5bcc5c6c
 SHA512:
-  metadata.gz: fb85a59fc8b7da2eff1f524ea3445d8bbf52c8fb3660f46c8fb2ffd54ad27df2bde15a4607515466687092ce01d4e19d577a4db528fe234ff8202299c874d685
-  data.tar.gz: a9e01027c746cd8245e9303172b47316aa5a68b0a511f2a16c672b675f22756619b2a9f6771daebbf937c2002057fade001326e4b57397c63f09a26ad9ea116e
+  metadata.gz: 0fe0df2e53ee2b41468e7a1261bc9cc5c52d7220a4c2e308709cb903423a7828844ad3c13e4aaa52fed6167a430b39337ae8602cb13b210c9e977d05a34da15c
+  data.tar.gz: 1d6b00c015dae3125486b8e7a410695b0f7f9a76525de83920fdcac222129ca0e17ba17278e23754c54531de8c9585d2cb599eb6ad77d708290bd7412b2ecb03

data/lib/quickmox/host.rb

@@ -31,7 +31,7 @@ module Quickmox
     end
 
     def connect
-      @session.connect
+      handle_exceptions { @session.connect }
       self
     end
 
@@ -40,50 +40,65 @@ module Quickmox
     end
 
     def scan
-      guestlist.each do |id|
-        @guests << Guest.new(id, self)
+      handle_exceptions do
+        guestlist.each do |id|
+          @guests << Guest.new(id, self)
+        end
+        @guests.scan
       end
-      @guests.scan
       self
     end
 
     def guestlist
-      list = Array.new
-      table = session.exec!('qm list')
-      lines = table.split("\n")
-      lines.each do |line|
-        if line =~ /^ *([0-9]{1,4}) */
-          list << $1
+      list = String.new
+      handle_exceptions do
+        list = Array.new
+        table = session.exec!('qm list')
+        lines = table.split("\n")
+        lines.each do |line|
+          if line =~ /^ *([0-9]{1,4}) */
+            list << $1
+          end
         end
       end
       list
     end
 
     def localname
-        session.exec!('hostname').chomp
+      handle_exceptions { session.exec!('hostname').chomp }
     end
 
     def uptime
-        session.exec!('uptime').chomp
+      handle_exceptions { session.exec!('uptime').chomp }
     end
 
     def close
-      disconnect
+      handle_exceptions { disconnect }
     end
 
     def disconnect
-        session.close
+      handle_exceptions { session.close }
     end
 
     def is_proxmox?
-        output = session.exec!('qm list')
+        output = String.new
+        handle_exceptions { output = session.exec!('qm list') }
         (output =~ /VMID NAME/) ? true : false
     end
 
     def exec(cmd)
-      session.exec!(cmd).chomp
+      handle_exceptions {session.exec!(cmd).chomp}
     end
 
+    private
+
+    def handle_exceptions
+      begin
+        yield
+      rescue => e
+        raise HostError, "Exception" #" in Quickmox::Host while handling host #{@session.host}: #{e}"
+      end
+    end
 
   end
 end

data/lib/quickmox/ssh_transport.rb

@@ -36,7 +36,6 @@ module Quickmox
       handle_exceptions do
         session.exec!(cmd).chomp
       end
-
     end
 
     private

data/lib/quickmox/version.rb

@@ -1,3 +1,3 @@
 module Quickmox
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quickmox
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - J.K.Valk