calabash 2.0.0.pre10 → 2.0.0.pre11

data/lib/calabash/android/life_cycle.rb

@@ -21,19 +21,19 @@ module Calabash
           raise 'No application given, and Application.default is not set'
         end
 
-        Device.default.resume_app(path_or_application)
+        Calabash::Internal.with_default_device(required_os: :android) {|device| device.resume_app(path_or_application)}
 
         true
       end
 
       # @!visibility private
-      def _send_current_app_to_background(for_seconds)
+      define_method(:_send_current_app_to_background) do |for_seconds|
         package = focused_package
         activity = focused_activity
 
         go_home
         sleep(for_seconds)
-        Device.default.resume_activity(package, activity)
+        Calabash::Internal.with_default_device(required_os: :android) {|device| device.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
-      def _set_orientation_landscape
-        Device.default.perform_action('set_activity_orientation', 'landscape')
+      define_method(:_set_orientation_landscape) do
+        Calabash::Internal.with_default_device(required_os: :android) {|device| device.perform_action('set_activity_orientation', 'landscape')}
       end
 
       # @!visibility private
-      def _set_orientation_portrait
-        Device.default.perform_action('set_activity_orientation', 'portrait')
+      define_method(:_set_orientation_portrait) do
+        Calabash::Internal.with_default_device(required_os: :android) {|device| device.perform_action('set_activity_orientation', 'portrait')}
       end
 
       # @!visibility private
-      def _portrait?
+      define_method(:_portrait?) do
         _orientation == 'portrait'
       end
 
       # @!visibility private
-      def _landscape?
+      define_method(:_landscape?) do
         _orientation == 'landscape'
       end
 
       # @!visibility private
-      def _orientation
-        Device.default.perform_action('get_activity_orientation')['message']
+      define_method(:_orientation) do
+        Calabash::Internal.with_default_device(required_os: :android) {|device| device.perform_action('get_activity_orientation')['message']}
       end
     end
   end

data/lib/calabash/android/physical_buttons.rb

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

data/lib/calabash/android/server.rb

@@ -10,7 +10,7 @@ module Calabash
 
       def self.default_helper
         endpoint = Environment::DEVICE_HELPER_ENDPOINT
-        Server.new(endpoint, 8102)
+        Server.new(endpoint, 8081)
       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
-        Device.default.perform_action('hide_soft_keyboard')
+        Calabash::Internal.with_default_device(required_os: :android) {|device| device.perform_action('hide_soft_keyboard')}
         sleep 0.5
       end
 
       # @!visibility private
-      def _clear_text
-        Device.default.perform_action('clear_text')
+      define_method(:_clear_text) do
+        Calabash::Internal.with_default_device(required_os: :android) {|device| device.perform_action('clear_text')}
       end
 
       # @!visibility private
-      def _clear_text_in(view)
+      define_method(:_clear_text_in) do |view|
         tap(view)
         sleep 0.5
         clear_text
       end
 
       # @!visibility private
-      def _enter_text(text)
-        Device.default.enter_text(text)
+      define_method(:_enter_text) do |text|
+        Calabash::Internal.with_default_device(required_os: :android) {|device| device.enter_text(text)}
       end
 
       # @!visibility private
-      def _enter_text_in(view, text)
+      define_method(:_enter_text_in) do |view, text|
         tap(view)
         sleep 0.5
         enter_text(text)
       end
 
       # @!visibility private
-      def _tap_keyboard_action_key(action_key)
+      define_method(:_tap_keyboard_action_key) do |action_key|
         if action_key.nil?
-          Device.default.perform_action('press_user_action_button')
+          Calabash::Internal.with_default_device(required_os: :android) {|device| device.perform_action('press_user_action_button')}
         else
-          Device.default.perform_action('press_user_action_button', action_key.to_s)
+          Calabash::Internal.with_default_device(required_os: :android) {|device| device.perform_action('press_user_action_button', action_key.to_s)}
         end
       end
 
       # @!visibility private
-      def _keyboard_visible?
-        Device.default.keyboard_visible?
+      define_method(:_keyboard_visible?) do
+        Calabash::Internal.with_default_device(required_os: :android) {|device| device.keyboard_visible?}
       end
     end
   end

data/lib/calabash/android/web.rb

@@ -0,0 +1,12 @@
+module Calabash
+  module Android
+    module Web
+      # @!visibility private
+      define_method(:_evaluate_javascript_in) do |query, javascript|
+        Calabash::Internal.with_default_device(required_os: :android) do |device|
+          device.evaluate_javascript_in(query, javascript)
+        end
+      end
+    end
+  end
+end

data/lib/calabash/application.rb

@@ -3,6 +3,9 @@ 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,24 +17,14 @@ module Calabash
           exit 1
         end
 
-        reset_between = :features
-        reset_method = :clear
+        cucumber_config = File.read(file(File.join('config', 'cucumber.yml.skeleton')))
 
-        cucumber_config = File.read(file(File.join('config', 'cucumber.yml')))
+        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')))
 
-        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
+        hooks = File.read(file(File.join('features', 'support', 'hooks.rb.skeleton')))
 
         FileUtils.mkdir('config')
 
@@ -45,12 +35,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', 'calabash_steps.rb'), 'w') {|file| file.write(calabash_steps) }
+        File.open(File.join('features', 'step_definitions', 'sample_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')))
+        gemfile = File.readlines(file(File.join('Gemfile.skeleton')))
 
         unless File.exist?('Gemfile')
           File.open('Gemfile', 'w') do |file|

data/lib/calabash/cli/helpers.rb

@@ -6,8 +6,7 @@ module Calabash
       # @!visibility private
       HELP = {
           help: 'help',
-          generate: 'generate',
-          run: 'run [application] [cucumber options]',
+          :'generate-cucumber' => 'generate-cucumber',
           console: 'console [application]',
           version: 'version',
           setup_keystore: 'setup-keystore',
@@ -35,7 +34,7 @@ EOF
         else
           output.write <<EOF
 Usage:
-  calabash [options] #{HELP[key]}
+  #{Calabash::Utility.bundle_exec_prepend}calabash [options] #{HELP[key]}
 EOF
         end
       end
@@ -43,18 +42,14 @@ EOF
       # @!visibility private
       def print_usage(output=STDOUT)
           output.write <<EOF
-  Usage: calabash [options] <command-name> [command specific options]
+  Usage: #{Calabash::Utility.bundle_exec_prepend}calabash [options] <command-name> [command specific options]
   <command-name> can be one of
     #{HELP[:help]} [command]
       print help information.
 
-    #{HELP[:generate]}
+    #{HELP[:'generate-cucumber']}
       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 Object.const_defined?(:Bundler)
+          unless Calabash::Utility.used_bundler?
             $stderr.puts "Warning! Could not load cucumber. Make sure it is installed."
           end
         end

data/lib/calabash/console_helpers.rb

@@ -5,21 +5,99 @@ module Calabash
   # Methods you can use in the Calabash console to help you
   # interact with your app.
   module ConsoleHelpers
+    # Reloads all required files that have git changes
+    def reload_git_files
+      files_to_reload =
+          (`cd ../../../ && git status`.lines.grep(/modified/).map{|l| l.split(" ").last.gsub('../', '')} +
+              `cd ../../../ && git ls-files --others --exclude-standard`.lines).map(&:chomp)
+
+      $LOADED_FEATURES.each do |file|
+        files_to_reload.each do |reload_name|
+          if file.end_with?(reload_name)
+            puts "LOADING #{file}"
+            load file
+            break
+          end
+        end
+      end
+
+      true
+    end
+
+    # Outputs all calabash methods
+    def cal_methods
+      c = Class.new(BasicObject) do
+        include Calabash
+      end
+
+      ConsoleHelpers.puts_unbound_methods(c, 'cal.')
+      true
+    end
+
+    # Outputs a calabash method
+    def cal_method(method)
+      c = Class.new(BasicObject) do
+        include Calabash
+      end
+
+      ConsoleHelpers.puts_unbound_method(c, method.to_sym, 'cal.')
+      true
+    end
+
+    # Outputs all calabash iOS methods
+    def cal_ios_methods
+      c = Class.new(BasicObject) do
+        include Calabash::IOSInternal
+      end
+
+      ConsoleHelpers.puts_unbound_methods(c, 'cal_ios.')
+      true
+    end
+
+    # Outputs a calabash Android method
+    def cal_ios_method(method)
+      c = Class.new(BasicObject) do
+        include Calabash::IOSInternal
+      end
+
+      ConsoleHelpers.puts_unbound_method(c, method.to_sym, 'cal_ios.')
+      true
+    end
+
+    # Outputs all calabash Android methods
+    def cal_android_methods
+      c = Class.new(BasicObject) do
+        include Calabash::AndroidInternal
+      end
+
+      ConsoleHelpers.puts_unbound_methods(c, 'cal_android.')
+      true
+    end
+
+    # Outputs a calabash Android method
+    def cal_android_method(method)
+      c = Class.new(BasicObject) do
+        include Calabash::AndroidInternal
+      end
+
+      ConsoleHelpers.puts_unbound_method(c, method.to_sym, 'cal_android.')
+      true
+    end
 
     # Outputs all visible elements as a tree.
     def tree
-      ConsoleHelpers.dump(Device.default.dump)
+      ConsoleHelpers.dump(Calabash::Internal.with_default_device {|device| device.dump})
       true
     end
 
     # List the visible element classes.
     def classes
-      query("*").map{|e| e['class']}.uniq
+      cal.query("*").map{|e| e['class']}.uniq
     end
 
     # List the visible element ids.
     def ids
-      query("*").map{|e| e['id']}.compact
+      cal.query("*").map{|e| e['id']}.compact
     end
 
     # Copy all the commands entered in the current console session into the OS
@@ -92,14 +170,31 @@ module Calabash
     # @!visibility private
     def puts_console_details
       puts ''
-      puts Color.blue('#             =>  Useful Methods  <=              #')
-      puts Color.cyan('>     ids => List all the visible ids.')
-      puts Color.cyan('> classes => List all the visible classes.')
-      puts Color.cyan(">    tree => The app's visible view hierarchy.")
-      puts Color.cyan('>    copy => Copy console commands to the Clipboard.')
-      puts Color.cyan('>   clear => Clear the console.')
-      puts Color.cyan('> verbose => Turn debug logging on.')
-      puts Color.cyan('>   quiet => Turn debug logging off.')
+      puts '#             =>  Useful Console Methods  <=              #'
+      puts Color.cyan('>         ids => List all the visible ids.')
+      puts Color.cyan('>     classes => List all the visible classes.')
+      puts Color.cyan(">        tree => The app's visible view hierarchy.")
+      puts Color.cyan('>        copy => Copy console commands to the Clipboard.')
+      puts Color.cyan('>       clear => Clear the console.')
+      puts Color.cyan('>     verbose => Turn debug logging on.')
+      puts Color.cyan('>       quiet => Turn debug logging off.')
+      puts Color.cyan('> cal_methods => Print all cross-platform Calabash methods.')
+      puts Color.cyan('> cal_method(method) => Print all information about a Calabash method')
+
+      if defined?(Calabash::AndroidInternal)
+        puts ''
+        puts 'Android specific'
+        puts Color.cyan('> cal_android_methods => Print all Android-specific Calabash methods.')
+        puts Color.cyan('> cal_android_method(method) => Print all information about an Android-specific Calabash method.')
+      end
+
+      if defined?(Calabash::IOSInternal)
+        puts ''
+        puts 'iOS specific'
+        puts Color.cyan('> cal_ios_methods => Print all iOS-specific Calabash methods.')
+        puts Color.cyan('> cal_ios_method(method) => Print all information about an ios-specific Calabash method.')
+      end
+
       puts ''
     end
 
@@ -191,5 +286,78 @@ module Calabash
     def self.visible?(data)
       raise AbstractMethodError
     end
+
+    # @!visibility private
+    def self.puts_unbound_methods(clazz, prefix)
+      (clazz.instance_methods - BasicObject.instance_methods).each do |method_sym|
+        signature,description = method_signature(clazz.instance_method(method_sym))
+
+        puts_method(signature, description, prefix)
+      end
+    end
+
+    # @!visibility private
+    def self.puts_unbound_method(clazz, method, prefix)
+      signature,description = method_signature(clazz.instance_method(method), true)
+
+      puts_method(signature, description, prefix)
+    end
+
+    # @!visibility private
+    def self.puts_method(signature, description, prefix)
+      if signature != nil
+        puts Color.yellow(description)
+        puts Color.blue("#{prefix}#{signature}")
+        puts ''
+      end
+    end
+
+    # @!visibility private
+    def self.method_signature(method, full_description = false)
+      file_name, line = method.source_location
+
+      file = File.open(file_name, 'r')
+
+      description = nil
+      read_next_lines = false
+
+      (line-1).times do
+        line = file.gets.strip
+
+        if line.start_with?('#')
+          if line.length == 1 || line.start_with?("# @")
+            read_next_lines = false
+          end
+
+          if description.nil?
+            description = line[2..-1]
+            read_next_lines = true
+          elsif read_next_lines || full_description
+            description = "#{description}\n#{line[2..-1]}"
+          end
+        else
+          description = nil
+        end
+      end
+
+      signature = file.gets.strip[4..-1]
+
+      method_name = if signature.index('(')
+                      signature[0,signature.index('(')]
+                    else
+                      signature
+                    end
+
+      # Remove alias'ed methods
+      if method_name != method.name.to_s
+        signature = nil
+      end
+
+      if description && description.start_with?("@!visibility private")
+        signature = nil
+      end
+
+      [signature,description]
+    end
   end
 end