hive-runner-android 1.2.6 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c76ad1905fc8732822f8f584e3e739fc4c497af3
-  data.tar.gz: d9f72a7a6dc976620dcc4c0f3c99812792aabaeb
+  metadata.gz: 0b1162cdff03feb8604b9df81477d6d35d979c45
+  data.tar.gz: 43b40b44f31fa1317acadc9060cd2014490db0f0
 SHA512:
-  metadata.gz: 924dc210d17e323cdc3f13f72a665854c3146cb7d85d17e1314eac352bb3ae73c9d59a8ef6f98898993d25dd4c05da160d60314855826d272e7674f305f4d06c
-  data.tar.gz: 383d25e84c5cd1ef7443f401cce28c6c9bda931f24b50970eec6768d15585c3f3695196c869f5e2e9920b7d35e585244507dab81916f6684fd9f73c7b2b64f44
+  metadata.gz: 2743b705ef9d62aaf8a43e5e09d1077020491ee570337a6399c8cd16b689917657e706f952141f3c7e57f4f02c82f9ef23fe262a8a311230be21010fa216f703
+  data.tar.gz: ec813178af07cfd46c9de3ea8432b2513fa3ed11b46d7bed4a91cf91157b584ea283774a9d40dba6df9f34e074a77d185e668015a0569cbe92950a3e8d8d2491

data/lib/hive/controller/android.rb

@@ -32,7 +32,11 @@ module Hive
         attached_devices = []
         hivemind_devices.each do |device|
           Hive.logger.debug("Device details: #{device.inspect}")
-          registered_device = connected_devices.select { |a| a.serial == device['serial'] }
+          begin
+            registered_device = connected_devices.select { |a| a.serial == device['serial'] }
+          rescue => e
+            registered_device = []
+          end
           if registered_device.empty?
             # A previously registered device isn't attached
             Hive.logger.debug("A previously registered device has disappeared: #{device}")
@@ -58,29 +62,35 @@ module Hive
         Hive.hive_mind.poll(*to_poll)
 
         # Register new devices
-        connected_devices.select{|a| a.status != :unauthorized && a.status != :no_permissions}.each do |device|
+        if !connected_devices.empty?
           begin
-            dev = Hive.hive_mind.register(
-                hostname: device.model,
-                serial: device.serial,
-                macs: [device.wifi_mac_address],
-                ips: [device.ip_address],
-                brand: device.manufacturer.capitalize,
-                model: device.model,
-                device_type: @device_type,
-                imei: device.imei,
-                operating_system_name: 'android',
-                operating_system_version: device.version
-            )
-            Hive.hive_mind.connect(dev['id'])
-            Hive.logger.info("Device registered: #{dev}")
-          rescue DeviceAPI::DeviceNotFound => e
-            Hive.logger.warn("Device disconnected before registration (serial: #{device.serial})")
+           connected_devices.select{|a| a.status != :unauthorized && a.status != :no_permissions && a.status != :unknown && a.status != :offline}.each do |device|
+            begin
+             dev = Hive.hive_mind.register(
+                 hostname: device.model,
+                 serial: device.serial,
+                 macs: [device.wifi_mac_address],
+                 ips: [device.ip_address],
+                 brand: device.manufacturer.capitalize,
+                 model: device.model,
+                 device_type: @device_type,
+                 imei: device.imei,
+                 operating_system_name: 'android',
+                 operating_system_version: device.version
+             )
+             Hive.hive_mind.connect(dev['id'])
+             Hive.logger.info("Device registered: #{dev}")
+            rescue DeviceAPI::DeviceNotFound => e
+             Hive.logger.warn("Device disconnected before registration (serial: #{device.serial})")
+            rescue => e
+             Hive.logger.warn("Error with connected device: #{e.message}")
+            end
+           end
           rescue => e
-            Hive.logger.warn("Error with connected device: #{e.message}")
-          end
+           Hive.logger.debug("Connected Devices: #{connected_devices}")
+           Hive.logger.warn(e)
+          end 
         end
-
         Hive.logger.info(attached_devices)
         attached_devices
       end
@@ -112,10 +122,18 @@ module Hive
       end
 
       def get_connected_devices
-        DeviceAPI::Android.devices.select do |a|
-          a.status != :unauthorized &&
-          a.status != :no_permissions &&
-          a.is_remote? == @remote
+        begin
+         DeviceAPI::Android.devices.select do |a|
+           a.status != :unauthorized &&
+           a.status != :no_permissions &&
+           a.status != :offline &&
+           a.status != :unknown &&
+           a.is_remote? == @remote
+         end
+        rescue DeviceAPI::DeviceNotFound => e
+           Hive.logger.info("Device disconnected while getting list of devices")
+        rescue => e
+           Hive.logger.warn("Device has got some issue. Exception => #{e}. Debug and connect device manually")
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hive-runner-android
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.8
 platform: ruby
 authors:
 - Jon Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-14 00:00:00.000000000 Z
+date: 2016-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: device_api-android