calabash-android 0.2.7 → 0.2.8

data/CHANGES.txt

@@ -1,3 +1,11 @@
+0.2.8:
+      Added /screenshot to test server.
+      Calabash will now kill the test server at exit.
+      Test server is now compiled with the debug flag which means better
+      stacktraces.
+
+      Bug fixes.
+
 0.2.7:
       Fixed path on Windows - Really!
 

data/features-skeleton/support/app_installation_hooks.rb

@@ -17,11 +17,12 @@ Before do |scenario|
 end
 
 at_exit do
-#	uninstall_apps
+  require 'net/http'
+  Net::HTTP.get(URI.parse("http://127.0.0.1:34777/kill"))
 end
 
 FeatureNameMemory = Class.new
 class << FeatureNameMemory
   @feature_name = nil
   attr_accessor :feature_name
-end
+end

data/lib/calabash-android/operations.rb

@@ -116,17 +116,6 @@ module Operations
 
       puts "#{adb_command} forward tcp:b#{server_port} tcp:7102"
       log `#{adb_command} forward tcp:#{server_port} tcp:7102`
-=begin
-      begin
-        Timeout::timeout(15) do
-          puts http("/ping")           
-        end
-      rescue Timeout::Error
-        msg = "Unable to make connection to Calabash Test Server at http://127.0.0.1:#{@server_port}/\n"
-        msg << "Please check the logcat output for more info about what happened\n"
-        raise msg
-      end
-=end
     end
 
     def reinstall_apps()
@@ -245,6 +234,16 @@ module Operations
       else
         `#{cmd} 1>&2 &`
       end
+
+      begin
+        Timeout::timeout(15) do
+          puts http("/ping")
+        end
+      rescue Timeout::Error
+        msg = "Unable to make connection to Calabash Test Server at http://127.0.0.1:#{@server_port}/\n"
+        msg << "Please check the logcat output for more info about what happened\n"
+        raise msg
+      end
     end
 
     def log(message)

data/lib/calabash-android/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Android
-    VERSION = "0.2.7"
-    FRAMEWORK_VERSION = "0.2.7"
+    VERSION = "0.2.8"
+    FRAMEWORK_VERSION = "0.2.8"
   end
 end

data/test-server/build.xml

@@ -112,6 +112,7 @@
 	       verbose="${verbose}"
          source="1.6"
          target="1.6"
+         debug="true"
 	       bootclasspathref="android.target.classpath"
 	       classpath="${extensible.classpath}"
 	       classpathref="jar.libs.ref">

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

@@ -1,9 +1,14 @@
 package sh.calaba.instrumentationbackend.actions;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.util.Properties;
 
+import android.graphics.Bitmap;
+import android.view.View;
 import sh.calaba.instrumentationbackend.Command;
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
 import sh.calaba.instrumentationbackend.Result;
 import sh.calaba.org.codehaus.jackson.map.DeserializationConfig.Feature;
 import sh.calaba.org.codehaus.jackson.map.ObjectMapper;
@@ -13,25 +18,34 @@ public class HttpServer extends NanoHTTPD {
 	private static final String TAG = "IntrumentationBackend";
 	private boolean running = true;
 	
-	private ObjectMapper mapper;
+	private final ObjectMapper mapper = createJsonMapper();
 
 	public HttpServer() {
 		super(7102, new File("/"));
-
-		mapper = createJsonMapper();
 	}
 
 	public Response serve( String uri, String method, Properties header, Properties params, Properties files )
 	{
 		System.out.println("URI: " + uri);
-		if ("/ping".equals(uri)) {
+		if (uri.endsWith("/ping")) {
 			return new NanoHTTPD.Response( HTTP_OK, MIME_HTML, "pong");
-		} else if ("/kill".equals(uri)) {
+		} else if (uri.endsWith("/kill")) {
 			running = false;
 			System.out.println("Stopping test server");
 			stop();
 			return new NanoHTTPD.Response( HTTP_OK, MIME_HTML, "Affirmative!");
-		}
+
+		} else if (uri.endsWith("/screenshot")) {
+            Bitmap bitmap;
+            View v1 = InstrumentationBackend.solo.getViews().get(0).getRootView();
+            v1.setDrawingCacheEnabled(true);
+            bitmap = Bitmap.createBitmap(v1.getDrawingCache());
+            v1.setDrawingCacheEnabled(false);
+
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            bitmap.compress(Bitmap.CompressFormat.PNG, 90, out);
+            return new NanoHTTPD.Response( HTTP_OK, "image/png", new ByteArrayInputStream(out.toByteArray()));
+        }
 		
 		String commandString = params.getProperty("command");
 		System.out.println("command: "+ commandString);

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: calabash-android
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 2
-  - 7
-  version: 0.2.7
+  - 8
+  version: 0.2.8
 platform: ruby
 authors: 
 - Jonas Maturana Larsen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-06 00:00:00 +02:00
+date: 2012-08-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency