hive-runner-android 1.2.0 → 1.2.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/android.rb +14 -18
- 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: 4a44ffdc1d5702450f6a3e236f19c280ba73436a
|
4
|
+
data.tar.gz: 9a885c5656b99d70242b4ab2fbf6e1be1a588638
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f9b24dc712d3a1c052a026353658ce1103ddeb8bfd2b109e85238fc2f09cc11d5abe401ece8b10b078f818ee9386971eb1604ff5f2116a9c901eed48de1d6100
|
7
|
+
data.tar.gz: 8f35aceb05377b5dd39719295334fa77558af037d10d3ded9b48365a57fa6c336974462ea727c274786ed6f9fe7f3720ecfb9961a651c7c435ac3f1c1fe570f1
|
@@ -6,14 +6,10 @@ module Hive
|
|
6
6
|
class Controller
|
7
7
|
class Android < Controller
|
8
8
|
|
9
|
+
# Register and poll connected devices
|
9
10
|
def detect
|
10
|
-
self.detect_hive_mind
|
11
|
-
end
|
12
|
-
|
13
|
-
# Register with Hive Mind (New)
|
14
|
-
def detect_hive_mind
|
15
11
|
devices = DeviceAPI::Android.devices
|
16
|
-
Hive.logger.debug('
|
12
|
+
Hive.logger.debug('No devices attached') if devices.empty?
|
17
13
|
|
18
14
|
if not Hive.hive_mind.device_details.has_key? :error
|
19
15
|
# Selecting only android mobiles
|
@@ -22,22 +18,22 @@ module Hive
|
|
22
18
|
to_poll = []
|
23
19
|
attached_devices = []
|
24
20
|
connected_devices.each do |device|
|
25
|
-
Hive.logger.debug("
|
21
|
+
Hive.logger.debug("Device details: #{device.inspect}")
|
26
22
|
registered_device = devices.select { |a| a.serial == device['serial'] && a.status != :unauthorized && a.status != :no_permissions}
|
27
23
|
if registered_device.empty?
|
28
24
|
# A previously registered device isn't attached
|
29
|
-
Hive.logger.debug("
|
25
|
+
Hive.logger.debug("A previously registered device has disappeared: #{device}")
|
30
26
|
else
|
31
27
|
# A previously registered device is attached, poll it
|
32
|
-
Hive.logger.debug("
|
33
|
-
Hive.logger.
|
28
|
+
Hive.logger.debug("Setting #{device} to be polled")
|
29
|
+
Hive.logger.debug("Device: #{registered_device.inspect}")
|
34
30
|
begin
|
35
31
|
attached_devices << self.create_device(device.merge('os_version' => registered_device[0].version))
|
36
32
|
to_poll << device['id']
|
37
33
|
rescue DeviceAPI::DeviceNotFound => e
|
38
|
-
Hive.logger.warn("
|
34
|
+
Hive.logger.warn("Device disconnected before registration (serial: #{device['serial']})")
|
39
35
|
rescue => e
|
40
|
-
Hive.logger.warn("
|
36
|
+
Hive.logger.warn("Error with connected device: #{e.message}")
|
41
37
|
end
|
42
38
|
|
43
39
|
devices = devices - registered_device
|
@@ -45,7 +41,7 @@ module Hive
|
|
45
41
|
end
|
46
42
|
|
47
43
|
# Poll already registered devices
|
48
|
-
Hive.logger.debug("
|
44
|
+
Hive.logger.debug("Polling: #{to_poll}")
|
49
45
|
Hive.hive_mind.poll(*to_poll)
|
50
46
|
|
51
47
|
# Register new devices
|
@@ -64,17 +60,17 @@ module Hive
|
|
64
60
|
operating_system_version: device.version
|
65
61
|
)
|
66
62
|
Hive.hive_mind.connect(dev['id'])
|
67
|
-
Hive.logger.info("
|
63
|
+
Hive.logger.info("Device registered: #{dev}")
|
68
64
|
rescue DeviceAPI::DeviceNotFound => e
|
69
|
-
Hive.logger.warn("
|
65
|
+
Hive.logger.warn("Device disconnected before registration (serial: #{device.serial})")
|
70
66
|
rescue => e
|
71
|
-
Hive.logger.warn("
|
67
|
+
Hive.logger.warn("Error with connected device: #{e.message}")
|
72
68
|
end
|
73
69
|
end
|
74
70
|
|
75
71
|
else
|
76
|
-
Hive.logger.info('
|
77
|
-
Hive.logger.debug("
|
72
|
+
Hive.logger.info('No Hive Mind connection')
|
73
|
+
Hive.logger.debug("Error: #{Hive.hive_mind.device_details[:error]}")
|
78
74
|
# Hive Mind isn't available, use DeviceAPI instead
|
79
75
|
device_info = devices.select { |a| a.status != :unauthorized && a.status != :no_permissions }.map do |device|
|
80
76
|
{
|
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.2.
|
4
|
+
version: 1.2.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-04-
|
11
|
+
date: 2016-04-12 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: device_api-android
|