calabash 2.0.0.pre11 → 2.0.0.prelegacy

data/lib/calabash/android/legacy.rb

@@ -1,6 +1,143 @@
-if Calabash::Environment.variable('DEVICE_ENDPOINT')
-  Calabash::Logger.warn("Deprecated use of old ENV variable 'DEVICE_ENDPOINT'")
+if ENV["APP_PATH"]
+  Calabash::Environment::APP_PATH = ENV["APP_PATH"]
+end
 
-  Calabash::Android::Environment::DEVICE_ENDPOINT =
-      URI.parse(Calabash::Environment.variable('DEVICE_ENDPOINT'))
+if ENV["TEST_APP_PATH"]
+  Calabash::Environment::TEST_SERVER_PATH = ENV["TEST_APP_PATH"]
 end
+
+
+module Calabash
+  module Android
+    class Device < Calabash::Device
+      def screen_on?
+        true
+      end
+
+      def md5_checksum(file_path)
+        "samplechecksum"
+      end
+
+      def adb_install_app(application)
+        @logger.log "Patch: Installing #{application.path}"
+
+        begin
+          result = adb.command("install #{application.path}", timeout: 60)
+        rescue ADB::ADBCallError => e
+          raise "Failed to install the application on device: '#{e.message}'"
+        end
+
+        if result.lines.last.downcase.chomp != 'success'
+          raise "Could not install app '#{application.identifier}': #{result.chomp}"
+        end
+
+        unless installed_packages.include?(application.identifier)
+          raise "App '#{application.identifier}' was not installed"
+        end
+      end
+
+      def _start_app(application, options={})
+        env_options = {}
+
+        options.fetch(:extras, {}).each do |k, v|
+          env_options[k] = v
+        end
+
+        env_options[:target_package] = application.identifier
+
+        if options[:activity]
+          env_options[:main_activity] = options[:activity]
+        end
+
+        env_options[:test_server_port] = server.test_server_port
+        env_options[:class] = options.fetch(:class, 'sh.calaba.instrumentationbackend.InstrumentationBackend')
+
+        if application.test_server.nil?
+          raise 'Invalid application. No test-server set.'
+        end
+
+        unless app_installed?(application.identifier)
+          raise "The application '#{application.identifier}' is not installed"
+        end
+
+        unless app_installed?(application.test_server.identifier)
+          raise "The test-server '#{application.test_server.identifier}' is not installed"
+        end
+
+        installed_app = installed_apps.find{|app| app[:package] == application.identifier}
+        installed_app_md5_checksum = md5_checksum(installed_app[:path])
+
+        if application.md5_checksum != installed_app_md5_checksum
+          raise "The specified app is not the same as the installed app (#{application.md5_checksum} != #{installed_app_md5_checksum})."
+        end
+
+        installed_test_server = installed_apps.find{|app| app[:package] == application.test_server.identifier}
+        installed_test_server_md5_checksum = md5_checksum(installed_test_server[:path])
+
+        if application.test_server.md5_checksum != installed_test_server_md5_checksum
+          raise "The specified test-server is not the same as the installed test-server (#{application.test_server.md5_checksum} != #{installed_test_server_md5_checksum})."
+        end
+
+        # 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.
+        port_forward(server.endpoint.port, server.test_server_port)
+
+        # For now, the test-server cannot rebind an existing socket.
+        # So we have to stop any running Calabash servers from the client
+        # for now.
+        if test_server_responding?
+          @logger.log("A test-server is already running on port #{server.test_server_port}")
+          @logger.log("Trying to stop it")
+
+          begin
+            _stop_app
+          rescue => _
+            raise 'Failed to stop old running test-server'
+          end
+        end
+
+        extras = ''
+
+        env_options.each_pair do |key, val|
+          extras = "#{extras} -e #{key.to_s} #{val.to_s}"
+        end
+
+        begin
+          instrument(application,
+                     'sh.calaba.instrumentationbackend.CalabashInstrumentationTestRunner',
+                     extras)
+        rescue ADB::ADBCallError => e
+          raise "Failed to start the application: '#{e.stderr.lines.first.chomp}'"
+        end
+
+        begin
+          Retriable.retriable(tries: 30, interval: 1, timeout: 30, on: RetryError) do
+            unless test_server_responding?
+              raise RetryError
+            end
+          end
+        rescue RetryError => _
+          @logger.log('Could not contact test-server', :error)
+          @logger.log('For information, see the adb logcat', :error)
+          raise 'Could not contact test-server'
+        end
+
+        begin
+          Retriable.retriable(tries: 10, interval: 1, timeout: 10) do
+            unless test_server_ready?
+              raise RetryError
+            end
+          end
+        rescue RetryError => _
+          @logger.log('Test-server was never ready', :error)
+          @logger.log('For information, see the adb logcat', :error)
+          raise 'Test-server was never ready'
+        end
+
+        # Return true to avoid cluttering the console
+        true
+      end
+    end
+  end
+end

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

