hive-runner-android 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf5ea608ebe487e9909148bdfdb250e8811b5b0d
-  data.tar.gz: 78a693e1b523daab61ab4ff5663d7fe2c8f142e2
+  metadata.gz: 2aae14ef832b9ea895f4bb1029c0b923e65614f8
+  data.tar.gz: 4ba623a934d783c2ea3d54e04e6f9098ccfc2921
 SHA512:
-  metadata.gz: dc33457203d224959ce1fa945bcbf6ab29b727cdfaa97297e5c38ae419d06ee3eae7e20914ed9248ee88f1d52026d5d275dbbba7b9ae8d605f520fce88b94505
-  data.tar.gz: e060cbd2d68c675f24fb9b8c4be1a812584c73d3f4759a005d2b48ce54c9e5a518bbe3cc305330287518f64832f6b6ead214772c6c9d485d7c16d32ec5421684
+  metadata.gz: f50c6fe8a8b917f156e71b3571dafaa657085b27559a46c15d628441523333d3dbc066a69c6dc1d1a7a14567db4b08b21732a45313061152214c3012d5e1d46e
+  data.tar.gz: 2ce15dc130d09fa7242c5ef590fc24b10a99fee4a2332ed0d669895cc7d70bd7dddaa7de35da79b30f1d5154b090d11df32d64555e5234280592817a507222e8

data/lib/hive/controller/android.rb

@@ -24,11 +24,10 @@ module Hive
           attached_devices = []
           connected_devices.each do |device|
             Hive.logger.debug("HM) Device details: #{device.inspect}")
-            registered_device = devices.select { |a| a.serial == device['serial'] && a.status != :unauthorized }
+            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) Removing previously registered device - #{device}")
-              Hive.hive_mind.disconnect(device['id'])
+              Hive.logger.debug("HM) 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")
@@ -51,7 +50,7 @@ module Hive
           Hive.hive_mind.poll(*to_poll)
 
           # Register new devices
-          devices.select{|a| a.status != :unauthorized}.each do |device|
+          devices.select{|a| a.status != :unauthorized && a.status != :no_permissions}.each do |device|
             begin
               dev = Hive.hive_mind.register(
                   hostname: device.model,
@@ -76,8 +75,9 @@ module Hive
 
         else
           Hive.logger.info('HM) No Hive Mind connection')
+          Hive.logger.debug("HM) Error: #{Hive.hive_mind.device_details[:error]}")
           # Hive Mind isn't available, use DeviceAPI instead
-          device_info = devices.select { |a| a.status != :unauthorized }.map do |device|
+          device_info = devices.select { |a| a.status != :unauthorized && a.status != :no_permissions }.map do |device|
             {
               'id' =>  device.serial,
               'serial' => device.serial,
@@ -117,11 +117,10 @@ module Hive
         if hive_details.is_a? Hash
           # DeviceDB information is available, use it
           hive_details['devices'].select {|a| a['os'] == 'android'}.each do |device|
-            registered_device = devices.select { |a| a.serial == device['serial'] && a.status != :unauthorized}
+            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("Removing previously registered device - #{device}")
-              Hive.devicedb('Device').hive_disconnect(device['id'])
+              Hive.logger.debug("HM) A previously registered device has disappeared: #{device}")
             else
               # A previously registered device is attached, poll it
               Hive.logger.debug("#{Time.now} Polling attached device - #{device}")
@@ -154,7 +153,7 @@ module Hive
         else
           # DeviceDB isn't available, use DeviceAPI instead
 
-          device_info = devices.select { |a| a.status != :unauthorized }.map do |device|
+          device_info = devices.select { |a| a.status != :unauthorized && a.status != :no_permissions }.map do |device|
             {
               'id' =>  device.serial,
               'serial' => device.serial,

data/lib/hive/device/android.rb

@@ -12,19 +12,21 @@ module Hive
         @brand = config['brand'].downcase.gsub(/\s/, '_')
         @os_version = config['os_version']
 
-        Hive.logger.info("Config: #{config.inspect}")
+        # TODO The setting of config['queues'] can be removed when DeviceDB
+        # is no longer being used
         new_queues = calculate_queue_names
         new_queues = new_queues | config['queues'] if config.has_key?('queues')
 
         devicedb_ids = new_queues.map { |queue| find_or_create_queue(queue) }
         Hive.devicedb('Device').edit(@identity, { device_queue_ids: devicedb_ids })
         config['queues'] = new_queues
+
         super
       end
 
       # Uses either DeviceAPI or DeviceDB to generate queue names for a device
+      # TODO Remove when DeviceDB is not being used any more
       def calculate_queue_names
-Hive.logger.info("QUEUE PREFIX; #{@queue_prefix}")
         [
           "#{@queue_prefix}#{self.model}",
           "#{@queue_prefix}#{self.brand}",

data/lib/hive/worker/android.rb

@@ -20,6 +20,10 @@ module Hive
       attr_accessor :device
 
       def initialize(device)
+        @queue_prefix = device['queue_prefix'].to_s == '' ? '' : "#{device['queue_prefix']}-"
+        @model = device['model'].downcase.gsub(/\s/, '_')
+        @brand = device['brand'].downcase.gsub(/\s/, '_')
+        @os_version = device['os_version']
         @worker_ports = PortReserver.new
         begin
           device.merge!({"device_api" => DeviceAPI::Android.device(device['serial'])})
@@ -105,6 +109,24 @@ module Hive
           @state
         end
       end
+
+      def autogenerated_queues
+        @log.info("Autogenerating queues")
+        [
+          "#{@queue_prefix}#{@model}",
+          "#{@queue_prefix}#{@brand}",
+          "#{@queue_prefix}android",
+          "#{@queue_prefix}android-#{@os_version}",
+          "#{@queue_prefix}android-#{@os_version}-#{@model}"
+        ]
+      end
+
+      def hive_mind_device_identifiers
+        {
+          serial: @device_id,
+          device_type: 'Mobile'
+        }
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hive-runner-android
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Jon Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: device_api-android