calabash-android 0.2.0.pre3 → 0.2.0.pre4

data/CHANGES.txt

@@ -1,3 +1,6 @@
+0.2.0.pre4:
+      It is no longer needed to do the separate build step.
+      If no test server is found calabash-android will now attempt build it.
 0.2.0.pre3:
       Reintroduced lib/calabash-android/management/app_installation.rb
       to stay backwards compatible with generated skeletons.

data/bin/calabash-android

@@ -42,7 +42,7 @@ elsif cmd == 'run'
   if ARGV.empty? or not is_apk_file?(ARGV.first)
     calabash_run(nil, ARGV)
   else
-    calabash_run(ARGV.shift)
+    calabash_run(relative_to_full_path(ARGV.shift))
   end
   exit 0
 elsif cmd == 'gen'

data/bin/calabash-android-build.rb

@@ -36,10 +36,12 @@ def calabash_build(app)
       end
     }
 
+    FileUtils.mkdir_p "test_servers" unless File.exist? "test_servers"
+
     test_apk = File.join(@test_server_dir, "bin", "Test.apk")
-    test_server_file_name = "#{checksum(app)}.apk"
-    FileUtils.cp(test_apk, File.join(@support_dir, test_server_file_name))
-    puts "Done building the test server. Moved it to features/support/#{test_server_file_name}"
+    test_server_file_name = test_server_path(app)
+    FileUtils.cp(test_apk, test_server_file_name)
+    puts "Done building the test server. Moved it to #{test_server_file_name}"
   end
 end
 

data/bin/calabash-android-run.rb

@@ -12,8 +12,15 @@ def calabash_run(app_path)
     exit
   end
 
+
+  unless File.exist?(test_server_path(app_path))
+    puts "No test server found for this combination of app and calabash version. Rebuilding test server."
+    calabash_build(app_path)
+  end
+
+
   if app_path
-    test_server_path = "features/support/#{checksum(app_path)}.apk"
+    test_server_path = test_server_path(app_path)
     env = "PACKAGE_NAME=#{package_name(app_path)} "\
           "TEST_PACKAGE_NAME=#{package_name(test_server_path)} "\
           "APP_PATH=#{app_path} "\

data/lib/calabash-android/helpers.rb

@@ -51,4 +51,8 @@ def checksum(file_path)
   Digest::MD5.hexdigest(File.read(file_path))
 end
 
+def test_server_path(apk_file_path)
+  "test_servers/#{checksum(apk_file_path)}_#{Calabash::Android::VERSION}.apk"
+end
+
 

data/lib/calabash-android/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Android
-    VERSION = "0.2.0.pre3"
-    FRAMEWORK_VERSION = "0.2.0.pre3"
+    VERSION = "0.2.0.pre4"
+    FRAMEWORK_VERSION = "0.2.0.pre4"
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: calabash-android
 version: !ruby/object:Gem::Version 
-  hash: 2063487833
+  hash: -4038335878
   prerelease: 6
   segments: 
   - 0
   - 2
   - 0
   - pre
-  - 3
-  version: 0.2.0.pre3
+  - 4
+  version: 0.2.0.pre4
 platform: ruby
 authors: 
 - Jonas Maturana Larsen