hive-runner-android 1.1.6 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2aae14ef832b9ea895f4bb1029c0b923e65614f8
-  data.tar.gz: 4ba623a934d783c2ea3d54e04e6f9098ccfc2921
+  metadata.gz: 386102f5f6c6fca8095d765453cb5bf8dbb356ab
+  data.tar.gz: c0dcd7026a3e84b03ae6ccec86e45a6747170d2f
 SHA512:
-  metadata.gz: f50c6fe8a8b917f156e71b3571dafaa657085b27559a46c15d628441523333d3dbc066a69c6dc1d1a7a14567db4b08b21732a45313061152214c3012d5e1d46e
-  data.tar.gz: 2ce15dc130d09fa7242c5ef590fc24b10a99fee4a2332ed0d669895cc7d70bd7dddaa7de35da79b30f1d5154b090d11df32d64555e5234280592817a507222e8
+  metadata.gz: 68a40b5c250516ac13a743d63c47ffe6c8ef2c288ad65d56b918a5bd7aadc32703b3278e511f175d9a40bd5e2f30e3cc89c260c6db58bfcdba166ae25c0d331b
+  data.tar.gz: c7be9e055cdab4e07402d0fb6614b8771f04da55d613cbb98e68537589606acda2c9d0b8aadaa00943423ad613e21730dd9306905a7700ac0561ed688cec638e

data/lib/hive/controller/android.rb

@@ -8,7 +8,6 @@ module Hive
 
       def detect
         self.detect_hive_mind
-        self.detect_devicedb
       end
 
       # Register with Hive Mind (New)
@@ -97,111 +96,6 @@ module Hive
         attached_devices
       end
 
-      # Register with DeviceDB (Old)
-      def detect_devicedb
-        devices = DeviceAPI::Android.devices
-        Hive.logger.debug('No devices attached') if devices.empty?
-        Hive.logger.debug("#{Time.now} Retrieving hive details")
-        hive_details = Hive.devicedb('Hive').find(Hive.id)
-        Hive.logger.debug("#{Time.now} Finished fetching hive details")
-        attached_devices = []
-
-        if hive_details.key?('devices')
-          # Update the 'cached' results from DeviceDB
-          @hive_details = hive_details
-        else
-          # DeviceDB isn't available - use the cached version
-          hive_details = @hive_details
-        end
-
-        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 && 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}")
-            else
-              # A previously registered device is attached, poll it
-              Hive.logger.debug("#{Time.now} Polling attached device - #{device}")
-              Hive.devicedb('Device').poll(device['id'])
-              Hive.logger.debug("#{Time.now} Finished polling device")
-
-              devices = devices - registered_device
-              begin
-                attached_devices <<
-                    self.create_device(device.merge(
-                      'os_version' => registered_device[0].version,
-                      'model' => device['device_model'],
-                      'brand' => device['device_brand'],
-                      'queues' => device['device_queues'].map{ |d| d['name'] },
-                      'queue_prefix' => @config['queue_prefix']
-                    ))
-              rescue DeviceAPI::DeviceNotFound
-                Hive.logger.info("Device '#{device['serial']}' disconnected during registration")
-              rescue => e
-                Hive.logger.warn("Error with connected device: #{e.message}")
-              end
-            end
-          end
-
-          devices.each do |device|
-            register_new_device(device)
-          end
-
-          display_devices(hive_details)
-        else
-          # DeviceDB isn't available, use DeviceAPI instead
-
-          device_info = devices.select { |a| a.status != :unauthorized && a.status != :no_permissions }.map do |device|
-            {
-              'id' =>  device.serial,
-              'serial' => device.serial,
-              'status' => 'idle',
-              'model' => device.model,
-              'brand' => device.manufacturer,
-              'os_version' => device.version,
-              'queue_prefix' => @config['queue_prefix']
-            }
-          end
-
-          attached_devices = device_info.collect do |physical_device|
-            self.create_device(physical_device)
-          end
-        end
-        attached_devices
-      end
-
-      def register_new_device(device)
-        begin
-          Hive.logger.info("Adding new Android device: #{device.model}")
-
-          attributes = {
-              os: 'android',
-              os_version: device.version,
-              serial: device.serial,
-              device_type: 'mobile',
-              device_model: device.model,
-              device_brand: device.manufacturer,
-              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)
-        Hive.devicedb('Device').hive_connect(registration['id'], Hive.id)
-      end
-
       def display_devices(hive_details)
         rows = []
         if hive_details.key?('devices')

data/lib/hive/device/android.rb

@@ -11,50 +11,8 @@ module Hive
         @model = config['model'].downcase.gsub(/\s/, '_')
         @brand = config['brand'].downcase.gsub(/\s/, '_')
         @os_version = config['os_version']
-
-        # 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
-        [
-          "#{@queue_prefix}#{self.model}",
-          "#{@queue_prefix}#{self.brand}",
-          "#{@queue_prefix}android",
-          "#{@queue_prefix}android-#{self.os_version}",
-          "#{@queue_prefix}android-#{self.os_version}-#{self.model}"
-        ]
-      end
-
-      private
-
-      def find_or_create_queue(name)
-        queue = Hive.devicedb('Queue').find_by_name(name)
-
-        return queue.first['id'] unless queue.empty? || queue.is_a?(Hash)
-
-        queue = create_queue(name, "#{name} queue created by Hive Runner")
-        queue['id'] unless queue.empty?
-      end
-
-      def create_queue(name, description)
-        queue_attributes = {
-          name: name,
-          description: description
-        }
-
-        Hive.devicedb('Queue').register(device_queue: queue_attributes)
-      end
     end
   end
 end

data/lib/hive/worker/android.rb

@@ -20,17 +20,18 @@ module Hive
       attr_accessor :device
 
       def initialize(device)
+        @serial = device['serial']
         @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'])})
+          device.merge!({"device_api" => DeviceAPI::Android.device(@serial)})
         rescue DeviceAPI::DeviceNotFound
-          Hive.logger.info("Device '#{device['serial']}' disconnected during initialization")
+          Hive.logger.info("Device '#{@serial}' disconnected during initialization")
         rescue DeviceAPI::UnauthorizedDevice
-          Hive.logger.info("Device '#{device['serial']}' is unauthorized")
+          Hive.logger.info("Device '#{@serial}' is unauthorized")
         rescue DeviceAPI::Android::ADBCommandError
           Hive.logger.info("Device disconnected during worker initialization")
         rescue => e
@@ -85,30 +86,13 @@ module Hive
         set_device_status('idle')
       end
 
-      def device_status
-        # TODO Get from Hive Mind
-        details = Hive.devicedb('Device').find(@options['id'])
-        if details.key?('status')
-          @state = details['status']
-        else
-          @state
-        end
-      end
+      #def device_status
+      #  # TODO Get from Hive Mind
+      #end
 
-      def set_device_status(status)
-        # TODO Report to Hive Mind
-        @state = status
-        begin
-          details = Hive.devicedb('Device').poll(@options['id'], status)
-          if details.key?('status')
-            details['status']
-          else
-            @state
-          end
-        rescue
-          @state
-        end
-      end
+      #def set_device_status(status)
+      #  # TODO Report to Hive Mind
+      #end
 
       def autogenerated_queues
         @log.info("Autogenerating queues")
@@ -123,7 +107,7 @@ module Hive
 
       def hive_mind_device_identifiers
         {
-          serial: @device_id,
+          serial: @serial,
           device_type: 'Mobile'
         }
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hive-runner-android
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.2.0
 platform: ruby
 authors:
 - Jon Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: device_api-android
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement