calabash 2.0.0.pre9 → 2.0.0.pre10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d018a4059fbc167401a00153fe9d5dd8a7660684
-  data.tar.gz: c7d01f02885927df13058ec9417dbdad8f254fc2
+  metadata.gz: 1788f3f3e1bfd128768042749d0b7d5dbdebb8ab
+  data.tar.gz: 68d92c0989f89f7b4d4cf55a23a0daed83fa25e1
 SHA512:
-  metadata.gz: b776516069ecd91364f819286532ea841d4eb1b25ab4ed364033a7faf50f406546fd986ffbd2e64484efb9df4045911232b95c9f670a7be883c3e2cdc5633d5f
-  data.tar.gz: a973bee5a42a306303f4ac7c8304b961488e14a11f0348358fb006c6d0fb3c385c62fdbadd290a154157f202a59ae63f2e9352a6471958e8bb41708605d1648a
+  metadata.gz: f46b1426f57a039bebe2ac8e59c015f6ad2720217cb37b0e8df118614fa958a4d2cb2ec62890dee52dbb41980c5111c435567c7756ae746487bf69797ceae898
+  data.tar.gz: 5ed96dfbd5603d13ba3dbbc4a976bb7839641b74d514c178c71f0c2fe6f26f9f8e1cae7bd11b5acc6b5f1bbbf7ffd58037c95180ba0fcb3d99b5a384565061a9

data/lib/calabash/android.rb

@@ -7,6 +7,10 @@ module Calabash
     UNSIGNED_TEST_SERVER_APK = File.join(File.dirname(__FILE__), 'android', 'lib', 'TestServer.apk')
     # @!visibility private
     ANDROID_MANIFEST_PATH = File.join(File.dirname(__FILE__), 'android', 'lib', 'AndroidManifest.xml')
+    # @!visibility private
+    HELPER_APPLICATION = File.join(File.dirname(__FILE__), 'android', 'lib', 'HelperApplication.apk')
+    # @!visibility private
+    HELPER_APPLICATION_TEST_SERVER = File.join(File.dirname(__FILE__), 'android', 'lib', 'HelperApplicationTestServer.apk')
 
     require 'calabash'
     include Calabash

data/lib/calabash/android/device.rb

@@ -66,22 +66,22 @@ module Calabash
 
       # @!visibility private
       def installed_packages
-        adb.shell('pm list packages').lines.map do |line|
-          line.sub('package:', '').chomp
-        end
+        installed_apps.map{|e| e[:package]}
       end
 
       # @!visibility private
       def installed_apps
-        adb.shell('pm list packages -f').lines.map do |line|
-          # line will be package:<path>=<package>
-          # e.g. "package:/system/app/GoogleEars.apk=com.google.android.ears"
-          info = line.sub("package:", "")
+        @installed_apps_cache ||= lambda do
+          adb.shell('pm list packages -f').lines.map do |line|
+            # line will be package:<path>=<package>
+            # e.g. "package:/system/app/GoogleEars.apk=com.google.android.ears"
+            info = line.sub("package:", "")
 
-          app_path, app_id = info.split('=').map(&:chomp)
+            app_path, app_id = info.split('=').map(&:chomp)
 
-          {package: app_id, path: app_path}
-        end
+            {package: app_id, path: app_path}
+          end
+        end.call
       end
 
       # @!visibility private
@@ -420,25 +420,71 @@ module Calabash
         adb.shell(cmd, no_exit_code_check: true).chomp == file
       end
 
+      def file_exists?(file)
+        ensure_helper_application_started
+
+        request = HTTP::Request.new('file-exists', params_for_request(fileName: file))
+        response = helper_application_http_client.post(request)
+
+        if response.status != 200
+          result = JSON.parse(response.body)
+          raise "Failed to find out if file exists #{result['reason']}"
+        end
+
+        case response.body
+          when 'true'
+            return true
+          when 'false'
+            return false
+          else
+            raise "Invalid resposne '#{response.body}'"
+        end
+      end
+
+      def read_file(file)
+        ensure_helper_application_started
+
+        request = HTTP::Request.new('read-file', params_for_request(fileName: file))
+        response = helper_application_http_client.post(request)
+
+        if response.status != 200
+          result = JSON.parse(response.body)
+          raise "Failed to read file. Reason: #{result['reason']}"
+        end
+
+        response.body
+      end
+
       def calabash_server_failure_exists?(application)
-        adb_file_exists?(calabash_server_failure_file_path(application))
+        file_exists?(calabash_server_failure_file_path(application))
       end
 
       def calabash_server_finished_exists?(application)
-        adb_file_exists?(calabash_server_finished_file_path(application))
+        file_exists?(calabash_server_finished_file_path(application))
       end
 
       def read_calabash_sever_failure(application)
-        adb.shell("cat #{calabash_server_failure_file_path(application)}")
+        read_file(calabash_server_failure_file_path(application))
       end
 
       def read_calabash_sever_finished(application)
-        adb.shell("cat #{calabash_server_finished_file_path(application)}")
+        read_file(calabash_server_finished_file_path(application))
       end
 
       def clear_calabash_server_report(application)
         if installed_packages.include?(application.test_server.identifier)
-          adb.shell("am start -e method clear -n #{application.test_server.identifier}/sh.calaba.instrumentationbackend.StatusReporterActivity")
+          parameters =
+              {
+                  packageName: application.test_server.identifier,
+                  className: 'sh.calaba.instrumentationbackend.StatusReporterActivity',
+                  extras:
+                      {
+                          method: 'clear'
+                      }
+              }
+
+          ensure_helper_application_started
+          start_activity(parameters)
         end
       end
 
@@ -450,7 +496,6 @@ module Calabash
         end
 
         env_options[:test_server_port] = server.test_server_port
-        env_options[:target_package] = application.identifier
 
         env_options[:class] = options.fetch(:class, 'sh.calaba.instrumentationbackend.InstrumentationBackend')
 
@@ -486,9 +531,6 @@ module Calabash
 
         ensure_screen_on
 
-        # Clear any old error reports
-        clear_calabash_server_report(application)
-
         # We have to forward the port ourselves, as an old test-server could be
         # running on the old port. If the retriable client was able to
         # determine if the port had been forwarded, we would not need this.
@@ -508,6 +550,9 @@ module Calabash
           end
         end
 
+        # Clear any old error reports
+        clear_calabash_server_report(application)
+
         extras = ''
 
         env_options.each_pair do |key, val|
@@ -515,7 +560,7 @@ module Calabash
         end
 
         begin
-          instrument(application,
+          adb_instrument(application,
                      'sh.calaba.instrumentationbackend.CalabashInstrumentationTestRunner',
                      extras)
         rescue ADB::ADBCallError => e
@@ -553,10 +598,26 @@ module Calabash
           raise 'Test-server was never ready'
         end
 
+        start_application(options[:intent])
+
         # Return true to avoid cluttering the console
         true
       end
 
+      # @!visibility private
+      def start_application(intent)
+        request = HTTP::Request.new('start-application', params_for_request(intent: intent))
+        body = http_client.post(request).body
+
+        result = JSON.parse(body)
+
+        if result['outcome'] != 'SUCCESS'
+          raise "Failed to start application. Reason: #{result['reason']}"
+        end
+
+        result['result']
+      end
+
       # @!visibility private
       def _stop_app
         Retriable.retriable(tries: 5, interval: 1) do
@@ -605,7 +666,7 @@ module Calabash
       end
 
       # @!visibility private
-      def instrument(application, test_server_activity, extras = '')
+      def adb_instrument(application, test_server_activity, extras = '')
         unless application.is_a?(Android::Application)
           raise ArgumentError, "Invalid application type '#{application.class}'"
         end
@@ -633,11 +694,45 @@ module Calabash
       class EnsureInstrumentActionError < RuntimeError; end
 
       # @!visibility private
-      def ensure_instrument_action(application, test_server_activity, extras = '')
+      def ensure_adb_instrument_action(application, test_server_activity, extras = '')
+        clear_calabash_server_report(application)
+
+        begin
+          adb_instrument(application, test_server_activity, extras)
+        rescue ADB::ADBCallError => e
+          raise EnsureInstrumentActionError, e
+        end
+
+        begin
+          Timeout.timeout(10) do
+            loop do
+              if calabash_server_failure_exists?(application)
+                failure_message = read_calabash_sever_failure(application)
+
+                raise EnsureInstrumentActionError, parse_failure_message(failure_message)
+              end
+
+              if calabash_server_finished_exists?(application)
+                output = read_calabash_sever_finished(application)
+
+                if output == 'SUCCESSFUL'
+                  break
+                end
+              end
+            end
+          end
+        rescue Timeout::Error => _
+          raise EnsureInstrumentActionError, 'Timed out waiting for status'
+        end
+      end
+
+      # @!visibility private
+      def ensure_instrument_action(application, parameters)
+        ensure_helper_application_started
         clear_calabash_server_report(application)
 
         begin
-          instrument(application, test_server_activity, extras)
+          instrument(parameters)
         rescue ADB::ADBCallError => e
           raise EnsureInstrumentActionError, e
         end
@@ -667,8 +762,14 @@ module Calabash
 
       # @!visibility private
       def ts_clear_app_data(application)
+        parameters =
+            {
+                className: 'sh.calaba.instrumentationbackend.ClearAppData2',
+                packageName: application.test_server.identifier,
+            }
+
         begin
-          ensure_instrument_action(application, 'sh.calaba.instrumentationbackend.ClearAppData2')
+          ensure_instrument_action(application, parameters)
         rescue EnsureInstrumentActionError => e
           raise "Failed to clear app data: #{e.message}"
         end
@@ -914,6 +1015,7 @@ module Calabash
 
       # @!visibility private
       def adb_uninstall_app(package)
+        @installed_apps_cache = nil
         @logger.log "Uninstalling #{package}"
         result = adb.command('uninstall', package, timeout: 60).lines.last
 
@@ -928,6 +1030,7 @@ module Calabash
 
       # @!visibility private
       def adb_install_app(application)
+        @installed_apps_cache = nil
         # Because of a bug in the latest version of ADB
         # https://github.com/android/platform_system_core/blob/0f91887868e51de67bdf9aedc97fbcb044dc1969/adb/commandline.cpp#L1466
         # ADB now uses rm -f ... to remove the temporary application on the
@@ -1024,6 +1127,92 @@ module Calabash
         end
       end
 
+      class InstrumentationError < RuntimeError; end
+
+      def instrument(parameters, http_client = helper_application_http_client)
+        request = HTTP::Request.new('instrument', params_for_request(parameters))
+
+        body = http_client.post(request).body
+        result = JSON.parse(body)
+
+        if result['outcome'] != 'SUCCESS'
+          raise InstrumentationError, "Failed to instrument. Reason: #{result['reason']}"
+        end
+
+        true
+      end
+
+      class StartActivityError < RuntimeError; end
+
+      def start_activity(parameters, http_client = helper_application_http_client)
+        request = HTTP::Request.new('start-activity', params_for_request(parameters))
+
+        body = http_client.post(request).body
+        result = JSON.parse(body)
+
+        if result['outcome'] != 'SUCCESS'
+          raise StartActivityError, "Failed to start activity. Reason: #{result['reason']}"
+        end
+
+        true
+      end
+
+      def ensure_helper_application_started
+        unless $_calabash_helper_application_started
+          install_helper_application
+          start_helper_application
+          $_calabash_helper_application_started = true
+        end
+      end
+
+      def helper_application
+        Calabash::Android::Application.new(Calabash::Android::HELPER_APPLICATION,
+                                           Calabash::Android::HELPER_APPLICATION_TEST_SERVER)
+      end
+
+      def helper_application_http_client
+        @helper_application_http_client ||= Calabash::HTTP::ForwardingClient.new(http_client, 8451)
+      end
+
+      # @!visibility private
+      def install_helper_application
+        begin
+          @logger.log "Ensuring helper application is installed"
+          ensure_app_installed(helper_application)
+        rescue => e
+          @logger.log("Unable to install helper application!", :error)
+          raise e
+        end
+
+        $_calabash_helper_application_installed = true
+      end
+
+      # @!visibility private
+      def has_installed_helper_application?
+        $_calabash_helper_application_installed
+      end
+
+      # @!visibility private
+      def helper_application_responding?
+        begin
+          helper_application_http_client.post(HTTP::Request.new('ping'), retries: 1).body == 'pong'
+        rescue HTTP::Error => _
+          false
+        end
+      end
+
+      def start_helper_application
+        extras = "-e test_server_port 8451"
+        name = "#{helper_application.test_server.identifier}/sh.calaba.instrumentationbackend.CalabashInstrumentationTestRunner"
+        cmd = "am instrument #{extras} #{name}"
+        Logger.debug("Starting global helper application using #{cmd}")
+        adb.shell(cmd)
+
+        cmd = "am start -e port #{server.test_server_port} -e testServerPort 0 -n #{helper_application.identifier}/.MainActivity"
+        Logger.debug("Starting helper application using #{cmd}")
+        adb.shell(cmd)
+      end
+
       # @!visibility private
       def params_for_request(parameters)
         {json: parameters.to_json}
@@ -1036,6 +1225,9 @@ module Calabash
         else
           if adb.shell('md5', no_exit_code_check: true).chomp == 'md5 file ...'
             @md5_binary = 'md5'
+          elsif (r = adb.shell('md5sum _cal_no_such_file', no_exit_code_check: true)) && r.chomp.start_with?('md5sum:') &&
+              !r.include?('permission denied')
+            @md5_binary = 'md5sum'
           else
             # The device does not have 'md5'
             calmd5 = Calabash::Android.binary_location('calmd5', info[:cpu_architecture], can_handle_pie_binaries?)

data/lib/calabash/android/server.rb

@@ -7,6 +7,11 @@ module Calabash
         endpoint = Environment::DEVICE_ENDPOINT
         Server.new(endpoint, 7102)
       end
+
+      def self.default_helper
+        endpoint = Environment::DEVICE_HELPER_ENDPOINT
+        Server.new(endpoint, 8102)
+      end
     end
   end
 end

data/lib/calabash/http.rb

@@ -2,6 +2,7 @@ module Calabash
   # @!visibility private
   module HTTP
     require 'calabash/http/retriable_client'
+    require 'calabash/http/forwarding_client'
     require 'calabash/http/request'
     require 'calabash/http/error'
   end

data/lib/calabash/http/forwarding_client.rb

@@ -0,0 +1,23 @@
+module Calabash
+  module HTTP
+    class ForwardingClient
+      HEADER_FORWARD = 'X-FORWARD-PORT'
+      ROUTES = [:get, :post, :put, :delete]
+
+      def initialize(client, forward_to_port)
+        @client = client
+        @forward_to_port = forward_to_port
+      end
+
+      ROUTES.each do |route|
+        define_method(route) do |request, options = {}|
+          new_options = options.clone
+          new_options[:header] ||= {}
+          new_options[:header][HEADER_FORWARD] = @forward_to_port.to_s
+
+          @client.send(route, request, new_options)
+        end
+      end
+    end
+  end
+end

data/lib/calabash/http/retriable_client.rb

@@ -33,6 +33,9 @@ module Calabash
                   'Content-Type' => 'application/json;charset=utf-8'
             }
 
+      # @!visibility private
+      attr_accessor :port_forward
+
       # Creates a new retriable client.
       #
       # This initializer takes multiple options.  If the option is not
@@ -107,7 +110,7 @@ module Calabash
         retries = options.fetch(:retries, @retries)
         timeout = options.fetch(:timeout, @timeout)
         interval = options.fetch(:interval, @interval)
-        header = options.fetch(:header, HEADER)
+        header = HEADER.merge(options.fetch(:header, {}))
 
         @logger.log "Getting: #{@server.endpoint + request.route} #{options}"
 

data/lib/calabash/version.rb

@@ -1,5 +1,5 @@
 module Calabash
 
   # @!visibility private
-  VERSION = "2.0.0.pre9"
+  VERSION = "2.0.0.pre10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre9
+  version: 2.0.0.pre10
 platform: ruby
 authors:
 - Jonas Maturana Larsen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: edn
@@ -392,6 +392,8 @@ files:
 - lib/calabash/android/legacy.rb
 - lib/calabash/android/lib/.irbrc
 - lib/calabash/android/lib/AndroidManifest.xml
+- lib/calabash/android/lib/HelperApplication.apk
+- lib/calabash/android/lib/HelperApplicationTestServer.apk
 - lib/calabash/android/lib/TestServer.apk
 - lib/calabash/android/lib/calmd5/arm64-v8a/calmd5
 - lib/calabash/android/lib/calmd5/arm64-v8a/calmd5-pie
@@ -432,6 +434,7 @@ files:
 - lib/calabash/gestures.rb
 - lib/calabash/http.rb
 - lib/calabash/http/error.rb
+- lib/calabash/http/forwarding_client.rb
 - lib/calabash/http/request.rb
 - lib/calabash/http/retriable_client.rb
 - lib/calabash/interactions.rb