@@ -39,15 +39,7 @@ end
 begin
   require '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::Android
   extend Calabash::ConsoleHelpers
 
   Calabash::Android.setup_defaults!

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

@@ -3,9 +3,7 @@
       package="#testPackage#"
       android:versionCode="3"
       android:versionName="0.3.0">
-    <application android:label="instrumentation_backend"
-        android:largeHeap="true">
-
+    <application android:label="instrumentation_backend">
       <uses-library android:name="android.test.runner" />
       <uses-library android:name="com.google.android.maps" android:required="false" />
       <activity
@@ -33,26 +31,8 @@
             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"
-        android:targetSdkVersion="21"/>
+    <uses-sdk android:minSdkVersion="4" />
     <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" />
@@ -67,6 +47,5 @@
     <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>

data/lib/calabash/android/life_cycle.rb

@@ -21,19 +21,19 @@ module Calabash
           raise 'No application given, and Application.default is not set'
         end
 
-        Calabash::Internal.with_default_device(required_os: :android) {|device| device.resume_app(path_or_application)}
+        Device.default.resume_app(path_or_application)
 
         true
       end
 
       # @!visibility private
-      define_method(:_send_current_app_to_background) do |for_seconds|
+      def _send_current_app_to_background(for_seconds)
         package = focused_package
         activity = focused_activity
 
         go_home
         sleep(for_seconds)
-        Calabash::Internal.with_default_device(required_os: :android) {|device| device.resume_activity(package, activity)}
+        Device.default.resume_activity(package, activity)
       end
     end
   end

data/lib/calabash/android/orientation.rb

@@ -3,28 +3,28 @@ module Calabash
     # @!visibility private
     module Orientation
       # @!visibility private
-      define_method(:_set_orientation_landscape) do
-        Calabash::Internal.with_default_device(required_os: :android) {|device| device.perform_action('set_activity_orientation', 'landscape')}
+      def _set_orientation_landscape
+        Device.default.perform_action('set_activity_orientation', 'landscape')
       end
 
       # @!visibility private
-      define_method(:_set_orientation_portrait) do
-        Calabash::Internal.with_default_device(required_os: :android) {|device| device.perform_action('set_activity_orientation', 'portrait')}
+      def _set_orientation_portrait
+        Device.default.perform_action('set_activity_orientation', 'portrait')
       end
 
       # @!visibility private
-      define_method(:_portrait?) do
+      def _portrait?
         _orientation == 'portrait'
       end
 
       # @!visibility private
-      define_method(:_landscape?) do
+      def _landscape?
         _orientation == 'landscape'
       end
 
       # @!visibility private
-      define_method(:_orientation) do
-        Calabash::Internal.with_default_device(required_os: :android) {|device| device.perform_action('get_activity_orientation')['message']}
+      def _orientation
+        Device.default.perform_action('get_activity_orientation')['message']
       end
     end
   end

data/lib/calabash/android/physical_buttons.rb

@@ -8,47 +8,44 @@ module Calabash
     module PhysicalButtons
 
       # @!visibility private
-      def press_physical_button(key)
-        Calabash::Internal.with_default_device(required_os: :android) do |device|
-          device.perform_action('press_physical_key', key)
-        end
-
+      def press_button(key)
+        Device.default.perform_action('press_key', key)
         true
       end
 
       # @!visibility private
-      def press_physical_back_button
-        press_physical_button('KEYCODE_BACK')
+      def press_back_button
+        press_button('KEYCODE_BACK')
       end
 
       # @!visibility private
-      def press_physical_menu_button
-        press_physical_button('KEYCODE_MENU')
+      def press_menu_button
+        press_button('KEYCODE_MENU')
       end
 
       # @!visibility private
-      def press_physical_down_button
-        press_physical_button('KEYCODE_DPAD_DOWN')
+      def press_down_button
+        press_button('KEYCODE_DPAD_DOWN')
       end
 
       # @!visibility private
-      def press_physical_up_button
-        press_physical_button('KEYCODE_DPAD_UP')
+      def press_up_button
+        press_button('KEYCODE_DPAD_UP')
       end
 
       # @!visibility private
-      def press_physical_left_button
-        press_physical_button('KEYCODE_DPAD_LEFT')
+      def press_left_button
+        press_button('KEYCODE_DPAD_LEFT')
       end
 
       # @!visibility private
-      def press_physical_right_button
-        press_physical_button('KEYCODE_DPAD_RIGHT')
+      def press_right_button
+        press_button('KEYCODE_DPAD_RIGHT')
       end
 
       # @!visibility private
-      def press_physical_enter_button
-        press_physical_button('KEYCODE_ENTER')
+      def press_enter_button
+        press_button('KEYCODE_ENTER')
       end
     end
   end

data/lib/calabash/android/server.rb

@@ -5,12 +5,7 @@ module Calabash
       # The default Android test server.
       def self.default
         endpoint = Environment::DEVICE_ENDPOINT
-        Server.new(endpoint, 7102)
-      end
-
-      def self.default_helper
-        endpoint = Environment::DEVICE_HELPER_ENDPOINT
-        Server.new(endpoint, 8081)
+        Server.new(endpoint)
       end
     end
   end

data/lib/calabash/android/text.rb

@@ -6,46 +6,46 @@ module Calabash
       # pressing the back button if the keyboard is showing. If the keyboard is
       # already hidden/dismissed, nothing is done.
       def dismiss_keyboard
-        Calabash::Internal.with_default_device(required_os: :android) {|device| device.perform_action('hide_soft_keyboard')}
+        Device.default.perform_action('hide_soft_keyboard')
         sleep 0.5
       end
 
       # @!visibility private
-      define_method(:_clear_text) do
-        Calabash::Internal.with_default_device(required_os: :android) {|device| device.perform_action('clear_text')}
+      def _clear_text
+        Device.default.perform_action('clear_text')
       end
 
       # @!visibility private
-      define_method(:_clear_text_in) do |view|
+      def _clear_text_in(view)
         tap(view)
         sleep 0.5
         clear_text
       end
 
       # @!visibility private
-      define_method(:_enter_text) do |text|
-        Calabash::Internal.with_default_device(required_os: :android) {|device| device.enter_text(text)}
+      def _enter_text(text)
+        Device.default.enter_text(text)
       end
 
       # @!visibility private
-      define_method(:_enter_text_in) do |view, text|
+      def _enter_text_in(view, text)
         tap(view)
         sleep 0.5
         enter_text(text)
       end
 
       # @!visibility private
-      define_method(:_tap_keyboard_action_key) do |action_key|
+      def _tap_keyboard_action_key(action_key)
         if action_key.nil?
-          Calabash::Internal.with_default_device(required_os: :android) {|device| device.perform_action('press_user_action_button')}
+          Device.default.perform_action('press_user_action_button')
         else
-          Calabash::Internal.with_default_device(required_os: :android) {|device| device.perform_action('press_user_action_button', action_key.to_s)}
+          Device.default.perform_action('press_user_action_button', action_key.to_s)
         end
       end
 
       # @!visibility private
-      define_method(:_keyboard_visible?) do
-        Calabash::Internal.with_default_device(required_os: :android) {|device| device.keyboard_visible?}
+      def _keyboard_visible?
+        Device.default.keyboard_visible?
       end
     end
   end

data/lib/calabash/android.rb

@@ -1,7 +1,28 @@
 module Calabash
-  # @!visibility private
-  module AndroidInternal
+  # Contains the Android implementations of the Calabash APIs.
+  module Android
+    # @!visibility private
+    TEST_SERVER_CODE_PATH = File.join(File.dirname(__FILE__), '..', '..', 'android', 'test-server')
+    # @!visibility private
+    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')
+
     require 'calabash'
+    include Calabash
+
+    # @!visibility private
+    def self.extended(base)
+      Calabash.send(:extended, base)
+    end
+
+    # @!visibility private
+    def self.included(base)
+      Calabash.send(:included, base)
+    end
+
+    require 'calabash/android/defaults'
+    extend Calabash::Android::Defaults
 
     require 'calabash/android/environment'
     require 'calabash/android/application'
@@ -15,10 +36,10 @@ module Calabash
     require 'calabash/android/orientation'
     require 'calabash/android/physical_buttons'
     require 'calabash/android/text'
-    require 'calabash/android/web'
     require 'calabash/android/console_helpers'
     require 'calabash/android/life_cycle'
     require 'calabash/android/scroll'
+    require 'calabash/android/legacy'
 
     include Calabash::Android::Gestures
     include Calabash::Android::Interactions
@@ -27,40 +48,6 @@ module Calabash
     include Calabash::Android::PhysicalButtons
     include Calabash::Android::Text
     include Calabash::Android::Scroll
-    include Calabash::Android::Web
-  end
-
-  # Contains the Android implementations of the Calabash APIs.
-  module Android
-    # @!visibility private
-    TEST_SERVER_CODE_PATH = File.join(File.dirname(__FILE__), '..', '..', 'android', 'test-server')
-    # @!visibility private
-    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')
-
-    # @!visibility private
-    def self.extended(base)
-      Calabash.send(:extended, base)
-    end
-
-    # @!visibility private
-    def self.included(base)
-      Calabash.send(:included, base)
-    end
-
-    require 'calabash'
-    # Hide from documentation
-    send(:include, Calabash)
-
-    require 'calabash/android/defaults'
-    extend Calabash::Android::Defaults
-
-    include ::Calabash::AndroidInternal
 
     # @!visibility private
     def self.binary_location(name, abi, using_pie)
@@ -78,61 +65,8 @@ module Calabash
 
       file
     end
-
-    require 'calabash/android/legacy'
   end
 end
 
-unless Calabash::Environment.variable("CAL_NO_DEPENDENCIES") == "1"
-  # Setup environment on load
-  Calabash::Android::Environment.setup
-end
-
-# @!visibility private
-class CalabashAndroidMethodsInternal
-  include ::Calabash::Android
-end
-
-# @!visibility private
-class CalabashAndroidMethods < BasicObject
-  include ::Calabash::AndroidInternal
-
-  instance_methods.each do |method_name|
-    define_method(method_name) do |*args, &block|
-      ::CalabashAndroidMethodsInternal.new.send(method_name, *args, &block)
-    end
-  end
-end
-
-# Returns a object that exposes all of the public Calabash Android API.
-# This method should *always* be used to access the Calabash API. By default,
-# all methods are executed using the default device and the default
-# application.
-#
-# For iOS specific methods use {cal_ios}. For cross-platform methods use {cal}.
-#
-# All Android API methods are available with documentation in
-# {Calabash::Android}
-#
-# @see Calabash::Android
-#
-# @return [Object] Instance responding to all Calabash Android methods
-#  in the API.
-def cal_android
-  CalabashAndroidMethods.new
-end
-
-# We also want to patch `cal` to invoke the Android implementations
-class CalabashMethodsInternal
-  include ::Calabash::Android
-
-  instance_methods.each do |method_name|
-    define_method(method_name) do |*args, &block|
-      ::CalabashAndroidMethodsInternal.new.send(method_name, *args, &block)
-    end
-  end
-end
-
-if defined?(::Calabash::IOSInternal)
-  raise Calabash::RequiredBothPlatformsError, "Cannot require both calabash/android and calabash/ios"
-end
+# Setup environment on load
+Calabash::Android::Environment.setup

data/lib/calabash/application.rb

@@ -3,9 +3,6 @@ require 'digest'
 module Calabash
   # A representation of an application that is under test.
   class Application
-    require 'calabash/android/application'
-    require 'calabash/ios/application'
-
     # @!visibility private
     include Calabash::Utility
 

data/lib/calabash/cli/generate.rb

@@ -17,14 +17,24 @@ module Calabash
           exit 1
         end
 
-        cucumber_config = File.read(file(File.join('config', 'cucumber.yml.skeleton')))
+        reset_between = :features
+        reset_method = :clear
 
-        env = File.read(file(File.join('features', 'support', 'env.rb.skeleton')))
-        dry_run = File.read(file(File.join('features', 'support', 'dry_run.rb.skeleton')))
-        sample_feature = File.read(file(File.join('features', 'sample.feature.skeleton')))
-        calabash_steps = File.read(file(File.join('features', 'step_definitions', 'sample_steps.rb.skeleton')))
+        cucumber_config = File.read(file(File.join('config', 'cucumber.yml')))
 
-        hooks = File.read(file(File.join('features', 'support', 'hooks.rb.skeleton')))
+        env = File.read(file(File.join('features', 'support', 'env.rb')))
+        dry_run = File.read(file(File.join('features', 'support', 'dry_run.rb')))
+        sample_feature = File.read(file(File.join('features', 'sample.feature')))
+        calabash_steps = File.read(file(File.join('features', 'step_definitions', 'calabash_steps.rb')))
+
+        hooks = File.read(file(File.join('features', 'support', 'hooks.rb')))
+        hooks.sub!("#!DEFAULT_RESET_BETWEEN#!", ":#{reset_between}")
+
+        if reset_method.nil?
+          hooks.sub!("#!DEFAULT_RESET_METHOD#!", 'nil')
+        else
+          hooks.sub!("#!DEFAULT_RESET_METHOD#!", ":#{reset_method}")
+        end
 
         FileUtils.mkdir('config')
 
@@ -35,12 +45,12 @@ module Calabash
         FileUtils.mkdir('features/support')
 
         File.open(File.join('features', 'sample.feature'), 'w') {|file| file.write(sample_feature) }
-        File.open(File.join('features', 'step_definitions', 'sample_steps.rb'), 'w') {|file| file.write(calabash_steps) }
+        File.open(File.join('features', 'step_definitions', 'calabash_steps.rb'), 'w') {|file| file.write(calabash_steps) }
         File.open(File.join('features', 'support', 'hooks.rb'), 'w') {|file| file.write(hooks) }
         File.open(File.join('features', 'support', 'env.rb'), 'w') {|file| file.write(env) }
         File.open(File.join('features', 'support', 'dry_run.rb'), 'w') {|file| file.write(dry_run) }
 
-        gemfile = File.readlines(file(File.join('Gemfile.skeleton')))
+        gemfile = File.readlines(file(File.join('Gemfile')))
 
         unless File.exist?('Gemfile')
           File.open('Gemfile', 'w') do |file|

data/lib/calabash/cli/helpers.rb

@@ -6,7 +6,8 @@ module Calabash
       # @!visibility private
       HELP = {
           help: 'help',
-          :'generate-cucumber' => 'generate-cucumber',
+          generate: 'generate',
+          run: 'run [application] [cucumber options]',
           console: 'console [application]',
           version: 'version',
           setup_keystore: 'setup-keystore',
@@ -34,7 +35,7 @@ EOF
         else
           output.write <<EOF
 Usage:
-  #{Calabash::Utility.bundle_exec_prepend}calabash [options] #{HELP[key]}
+  calabash [options] #{HELP[key]}
 EOF
         end
       end
@@ -42,14 +43,18 @@ EOF
       # @!visibility private
       def print_usage(output=STDOUT)
           output.write <<EOF
-  Usage: #{Calabash::Utility.bundle_exec_prepend}calabash [options] <command-name> [command specific options]
+  Usage: calabash [options] <command-name> [command specific options]
   <command-name> can be one of
     #{HELP[:help]} [command]
       print help information.
 
-    #{HELP[:'generate-cucumber']}
+    #{HELP[:generate]}
       generate a Cucumber project folder structure.
 
+    #{HELP[:run]}
+      runs Cucumber in the current folder with the environment needed.
+      the cucumber options will be passed unchanged to cucumber
+
     #{HELP[:console]}
       starts an interactive console to interact with your app via Calabash
 

data/lib/calabash/cli/run.rb

@@ -87,7 +87,7 @@ module Calabash
         begin
           require 'cucumber'
         rescue LoadError => _
-          unless Calabash::Utility.used_bundler?
+          unless Object.const_defined?(:Bundler)
             $stderr.puts "Warning! Could not load cucumber. Make sure it is installed."
           end
         end