calabash-android 0.3.0.pre3 → 0.3.0.pre4

data/bin/calabash-android-build.rb

@@ -1,3 +1,4 @@
+require 'zip/zip'
 def calabash_build(app)
   keystore = read_keystore_info()
 
@@ -12,9 +13,12 @@ def calabash_build(app)
 
       system  %Q{ruby -pi.bak -e "gsub(/#targetPackage#/, '#{package_name(app)}')" AndroidManifest.xml}
       
-      system("aapt package -M AndroidManifest.xml  -I #{android_platform}/android.jar -F dummy.apk")
-      system("unzip -o dummy.apk AndroidManifest.xml")
-      system("zip TestServer.apk AndroidManifest.xml")
+      system("#{ENV["ANDROID_HOME"]}/platform-tools/aapt package -M AndroidManifest.xml  -I #{android_platform}/android.jar -F dummy.apk")
+
+      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")  
+      end
     end
     cmd = "jarsigner -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"]}"
     system(cmd)
@@ -22,6 +26,7 @@ def calabash_build(app)
   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"))

data/calabash-android.gemspec

@@ -19,5 +19,6 @@ Gem::Specification.new do |s|
   s.add_dependency( "json" )
   s.add_dependency( "retriable" )
   s.add_dependency( "slowhandcuke" )
+  s.add_dependency( "rubyzip" )
 
 end

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.3.0.pre3"
+    VERSION = "0.3.0.pre4"
   end
 end

data/test-server/build.xml

@@ -108,8 +108,6 @@
       <exec executable="${env.ANDROID_HOME}/platform-tools/aapt" failonerror="yes">
         <arg value="package" />
         <arg value="-f" />
-        <arg value="-M" />
-        <arg file="${staging.dir}/AndroidManifest.xml" />
         <arg value="-F" />
         <arg file="${test.app.aapt}" />
         <arg value="-I" />

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.3.0.pre3
+  version: 0.3.0.pre4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-24 00:00:00.000000000 Z
+date: 2012-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -75,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! 'calabash-android drives tests for native  and hybrid Android apps. '
 email:
 - jonas@lesspainful.com