hive-runner-ios 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7322752108ca0a24e22439273d2b832d65772393
-  data.tar.gz: b915a2528216af4bb9260f77f7e4dfe0f224379c
+  metadata.gz: a67b5445da47159e7b5f738bc416db2ba4568f9f
+  data.tar.gz: 714c35ab0057e737abc830b174b48baca18b73f5
 SHA512:
-  metadata.gz: 55436f90a7ae13ddd0477779b76d0cb9e1d9196d39dff1cbc65002931f434f2ab27015f240baee84b49913bd3ca326c6a568a854e9225e6941b69c4e27ff790d
-  data.tar.gz: 568c53aff2d74fa00c3f3c1f9b2aa6ba1e8d70753edabd3c9946cbdc518d8ed41461aa402bde70be9b740982c7a08c979c55c8636afae59fa2dc2ac9ae42c949
+  metadata.gz: d5b9f2acb156eac299ff83c0311124d95ac1488294b183f0ec59514bd345cdf562d677ef1b64a111dd61ab0cc7170f7a8ae4debd93f923d969e225164b748a0f
+  data.tar.gz: 0144d59316286b6cad9332291ae68229fb78e58383de0aecebac96dcfbfbc9c2dd1ce6701632d2cde730b7e390b6ca180b768b83546930468e6f3a87b5f7cc4d

data/lib/hive/controller/ios.rb

@@ -6,9 +6,9 @@ module Hive
   class Controller
     class Ios < Controller
 
-      def register
+      def detect
         devices = DeviceAPI::IOS.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
           connected_devices = Hive.hive_mind.device_details['connected_devices'].select{ |d| d['device_type'] == 'Mobile' && d['operating_system_name'] == 'ios' }
@@ -16,13 +16,12 @@ 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.trusted? }
             if registered_device.empty?
-              Hive.logger.debug("HM: Removing previously registered device - #{device}")
-              Hive.hive_mind.disconnect(device['id'])
+              Hive.logger.debug("Removing previously registered device - #{device}")
             else
-              Hive.logger.debug("HM: Device #{device} to be polled")
+              Hive.logger.debug("Device #{device} to be polled")
               begin
                 attached_devices << self.create_device(device.merge(
                                                            'os_version' => registered_device[0].version,
@@ -31,14 +30,14 @@ module Hive
                 )
                 to_poll << device['id']
               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
             end
           end
 
-          Hive.logger.debug("HM: Polling - #{to_poll}")
+          Hive.logger.debug("Polling - #{to_poll}")
           Hive.hive_mind.poll(*to_poll)
 
           devices.select{|a| a.trusted? }.each do |device|
@@ -55,13 +54,13 @@ 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 => 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.info('No Hive Mind connection')
           device_info = devices.select{|a| a.trusted? }.map do |device|
             {
                 'id' => device.serial,
@@ -78,7 +77,7 @@ module Hive
             begin
               self.create_device(physical_device)
             rescue => e
-              Hive.logger.info("HM: Could not created device: #{physical_device}");
+              Hive.logger.info("Could not created device: #{physical_device}");
             end
           end
         end
@@ -87,10 +86,6 @@ module Hive
         attached_devices
       end
 
-      def detect
-        register
-      end
-
       def display_untrusted
         devices = DeviceAPI::IOS.devices
         untrusted_devices = devices.select { |a| !a.trusted? }

data/lib/hive/worker/ios.rb

@@ -26,6 +26,7 @@ module Hive
         @device_range = device['device_range'].downcase
         @os_version = device['os_version']
         @worker_ports = PortReserver.new
+        set_device_status('idle')
         self.device = device
         super(device)
       end
@@ -61,8 +62,8 @@ module Hive
       end
 
       def pre_script(job, file_system, script)
-        Hive.devicedb('Device').poll(@options['id'], 'busy')
 
+        set_device_status('busy')
         device = DeviceAPI::IOS.device(self.device['serial'])
 
         if job.build
@@ -70,9 +71,9 @@ module Hive
           app_path = file_system.home_path + '/build/' + 'build.ipa'
 
           file_system.fetch_build(job.build, app_path)
-          entitlements = FruityBuilder::Signing.enable_get_tasks(app_path)
-          FruityBuilder::Signing.sign_app(@options['signing_identity'], entitlements: entitlements, app: app_path)
-          app_info = FruityBuilder::Plistutil.get_bundle_id_from_app(app_path)
+          entitlements = FruityBuilder::IOS::Signing.enable_get_tasks(app_path)
+          FruityBuilder::IOS::Signing.sign_app(@options['signing_identity'], entitlements: entitlements, app: app_path)
+          app_info = FruityBuilder::IOS::Plistutil.get_bundle_id_from_app(app_path)
           app_bundle = app_info['CFBundleIdentifier']
           device.install(app_path)
           script.set_env 'BUNDLE_ID', app_bundle
@@ -117,13 +118,13 @@ module Hive
         set_device_status('idle')
       end
 
-      def device_status
-
-      end
-
-      def set_device_status(status)
-
-      end
+      #def device_status
+      #
+      #end
+      #
+      #def set_device_status(status)
+      #
+      #end
 
       def autogenerated_queues
         [
@@ -138,7 +139,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-ios
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Jon Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-12 00:00:00.000000000 Z
+date: 2016-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hive-runner