hive-runner-android 1.1.2 → 1.1.3
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/android.rb +32 -1
- data/lib/hive/worker/android.rb +6 -0
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 791d7c48d21d1e3627d48e26c5533b9322e84fa3
|
4
|
+
data.tar.gz: 8d3b477541b6c21792b41bb9842df29826ebe24a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 7efa0377366f1eede0880a902d00a7f7ca0737bfbe5010c7ed723597ee3457584b10749bb0f1916b3a2e8d96c76a79ffc47fefaae012c2e62023816bde90ff97
|
7
|
+
data.tar.gz: 756c0d99968a708b3e465327595b7dffc5e1ff270c6636061a2630b7eccab56ad4d0d1f6eb457832380c5d0442a8b9bb2d41007048d47863d1bcd5251bb8e33b
|
@@ -83,6 +83,31 @@ module Hive
|
|
83
83
|
hive_details = Hive.devicedb('Hive').find(Hive.id)
|
84
84
|
Hive.logger.debug("#{Time.now} Finished fetching hive details")
|
85
85
|
|
86
|
+
devices.each do |device|
|
87
|
+
begin
|
88
|
+
Hive.hive_mind.register(
|
89
|
+
hostname: device.model,
|
90
|
+
serial: device.serial,
|
91
|
+
macs: [device.wifi_mac_address],
|
92
|
+
ips: [device.ip_address],
|
93
|
+
brand: device.manufacturer.capitalize,
|
94
|
+
model: device.model,
|
95
|
+
device_type: 'Mobile',
|
96
|
+
imei: device.imei,
|
97
|
+
hive_id: Hive.id
|
98
|
+
)
|
99
|
+
rescue DeviceAPI::DeviceNotFound
|
100
|
+
Hive.logger.info("Device '#{device.serial}' disconnected during registration")
|
101
|
+
devices.delete(device)
|
102
|
+
rescue DeviceAPI::UnauthorizedDevice
|
103
|
+
Hive.logger.info("Device '#{device.serial}' is unauthorized")
|
104
|
+
devices.delete(device)
|
105
|
+
rescue => e
|
106
|
+
Hive.logger.warn("Error with connected device: #{e.message}")
|
107
|
+
devices.delete(device)
|
108
|
+
end
|
109
|
+
end
|
110
|
+
|
86
111
|
if hive_details.key?('devices')
|
87
112
|
# Update the 'cached' results from DeviceDB
|
88
113
|
@hive_details = hive_details
|
@@ -135,7 +160,7 @@ module Hive
|
|
135
160
|
|
136
161
|
def register_new_device(device)
|
137
162
|
begin
|
138
|
-
Hive.logger.
|
163
|
+
Hive.logger.info("Adding new Android device: #{device.model}")
|
139
164
|
|
140
165
|
attributes = {
|
141
166
|
os: 'android',
|
@@ -147,10 +172,16 @@ module Hive
|
|
147
172
|
device_range: device.range,
|
148
173
|
hive: Hive.id
|
149
174
|
}
|
175
|
+
rescue DeviceAPI::DeviceNotFound
|
176
|
+
Hive.logger.info("Device '#{device.serial}' disconnected during registration")
|
177
|
+
rescue DeviceAPI::UnauthorizedDevice
|
178
|
+
Hive.logger.info("Device '#{device.serial}' is unauthorized")
|
150
179
|
rescue DeviceAPI::Android::ADBCommandError
|
151
180
|
# If a device has been disconnected while we're trying to add it, the device_api
|
152
181
|
# gem will throw an error
|
153
182
|
Hive.logger.debug('Device disconnected while attempting to add')
|
183
|
+
rescue => e
|
184
|
+
Hive.logger.warn("Error with connected device: #{e.message}")
|
154
185
|
end
|
155
186
|
|
156
187
|
registration = Hive.devicedb('Device').register(attributes)
|
data/lib/hive/worker/android.rb
CHANGED
@@ -23,8 +23,14 @@ module Hive
|
|
23
23
|
@worker_ports = PortReserver.new
|
24
24
|
begin
|
25
25
|
device.merge!({"device_api" => DeviceAPI::Android.device(device['serial'])})
|
26
|
+
rescue DeviceAPI::DeviceNotFound
|
27
|
+
Hive.logger.info("Device '#{device['serial']}' disconnected during initialization")
|
28
|
+
rescue DeviceAPI::UnauthorizedDevice
|
29
|
+
Hive.logger.info("Device '#{device['serial']}' is unauthorized")
|
26
30
|
rescue DeviceAPI::Android::ADBCommandError
|
27
31
|
Hive.logger.info("Device disconnected during worker initialization")
|
32
|
+
rescue => e
|
33
|
+
Hive.logger.warn("Error with connected device: #{e.message}")
|
28
34
|
end
|
29
35
|
set_device_status('idle')
|
30
36
|
self.device = device
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: hive-runner-android
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.1.
|
4
|
+
version: 1.1.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Jon Wilson
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2016-02-09 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: device_api-android
|
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
87
87
|
version: '0'
|
88
88
|
requirements: []
|
89
89
|
rubyforge_project:
|
90
|
-
rubygems_version: 2.
|
90
|
+
rubygems_version: 2.5.0
|
91
91
|
signing_key:
|
92
92
|
specification_version: 4
|
93
93
|
summary: Hive Runner Android
|