hive-runner-android 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 386102f5f6c6fca8095d765453cb5bf8dbb356ab
-  data.tar.gz: c0dcd7026a3e84b03ae6ccec86e45a6747170d2f
+  metadata.gz: 4a44ffdc1d5702450f6a3e236f19c280ba73436a
+  data.tar.gz: 9a885c5656b99d70242b4ab2fbf6e1be1a588638
 SHA512:
-  metadata.gz: 68a40b5c250516ac13a743d63c47ffe6c8ef2c288ad65d56b918a5bd7aadc32703b3278e511f175d9a40bd5e2f30e3cc89c260c6db58bfcdba166ae25c0d331b
-  data.tar.gz: c7be9e055cdab4e07402d0fb6614b8771f04da55d613cbb98e68537589606acda2c9d0b8aadaa00943423ad613e21730dd9306905a7700ac0561ed688cec638e
+  metadata.gz: f9b24dc712d3a1c052a026353658ce1103ddeb8bfd2b109e85238fc2f09cc11d5abe401ece8b10b078f818ee9386971eb1604ff5f2116a9c901eed48de1d6100
+  data.tar.gz: 8f35aceb05377b5dd39719295334fa77558af037d10d3ded9b48365a57fa6c336974462ea727c274786ed6f9fe7f3720ecfb9961a651c7c435ac3f1c1fe570f1

data/lib/hive/controller/android.rb

@@ -6,14 +6,10 @@ module Hive
   class Controller
     class Android < Controller
 
+      # Register and poll connected devices
       def detect
-        self.detect_hive_mind
-      end
-
-      # Register with Hive Mind (New)
-      def detect_hive_mind
         devices = DeviceAPI::Android.devices
-        Hive.logger.debug('HM) No devices attached') if devices.empty?
+        Hive.logger.debug('No devices attached') if devices.empty?
 
         if not Hive.hive_mind.device_details.has_key? :error
           # Selecting only android mobiles
@@ -22,22 +18,22 @@ module Hive
           to_poll = []
           attached_devices = []
           connected_devices.each do |device|
-            Hive.logger.debug("HM) Device details: #{device.inspect}")
+            Hive.logger.debug("Device details: #{device.inspect}")
             registered_device = devices.select { |a| a.serial == device['serial'] && a.status != :unauthorized && a.status != :no_permissions}
             if registered_device.empty?
               # A previously registered device isn't attached
-              Hive.logger.debug("HM) A previously registered device has disappeared: #{device}")
+              Hive.logger.debug("A previously registered device has disappeared: #{device}")
             else
               # A previously registered device is attached, poll it
-              Hive.logger.debug("HM) Setting #{device} to be polled")
-              Hive.logger.info("HM) Stuff: #{registered_device.inspect}")
+              Hive.logger.debug("Setting #{device} to be polled")
+              Hive.logger.debug("Device: #{registered_device.inspect}")
               begin
                 attached_devices << self.create_device(device.merge('os_version' => registered_device[0].version))
                 to_poll << device['id']
               rescue DeviceAPI::DeviceNotFound => e
-                Hive.logger.warn("HM) Device disconnected before registration (serial: #{device['serial']})")
+                Hive.logger.warn("Device disconnected before registration (serial: #{device['serial']})")
               rescue => e
-                Hive.logger.warn("HM) Error with connected device: #{e.message}")
+                Hive.logger.warn("Error with connected device: #{e.message}")
               end
 
               devices = devices - registered_device
@@ -45,7 +41,7 @@ module Hive
           end
 
           # Poll already registered devices
-          Hive.logger.debug("HM) Polling: #{to_poll}")
+          Hive.logger.debug("Polling: #{to_poll}")
           Hive.hive_mind.poll(*to_poll)
 
           # Register new devices
@@ -64,17 +60,17 @@ module Hive
                   operating_system_version: device.version
               )
               Hive.hive_mind.connect(dev['id'])
-              Hive.logger.info("HM) Device registered: #{dev}")
+              Hive.logger.info("Device registered: #{dev}")
             rescue DeviceAPI::DeviceNotFound => e
-              Hive.logger.warn("HM) Device disconnected before registration (serial: #{device.serial})")
+              Hive.logger.warn("Device disconnected before registration (serial: #{device.serial})")
             rescue => e
-              Hive.logger.warn("HM) Error with connected device: #{e.message}")
+              Hive.logger.warn("Error with connected device: #{e.message}")
             end
           end
 
         else
-          Hive.logger.info('HM) No Hive Mind connection')
-          Hive.logger.debug("HM) Error: #{Hive.hive_mind.device_details[:error]}")
+          Hive.logger.info('No Hive Mind connection')
+          Hive.logger.debug("Error: #{Hive.hive_mind.device_details[:error]}")
           # Hive Mind isn't available, use DeviceAPI instead
           device_info = devices.select { |a| a.status != :unauthorized && a.status != :no_permissions }.map do |device|
             {

metadata

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