calabash-android 0.4.12 → 0.4.13
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/lib/calabash-android/java_keystore.rb +6 -3
- data/lib/calabash-android/lib/TestServer.apk +0 -0
- data/lib/calabash-android/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: c222410c283ad02acca304120862c3a0957dff68
|
|
4
|
+
data.tar.gz: 8328231a62c71901948ba5e21de3a6244c640991
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 7a716e4ffe3b7969eba54d857c5a4b20aac49150a2dc5a008f72e7fdce2efd604d0a3f9c1fb5a38454cf402017cda3714d946a6ed68254c45783631069382213
|
|
7
|
+
data.tar.gz: 73d956ee72f791979f8a4f6b11748abf68e7e6cb7f9e14bfe3ccd315891454d8554993ed40553e333874091a68f1821bf12911bc89d46058c17166dde31088e7
|
data/Gemfile.lock
CHANGED
|
@@ -4,15 +4,18 @@ class JavaKeystore
|
|
|
4
4
|
raise "No such file #{location}" unless File.exists?(File.expand_path(location))
|
|
5
5
|
|
|
6
6
|
keystore_data = system_with_stdout_on_success(Env.keytool_path, '-list', '-v', '-alias', keystore_alias, '-keystore', location, '-storepass', password)
|
|
7
|
-
|
|
7
|
+
if keystore_data.nil?
|
|
8
8
|
error = "Could not list certificates in keystore. Probably because the password was incorrect."
|
|
9
9
|
@errors = [{:message => error}]
|
|
10
10
|
log error
|
|
11
|
+
raise error
|
|
11
12
|
#TODO: Handle the case where password is correct but the alias is missing.
|
|
12
13
|
end
|
|
13
14
|
@location = location
|
|
14
15
|
@keystore_alias = keystore_alias
|
|
15
16
|
@password = password
|
|
17
|
+
log "Key store data:"
|
|
18
|
+
log keystore_data
|
|
16
19
|
@fingerprint = extract_md5_fingerprint(keystore_data)
|
|
17
20
|
end
|
|
18
21
|
|
|
@@ -56,7 +59,7 @@ class JavaKeystore
|
|
|
56
59
|
|
|
57
60
|
def self.get_keystores
|
|
58
61
|
if keystore = keystore_from_settings
|
|
59
|
-
keystore
|
|
62
|
+
[ keystore ]
|
|
60
63
|
else
|
|
61
64
|
[
|
|
62
65
|
read_keystore_with_default_password_and_alias(File.join(ENV["HOME"], "/.android/debug.keystore")),
|
|
@@ -78,7 +81,7 @@ class JavaKeystore
|
|
|
78
81
|
JavaKeystore.new(keystore["keystore_location"], keystore["keystore_alias"], keystore["keystore_password"])
|
|
79
82
|
end
|
|
80
83
|
|
|
81
|
-
def fail_if_key_missing(map, key)
|
|
84
|
+
def self.fail_if_key_missing(map, key)
|
|
82
85
|
raise "Found .calabash_settings but no #{key} defined." unless map[key]
|
|
83
86
|
end
|
|
84
87
|
|
|
Binary file
|