calabash-android 0.2.20 → 0.2.21

data/CHANGES.txt

@@ -1,3 +1,6 @@
+0.2.21:
+      Various bug fixes related to keystore.
+
 0.2.20:
       Added click_on_view_by_description action
 

data/bin/calabash-android-build.rb

@@ -12,20 +12,20 @@ def calabash_build(app)
     FileUtils.cp_r(test_server_template_dir, workspace_dir)
     
     ant_executable = (is_windows? ? "ant.bat" : "ant")
+    args = [
+      ant_executable,
+      "clean", 
+      "package",
+      "-Dtested.package_name=#{package_name(app)}",
+      "-Dtested.main_activity=#{main_activity(app)}",
+      "-Dtested.project.apk=\"#{app}\"",
+      "-Dandroid.api.level=#{api_level}",
+      "-Dkey.store=\"#{File.expand_path keystore["keystore_location"]}\"",
+      "-Dkey.store.password=#{keystore["keystore_password"]}",
+      "-Dkey.alias=#{keystore["keystore_alias"]}",
+      "-Dkey.alias.password=#{keystore["keystore_alias_password"]}",
+    ]
     Dir.chdir(@test_server_dir) {
-      args = [
-        ant_executable,
-        "clean", 
-        "package",
-        "-Dtested.package_name=#{package_name(app)}",
-        "-Dtested.main_activity=#{main_activity(app)}",
-        "-Dtested.project.apk=\"#{app}\"",
-        "-Dandroid.api.level=#{api_level}",
-        "-Dkey.store=\"#{File.expand_path keystore["keystore_location"]}\"",
-        "-Dkey.store.password=#{keystore["keystore_password"]}",
-        "-Dkey.alias=#{keystore["keystore_alias"]}",
-        "-Dkey.alias.password=#{keystore["keystore_alias_password"]}",
-      ]
       STDOUT.sync = true
       IO.popen(args.join(" ")) do |io|
         io.each { |s| print s }

data/lib/calabash-android/operations.rb

@@ -62,6 +62,14 @@ module Operations
     default_device.screenshot(options)
   end
 
+  def set_gps_coordinates_from_location(location)
+    default_device.set_gps_coordinates_from_location(location)
+  end
+
+  def set_gps_coordinates(latitude, longitude)
+    default_device.set_gps_coordinates(latitude, longitude)
+  end
+
   def wait_for(timeout, &block)
     begin
       Timeout::timeout(timeout) do

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.2.20"
+    VERSION = "0.2.21"
   end
 end

data/test-server/build.xml

@@ -46,7 +46,7 @@
     <path id="android.target.classpath">
       <fileset dir="${env.ANDROID_HOME}/platforms/android-${android.api.level}/" includes="*.jar"/>
     </path>
-    
+
     <target name="-check.preconditions">
       <available file="${tested.project.apk}" property="tested.apk.found" />
       <fail unless="tested.apk.found" message="Tested apk: '${tested.project.apk}' could not be found"/>
@@ -177,7 +177,7 @@
 
 
     <target name ="-sign">
-      <exec executable="jarsigner">
+      <exec executable="jarsigner" failonerror="true">
         <arg value="-sigalg" />
         <arg value="MD5withRSA" />
         <arg value="-digestalg" />

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.2.20
+  version: 0.2.21
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-13 00:00:00.000000000 Z
+date: 2012-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber