calabash-android 0.3.6 → 0.3.7

data/CHANGES.txt

@@ -1,3 +1,12 @@
+0.3.7:
+      Added calabash-android resign command
+
+      Fixed bug: No longer reuses a single result for every success result
+
+      Will give the app a few seconds to get up and running before failing
+
+      Fixed skeleton app_life_cycle_hook so screenshots are now taken before the app is shut down
+
 0.3.6:
       Will fail if the keyguard cannot be disabled when starting the app.
 

data/bin/calabash-android

@@ -79,6 +79,13 @@ elsif cmd == 'extract-manifest'
 
   puts manifest ARGV.first
   exit 0
+elsif cmd == 'resign'
+  unless File.exist? ARGV.first
+    puts "No such file #{ARGV.first}"
+    exit 1
+  end
+  resign_apk(ARGV.first)
+
 elsif cmd == 'version'
   puts Calabash::Android::VERSION
   exit 0

data/bin/calabash-android-build.rb

@@ -1,4 +1,3 @@
-require 'zip/zip'
 def calabash_build(app)
   keystore = read_keystore_info()
 
@@ -23,34 +22,16 @@ def calabash_build(app)
 
       Zip::ZipFile.new("dummy.apk").extract("AndroidManifest.xml","customAndroidManifest.xml")
       Zip::ZipFile.open("TestServer.apk") do |zip_file|
-        zip_file.add("AndroidManifest.xml", "customAndroidManifest.xml")  
+        zip_file.add("AndroidManifest.xml", "customAndroidManifest.xml")
       end
     end
-    if is_windows?
-      jarsigner_path = "\"#{ENV["JAVA_HOME"]}/bin/jarsigner.exe\""
-    else
-      jarsigner_path = "jarsigner"
-    end
+    sign_apk("#{workspace_dir}/TestServer.apk", test_server_file_name)
+    begin
 
-    cmd = "#{jarsigner_path} -sigalg MD5withRSA -digestalg SHA1 -signedjar #{test_server_file_name} -storepass #{keystore["keystore_password"]} -keystore \"#{File.expand_path keystore["keystore_location"]}\" #{workspace_dir}/TestServer.apk #{keystore["keystore_alias"]}"           
-    unless system(cmd)
-      puts "jarsigner command: #{cmd}"
+    rescue Exception => e
+      log e
       raise "Could not sign test server"
     end
   end
   puts "Done signing the test server. Moved it to #{test_server_file_name}"
-end
-
-
-def read_keystore_info
-  if File.exist? ".calabash_settings"
-    JSON.parse(IO.read(".calabash_settings"))
-  else
-    {
-    "keystore_location" => "#{ENV["HOME"]}/.android/debug.keystore",
-    "keystore_password" => "android",
-    "keystore_alias" => "androiddebugkey",
-    "keystore_alias_password" => "android"
-    }
-  end
 end

data/bin/calabash-android-helpers.rb

@@ -19,6 +19,8 @@ def print_usage
       generate a features folder structure.
     setup
       sets up a non-default keystore to use with this test project.
+    resign <apk>
+      resigns the app with the currently configured keystore.
     build <apk>
       builds the test server that will be used when testing the app.
     run <apk>

data/features-skeleton/support/app_life_cycle_hooks.rb

@@ -10,8 +10,5 @@ After do |scenario|
   if scenario.failed?
     screenshot_embed
   end
-end
-
-After do
-    shutdown_test_server
+  shutdown_test_server
 end

data/lib/calabash-android/canned_steps.md

@@ -51,6 +51,9 @@ Find the datepicker by content description and changes the date.
     Then /^I enter "([^\"]*)" into input field number (\d+)$/ do |text, number|
 Enters the specified text into the input field with index `number`.
 
+    Then /^I enter text "([^\"]*)" into field with id "([^\"]*)"$/ do |text, view_id|
+Enters Text into the input field with id `view_id`.
+
     Then /^I enter "([^\"]*)" as "([^\"]*)"$/ do |text, target|
     Then /^I enter "([^\"]*)" into "([^\"]*)"$/ do |text, target|
 Enters the specified text into the input field that has a content desciption that matches the provided target.

data/lib/calabash-android/helpers.rb

@@ -1,5 +1,7 @@
 require 'rexml/document'
 require 'rexml/xpath'
+require 'zip/zip'
+require 'tempfile'
 
 include REXML
 
