calabash-android 0.5.8 → 0.5.9.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2972ff40ef8c48deee8114f14ef05c167eb515a
-  data.tar.gz: 2616762916d55820dd12156e65adfbc12e85c997
+  metadata.gz: 091c6d35abaadeb97ab814a723dfdc9baeb69702
+  data.tar.gz: c4d86e7ce7e2b7c101a23c66528346ea39e679bf
 SHA512:
-  metadata.gz: 796972c0f61e384a2894b1e3ac3051aa5bcd0eb3f6ef5346285d5f2804faa5e9ed5513d124dc7caaa67027ac37c833b498cfd3a4fd00facd69cbefaac3998051
-  data.tar.gz: 8a5151fca2ba0de14738a2b1551b0eed9847d185a0a71c7377b9d954100e21149fdac139de182ba17bea366332e7b41f5afccc585a922c773335816d2b58ef8e
+  metadata.gz: 3c538a2dc7c8a24887e9cb8d2e676ded1ffc7523b564e667590308000095d17d14ad1ba2e38daebe3badc0b3f54c85695f02b4627a97085752f367658bccef7d
+  data.tar.gz: c55e01a414d1ffb8e7390187e898dc1a837d9dfd7d009335c7b413cae58a2ca1988a0c14b87de1cfe63690ab23592f0f51cdcf85eb3489392f82cd110c74de87

data/features-skeleton/support/app_installation_hooks.rb

@@ -1,36 +1,28 @@
 require 'calabash-android/management/app_installation'
 
 AfterConfiguration do |config|
-	FeatureNameMemory.feature_name = nil
+  FeatureMemory.feature = nil
 end
 
 Before do |scenario|
-  @scenario_is_outline = (scenario.class == Cucumber::Ast::OutlineTable::ExampleRow)
-  if @scenario_is_outline 
-    scenario = scenario.scenario_outline 
-  end 
+  scenario = scenario.scenario_outline if scenario.respond_to?(:scenario_outline)
 
-  feature_name = scenario.feature.title
-  if FeatureNameMemory.feature_name != feature_name \
-      or ENV["RESET_BETWEEN_SCENARIOS"] == "1"
-    if ENV["RESET_BETWEEN_SCENARIOS"] == "1"
-      log "New scenario - reinstalling apps"
+  feature = scenario.feature
+  if FeatureMemory.feature != feature || ENV['RESET_BETWEEN_SCENARIOS'] == '1'
+    if ENV['RESET_BETWEEN_SCENARIOS'] == '1'
+      log 'New scenario - reinstalling apps'
     else
-      log "First scenario in feature - reinstalling apps"
+      log 'First scenario in feature - reinstalling apps'
     end
-    
+
     uninstall_apps
-    install_app(ENV["TEST_APP_PATH"])
-    install_app(ENV["APP_PATH"])
-    FeatureNameMemory.feature_name = feature_name
-	FeatureNameMemory.invocation = 1
+    install_app(ENV['TEST_APP_PATH'])
+    install_app(ENV['APP_PATH'])
+    FeatureMemory.feature = feature
+    FeatureMemory.invocation = 1
   else
-    FeatureNameMemory.invocation += 1
+    FeatureMemory.invocation += 1
   end
 end
 
-FeatureNameMemory = Class.new
-class << FeatureNameMemory
-  @feature_name = nil
-  attr_accessor :feature_name, :invocation
-end
+FeatureMemory = Struct.new(:feature, :invocation).new

data/lib/calabash-android/helpers.rb

@@ -146,14 +146,20 @@ def fingerprint_from_apk(app_path)
       FileUtils.cp(app_path, "app.apk")
       FileUtils.mkdir("META-INF")
       Zip::File.foreach("app.apk") do |z|
-        z.extract if /^META-INF\/\w+.(RSA|rsa)/ =~ z.name
+        z.extract if /^META-INF\/\w+.(rsa|dsa)/i =~ z.name
       end
-      rsa_files = Dir["#{tmp_dir}/META-INF/*"]
+      signature_files = Dir["#{tmp_dir}/META-INF/*"]
 
-      raise "No RSA file found in META-INF. Cannot proceed." if rsa_files.empty?
-      raise "More than one RSA file found in META-INF. Cannot proceed." if rsa_files.length > 1
+      log 'Signature files:'
 
-      cmd = "#{Env.keytool_path} -v -printcert -J\"-Dfile.encoding=utf-8\" -file \"#{rsa_files.first}\""
+      signature_files.each do |signature_file|
+        log signature_file
+      end
+
+      raise "No signature files found in META-INF. Cannot proceed." if signature_files.empty?
+      raise "More than one signature file (DSA or RSA) found in META-INF. Cannot proceed." if signature_files.length > 1
+
+      cmd = "#{Env.keytool_path} -v -printcert -J\"-Dfile.encoding=utf-8\" -file \"#{signature_files.first}\""
       log cmd
       fingerprints = `#{cmd}`
       md5_fingerprint = extract_md5_fingerprint(fingerprints)
@@ -169,6 +175,12 @@ def extract_md5_fingerprint(fingerprints)
   m.first
 end
 
+def extract_signature_algorithm_name(fingerprints)
+  m = fingerprints.scan(/Signature algorithm name: (.*)/).flatten
+  raise "No signature algorithm names found:\n #{fingerprints}" if m.empty?
+  m.first
+end
+
 def log(message, error = false)
   $stdout.puts "#{Time.now.strftime("%Y-%m-%d %H:%M:%S")} - #{message}" if (error or ARGV.include? "-v" or ARGV.include? "--verbose")
 end

data/lib/calabash-android/java_keystore.rb

@@ -1,5 +1,6 @@
 class JavaKeystore
   attr_reader :errors, :location, :keystore_alias, :password, :fingerprint
+  attr_reader :signature_algorithm_name
 
   def initialize(location, keystore_alias, password)
     raise "No such keystore file '#{location}'" unless File.exists?(File.expand_path(location))
@@ -38,13 +39,16 @@ class JavaKeystore
     log "Key store data:"
     log keystore_data
     @fingerprint = extract_md5_fingerprint(keystore_data)
+    @signature_algorithm_name = extract_signature_algorithm_name(keystore_data)
+    log "Fingerprint: #{fingerprint}"
+    log "Signature algorithm name: #{signature_algorithm_name}"
   end
 
   def sign_apk(apk_path, dest_path)
     raise "Cannot sign with a miss configured keystore" if errors
     raise "No such file: #{apk_path}" unless File.exists?(apk_path)
 
-    unless system_with_stdout_on_success(Env.jarsigner_path, '-sigalg', 'MD5withRSA', '-digestalg', 'SHA1', '-signedjar', dest_path, '-storepass', password, '-keystore',  location, apk_path, keystore_alias)
+    unless system_with_stdout_on_success(Env.jarsigner_path, '-sigalg', signature_algorithm_name, '-digestalg', 'SHA1', '-signedjar', dest_path, '-storepass', password, '-keystore',  location, apk_path, keystore_alias)
       raise "Could not sign app: #{apk_path}"
     end
   end

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.5.8"
+    VERSION = "0.5.9.pre1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9.pre1
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-09 00:00:00.000000000 Z
+date: 2015-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -266,9 +266,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.2