hive-runner-ios 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 569799065f00e3d0934176298eddbb60f8db83c8
-  data.tar.gz: fd62240fb06d1d33e244e0eca4fb87be6029b96b
+  metadata.gz: d9217a775fece75da70489ef669479a8966b3d98
+  data.tar.gz: dd897a7898c1ca344e458ac5e03956ff7d758461
 SHA512:
-  metadata.gz: f35f0e8034cc6934ab2016256655a253636b0b89cf32a6466885b2826ced22cc3396161b3684e8b0acb42669b7c7d7c852b58005145aeeb98668e89f4436641e
-  data.tar.gz: 76ab662fccaae511c0cd7c5b71d69b5a39001b7e1d66b911662af046f119e550d4ddecd5f0b74104753417f7768b0357c9cde301283f8d690b93a07be04bd02d
+  metadata.gz: 37018163ec68ba7c02b108f64e1fbbee5fcd4dbb3eb85b4c0a1b0f274b5e3adcf6762548343b96e46d127d8bb08b31d240395a787bcc17c656c708712262d3ed
+  data.tar.gz: 8f0f4d36c91f07e42040cd84dc602f4af6edabf5ed08283369d25d8ef7d81a41439cdbd44e86fe129f15fd899e6d46894ccc684d28ef0a5d7df8beeeae99e632

data/lib/hive/controller/ios.rb

@@ -1,12 +1,19 @@
 require 'hive/controller'
 require 'hive/worker/ios'
 require 'device_api/ios'
+require 'mind_meld'
 
 module Hive
   class Controller
     class Ios < Controller
 
+      def initialize(options)
+        @hivemind = MindMeld.new(url: 'http://localhost:3000')
+        super(options)
+      end
+
       def detect
+
         Hive.logger.debug("#{Time.now} Polling hive: #{Hive.id}")
         Hive.devicedb('Hive').poll(Hive.id)
         Hive.logger.debug("#{Time.now} Finished polling hive: #{Hive.id}")
@@ -22,6 +29,19 @@ module Hive
           return []
         end
 
+        devices.each do |device|
+          @hivemind.register(
+                hostname: device.model,
+                serial: device.serial,
+                macs: [device.wifi_mac_address],
+                #ips: [device.ip_address],
+                brand: 'Apple',
+                model: device.model,
+                device_type: 'mobile',
+                imei: device.imei
+          )
+        end
+
         unless hive_details['devices'].empty?
           hive_details['devices'].select {|a| a['os'] == 'ios'}.each do |device|
             registered_device = devices.select { |a| a.serial == device['serial'] }

data/lib/hive/worker/ios.rb

@@ -33,6 +33,9 @@ module Hive
 
         helper = FruityBuilder::IOS::Helper.new(project_path)
 
+        # Check to see if a project has been passed in
+        return unless helper.has_project?
+
         helper.build.replace_bundle_id(@options['bundle_id'])
 
         helper.build.replace_dev_team(dev_team)
@@ -63,6 +66,7 @@ module Hive
           file_system.fetch_build(job.build, app_path)
           app_info = DeviceAPI::IOS::Plistutil.get_bundle_id_from_app(app_path)
           app_bundle = app_info['CFBundleIdentifier']
+          DeviceAPI::IOS.device(self.device['serial']).install(app_path)
           script.set_env 'BUNDLE_ID', app_bundle
         else
           alter_project(file_system.home_path + '/test_code/code/')
@@ -70,20 +74,22 @@ module Hive
 
         ip_address = DeviceAPI::IOS::IPAddress.address(self.device['serial'])
 
-        script.set_env 'CHARLES_PROXY_PORT',  @ports.reserve(queue_name: 'Charles')
+        script.set_env 'CHARLES_PROXY_PORT',  @worker_ports.reserve(queue_name: 'Charles') { @port_allocator.allocate_port }
 
         # TODO: Allow the scheduler to specify the ports to use
 
-        script.set_env 'APPIUM_PORT',         @worker_ports.reserve(queue_name: 'Appium') { self.allocate_port }
-        script.set_env 'BOOTSTRAP_PORT',      @worker_ports.reserve(queue_name: 'Bootstrap') { self.allocate_port }
-        script.set_env 'CHROMEDRIVER_PORT',   @worker_ports.reserve(queue_name: 'Chromedriver') { self.allocate_port }
+        script.set_env 'APPIUM_PORT',         @worker_ports.reserve(queue_name: 'Appium') { @port_allocator.allocate_port }
+        script.set_env 'BOOTSTRAP_PORT',      @worker_ports.reserve(queue_name: 'Bootstrap') { @port_allocator.allocate_port }
+        script.set_env 'CHROMEDRIVER_PORT',   @worker_ports.reserve(queue_name: 'Chromedriver') { @port_allocator.allocate_port }
 
         script.set_env 'APP_PATH', app_path
         script.set_env 'APP_BUNDLE_PATH', app_path
         script.set_env 'DEVICE_TARGET', self.device['serial']
+
+        # Required for Calabash testing
         script.set_env 'DEVICE_ENDPOINT', "http://#{ip_address}:37265"
 
-        "#{self.device['serial']} #{@ports.ports['Appium']} #{app_path} #{file_system.results_path}"
+        "#{self.device['serial']} #{@worker_ports.ports['Appium']} #{app_path} #{file_system.results_path}"
       end
 
       def job_message_klass
@@ -93,7 +99,7 @@ module Hive
       def post_script(job, file_system, script)
         @log.info('Post script')
         @worker_ports.ports.each do |name, port|
-          self.release_port(port)
+          @port_allocator.release_port(port)
         end
         set_device_status('idle')
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hive-runner-ios
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Jon Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-23 00:00:00.000000000 Z
+date: 2016-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: device_api-ios