@@ -10,7 +12,7 @@ def package_name(app)
   manifest = Document.new(manifest(app))
   manifest.root.attributes['package']
 end
-  
+
 def main_activity(app)
   manifest = Document.new(manifest(app))
   main_activity = manifest.elements["//action[@name='android.intent.action.MAIN']/../.."].attributes['name']
@@ -36,6 +38,53 @@ def test_server_path(apk_file_path)
   "test_servers/#{checksum(apk_file_path)}_#{Calabash::Android::VERSION}.apk"
 end
 
+def resign_apk(app_path)
+  log "Resign apk"
+  #Delete META-INF/*
+  unsigned_path = Tempfile.new('unsigned.apk').path
+  FileUtils.cp(app_path, unsigned_path)
+
+  to_remove = Zip::ZipFile.foreach(unsigned_path).find_all { |e| /^META-INF\// =~ e.name}.collect &:name
+
+  Zip::ZipFile.open(unsigned_path) do |zip_file|
+    to_remove.each do |x|
+      log "Removing #{x}"
+      zip_file.remove x
+    end
+  end
+  sign_apk(unsigned_path, app_path)
+end
+
+def sign_apk(app_path, dest_path)
+  keystore = read_keystore_info()
+
+  if is_windows?
+    jarsigner_path = "\"#{ENV["JAVA_HOME"]}/bin/jarsigner.exe\""
+  else
+    jarsigner_path = "jarsigner"
+  end
+
+  cmd = "#{jarsigner_path} -sigalg MD5withRSA -digestalg SHA1 -signedjar #{dest_path} -storepass #{keystore["keystore_password"]} -keystore \"#{File.expand_path keystore["keystore_location"]}\" #{app_path} #{keystore["keystore_alias"]}"
+  log cmd
+  unless system(cmd)
+    puts "jarsigner command: #{cmd}"
+    raise "Could not sign app (#{app_path}"
+  end
+end
+
+def read_keystore_info
+  if File.exist? ".calabash_settings"
+    JSON.parse(IO.read(".calabash_settings"))
+  else
+    {
+    "keystore_location" => "#{ENV["HOME"]}/.android/debug.keystore",
+    "keystore_password" => "android",
+    "keystore_alias" => "androiddebugkey",
+    "keystore_alias_password" => "android"
+    }
+  end
+end
+
 def is_windows?
   require 'rbconfig'
   (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)

data/lib/calabash-android/operations.rb

@@ -167,7 +167,7 @@ module Operations
     end
 
     def app_running?
-      `#{adb_command} shell ps`.include?(package_name(@app_path))
+      `#{adb_command} shell ps`.include?(ENV["PROCESS_NAME"] || package_name(@app_path))
     end
 
     def keyguard_enabled?
@@ -310,7 +310,9 @@ module Operations
       log cmd
       raise "Could not execute command to start test server" unless system("#{cmd} 2>&1")
 
-      raise "App did not start" unless app_running?
+      retriable :tries => 10, :interval => 1 do
+        raise "App did not start" unless app_running?
+      end
 
       begin
         retriable :tries => 10, :interval => 3 do

data/lib/calabash-android/steps/enter_text_steps.rb

@@ -1,4 +1,3 @@
-
 Then /^I enter "([^\"]*)" as "([^\"]*)"$/ do |text, target|
   performAction('enter_text_into_named_field', text, target)
 end
@@ -19,3 +18,6 @@ Then /^I clear input field number (\d+)$/ do |number|
   performAction('clear_numbered_field',number)
 end
 
+Then /^I enter text "([^\"]*)" into field with id "([^\"]*)"$/ do |text, view_id|
+  performAction('enter_text_into_id_field', text, view_id)
+end

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.3.6"
+    VERSION = "0.3.7"
   end
 end

data/test-server/instrumentation-backend/project.properties

@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=Google Inc.:Google APIs:15
+target=Google Inc.:Google APIs:16

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/Result.java

@@ -7,7 +7,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class Result {
-	private static Result successResult = new Result(true);
 	
     boolean success;
     String message;
@@ -62,7 +61,7 @@ public class Result {
     }
     
     public static Result successResult() {
-    	return successResult;
+    	return new Result(true);
     }
 
     public static Result failedResult() {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-28 00:00:00.000000000 Z
+date: 2012-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber