hive-runner-ios 1.1.0 → 1.1.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/hive/controller/ios.rb +11 -16
- data/lib/hive/worker/ios.rb +13 -12
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: a67b5445da47159e7b5f738bc416db2ba4568f9f
|
4
|
+
data.tar.gz: 714c35ab0057e737abc830b174b48baca18b73f5
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d5b9f2acb156eac299ff83c0311124d95ac1488294b183f0ec59514bd345cdf562d677ef1b64a111dd61ab0cc7170f7a8ae4debd93f923d969e225164b748a0f
|
7
|
+
data.tar.gz: 0144d59316286b6cad9332291ae68229fb78e58383de0aecebac96dcfbfbc9c2dd1ce6701632d2cde730b7e390b6ca180b768b83546930468e6f3a87b5f7cc4d
|
data/lib/hive/controller/ios.rb
CHANGED
@@ -6,9 +6,9 @@ module Hive
|
|
6
6
|
class Controller
|
7
7
|
class Ios < Controller
|
8
8
|
|
9
|
-
def
|
9
|
+
def detect
|
10
10
|
devices = DeviceAPI::IOS.devices
|
11
|
-
Hive.logger.debug('
|
11
|
+
Hive.logger.debug('No devices attached') if devices.empty?
|
12
12
|
|
13
13
|
if not Hive.hive_mind.device_details.has_key? :error
|
14
14
|
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
|
|
16
16
|
to_poll = []
|
17
17
|
attached_devices = []
|
18
18
|
connected_devices.each do |device|
|
19
|
-
Hive.logger.debug("
|
19
|
+
Hive.logger.debug("Device details: #{device.inspect}")
|
20
20
|
registered_device = devices.select { |a| a.serial == device['serial'] && a.trusted? }
|
21
21
|
if registered_device.empty?
|
22
|
-
Hive.logger.debug("
|
23
|
-
Hive.hive_mind.disconnect(device['id'])
|
22
|
+
Hive.logger.debug("Removing previously registered device - #{device}")
|
24
23
|
else
|
25
|
-
Hive.logger.debug("
|
24
|
+
Hive.logger.debug("Device #{device} to be polled")
|
26
25
|
begin
|
27
26
|
attached_devices << self.create_device(device.merge(
|
28
27
|
'os_version' => registered_device[0].version,
|
@@ -31,14 +30,14 @@ module Hive
|
|
31
30
|
)
|
32
31
|
to_poll << device['id']
|
33
32
|
rescue => e
|
34
|
-
Hive.logger.warn("
|
33
|
+
Hive.logger.warn("Error with connected device: #{e.message}")
|
35
34
|
end
|
36
35
|
|
37
36
|
devices = devices - registered_device
|
38
37
|
end
|
39
38
|
end
|
40
39
|
|
41
|
-
Hive.logger.debug("
|
40
|
+
Hive.logger.debug("Polling - #{to_poll}")
|
42
41
|
Hive.hive_mind.poll(*to_poll)
|
43
42
|
|
44
43
|
devices.select{|a| a.trusted? }.each do |device|
|
@@ -55,13 +54,13 @@ module Hive
|
|
55
54
|
operating_system_version: device.version
|
56
55
|
)
|
57
56
|
Hive.hive_mind.connect(dev['id'])
|
58
|
-
Hive.logger.info("
|
57
|
+
Hive.logger.info("Device registered: #{dev}")
|
59
58
|
rescue => e
|
60
|
-
Hive.logger.warn("
|
59
|
+
Hive.logger.warn("Error with connected device - #{e.message}")
|
61
60
|
end
|
62
61
|
end
|
63
62
|
else
|
64
|
-
Hive.logger.info('
|
63
|
+
Hive.logger.info('No Hive Mind connection')
|
65
64
|
device_info = devices.select{|a| a.trusted? }.map do |device|
|
66
65
|
{
|
67
66
|
'id' => device.serial,
|
@@ -78,7 +77,7 @@ module Hive
|
|
78
77
|
begin
|
79
78
|
self.create_device(physical_device)
|
80
79
|
rescue => e
|
81
|
-
Hive.logger.info("
|
80
|
+
Hive.logger.info("Could not created device: #{physical_device}");
|
82
81
|
end
|
83
82
|
end
|
84
83
|
end
|
@@ -87,10 +86,6 @@ module Hive
|
|
87
86
|
attached_devices
|
88
87
|
end
|
89
88
|
|
90
|
-
def detect
|
91
|
-
register
|
92
|
-
end
|
93
|
-
|
94
89
|
def display_untrusted
|
95
90
|
devices = DeviceAPI::IOS.devices
|
96
91
|
untrusted_devices = devices.select { |a| !a.trusted? }
|
data/lib/hive/worker/ios.rb
CHANGED
@@ -26,6 +26,7 @@ module Hive
|
|
26
26
|
@device_range = device['device_range'].downcase
|
27
27
|
@os_version = device['os_version']
|
28
28
|
@worker_ports = PortReserver.new
|
29
|
+
set_device_status('idle')
|
29
30
|
self.device = device
|
30
31
|
super(device)
|
31
32
|
end
|
@@ -61,8 +62,8 @@ module Hive
|
|
61
62
|
end
|
62
63
|
|
63
64
|
def pre_script(job, file_system, script)
|
64
|
-
Hive.devicedb('Device').poll(@options['id'], 'busy')
|
65
65
|
|
66
|
+
set_device_status('busy')
|
66
67
|
device = DeviceAPI::IOS.device(self.device['serial'])
|
67
68
|
|
68
69
|
if job.build
|
@@ -70,9 +71,9 @@ module Hive
|
|
70
71
|
app_path = file_system.home_path + '/build/' + 'build.ipa'
|
71
72
|
|
72
73
|
file_system.fetch_build(job.build, app_path)
|
73
|
-
entitlements = FruityBuilder::Signing.enable_get_tasks(app_path)
|
74
|
-
FruityBuilder::Signing.sign_app(@options['signing_identity'], entitlements: entitlements, app: app_path)
|
75
|
-
app_info = FruityBuilder::Plistutil.get_bundle_id_from_app(app_path)
|
74
|
+
entitlements = FruityBuilder::IOS::Signing.enable_get_tasks(app_path)
|
75
|
+
FruityBuilder::IOS::Signing.sign_app(@options['signing_identity'], entitlements: entitlements, app: app_path)
|
76
|
+
app_info = FruityBuilder::IOS::Plistutil.get_bundle_id_from_app(app_path)
|
76
77
|
app_bundle = app_info['CFBundleIdentifier']
|
77
78
|
device.install(app_path)
|
78
79
|
script.set_env 'BUNDLE_ID', app_bundle
|
@@ -117,13 +118,13 @@ module Hive
|
|
117
118
|
set_device_status('idle')
|
118
119
|
end
|
119
120
|
|
120
|
-
def device_status
|
121
|
-
|
122
|
-
end
|
123
|
-
|
124
|
-
def set_device_status(status)
|
125
|
-
|
126
|
-
end
|
121
|
+
#def device_status
|
122
|
+
#
|
123
|
+
#end
|
124
|
+
#
|
125
|
+
#def set_device_status(status)
|
126
|
+
#
|
127
|
+
#end
|
127
128
|
|
128
129
|
def autogenerated_queues
|
129
130
|
[
|
@@ -138,7 +139,7 @@ module Hive
|
|
138
139
|
|
139
140
|
def hive_mind_device_identifiers
|
140
141
|
{
|
141
|
-
serial: @
|
142
|
+
serial: @serial,
|
142
143
|
device_type: 'Mobile'
|
143
144
|
}
|
144
145
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: hive-runner-ios
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.1.
|
4
|
+
version: 1.1.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Jon Wilson
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-
|
11
|
+
date: 2016-05-03 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: hive-runner
|