hive-runner-android 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bccff475a48b03346d14fd1d39669540f6f535f3
-  data.tar.gz: 2abf3f54d01047646fdc0864f882d27735ce80fc
+  metadata.gz: 791d7c48d21d1e3627d48e26c5533b9322e84fa3
+  data.tar.gz: 8d3b477541b6c21792b41bb9842df29826ebe24a
 SHA512:
-  metadata.gz: 2931bb0d4b48ae4f31622cd2a7ff8168133b763a95dfae1daa7f87179b992bf43ca8661f4868ee47cd71cd603d4a61d7f068cb7a4be77e2155e49ef304a42bc0
-  data.tar.gz: e56e0a3d44662c7fc39ec68dd886dda127778b43cee7e74eb2ae18c20be49743ec74ccca220750f74db459e808c63b6d1569c6c567113be4cf93a42e5f53dee0
+  metadata.gz: 7efa0377366f1eede0880a902d00a7f7ca0737bfbe5010c7ed723597ee3457584b10749bb0f1916b3a2e8d96c76a79ffc47fefaae012c2e62023816bde90ff97
+  data.tar.gz: 756c0d99968a708b3e465327595b7dffc5e1ff270c6636061a2630b7eccab56ad4d0d1f6eb457832380c5d0442a8b9bb2d41007048d47863d1bcd5251bb8e33b

data/lib/hive/controller/android.rb

@@ -83,6 +83,31 @@ module Hive
         hive_details = Hive.devicedb('Hive').find(Hive.id)
         Hive.logger.debug("#{Time.now} Finished fetching hive details")
 
+        devices.each do |device|
+          begin
+            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: 'Mobile',
+                imei: device.imei,
+                hive_id: Hive.id
+            )
+          rescue DeviceAPI::DeviceNotFound
+            Hive.logger.info("Device '#{device.serial}' disconnected during registration")
+            devices.delete(device)
+          rescue DeviceAPI::UnauthorizedDevice
+            Hive.logger.info("Device '#{device.serial}' is unauthorized")
+            devices.delete(device)
+          rescue => e
+            Hive.logger.warn("Error with connected device: #{e.message}")
+            devices.delete(device)
+          end
+        end
+
         if hive_details.key?('devices')
           # Update the 'cached' results from DeviceDB
           @hive_details = hive_details
@@ -135,7 +160,7 @@ module Hive
 
       def register_new_device(device)
         begin
-          Hive.logger.debug("Adding new Android device: #{device.model}")
+          Hive.logger.info("Adding new Android device: #{device.model}")
 
           attributes = {
               os: 'android',
@@ -147,10 +172,16 @@ module Hive
               device_range: device.range,
               hive: Hive.id
           }
+        rescue DeviceAPI::DeviceNotFound
+          Hive.logger.info("Device '#{device.serial}' disconnected during registration")
+        rescue DeviceAPI::UnauthorizedDevice
+          Hive.logger.info("Device '#{device.serial}' is unauthorized")
         rescue DeviceAPI::Android::ADBCommandError
           # If a device has been disconnected while we're trying to add it, the device_api
           # gem will throw an error
           Hive.logger.debug('Device disconnected while attempting to add')
+        rescue => e
+          Hive.logger.warn("Error with connected device: #{e.message}")
         end
 
         registration = Hive.devicedb('Device').register(attributes)

data/lib/hive/worker/android.rb

@@ -23,8 +23,14 @@ module Hive
         @worker_ports = PortReserver.new
         begin
           device.merge!({"device_api" => DeviceAPI::Android.device(device['serial'])})
+        rescue DeviceAPI::DeviceNotFound
+          Hive.logger.info("Device '#{device['serial']}' disconnected during initialization")
+        rescue DeviceAPI::UnauthorizedDevice
+          Hive.logger.info("Device '#{device['serial']}' is unauthorized")
         rescue DeviceAPI::Android::ADBCommandError
           Hive.logger.info("Device disconnected during worker initialization")
+        rescue => e
+          Hive.logger.warn("Error with connected device: #{e.message}")
         end
         set_device_status('idle')
         self.device = device

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hive-runner-android
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Jon Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: device_api-android
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Hive Runner Android