calabash-android 0.4.0.pre16 → 0.4.0.pre17

data/Rakefile

@@ -5,16 +5,17 @@ def build
   test_server_template_dir = File.join(File.dirname(__FILE__), 'test-server')
 
   Dir.mktmpdir do |workspace_dir|
-    
+
     @test_server_dir = File.join(workspace_dir, 'test-server')
     FileUtils.cp_r(test_server_template_dir, workspace_dir)
-    
+
     ant_executable = (is_windows? ? "ant.bat" : "ant")
     args = [
       ant_executable,
-      "clean", 
+      "clean",
       "package",
       "-Dandroid.api.level=16",
+      "-Dversion=#{Calabash::Android::VERSION}",
     ]
     Dir.chdir(@test_server_dir) do
       STDOUT.sync = true
@@ -28,38 +29,12 @@ def build
     end
 
     FileUtils.mkdir_p "test_servers" unless File.exist? "test_servers"
-    
-    FileUtils.cp(File.join(@test_server_dir, "bin", "Test_unsigned.apk"), File.join(File.dirname(__FILE__), 'lib/calabash-android/lib/TestServer.apk'))
-  end
-end
-
 
-desc "Update server version to expected server version"
-task :match_versions do
-  test_server_template_dir = File.join(File.dirname(__FILE__), 'test-server')
-
-  version_command = File.join(test_server_template_dir,
-                              "instrumentation-backend",
-                              "src",
-                              "sh",
-                              "calaba",
-                              "instrumentationbackend",
-                              "actions",
-                              "version",
-                              "Version.java" )
-
-  unless File.exist?(version_command)
-    raise "Unable to find version file at: #{version_command}"
+    FileUtils.cp(File.join(@test_server_dir, "bin", "Test_unsigned.apk"), File.join(File.dirname(__FILE__), 'lib/calabash-android/lib/TestServer.apk'))
   end
-
-  text = File.read(version_command)
-  text.gsub!(/public static final String VERSION=".*";/,%Q[public static final String VERSION="#{Calabash::Android::SERVER_VERSION}";])
-  File.open(version_command, 'w') { |f| f.write(text) }
-
 end
 
-
-task :build => :match_versions do
+task :build do
   unless File.exists? "test-server/calabash-js/src"
     puts "calabash-js not found!"
     puts "For instuctions see: https://github.com/calabash/calabash-android/wiki/Building-calabash-android"

data/bin/calabash-android

@@ -69,7 +69,7 @@ elsif cmd == 'console'
     puts "No such file #{ARGV.first}"
     exit 1
   end
-  calabash_console ARGV.first
+  calabash_console(relative_to_full_path(ARGV.shift))
   exit 0
 elsif cmd == 'setup'
   calabash_setup

data/bin/calabash-android-console.rb

@@ -23,5 +23,7 @@ def calabash_console(app_path = nil)
     ENV["TEST_APP_PATH"] = test_server_path
   end
 
+  build_test_server_if_needed(app_path)
+
   system "#{RbConfig.ruby} -S irb"
 end

data/bin/calabash-android-run.rb

@@ -13,15 +13,7 @@ def calabash_run(app_path = nil)
   end
 
   if app_path
-    unless File.exist?(test_server_path(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
+    build_test_server_if_needed(app_path)
 
     test_server_path = test_server_path(app_path)
     if ENV["TEST_SERVER_PORT"]

data/lib/calabash-android/helpers.rb

@@ -38,6 +38,19 @@ def test_server_path(apk_file_path)
   "test_servers/#{checksum(apk_file_path)}_#{Calabash::Android::VERSION}.apk"
 end
 
+
+def build_test_server_if_needed(app_path)
+  unless File.exist?(test_server_path(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
+end
+
 def resign_apk(app_path)
   Dir.mktmpdir do |tmp_dir|
     log "Resign apk"

data/lib/calabash-android/operations.rb

@@ -48,6 +48,14 @@ module Operations
     default_device.perform_action(action, *arguments)
   end
 
+  def reinstall_apps
+    default_device.reinstall_apps
+  end
+
+  def reinstall_test_server
+    default_device.reinstall_test_server
+  end
+
   def install_app(app_path)
     default_device.install_app(app_path)
   end
@@ -168,6 +176,10 @@ module Operations
     def reinstall_apps()
       uninstall_app(package_name(@app_path))
       install_app(@app_path)
+      reinstall_test_server()
+    end
+
+    def reinstall_test_server()
       uninstall_app(package_name(@test_server_path))
       install_app(@test_server_path)
     end
@@ -384,21 +396,19 @@ module Operations
       response = perform_action('version')
       unless response['success']
         msg = ["Unable to obtain Test Server version. "]
-        msg << "Please delete your test_servers"
-        msg << "and re-run calabash-android run..."
+        msg << "Please run 'reinstall_test_server' to make sure you have the correct version"
         msg_s = msg.join("\n")
         log(msg_s)
         raise msg_s
       end
-      unless response['message'] == Calabash::Android::SERVER_VERSION
+      unless response['message'] == Calabash::Android::VERSION
 
         msg = ["Calabash Client and Test-server version mismatch."]
         msg << "Client version #{Calabash::Android::VERSION}"
         msg << "Test-server version #{response['message']}"
-        msg << "Expected Test-server version #{Calabash::Android::SERVER_VERSION}"
+        msg << "Expected Test-server version #{Calabash::Android::VERSION}"
         msg << "\n\nSolution:\n\n"
-        msg << "Please delete your test_servers"
-        msg << "and re-run calabash-android run..."
+        msg << "Run 'reinstall_test_server' to make sure you have the correct version"
         msg_s = msg.join("\n")
         log(msg_s)
         raise msg_s

data/lib/calabash-android/version.rb

@@ -1,6 +1,5 @@
 module Calabash
   module Android
-    SERVER_VERSION = "0.4.0.pre16"
-    VERSION = "0.4.0.pre16"
+    VERSION = "0.4.0.pre17"
   end
 end

data/test-server/build.xml

@@ -69,6 +69,7 @@
       <copy todir="${staging.dir}/assets">
         <fileset dir="${calabashjs.dir}"/>
       </copy>
+      <replace file="${staging.dir}/src/sh/calaba/instrumentationbackend/actions/version/Version.java" token="####VERSION####" value="${version}" failOnNoReplacements="true" />
     </target>
 
 

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/version/Version.java

@@ -14,18 +14,12 @@ public class Version implements Action {
 	/******
 	 * Generate Version Number
 	 * DO NOT EDIT
-	 * 
-	 * Version number is changed by changing SERVER_VERSION
-	 * in calabash-android/version.rb
-	 * 
-	 * When doing so, this version will be copied here when
-	 * test server is built.
-	 * 
+	 *
 	 */
-	public static final String VERSION="0.4.0.pre16";
-    
+	public static final String VERSION="####VERSION####";
+
 	@Override
-    public Result execute(String... args) {                
+    public Result execute(String... args) {
         return new Result(true,VERSION);
     }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.4.0.pre16
+  version: 0.4.0.pre17
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-03 00:00:00.000000000 Z
+date: 2013-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber