calabash 1.9.9.pre3 → 2.0.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c93bdf73649617b8de5fe8e2e34fcf03a2f31f2e
-  data.tar.gz: 187f1e60ca6bf8005efa47ee03a9f6896c169599
+  metadata.gz: c5f1a37cf3cb44cfb343b2824ad867a43b8ada5b
+  data.tar.gz: 37184436097bcf66b89307857ccddb35e014ecbc
 SHA512:
-  metadata.gz: de02fd0467b70c2836fcca4859b803537365bf69ef6ae9c7f70f7f153ee877ecbaa1ec69a5941de2ba816874e9b9ad131af9b79642aef88c17a505d73df15af0
-  data.tar.gz: cd2a3b11e0ce8dcbc31236346f483440cfd61cdb00b12124ccf9c8922ee0373f5f940d2ea3e902308fca6f47c4bb8405816d5b9c238a2ac3c5ab6ad67e38c438
+  metadata.gz: 0737e9ced39e5c585a8a030f1072c537f456bcf3d08f3e11a92fc99c794677fa10f8cbde32a79266ad2dbe25b2081e4abc3c3bca924c9f3162b7f25d423c1d94
+  data.tar.gz: 257460621c5e711e222e84e91f52c070da2ae1a12bda33386bd01ebb7148f9b9c5d05231dc3561bb4adee216f73f6d9bf14464dffdbebed5bfe8728fefc71cc0

data/README.md

@@ -47,6 +47,20 @@ $ be rake spec # All tests.  Launches iOS Simulators, etc.
 $ be guard     # Run unit tests as you develop.
 ```
 
+### Cucumber Android
+
+**NOTE** If you find you cannot launch on Android, be sure you run the
+`copy\_repos` and `changing\_old\_files.sh` script.
+
+```
+$ bundle update
+$ rake android:build
+$ cd cucumber/android
+$ be calabash resign ../../spec/resources/android/xtc-android-sample.apk
+$ be calabash build ../../spec/resources/android/xtc-android-sample.apk
+$ be cucumber
+```
+
 ### Cucumber iOS
 
 ```

data/bin/calabash

@@ -47,49 +47,58 @@ module Calabash
       def parse_arguments!
         argument = @arguments.shift
 
-        case argument
-          when '-v', '--verbose'
-            @options[:verbose] = true
-            Logger.log_levels += [:debug]
-            parse_arguments!
-          when '--platform'
-            platform = @arguments.shift.downcase
+        begin
+          case argument
+            when '-v', '--verbose'
+              @options[:verbose] = true
+              Logger.log_levels += [:debug]
+              parse_arguments!
+            when '--platform'
+              platform = @arguments.shift.downcase
 
-            fail("Invalid specified platform '#{platform}'") unless platform == 'android' || platform == 'ios'
+              fail("Invalid specified platform '#{platform}'") unless platform == 'android' || platform == 'ios'
 
-            set_platform!(platform.to_sym)
+              set_platform!(platform.to_sym)
 
-            parse_arguments!
-          when 'version'
-            puts Calabash::VERSION
-          when 'build'
-            parse_build_arguments!
-          when 'resign'
-            parse_resign_arguments!
-          when 'console'
-            parse_console_arguments!
-          when 'generate'
-            parse_generate_arguments!
-          when 'run'
-            parse_run_arguments!
-          when 'setup-keystore'
-            parse_setup_keystore_arguments!
-          when 'help'
-            argument = @arguments.shift
+              parse_arguments!
+            when 'version'
+              puts Calabash::VERSION
+            when 'build'
+              parse_build_arguments!
+            when 'resign'
+              parse_resign_arguments!
+            when 'console'
+              parse_console_arguments!
+            when 'generate'
+              parse_generate_arguments!
+            when 'run'
+              parse_run_arguments!
+            when 'setup-keystore'
+              parse_setup_keystore_arguments!
+            when 'help'
+              argument = @arguments.shift
 
-            if argument.nil?
-              print_usage
-            else
-              if key_for_command(argument)
-                print_usage_for(key_for_command(argument))
+              if argument.nil?
+                print_usage
               else
-                fail("No such command '#{argument}'")
+                if key_for_command(argument)
+                  print_usage_for(key_for_command(argument))
+                else
+                  fail("No such command '#{argument}'")
+                end
               end
-            end
-          when nil
-            print_usage
+            when nil
+              print_usage
+            else
+              fail("Invalid command #{argument}.\n  For help use 'calabash help'")
+          end
+        rescue => e
+          if Logger.log_levels.include?(:debug)
+            raise e
           else
-            fail("Invalid command #{argument}.\n  For help use 'calabash help'")
+            puts "#{Color.red(e.message)}"
+            exit 1
+          end
         end
       end
     end

data/lib/calabash/android/build/builder.rb

@@ -37,7 +37,7 @@ module Calabash
             end
             @logger.log ""
             @logger.log "You can resign the app with #{keystores.first.location} by running:
-      calabash resign #{@application_path}"
+      calabash resign \"#{@application_path}\""
 
             @logger.log ""
             @logger.log "Notice that resigning an app might break some functionality."

data/lib/calabash/android/build/resigner.rb

@@ -27,7 +27,25 @@ module Calabash
         end
 
         def unsign(unsigned_path)
-          files_to_remove = `"#{Environment.aapt_path}" list "#{unsigned_path}"`.lines.collect(&:strip).grep(/^META-INF\//)
+          meta_files = `"#{Environment.aapt_path}" list "#{unsigned_path}"`.lines.collect(&:strip).grep(/^META-INF\//)
+
+          signing_file_names = ['.mf', '.rsa', '.dsa', '.ec', '.sf']
+
+          files_to_remove = meta_files.select do |file|
+            # other will be:
+            # META-INF/foo/bar
+            #  other #=> bar
+            directory, file_name, other = file.split('/')
+
+            if other != nil || file_name.nil?
+              false
+            else
+              if signing_file_names.include?(File.extname(file_name).downcase)
+                true
+              end
+            end
+          end
+
           if files_to_remove.empty?
             @logger.log "App wasn't signed. Will not try to unsign it.", :debug
           else

data/lib/calabash/android/device.rb

@@ -157,7 +157,13 @@ module Calabash
 
         request = HTTP::Request.new('map', params_for_request(parameters))
 
-        result = JSON.parse(http_client.get(request).body)
+        http_result = if method_name == :flash
+                        http_client.get(request, timeout: 30)
+                      else
+                        http_client.get(request)
+                      end
+
+        result = JSON.parse(http_result.body)
 
         if result['outcome'] != 'SUCCESS'
           raise "mapping \"#{query}\" with \"#{method_name}\" failed because: #{result['reason']}\n#{result['details']}"
@@ -819,9 +825,14 @@ module Calabash
         gesture.gestures.first.touches[0].query = query_from
         gesture.gestures.first.touches[1].query = query_to
 
-        execute_gesture(Gestures::Gesture.with_parameters(gesture,
+        result = execute_gesture(Gestures::Gesture.with_parameters(gesture,
                                                           query: query_to,
                                                           timeout: options[:timeout]))
+
+        {
+            :from => Calabash::QueryResult.create(result[0], query_from),
+            :to => Calabash::QueryResult.create(result[1], query_to)
+        }
       end
 
       # @!visibility private

data/lib/calabash/android/interactions.rb

@@ -1,10 +1,12 @@
+require 'date'
+require 'time'
+
 module Calabash
   module Android
-    # @!visibility private
     module Interactions
-      # Go back.
+      # Go back. If the keyboard is shown, it will be dismissed.
       def go_back
-        dismiss_keyboard
+        Device.default.perform_action('hide_soft_keyboard')
         press_back_button
       end
 
@@ -37,6 +39,105 @@ module Calabash
         Device.default.current_focus[:package]
       end
 
+      # Sets the date of the first visible date picker widget.
+      #
+      # @example
+      #  set_date('2012-04-24')
+      #
+      # @example
+      #  date = Date.parse('3rd Feb 2012')
+      #  set_date(date)
+      #
+      # @param [Date, String] date The date to set. If given a String,
+      #  `Date.parse` is called on the string.
+      #
+      # @see #set_date_in
+      def set_date(date)
+        set_date_in("android.widget.DatePicker index:0", date)
+      end
+
+      # Sets the date of a date picker widget. If `query` matches multiple date
+      # pickers, the date is set for all of them.
+      #
+      # @param [String, Hash, Calabash::Query] query The query to match the
+      #  date picker.
+      # @param [Date, String] date The date to set. If given a String,
+      #  `Date.parse` is called on the string.
+      # @see #set_date
+      def set_date_in(query, date)
+        if date.is_a?(String)
+          date = Date.parse(date)
+        end
+
+        wait_for_view(query, timeout: Calabash::Gestures::DEFAULT_GESTURE_WAIT_TIMEOUT)
+        result = query(query, updateDate: [date.year, date.month, date.day])
+
+        if result.length != 1
+          raise "Failed to set the date of '#{query}'"
+        end
+
+        if result.first.is_a?(Hash) && result.first.has_key?('error')
+          raise result.first['error']
+        end
+
+        true
+      end
+
+      # Sets the time of the first visible time picker widget.
+      #
+      # @example
+      #  set_time('14:42')
+      #
+      # @example
+      #  time = Time.parse('8:30 AM')
+      #  set_time(time)
+      #
+      # @param [Time, String] time The time to set. If given a String,
+      #  `Time.parse` is called on the string.
+      #
+      # @see #set_time_in
+      def set_time(time)
+        set_time_in("android.widget.TimePicker index:0", time)
+      end
+
+      # Sets the time of a time picker widget. If `query` matches multiple time
+      # pickers, the time is set for all of them.
+      #
+      # @param [String, Hash, Calabash::Query] query The query to match the
+      #  time picker.
+      # @param [Time, String] time The time to set. If given a String,
+      #  `Time.parse` is called on the string.
+      # @see #set_time
+      def set_time_in(query, time)
+        if time.is_a?(String)
+          time = Time.parse(time)
+        end
+
+        wait_for_view(query, timeout: Calabash::Gestures::DEFAULT_GESTURE_WAIT_TIMEOUT)
+        result = query(query, setCurrentHour: time.hour)
+
+        if result.length != 1
+          raise "Failed to set the time of '#{query}'"
+        end
+
+        if result.first.is_a?(Hash) && result.first.has_key?('error')
+          raise result.first['error']
+        end
+
+        result = query(query, setCurrentMinute: time.min)
+
+        if result.length != 1
+          raise "Failed to set the time of '#{query}'"
+        end
+
+        if result.first.is_a?(Hash) && result.first.has_key?('error')
+          raise result.first['error']
+        end
+
+        true
+      end
+
+
       # @!visibility private
       def _evaluate_javascript_in(query, javascript)
         Device.default.evaluate_javascript_in(query, javascript)

data/lib/calabash/android/life_cycle.rb

@@ -1,16 +1,18 @@
 module Calabash
   module Android
-    # @!visibility private
     module LifeCycle
       # Resume an application. If the application is already focused, nothing
       # will happen.
       #
       # @example
       #  go_home
+      #  # Do something
       #  resume_app
       #
-      # @param [String, Calabash::Application] path_or_application The
-      #  application to resume.
+      # @param [String, Calabash::Application] path_or_application A path to the
+      #  application, or an instance of {Calabash::Application}.
+      #  Defaults to
+      #  {Calabash::Defaults#default_application Calabash.default_application}
       def resume_app(path_or_application = nil)
         path_or_application ||= Application.default
 
@@ -23,7 +25,6 @@ module Calabash
         true
       end
 
-
       # @!visibility private
       def _send_current_app_to_background(for_seconds)
         package = focused_package

data/lib/calabash/android/physical_buttons.rb

@@ -1,9 +1,12 @@
 module Calabash
   module Android
+    # Simulates pressing a *physical* button on the device. Use these methods
+    # carefully, as only a few devices have hardware key input. They can,
+    # however, be very useful for testing behaviour that would be hard to
+    # replicate otherwise.
     # @!visibility private
     module PhysicalButtons
 
-      # @todo: Add note about this class being easily abused
       def press_button(key)
         Device.default.perform_action('press_key', key)
         true

data/lib/calabash/android/scroll.rb

@@ -0,0 +1,5 @@
+module Calabash
+  module Android
+
+  end
+end

data/lib/calabash/android/text.rb

@@ -1,31 +1,12 @@
 module Calabash
   module Android
-    # @!visibility private
     module Text
+      # Dismisses the current keyboard. This is equivalent to the user
+      # 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')
-      end
-
-      # Taps a keyboard action key on the keyboard. Notice that Calabash does
-      # not ensure that this particular action key is actually available on the
-      # current keyboard.
-      #
-      # @example
-      #  tap_keyboard_action_key(:normal)
-      #  tap_keyboard_action_key(:unspecified)
-      #  tap_keyboard_action_key(:none)
-      #  tap_keyboard_action_key(:go)
-      #  tap_keyboard_action_key(:search)
-      #  tap_keyboard_action_key(:send)
-      #  tap_keyboard_action_key(:next)
-      #  tap_keyboard_action_key(:done)
-      #  tap_keyboard_action_key(:previous)
-      #
-      # @see http://developer.android.com/reference/android/view/inputmethod/EditorInfo.html
-      #
-      # @param [Symbol] action_key The key to press.
-      def tap_keyboard_action_key(action_key)
-        Device.default.perform_action('press_user_action_button', action_key.to_s)
+        sleep 0.5
       end
 
       # @!visibility private
@@ -53,8 +34,12 @@ module Calabash
       end
 
       # @!visibility private
-      def _tap_current_keyboard_action_key
-        Device.default.perform_action('press_user_action_button')
+      def _tap_keyboard_action_key(action_key)
+        if action_key.nil?
+          Device.default.perform_action('press_user_action_button')
+        else
+          Device.default.perform_action('press_user_action_button', action_key.to_s)
+        end
       end
     end
   end

data/lib/calabash/android.rb

@@ -1,8 +1,11 @@
 module Calabash
   # 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'

data/lib/calabash/cli/generate.rb

@@ -22,6 +22,7 @@ module Calabash
         cucumber_config = File.read(file(File.join('config', 'cucumber.yml')))
 
         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')))
 
@@ -46,6 +47,7 @@ module Calabash
         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')))
 

data/lib/calabash/console_helpers.rb

@@ -4,7 +4,6 @@ module Calabash
 
   # Methods you can use in the Calabash console to help you
   # interact with your app.
-  # @!visibility private
   module ConsoleHelpers
 
     # Outputs all visible elements as a tree.
@@ -30,13 +29,15 @@ module Calabash
       true
     end
 
-    # Clear the console.
+    # Clear the console history. Note that this also clears the contents
+    # given to Calabash::ConsoleHelpers#copy.
     def clear
       ConsoleHelpers.clear
       true
     end
 
     # Puts a message of the day.
+    # @!visibility private
     def message_of_the_day
       messages = [
             "Let's get this done!",
@@ -141,6 +142,7 @@ module Calabash
       readline_history.last(length)
     end
 
+    # @!visibility private
     FILTER_REGEX = Regexp.union(/\s*copy(\(|\z)/, /\s*tree(\(|\z)/,
                                 /\s*flash(\(|\z)/, /\s*classes(\(|\z)/,
                                 /\s*ids(\(|\z)/, /\s*start_app(\(|\z)/,

data/lib/calabash/device.rb

@@ -138,9 +138,6 @@ module Calabash
       gesture_options[:at] ||= {}
       gesture_options[:at][:x] ||= 50
       gesture_options[:at][:y] ||= 50
-      gesture_options[:offset] ||= {}
-      gesture_options[:offset][:x] ||= 0
-      gesture_options[:offset][:y] ||= 0
       gesture_options[:timeout] ||= Calabash::Gestures::DEFAULT_GESTURE_WAIT_TIMEOUT
 
       _tap(query, gesture_options)
@@ -156,9 +153,6 @@ module Calabash
       gesture_options[:at] ||= {}
       gesture_options[:at][:x] ||= 50
       gesture_options[:at][:y] ||= 50
-      gesture_options[:offset] ||= {}
-      gesture_options[:offset][:x] ||= 0
-      gesture_options[:offset][:y] ||= 0
       gesture_options[:timeout] ||= Calabash::Gestures::DEFAULT_GESTURE_WAIT_TIMEOUT
 
       _double_tap(query, gesture_options)
@@ -174,9 +168,6 @@ module Calabash
       gesture_options[:at] ||= {}
       gesture_options[:at][:x] ||= 50
       gesture_options[:at][:y] ||= 50
-      gesture_options[:offset] ||= {}
-      gesture_options[:offset][:x] ||= 0
-      gesture_options[:offset][:y] ||= 0
       gesture_options[:timeout] ||= Calabash::Gestures::DEFAULT_GESTURE_WAIT_TIMEOUT
       gesture_options[:duration] ||= 1
 
@@ -237,6 +228,7 @@ module Calabash
       end
 
       gesture_options = options.dup
+      gesture_options[:duration] ||= 0.5
       gesture_options[:timeout] ||= Calabash::Gestures::DEFAULT_GESTURE_WAIT_TIMEOUT
 
       _pinch(direction, query, gesture_options)

data/lib/calabash/environment.rb

@@ -30,6 +30,10 @@ module Calabash
     # Is Calabash running in debug mode. True if $CAL_DEBUG is '1'
     DEBUG = variable('CAL_DEBUG') == '1'
 
+    # @!visibility private
+    # Experimental! Print every method that is called in Calabash
+    DEBUG_CALLED_METHODS = variable('CAL_DEBUG_CALLED_METHODS') == '1'
+
     # The path of the default app under test. This value is used if no app is
     # given from the command line. e.g. $ calabash run.
     #