calabash-cucumber 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41d103959b49c4411bcc0583fe986cc3acd06542
-  data.tar.gz: d7dd688264cf2a1d130b78f167bd97a95222988a
+  metadata.gz: 1bd0df04cec74d782b40e63d60e408db81c21cdb
+  data.tar.gz: 34502d517be61ca09306bafbeb04ed44f4de6004
 SHA512:
-  metadata.gz: 9e7e0ad4833aa4d21c6845cdad2bfce13965e5176796246efd3b621d7e46e61640aafbceeebdf3ffbd31cb15720c2a4e61ee24ba1500c6bf9e8195713fa0574b
-  data.tar.gz: ecb3d00cc9390fee76e2d55530cdc43014fe6ed5e07ac044edd3a72d8c6b395624044a1fdf4839cd5138297b3ecae06d2c870a86e31fcbf0571d7346379990b2
+  metadata.gz: bbf7c5b7f7fb04d0e961a6088986a93caccd0a6aab0f631ee7737d23b90e21faec764762d796ee00b90308d93b4e0bc841c7ae314fbac7184eaf4caa62720272
+  data.tar.gz: 26c232af033ce6c182e8c881b950e2e6fc01b24000a427ee3401feda745254d71c4c6501f47369c56ad4a05ddc62b83155cb8a207a3afb6e90db53ea8589673f

data/lib/calabash-cucumber/core.rb

@@ -1081,11 +1081,16 @@ module Calabash
       #
       #  to connect to the current launcher
       #
+      # @param [Symbol] uia_strategy Optionally specify the uia strategy, which
+      #   can be one of :shared_element, :preferences, :host.  If you don't
+      #   know which to choose, don't specify one and calabash will try deduce
+      #   the correct strategy to use based on the environment variables used
+      #   when starting the console.
       # @return [Calabash::Cucumber::Launcher,nil] the currently active
       #  calabash launcher
-      def console_attach
+      def console_attach(uia_strategy = nil)
         # setting the @calabash_launcher here for backward compatibility
-        @calabash_launcher = launcher.attach
+        @calabash_launcher = launcher.attach({:uia_strategy => uia_strategy})
       end
 
       # @!visibility private

data/lib/calabash-cucumber/launcher.rb

@@ -96,12 +96,33 @@ class Calabash::Cucumber::Launcher
   end
 
   # @see Calabash::Cucumber::Core#console_attach
-  def attach(max_retry=1, timeout=10)
+  def attach(options={})
+    default_options = {:max_retry => 1,
+                       :timeout => 10,
+                       :uia_strategy => nil}
+    merged_options = default_options.merge(options)
+
     if calabash_no_launch?
       self.actions= Calabash::Cucumber::PlaybackActions.new
       return
     end
 
+    # :host is is a special case and requires reading information from a cache.
+    strategy_from_options = merged_options[:uia_strategy]
+    if strategy_from_options == :host
+      self.run_loop = RunLoop::HostCache.default.read
+      return self
+    end
+
+    # Sets the device attribute.
+    ensure_connectivity(merged_options[:max_retry], merged_options[:timeout])
+
+    # The default strategy for iOS 8 devices is :host.
+    if strategy_from_options.nil? && self.device.ios_major_version > '8'
+      self.run_loop = RunLoop::HostCache.default.read
+      return self
+    end
+
     pids_str = `ps x -o pid,command | grep -v grep | grep "instruments" | awk '{printf "%s,", $1}'`
     pids = pids_str.split(',').map { |pid| pid.to_i }
     pid = pids.first
@@ -113,17 +134,10 @@ class Calabash::Cucumber::Launcher
       self.actions= Calabash::Cucumber::PlaybackActions.new
     end
 
-    # Sets the device attribute.
-    ensure_connectivity(max_retry, timeout)
-
-    if self.device.simulator?
-      run_loop[:uia_strategy] = :preferences
+    if strategy_from_options
+      run_loop[:uia_strategy] = merged_options[:uia_strategy]
     else
-      if self.device.ios_major_version < '8'
-        run_loop[:uia_strategy] = :preferences
-      else
-        run_loop[:uia_strategy] = :host
-      end
+      run_loop[:uia_strategy] = :preferences
     end
 
     self.run_loop = run_loop
@@ -131,8 +145,8 @@ class Calabash::Cucumber::Launcher
     if major.to_i >= 7 && self.actions.is_a?(Calabash::Cucumber::PlaybackActions)
       puts "\n\n WARNING \n\n"
       puts 'Warning Trying to connect to simulator that was not launched by Calabash/instruments.'
-      puts 'To fix this you must let Calabash or instruments launch the app'
-      puts 'Continuing... query et al will work.'
+      puts 'To fix this you must let Calabash or instruments launch the app.'
+      puts 'Query will work, but gestures will not.'
       puts "\n\n WARNING \n\n"
       puts 'Please read: https://github.com/calabash/calabash-ios/wiki/A0-UIAutomation---instruments-problems'
     end
@@ -649,6 +663,10 @@ class Calabash::Cucumber::Launcher
           break
         end
       end
+
+      # -1 for manipulating the launch_args in this method!
+      # This work should not be done here!
+      # @todo Do not modify launch_args in default_uia_strategy method
       if target_device.nil?
         target_device = devices_connected.first
         if target_device

data/lib/calabash-cucumber/rotation_helpers.rb

@@ -15,7 +15,7 @@ module Calabash
            rotate_right_home_down rotate_right_home_left rotate_right_home_right rotate_right_home_up)
       end
 
-      # Rotates the home button position to the position indicated by `dir`.
+      # Rotates the home button to a position relative to the status bar.
       #
       # @example portrait
       #  rotate_home_button_to :down
@@ -47,10 +47,11 @@ module Calabash
       # @param [Symbol] dir The position of the home button after the rotation.
       #  Can be one of `{:down | :left | :right | :up }`.
       #
-      # @return [Symbol] The orientation of the button when all rotations have
-      #  been completed.  If there is problem rotating, this method will return
-      #  `:down` regardless of the actual home button position.
+      # @note A rotation will only occur if your view controller and application
+      #  support the target orientation.
       #
+      # @return [Symbol] The position of the home button relative to the status
+      #  bar when all rotations have been completed.
       def rotate_home_button_to(dir)
         dir_sym = dir.to_sym
         if dir_sym.eql?(:top)

data/lib/calabash-cucumber/status_bar_helpers.rb

@@ -15,11 +15,7 @@ module Calabash
       #  use `status_bar_orientation` whenever possible.
       #
       # @note Devices that are lying on a flat surface will report their
-      #  orientation as 'face up' or 'face down'.  In order to translate
-      #  gestures based on orientation, Calabash must have left, right, up, or
-      #  down orientation. To that end, if a device is lying flat, this method
-      #  will ***force*** a down orientation.  This will happen regardless of
-      #  the value of the `force_down` optional argument.
+      #  orientation as 'face up' or 'face down'.
       #
       # @see #status_bar_orientation
       # @see Calabash::Cucumber::RotationHelpers#rotate_home_button_to
@@ -80,4 +76,4 @@ module Calabash
 
     end
   end
-end
+end

data/lib/calabash-cucumber/uia.rb

@@ -66,16 +66,40 @@ module Calabash
       def uia_wait_tap(query, options={})
         launcher = Calabash::Cucumber::Launcher.launcher_if_used
         run_loop = launcher && launcher.active? && launcher.run_loop
-        raise ArgumentError, 'the current launcher must be active and be attached to a run_loop' unless run_loop
-        raise ArgumentError, 'please supply :command' unless command
+
+        unless run_loop
+          raise 'The current launcher must be active and be attached to a run_loop'
+        end
+
+        unless query
+          raise ArgumentError, "Expected a query argument but got '#{query}'"
+        end
 
         strategy = run_loop[:uia_strategy]
-        path = (strategy == :preferences ? 'uia-tap' : 'uia-tap-shared')
+
+        case strategy
+          when :preferences
+            path = 'uia-tap'
+          when :shared_element
+            path = 'uia-tap-shared'
+          when :host
+            lines = ['wait_tap is not supported when using the :host strategy',
+                     'Please see:',
+                     '',
+                     'https://github.com/calabash/calabash-ios/issues/675',
+                     '',
+                     'for details and workarounds'
+            ]
+
+            raise lines.join("\n")
+          else
+            raise "Unknown UIA strategy '#{strategy}'; expected {:host | :preferences | :shared_element}"
+        end
 
         res = http({:method => :post, :path => path}, {:query => query}.merge(options))
         res = JSON.parse(res)
         if res['outcome'] != 'SUCCESS'
-          raise "uia-tap action failed because: #{res['reason']}\n#{res['details']}"
+          raise "wait-uia-tap action failed because: #{res['reason']}\n#{res['details']}"
         end
         res['results']
       end

data/lib/calabash-cucumber/version.rb

@@ -3,7 +3,7 @@ module Calabash
 
     # @!visibility public
     # The Calabash iOS gem version.
-    VERSION = '0.12.0'
+    VERSION = '0.12.1'
 
     # @!visibility public
     # The minimum required version of the calabash.framework or, for Xamarin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-07 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -126,16 +126,22 @@ dependencies:
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.2
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.3.3
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.2
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.3.3
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -156,28 +162,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: run_loop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement