calabash-android 0.3.1 → 0.3.2.pre1

data/lib/calabash-android/operations.rb

@@ -165,10 +165,6 @@ module Operations
       log `#{adb_command} uninstall #{package_name}`
     end
 
-    def shutdown_test_server
-      http("/kill")
-    end
-
     def perform_action(action, *arguments)
       log "Action: #{action} - Params: #{arguments.join(', ')}"
 
@@ -275,14 +271,10 @@ module Operations
     end
 
     def start_test_server_in_background
-      cmd = "#{adb_command} shell am instrument -w -e target_package #{ENV["PACKAGE_NAME"]} -e main_activity #{ENV["MAIN_ACTIVITY"]} -e class sh.calaba.instrumentationbackend.InstrumentationBackend sh.calaba.android.test/sh.calaba.instrumentationbackend.CalabashInstrumentationTestRunner"
+      cmd = "#{adb_command} shell am instrument -e target_package #{ENV["PACKAGE_NAME"]} -e main_activity #{ENV["MAIN_ACTIVITY"]} -e class sh.calaba.instrumentationbackend.InstrumentationBackend sh.calaba.android.test/sh.calaba.instrumentationbackend.CalabashInstrumentationTestRunner"
       log "Starting test server using:"
       log cmd
-      if is_windows?
-        system(%Q(start /MIN cmd /C #{cmd}))
-      else
-        `#{cmd} 1>&2 &`
-      end
+      raise "Could not execute command to start test server" unless system("#{cmd} 2>&1")
 
       begin
         retriable :tries => 10, :interval => 3 do
@@ -304,6 +296,10 @@ module Operations
       end
     end
 
+    def shutdown_test_server
+      http("/kill")
+    end
+
     def log(message)
       $stdout.puts "#{Time.now.strftime("%Y-%m-%d %H:%M:%S")} - #{message}" if (ARGV.include? "-v" or ARGV.include? "--verbose")
     end

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.3.1"
+    VERSION = "0.3.2.pre1"
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.3.1
-  prerelease: 
+  version: 0.3.2.pre1
+  prerelease: 6
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-10 00:00:00.000000000 Z
+date: 2012-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -701,9 +701,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.24