calabash 2.0.0.pre10 → 2.0.0.pre11

data/lib/calabash/android/device.rb

@@ -5,6 +5,10 @@ module Calabash
     # A representation of a Calabash Android device.
     # @!visibility private
     class Device < ::Calabash::Device
+      require 'calabash/android/device/helper_application'
+
+      include Calabash::Android::Device::HelperApplication
+
       attr_reader :adb
 
       def initialize(identifier, server)
@@ -475,12 +479,16 @@ module Calabash
         if installed_packages.include?(application.test_server.identifier)
           parameters =
               {
-                  packageName: application.test_server.identifier,
-                  className: 'sh.calaba.instrumentationbackend.StatusReporterActivity',
-                  extras:
-                      {
+                  intent: {
+                      flags: 0x10000000,
+                      component: {
+                          packageName: application.test_server.identifier,
+                          className: 'sh.calaba.instrumentationbackend.StatusReporterActivity',
+                      },
+                      extras: {
                           method: 'clear'
                       }
+                  }
               }
 
           ensure_helper_application_started
@@ -568,7 +576,7 @@ module Calabash
         end
 
         begin
-          Retriable.retriable(tries: 30, interval: 1, timeout: 30, on: RetryError) do
+          Calabash::Retry.retry(retries: 30, interval: 1, timeout: 30, on_errors: [RetryError]) do
             unless test_server_responding?
               # Read any message the test-server might have
               if calabash_server_failure_exists?(application)
@@ -587,7 +595,7 @@ module Calabash
         end
 
         begin
-          Retriable.retriable(tries: 10, interval: 1, timeout: 10) do
+          Calabash::Retry.retry(retries: 10, interval: 1, timeout: 10, on_errors: [RetryError]) do
             unless test_server_ready?
               raise RetryError
             end
@@ -620,7 +628,7 @@ module Calabash
 
       # @!visibility private
       def _stop_app
-        Retriable.retriable(tries: 5, interval: 1) do
+        Calabash::Retry.retry(retries: 5, interval: 1) do
           begin
             http_client.post(HTTP::Request.new('kill'), retries: 1, interval: 0)
           rescue HTTP::Error => _
@@ -764,8 +772,12 @@ module Calabash
       def ts_clear_app_data(application)
         parameters =
             {
-                className: 'sh.calaba.instrumentationbackend.ClearAppData2',
-                packageName: application.test_server.identifier,
+                intent: {
+                    component: {
+                        className: 'sh.calaba.instrumentationbackend.ClearAppData2',
+                        packageName: application.test_server.identifier
+                    }
+                }
             }
 
         begin
@@ -857,7 +869,7 @@ module Calabash
           installed_app_md5_checksum = md5_checksum_for_app_package(application.identifier)
 
           if application.md5_checksum != installed_app_md5_checksum
-            @logger.log("The md5 checksum has changed (#{application.md5_checksum} != #{installed_app_md5_checksum}).", :info)
+            @logger.log("The md5 checksum has changed for '#{application.identifier}' (#{application.md5_checksum} != #{installed_app_md5_checksum}).", :info)
             _install_app(application)
           end
         else
@@ -1157,62 +1169,6 @@ module Calabash
         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}

data/lib/calabash/android/device/helper_application.rb

@@ -0,0 +1,95 @@
+require 'json'
+
+module Calabash
+  module Android
+    class Device
+      module HelperApplication
+        def ensure_helper_application_started
+          unless $_calabash_helper_application_started
+            $stdout.puts "NEW DEBUG: IN HERE"
+            $stdout.puts "NEW DEBUG: INSTALLING"
+            install_helper_application
+            $stdout.puts "NEW DEBUG: STARTING"
+            begin
+              start_helper_application
+            rescue => e
+              $stdout.puts "NEW DEBUG EXCERPICON: #{e.backtrace.join("\n")}"
+              raise e
+            end
+
+            $stdout.puts "NEW DEBUG: DONE STARTING"
+            $_calabash_helper_application_started = true
+          end
+        end
+
+        def helper_application_server
+          Calabash::Android::Server.default_helper
+        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 ||= lambda do
+            server = Calabash::HTTP::RetriableClient.new(helper_application_server)
+            port_forward(helper_application_server.endpoint, helper_application_server.test_server_port)
+
+            server.on_error(Errno::ECONNREFUSED) do |s|
+              port_forward(s.endpoint.port, s.test_server_port)
+            end
+
+            server
+          end.call
+        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 => e
+            $stdout.puts "SH NEW DEBUG: PING ERROR #{e.backtrace.join("\n")}"
+            false
+          end
+        end
+
+        def start_helper_application
+          cmd = ["am start",
+                 "-e testServerPort 0",
+                 "-e port 8081",
+                 "sh.calaba.calabashhelper/sh.calaba.calabashhelper.MainActivity"].join(" ")
+
+          adb.shell(cmd)
+
+          100.times do |i|
+            if i == 99
+              raise "Unable to start helper application"
+            end
+
+            break if helper_application_responding?
+            sleep 1
+          end
+        end
+      end
+    end
+  end
+end

data/lib/calabash/android/environment.rb

@@ -1,6 +1,11 @@
 require 'rexml/document'
 require 'timeout'
-require 'luffa'
+
+# We sometimes want to require a Ruby gem without having our IDE auto-complete
+# using it. For example awesome_print adds a ton of methods to 'Object'
+alias :cal_require_without_documentation :require
+cal_require_without_documentation 'luffa'
+
 require 'timeout'
 
 if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
@@ -25,6 +30,14 @@ module Calabash
       # @todo Maybe rename this to CAL_SERVER_URL or CAL_SERVER?
       DEVICE_ENDPOINT = URI.parse((variable('CAL_ENDPOINT') || 'http://127.0.0.1:34777'))
 
+      # A URI that points to the helper server on the device.
+      #
+      # The default value is 'http://localhost:34778'.
+      #
+      # You can control the value of this variable by setting the `CAL_HELPER_ENDPOINT`
+      # variable.
+      DEVICE_HELPER_ENDPOINT = URI.parse((variable('CAL_HELPER_ENDPOINT') || 'http://127.0.0.1:34778'))
+
       private
 
       def self.set_android_dependencies(android_dependencies)

data/lib/calabash/android/gestures.rb

@@ -314,7 +314,7 @@ module Calabash
       end
 
       # @!visibility private
-      def _pan_screen_up(options={})
+      define_method(:_pan_screen_up) do |options={}|
         from = {x: 50, y: 90}
         to = {x: 50, y: 10}
 
@@ -322,7 +322,7 @@ module Calabash
       end
 
       # @!visibility private
-      def _pan_screen_down(options={})
+      define_method(:_pan_screen_down) do |options={}|
         from = {x: 50, y: 10}
         to = {x: 50, y: 90}
 
@@ -330,7 +330,7 @@ module Calabash
       end
 
       # @!visibility private
-      def _flick_screen_up(options={})
+      define_method(:_flick_screen_up) do |options={}|
         from = {x: 50, y: 90}
         to = {x: 50, y: 10}
 
@@ -338,7 +338,7 @@ module Calabash
       end
 
       # @!visibility private
-      def _flick_screen_down(options={})
+      define_method(:_flick_screen_down) do |options={}|
         from = {x: 50, y: 10}
         to = {x: 50, y: 90}
 
@@ -346,24 +346,8 @@ module Calabash
       end
 
       # @!visibility private
-      def _pinch_screen(direction, options={})
-        Device.default.pinch(direction, "* id:'content'", options)
-      end
-
-      # @!visibility private
-      def _pinch_to_zoom(direction, query, options={})
-        if direction == :out
-          Device.default.pinch(:in, query, options)
-        elsif direction == :in
-          Device.default.pinch(:out, query, options)
-        else
-          raise "Invalid direction '#{direction}'"
-        end
-      end
-
-      # @!visibility private
-      def _pinch_screen_to_zoom(direction, options={})
-        _pinch_to_zoom(direction, "* id:'content'", options)
+      define_method(:_pinch_screen) do |options={}|
+        Calabash::Internal.with_default_device(required_os: :android) {|device| device.pinch(direction, "* id:'content'", options)}
       end
     end
   end

data/lib/calabash/android/interactions.rb

@@ -8,13 +8,16 @@ module Calabash
     module Interactions
       # Go back. If the keyboard is shown, it will be dismissed.
       def go_back
-        Device.default.perform_action('hide_soft_keyboard')
-        press_back_button
+        Calabash::Internal.with_default_device(required_os: :android) do |device|
+          device.perform_action('hide_soft_keyboard')
+        end
+
+        press_physical_back_button
       end
 
       # Go to the home screen.
       def go_home
-        Device.default.go_home
+        Calabash::Internal.with_default_device(required_os: :android) {|device| device.go_home}
 
         true
       end
@@ -22,33 +25,33 @@ module Calabash
       # Get the name of the currently focused activity
       #
       # @example
-      #  puts focused_activity
+      #  puts cal_android.focused_activity
       #  # => com.example.MainActivity
       #
       # @return [String] The name of the currently focused activity.
       def focused_activity
-        Device.default.current_focus[:activity]
+        Calabash::Internal.with_default_device(required_os: :android) {|device| device.current_focus[:activity]}
       end
 
       # Get the name of the currently focused package
       #
       # @example
-      #  puts focused_package
+      #  puts cal_android.focused_package
       #  # => com.example
       #
       # @return [String] The name of the currently focused package
       def focused_package
-        Device.default.current_focus[:package]
+        Calabash::Internal.with_default_device(required_os: :android) {|device| device.current_focus[:package]}
       end
 
       # Sets the date of the first visible date picker widget.
       #
       # @example
-      #  set_date('2012-04-24')
+      #  cal_android.set_date('2012-04-24')
       #
       # @example
       #  date = Date.parse('3rd Feb 2012')
-      #  set_date(date)
+      #  cal_android.set_date(date)
       #
       # @param [Date, String] date The date to set. If given a String,
       #  `Date.parse` is called on the string.
@@ -88,11 +91,11 @@ module Calabash
       # Sets the time of the first visible time picker widget.
       #
       # @example
-      #  set_time('14:42')
+      #  cal_android.set_time('14:42')
       #
       # @example
       #  time = Time.parse('8:30 AM')
-      #  set_time(time)
+      #  cal_android.set_time(time)
       #
       # @param [Time, String] time The time to set. If given a String,
       #  `Time.parse` is called on the string.
@@ -138,12 +141,6 @@ module Calabash
 
         true
       end
-
-
-      # @!visibility private
-      def _evaluate_javascript_in(query, javascript)
-        Device.default.evaluate_javascript_in(query, javascript)
-      end
     end
   end
 end

data/lib/calabash/android/lib/.irbrc

@@ -39,7 +39,15 @@ end
 begin
   require 'calabash/android'
 
-  extend Calabash::Android
+  IRB.conf[:PROMPT][:CALABASH] = {
+    :PROMPT_I => "calabash #{Calabash::VERSION}> ",
+    :PROMPT_S => "%03n> ",
+    :PROMPT_C => "%03n> ",
+    :RETURN => "%s\n"
+  }
+
+  IRB.conf[:PROMPT_MODE] = :CALABASH
+
   extend Calabash::ConsoleHelpers
 
   Calabash::Android.setup_defaults!

data/lib/calabash/android/lib/AndroidManifest.xml

@@ -3,7 +3,9 @@
       package="#testPackage#"
       android:versionCode="3"
       android:versionName="0.3.0">
-    <application android:label="instrumentation_backend">
+    <application android:label="instrumentation_backend"
+        android:largeHeap="true">
+
       <uses-library android:name="android.test.runner" />
       <uses-library android:name="com.google.android.maps" android:required="false" />
       <activity
@@ -31,8 +33,26 @@
             android:stateNotNeeded="true"
             android:noHistory="true"
             android:excludeFromRecents="true"/>
+    <activity
+        android:name="sh.calaba.instrumentationbackend.FakeCameraActivity"
+        android:label="FakeCameraActivity"
+        android:exported="true"
+        android:finishOnTaskLaunch="true"
+        android:stateNotNeeded="true"
+        android:noHistory="true"
+        android:excludeFromRecents="true"
+        android:theme="@android:style/Theme.NoTitleBar.Fullscreen"/>
+    <activity
+        android:name="sh.calaba.instrumentationbackend.FakePickerActivity"
+        android:label="FakePickerActivity"
+        android:exported="true"
+        android:finishOnTaskLaunch="true"
+        android:stateNotNeeded="true"
+        android:noHistory="true"
+        android:excludeFromRecents="true"/>
     </application>
-    <uses-sdk android:minSdkVersion="4" />
+    <uses-sdk android:minSdkVersion="4"
+        android:targetSdkVersion="21"/>
     <instrumentation android:targetPackage="#targetPackage#" android:name="sh.calaba.instrumentationbackend.CalabashInstrumentationTestRunner" />
     <instrumentation android:targetPackage="#targetPackage#" android:name="sh.calaba.instrumentationbackend.ClearAppData" />
     <instrumentation android:targetPackage="#targetPackage#" android:name="sh.calaba.instrumentationbackend.ClearAppData2" />
@@ -47,5 +67,6 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.GET_TASKS" />
     <uses-permission android:name="android.permission.REORDER_TASKS" />
+    <uses-permission android:name="android.permission.CAMERA" />
 
 </manifest>