calabash-android 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11d0bc339c6953b539999891fd97b7b7a9c28ed4d3d3156532ca74e8398dc4bd
-  data.tar.gz: 22683a5d2c73e3b1b99f4bf9de5a8ab65e6a9f8ad2ca2d6c4cc7dfd29f0ee784
+  metadata.gz: 9fbc879cc380dc19b04c288fda6862a907bee38e37dc48926cccb97313731618
+  data.tar.gz: 4d2cebeba99e5008f0a8d6efa50c0dbe6e8ce290a09c4bd9588561331a0e127a
 SHA512:
-  metadata.gz: 369b3ef1b6276ef5d79e10460f9058f86e9b6e138b68f36d00105d68263c85034efec218898556a6140b38b92f9591608e1454175ac8f33ec9bdafaf52785504
-  data.tar.gz: b0523322d6d25fe58a2a6c5845966e8784c03663e41fdafc416a8dbe0b3abc7c7e8631548f98541ffbc72e4e5005972925e280f0d0afb5d7f9adbe98fc2c6f34
+  metadata.gz: bc6b9fe1cbdda7e5a646418f93096f6eb441cfcb5b7751cd96ddf78d69d9742fea1dfd7c06fd0af8c865f4c55650ada69daea01e973b30d3f9c74a61066f0730
+  data.tar.gz: 0d6f624b4ab2fd09ade749660061e53b13f2b7b38ffe43ba3a2015fc5a837e5f03cde01c9735508833175ae02955187eb5ebec365714c6ca4963a2ff5e577238

data/lib/calabash-android/environment.rb

@@ -38,6 +38,12 @@ module Calabash
         end
       end
 
+      # @!visibility private
+      # Returns true if the server / client version check can be skipped
+      def self.skip_version_check?
+        ENV["SKIP_VERSION_CHECK"] == "1"
+      end
+
       # @!visibility private
       # Returns true if debugging is enabled.
       def self.debug?

data/lib/calabash-android/java_keystore.rb

@@ -2,7 +2,7 @@ class JavaKeystore
   attr_reader :errors, :location, :keystore_alias, :password, :fingerprint
   attr_reader :signature_algorithm_name
 
-  def initialize(location, keystore_alias, password)
+  def initialize(location, keystore_alias, password, key_password = nil)
     raise "No such keystore file '#{location}'" unless File.exists?(File.expand_path(location))
     log "Reading keystore data from keystore file '#{File.expand_path(location)}'"
 
@@ -36,6 +36,7 @@ class JavaKeystore
     @location = location
     @keystore_alias = keystore_alias
     @password = password
+    @key_password = key_password
     log "Key store data:"
     log keystore_data
     @fingerprint = extract_sha1_fingerprint(keystore_data)
@@ -56,7 +57,26 @@ class JavaKeystore
     log "Signing using the signature algorithm: '#{signing_algorithm}'"
     log "Signing using the digest algorithm: '#{digest_algorithm}'"
 
-    unless system_with_stdout_on_success(Calabash::Android::Dependencies.jarsigner_path, '-sigfile', 'CERT', '-sigalg', signing_algorithm, '-digestalg', digest_algorithm, '-signedjar', dest_path, '-storepass', password, '-keystore',  location, apk_path, keystore_alias)
+    cmd_args = {
+      '-sigfile' => 'CERT',
+      '-sigalg' => signing_algorithm,
+      '-digestalg' => digest_algorithm,
+      '-signedjar' => dest_path,
+      '-storepass' => password,
+      '-keystore' =>  location,
+    }
+
+    unless @key_password.nil?
+      cmd_args['-keypass'] = @key_password
+    end
+
+    cmd_args = cmd_args.flatten
+    cmd_args << apk_path
+    cmd_args << keystore_alias
+
+    result = system_with_stdout_on_success(Calabash::Android::Dependencies.jarsigner_path, *cmd_args)
+
+    unless result
       raise "Could not sign app: #{apk_path}"
     end
   end
@@ -92,7 +112,7 @@ class JavaKeystore
   end
 
   def self.get_keystores
-    if keystore = keystore_from_settings 
+    if keystore = keystore_from_settings
       [ keystore ]
     else
       [
@@ -113,7 +133,7 @@ class JavaKeystore
       fail_if_key_missing(keystore, "keystore_alias")
       keystore["keystore_location"] = File.expand_path(keystore["keystore_location"])
       log("Keystore location specified in #{File.exist?(".calabash_settings") ? ".calabash_settings" : "calabash_settings"}.")
-      JavaKeystore.new(keystore["keystore_location"], keystore["keystore_alias"], keystore["keystore_password"])
+      JavaKeystore.new(keystore["keystore_location"], keystore["keystore_alias"], keystore["keystore_password"], keystore['key_password'])
   end
 
   def self.fail_if_key_missing(map, key)

data/lib/calabash-android/operations.rb

@@ -763,8 +763,6 @@ module Calabash module Android
           raise msg
         end
 
-        log "Checking client-server version match..."
-
         begin
           server_version = server_version()
         rescue
@@ -777,19 +775,33 @@ module Calabash module Android
 
         client_version = client_version()
 
-        unless server_version == client_version
-          msg = ["Calabash Client and Test-server version mismatch."]
-          msg << "Client version #{client_version}"
-          msg << "Test-server version #{server_version}"
-          msg << "Expected Test-server version #{client_version}"
-          msg << "\n\nSolution:\n\n"
-          msg << "Run 'reinstall_test_server' to make sure you have the correct version"
-          msg_s = msg.join("\n")
-          log(msg_s)
-          raise msg_s
-        end
+        if Calabash::Android::Environment.skip_version_check?
+          log(%Q[
+     Client version #{client_version}
+Test-server version #{server_version}
+
+])
+          $stdout.flush
+        else
+          log "Checking client-server version match..."
 
-        log("Client and server versions match (client: #{client_version}, server: #{server_version}). Proceeding...")
+          if server_version != client_version
+             raise(%Q[
+Calabash Client and Test-server version mismatch.
+
+              Client version #{client_version}
+         Test-server version #{server_version}
+Expected Test-server version #{client_version}
+
+Solution:
+
+Run 'reinstall_test_server' to make sure you have the correct version
+
+])
+          else
+            log("Client and server versions match (client: #{client_version}, server: #{server_version}). Proceeding...")
+          end
+        end
 
         block.call if block
 

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.9.4"
+    VERSION = "0.9.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-13 00:00:00.000000000 Z
+date: 2018-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber