calabash-android 0.4.2 → 0.4.3.pre1

data/bin/calabash-android-build.rb

@@ -22,6 +22,10 @@ def calabash_build(app)
         raise "Could not replace package name in manifest"
       end
 
+       unless system %Q{"#{RbConfig.ruby}" -pi.bak -e "gsub(/#testPackage#/, '#{package_name(app)}.test')" AndroidManifest.xml}
+        raise "Could not replace test package name in manifest"
+      end
+
       unless system %Q{"#{ENV["ANDROID_HOME"]}/platform-tools/aapt" package -M AndroidManifest.xml  -I "#{android_platform}/android.jar" -F dummy.apk}
         raise "Could not create dummy.apk"
       end

data/bin/calabash-android-console.rb

@@ -7,10 +7,6 @@ def calabash_console(app_path = nil)
 
   ENV["IRBRC"] = File.join(File.dirname(__FILE__), '..', 'irbrc')
 
-  unless ENV["PACKAGE_NAME"]
-    ENV["PACKAGE_NAME"] = package_name(app_path)
-  end
-
   unless ENV["MAIN_ACTIVITY"]
     ENV["MAIN_ACTIVITY"] = main_activity(app_path)
   end

data/bin/calabash-android-run.rb

@@ -21,8 +21,7 @@ def calabash_run(app_path = nil)
     else
       test_server_port = "34777"
     end
-    env = "PACKAGE_NAME=#{package_name(app_path)} "\
-          "MAIN_ACTIVITY=#{main_activity(app_path)} "\
+    env = "MAIN_ACTIVITY=#{main_activity(app_path)} "\
           "APP_PATH=\"#{app_path}\" "\
           "TEST_APP_PATH=\"#{test_server_path}\" "\
           "TEST_SERVER_PORT=#{test_server_port}"

data/lib/calabash-android/operations.rb

@@ -59,8 +59,8 @@ module Operations
   end
 
   def uninstall_apps
-    default_device.uninstall_app("sh.calaba.android.test")
-    default_device.uninstall_app(ENV["PACKAGE_NAME"])
+    default_device.uninstall_app(package_name(default_device.test_server_path))
+    default_device.uninstall_app(package_name(default_device.app_path))
   end
 
   def wake_up
@@ -148,15 +148,18 @@ module Operations
   end
 
   class Device
+    attr_reader :app_path, :test_server_path, :serial, :server_port, :test_server_port
+
+    def initialize(cucumber_world, serial, server_port, app_path, test_server_path, test_server_port = 7102)
 
-    def initialize(cucumber_world, serial, server_port, app_path, test_server_path)
       @cucumber_world = cucumber_world
       @serial = serial
       @server_port = server_port
       @app_path = app_path
       @test_server_path = test_server_path
+      @test_server_port = test_server_port
 
-      forward_cmd = "#{adb_command} forward tcp:#{server_port} tcp:7102"
+      forward_cmd = "#{adb_command} forward tcp:#{@server_port} tcp:#{@test_server_port}"
       log forward_cmd
       log `#{forward_cmd}`
     end
@@ -316,8 +319,10 @@ module Operations
         wake_up
       end
 
+      puts "app_path: #{@app_path}"
       env_options = {:target_package => options[:target_package] || package_name(@app_path),
                      :main_activity => options[:main_activity] || main_activity(@app_path),
+                     :test_server_port => @test_server_port,
                      :debug => options[:debug] || false,
                      :class => options[:class] || "sh.calaba.instrumentationbackend.InstrumentationBackend"}
 
@@ -329,7 +334,7 @@ module Operations
         cmd_arr << val.to_s
       end
 
-      cmd_arr << "sh.calaba.android.test/sh.calaba.instrumentationbackend.CalabashInstrumentationTestRunner"
+      cmd_arr << "#{package_name(@test_server_path)}/sh.calaba.instrumentationbackend.CalabashInstrumentationTestRunner"
 
       cmd = cmd_arr.join(" ")
 

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.4.2"
+    VERSION = "0.4.3.pre1"
   end
 end

data/test-server/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="sh.calaba.android.test"
+      package="#testPackage#"
       android:versionCode="3"
       android:versionName="0.3.0">
     <application android:label="instrumentation_backend">

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/CalabashInstrumentationTestRunner.java

@@ -21,7 +21,7 @@ public class CalabashInstrumentationTestRunner extends InstrumentationTestRunner
 		}
 
         // Start the HttpServer as soon as possible in a not-ready state
-        HttpServer.instantiate();
+        HttpServer.instantiate(Integer.parseInt(arguments.getString("test_server_port")));
 
         InstrumentationBackend.testPackage = arguments.getString("target_package");
 

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

@@ -42,20 +42,14 @@ public class HttpServer extends NanoHTTPD {
 	 * 
 	 * Can only be called once. Otherwise, you'll get an IllegalStateException.
 	 */
-	public synchronized static HttpServer instantiate() {
+	public synchronized static HttpServer instantiate(int testServerPort) {
 		if (instance != null) {
 			throw new IllegalStateException("Can only instantiate once!");
 		}
-		instance = new HttpServer();
+		instance = new HttpServer(testServerPort);
 		return instance;
 	}
 
-	/**
-	 * Returns the singleton instance for HttpServer.
-	 * 
-	 * If {@link #instantiate()} hasn't already been called, an
-	 * IllegalStateException is thrown.
-	 */
 	public synchronized static HttpServer getInstance() {
 		if (instance == null) {
 			throw new IllegalStateException("Must be initialized!");
@@ -63,8 +57,8 @@ public class HttpServer extends NanoHTTPD {
 		return instance;
 	}
 
-	private HttpServer() {
-		super(7102, new File("/"));
+	private HttpServer(int testServerPort) {
+		super(testServerPort, new File("/"));
 	}
 
 	@SuppressWarnings("rawtypes")

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.4.2
-  prerelease: 
+  version: 0.4.3.pre1
+  prerelease: 6
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2013-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -844,9 +844,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23