calabash-android 0.4.16 → 0.4.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7314407709a63f7e8e463a01e2e12b5c9a697fe
-  data.tar.gz: 2d95c65ee050fec3409ccaf1ef7168bf89757290
+  metadata.gz: 2c44c0e993a7a43772eeba1e688c898e44bf09c6
+  data.tar.gz: 3dfac41109392ced77865e6b0e8853c7fa90252d
 SHA512:
-  metadata.gz: b6f1ebb7b0abff64917d9bf2db2ee0a064b4ef6ec3ec8c7b20fd9886b3914382a97277c68e88f72a9e7b7eadd281356602884c96e560cf45800d18c0e071f4ba
-  data.tar.gz: 2eb5199dafc58b36844e9198c80752e9bd517cebb89db931855afd22ff9aad993302a0471d16db42a51a10f486fab24034627d2501d9eaefbf39516c84fa3684
+  metadata.gz: fc19afcc81335aa79fd2eb45cc34c58fd0a21bc298f059ce7061a453d4ddf564c3347b0321ac7573828f6977dd9a39769d2f1463e498e484f5ef60061775c69b
+  data.tar.gz: 3879719b56b1aa587f552ff601db1f36e7576d2b7105496d08b5fbf48206f739186c53037acc28c226edd928bb9dcdef402e23f9e1aa982e6126ef0d38e1b064

data/bin/calabash-android-build.rb

@@ -3,6 +3,11 @@ def calabash_build(app)
   log "#{app} was signed with a certificate with fingerprint #{apk_fingerprint}"
 
   keystores = JavaKeystore.get_keystores
+  if keystores.empty?
+    puts "No keystores found."
+    puts "Please create one or run calabash-android setup to configure calabash-android to use an existing keystore."
+    exit 1
+  end
   keystore = keystores.find { |k| k.fingerprint == apk_fingerprint}
 
   unless keystore

data/lib/calabash-android/env.rb

@@ -78,6 +78,10 @@ class Env
     path if path && File.exists?(File.join(path, 'bin', jarsigner_executable))
   end
 
+  def self.zipalign_path
+    %Q("#{android_home_path}/tools/zipalign")
+  end
+
   def self.jarsigner_executable
     is_windows? ? 'jarsigner.exe' : 'jarsigner'
   end

data/lib/calabash-android/helpers.rb

@@ -76,14 +76,27 @@ def resign_apk(app_path)
   Dir.mktmpdir do |tmp_dir|
     log "Resign apk"
     unsigned_path = File.join(tmp_dir, 'unsigned.apk')
+    unaligned_path = File.join(tmp_dir, 'unaligned.apk')
     FileUtils.cp(app_path, unsigned_path)
+    unsign_apk(unsigned_path)
+    sign_apk(unsigned_path, unaligned_path)
+    zipalign_apk(unaligned_path, app_path)
+  end
+end
 
-    `#{Env.java_path} -jar "#{File.dirname(__FILE__)}/lib/unsign.jar" "#{unsigned_path}"`
-
-    sign_apk(unsigned_path, app_path)
+def unsign_apk(path)
+  files_to_remove = `#{Env.tools_dir}/aapt list "#{path}"`.lines.collect(&:strip).grep(/^META-INF\//)
+  if files_to_remove.empty?
+    log "App wasn't signed. Will not try to unsign it."
+  else
+    system("#{Env.tools_dir}/aapt remove \"#{path}\" #{files_to_remove.join(" ")}")
   end
 end
 
+def zipalign_apk(inpath, outpath)
+  system(%Q(#{Env.zipalign_path} -f 4 "#{inpath}" "#{outpath}"))
+end
+
 def sign_apk(app_path, dest_path)
   java_keystore = JavaKeystore.get_keystores.first
   java_keystore.sign_apk(app_path, dest_path)

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.4.16"
+    VERSION = "0.4.18"
   end
 end

data/test-server/build.xml

@@ -44,6 +44,14 @@
       <fail unless="doesCalabashJsExist">
         ${calabashjs.dir} does not exist.
       </fail>
+      <antversion property="version.running" />
+      <fail message="FATAL ERROR:  The running Ant version, ${version.running}, is too old.">
+        <condition>
+          <not>
+            <antversion atleast="1.8" />
+          </not>
+        </condition>
+      </fail>
     </target>
 
     <target name="-stage">

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.4.16
+  version: 0.4.18
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-11 00:00:00.000000000 Z
+date: 2013-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -180,7 +180,6 @@ files:
 - lib/calabash-android/lib/apktool-cli-1.5.3-SNAPSHOT.jar
 - lib/calabash-android/lib/manifest_extractor.jar
 - lib/calabash-android/lib/screenshotTaker.jar
-- lib/calabash-android/lib/unsign.jar
 - lib/calabash-android/management/adb.rb
 - lib/calabash-android/management/app_installation.rb
 - lib/calabash-android/operations.rb