calabash-android 0.3.0.pre4 → 0.3.0.pre5

data/bin/calabash-android-build.rb

@@ -4,8 +4,7 @@ def calabash_build(app)
 
   test_server_file_name = test_server_path(app)
   unsigned_test_apk = File.join(File.dirname(__FILE__), '..', 'lib/calabash-android/lib/TestServer.apk')
-  android_platform = Dir["#{ENV["ANDROID_HOME"]}/platforms/android-*"].last
-
+  android_platform = Dir["#{ENV["ANDROID_HOME"].gsub("\\", "/")}/platforms/android-*"].last
   Dir.mktmpdir do |workspace_dir|
     Dir.chdir(workspace_dir) do
       FileUtils.cp(unsigned_test_apk, "TestServer.apk")

data/bin/calabash-android-run.rb

@@ -14,8 +14,13 @@ def calabash_run(app_path = nil)
 
   if app_path
     unless File.exist?(test_server_path(app_path))
-      puts "No test server found for this combination of app and calabash version. Recreating test server."
-      calabash_build(app_path)
+      if ARGV.include? "--no-build"
+        puts "No test server found for this combination of app and calabash version. Exiting!"
+        exit 1
+      else
+        puts "No test server found for this combination of app and calabash version. Recreating test server."
+        calabash_build(app_path)
+      end
     end
 
     test_server_path = test_server_path(app_path)
@@ -34,7 +39,7 @@ def calabash_run(app_path = nil)
   end
 
   STDOUT.sync = true
-  arguments = ARGV - ["--google-maps-support"]
+  arguments = ARGV - ["--google-maps-support", "--no-build"]
   cmd = "cucumber #{arguments.join(" ")} #{env}"
   puts cmd
   exit_code = system(cmd)

data/lib/calabash-android/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.3.0.pre4
+  version: 0.3.0.pre5
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000 Z
+date: 2012-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber