hive-runner-ios 1.0.7 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0285bff2ed9063c843f3480c68f022e7238bff85
-  data.tar.gz: 03740faa4ae4bd5ab2dc6fb807afe7582bd16852
+  metadata.gz: 7322752108ca0a24e22439273d2b832d65772393
+  data.tar.gz: b915a2528216af4bb9260f77f7e4dfe0f224379c
 SHA512:
-  metadata.gz: 7dbb67b82be8d6c66348e70c925b54671fb35e076ac0097d64069e1bf8c212afaf6bd4d0fb0eeb7be857e2ba87e65b4ecbc929a00e329904a78e59fc6dfad51d
-  data.tar.gz: 26cdc8ba29be46e88e7b4b34573117ce45a84353384492cef1619c14f172a72cd7a9d79d2e2f37fe2a71ec91432f62312f51e5734daf966977cbed4fa33ff5d0
+  metadata.gz: 55436f90a7ae13ddd0477779b76d0cb9e1d9196d39dff1cbc65002931f434f2ab27015f240baee84b49913bd3ca326c6a568a854e9225e6941b69c4e27ff790d
+  data.tar.gz: 568c53aff2d74fa00c3f3c1f9b2aa6ba1e8d70753edabd3c9946cbdc518d8ed41461aa402bde70be9b740982c7a08c979c55c8636afae59fa2dc2ac9ae42c949

data/lib/hive/controller/ios.rb

@@ -6,70 +6,7 @@ module Hive
   class Controller
     class Ios < Controller
 
-      def register_with_devicedb
-        devices = DeviceAPI::IOS.devices
-        Hive.logger.debug('DDB: No devices attached') if devices.empty?
-
-        hive_details = Hive.devicedb('Hive').find(Hive.id)
-
-        attached_devices = []
-
-        if hive_details.key?('devices')
-          @hive_details = hive_details
-        else
-          hive_details = @hive_details
-        end
-
-        if hive_details.is_a? Hash
-          hive_details['devices'].select { |a| a['os'] == 'ios'}.each do |device|
-            registered_device = devices.select { |a| a.serial == device['serial'] && a.trusted? }
-            if registered_device.empty?
-              # A previously registered device isn't attached
-              Hive.devicedb('Device').hive_disconnect(device['id'])
-            else
-              Hive.devicedb('Device').poll(device['id'])
-
-              devices = devices - registered_device
-
-              begin
-                attached_devices <<
-                    self.create_device(device.merge(
-                        'os_version' => registered_device[0].version,
-                        'model' => device['device_model'],
-                        'device_range' => registered_device[0].device_class,
-                        'queues' => device['device_queues'].map{ |d| d['name'] },
-                        'queue_prefix' => @config['queue_prefix']
-                                       ))
-              rescue => e
-                Hive.logger.warn("Error with connected device: #{e.message}")
-              end
-            end
-          end
-          devices.select {|a| a.trusted? }.each do |device|
-            register_new_device(device)
-          end
-        else
-          # DeviceDB isn't available, use DeviceAPI instead
-          device_info = devices.select { |a| a.trusted? }.map do |device|
-            {
-                'id' => device.serial,
-                'serial' => device.serial,
-                'status' => 'idle',
-                'model' => device.model,
-                'brand' => 'Apple',
-                '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_with_hivemind
+      def register
         devices = DeviceAPI::IOS.devices
         Hive.logger.debug('HM: No devices attached') if devices.empty?
 
@@ -138,7 +75,11 @@ module Hive
           end
 
           attached_devices = device_info.collect do |physical_device|
-            self.create_device(physical_device)
+            begin
+              self.create_device(physical_device)
+            rescue => e
+              Hive.logger.info("HM: Could not created device: #{physical_device}");
+            end
           end
         end
 
@@ -147,8 +88,7 @@ module Hive
       end
 
       def detect
-        register_with_hivemind
-        register_with_devicedb
+        register
       end
 
       def display_untrusted
@@ -158,48 +98,6 @@ module Hive
         return if untrusted_devices.empty?
         puts Terminal::Table.new headings: ['Untrusted devices'], rows: [untrusted_devices]
       end
-
-      def register_new_device(device)
-        Hive.logger.debug("Adding new iOS device: #{device.model}")
-
-        attributes = {
-            os:           'ios',
-            os_version:   device.version,
-            serial:       device.serial,
-            device_type:  'mobile',
-            device_model: device.model.to_s.gsub(',','_'),
-            device_range: device.device_class,
-            device_brand: 'Apple',
-            hive:         Hive.id
-        }
-
-        registration = Hive.devicedb('Device').register(attributes)
-        Hive.devicedb('Device').hive_connect(registration['id'], Hive.id)
-      end
-
-      def populate_queues(device)
-        queues = calculate_queue_names(device)
-
-        devicedb_queues = device['device_queues'].map { |d| d['name'] }
-        # Check to see if the queues have already been registered with this device
-        missing_queues = (queues - devicedb_queues) + (devicedb_queues - queues)
-        return if missing_queues.empty?
-
-        queues << missing_queues
-
-        queue_ids = queues.flatten.uniq.map { |queue| find_or_create_queue(queue) }
-
-        values = {
-            name: device['name'],
-            hive_id: device['hive_id'],
-            feature_list: device['features'],
-            device_queue_ids: queue_ids
-        }
-
-        Hive.devicedb('Device').edit(device['id'], values)
-      end
-
-
     end
   end
 end

data/lib/hive/device/ios.rb

@@ -12,45 +12,8 @@ module Hive
         @device_range = config['device_range'].downcase
         @os_version = config['os_version']
 
-        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
-
-      def calculate_queue_names
-        [
-            "#{@queue_prefix}#{self.model}",
-            "#{@queue_prefix}ios",
-            "#{@queue_prefix}ios-#{self.os_version}",
-            "#{@queue_prefix}ios-#{self.os_version}-#{self.model}",
-            "#{@queue_prefix}#{@device_range}",
-            "#{@queue_prefix}#{@device_range}-#{self.os_version}"
-        ]
-      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
+end

data/lib/hive/worker/ios.rb

@@ -21,6 +21,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/, '_')
+        @device_range = device['device_range'].downcase
+        @os_version = device['os_version']
         @worker_ports = PortReserver.new
         self.device = device
         super(device)
@@ -114,27 +118,30 @@ module Hive
       end
 
       def device_status
-        details = Hive.devicedb('Device').find(@options['id'])
-        if details.key?('status')
-          @state = details['status']
-        else
-          @state
-        end
+
       end
 
       def set_device_status(status)
-        @state = status
-        begin
-          details = Hive.devicedb('Device').poll(@options['id'], status)
-          if details.key?('status')
-            @state = details['status']
-          else
-            @state
-          end
-        rescue
-          @state
-        end
+
+      end
+
+      def autogenerated_queues
+        [
+          "#{@queue_prefix}#{@model}",
+          "#{@queue_prefix}ios",
+          "#{@queue_prefix}ios-#{@os_version}",
+          "#{@queue_prefix}ios-#{@os_version}-#{@model}",
+          "#{@queue_prefix}#{@device_range}",
+          "#{@queue_prefix}#{@device_range}-#{@os_version}"
+        ]
+      end
+
+      def hive_mind_device_identifiers
+        {
+          serial: @device_id,
+          device_type: 'Mobile'
+        }
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hive-runner-ios
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.1.0
 platform: ruby
 authors:
 - Jon Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-19 00:00:00.000000000 Z
+date: 2016-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hive-runner
@@ -16,14 +16,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: device_api-ios
   requirement: !ruby/object:Gem::Requirement