calabash-cucumber 0.15.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1162678765d96a589e12bdf06d092d2f0eba972a
-  data.tar.gz: 4c68a868778d5fac3f875a2c709c1329e4330791
+  metadata.gz: f501008ee0e1a3152d8b681c2a6ccc5463a14057
+  data.tar.gz: 09c4bf7340eeb0f0b4ea96f1db3f477f829a68e0
 SHA512:
-  metadata.gz: da411ca25785cad3d76cbc52745708a9af974d1aed3d9d855e0231afb6d21486ec71a9ff9f980bf25c2bdad61742d244695c9f799e763f42f12328c3f82a8335
-  data.tar.gz: 0cca1e98616a717243bb4727e64ce41a2befaecc9f6fc6b54f5421723ff696c53435b42e986daa43a72bb55387f177058233119af367b80989d43cb62ac55c56
+  metadata.gz: 2bd0c0c774158fd2e8d3789b45a816ecf90b1073e17710c2f5869460fccc9ac8eb75e040c1d21ea84671cce24666467af8afc9e93c84f742a6e89f137ae7c6f0
+  data.tar.gz: 7b8e3efec441d1af9e46352c136b0ed95a7b875a29f04a1827ec6e62062a15e7d6ab08dac6709b0a930ca1f526236e5c0ec3098b793cfa927892bb3be8e7bd38

data/lib/calabash-cucumber/device.rb

@@ -244,6 +244,12 @@ module Calabash
         version_hash(ios_version)[:major_version]
       end
 
+      # Is this device running iOS 9?
+      # @return [Boolean] true if the major version of the OS is 9
+      def ios9?
+        ios_major_version == '9'
+      end
+
       # Is this device running iOS 8?
       # @return [Boolean] true if the major version of the OS is 8
       def ios8?

data/lib/calabash-cucumber/environment_helpers.rb

@@ -123,6 +123,18 @@ module Calabash
         _default_device_or_create.iphone_35in?
       end
 
+      # The iOS version on the device under test.
+      #
+      # @note
+      #  **WARNING:** The `OS` env variable has been deprecated and should
+      #  never be set.
+      #
+      # @raise [RuntimeError] If the server cannot be reached.
+      # @return [RunLoop::Version] The version of the iOS running on the device.
+      def ios_version
+        RunLoop::Version.new(_default_device_or_create.ios_version)
+      end
+
       # Is the device under test running iOS 5?
       #
       # @note
@@ -180,6 +192,18 @@ module Calabash
        _default_device_or_create.ios8?
       end
 
+      # Is the device under test running iOS 9?
+      #
+      # @note
+      #  **WARNING:** The `OS` env variable has been deprecated and should
+      #  never be set.
+      #
+      # @raise [RuntimeError] if the server cannot be reached
+      # @return [Boolean] true if device under test is running iOS 9
+      def ios9?
+       _default_device_or_create.ios9?
+      end
+
       # Is the app that is being tested an iPhone app emulated on an iPad?
       #
       # @see Calabash::Cucumber::IPad

data/lib/calabash-cucumber/launcher.rb

@@ -122,8 +122,7 @@ class Calabash::Cucumber::Launcher
     # 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'
+    if strategy_from_options.nil? && xcode.version_gte_7?
       self.run_loop = RunLoop::HostCache.default.read
       return self
     end
@@ -666,36 +665,40 @@ class Calabash::Cucumber::Launcher
   # @param [RunLoop::SimControl] sim_control Used to find simulators.
   # @param [RunLoop::Instruments] instruments Used to find physical devices.
   def default_uia_strategy(launch_args, sim_control, instruments)
-    # Preferences strategy works on Xcode iOS Simulators.
-    if RunLoop::Core.simulator_target?(launch_args, sim_control)
-      :preferences
+
+    xcode = sim_control.xcode
+    if xcode.version_gte_7?
+      :host
     else
-      target_udid = launch_args[:device_target]
-      target_device = nil
-      devices_connected = instruments.physical_devices
-      devices_connected.each do |device|
-        if device.udid == target_udid
-          target_device = device
-          break
-        end
-      end
+      udid_or_name = launch_args[:device_target]
 
-      # -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
-          launch_args[:device_target] = target_device.udid
-        end
+      # Can't make a determination, so return :host because it works everywhere.
+      return :host if udid_or_name == nil || udid_or_name == ''
+
+      # The default.
+      # No DEVICE_TARGET is set and no option was passed to relaunch.
+      return :preferences if udid_or_name.downcase.include?('simulator')
+
+      simulator = sim_control.simulators.find do |sim|
+        sim.instruments_identifier(xcode) == udid_or_name ||
+              sim.udid == udid_or_name
       end
-      unless target_device
-        raise 'No device_target was specified and did not detect a connected device. Set a device_target option in the relaunch method.'
+
+      return :preferences if simulator
+
+      physical_device = instruments.physical_devices.find do |device|
+        device.name == udid_or_name ||
+              device.udid == udid_or_name
       end
-      # Preferences strategy works for iOS < 8.0, but not for iOS >= 8.0.
-      if target_device.version < RunLoop::Version.new('8.0')
-        :preferences
+
+      if physical_device
+        if physical_device.version < RunLoop::Version.new('8.0')
+          :preferences
+        else
+          :host
+        end
       else
+        # Return host because it works everywhere.
         :host
       end
     end
@@ -888,11 +891,32 @@ class Calabash::Cucumber::Launcher
     (ENV['DEVICE_TARGET'] != nil) && (not simulator_target?)
   end
 
+  # @!visibility private
+  def discover_device_target(launch_args)
+    ENV['DEVICE_TARGET'] || launch_args[:device_target]
+  end
+
   # @!visibility private
   def simulator_target?(launch_args={})
-    value = ENV['DEVICE_TARGET'] || launch_args[:device_target]
-    return false if value.nil?
-    value.downcase.include?('simulator')
+    udid_or_name = discover_device_target(launch_args)
+
+    return false if udid_or_name.nil? || udid_or_name == ''
+
+    return true if udid_or_name.downcase.include?('simulator')
+
+    return false if udid_or_name[RunLoop::Regex::DEVICE_UDID_REGEX, 0] != nil
+
+    if xcode.version_gte_6?
+      sim_control = launch_args[:sim_control] || RunLoop::SimControl.new
+      simulator = sim_control.simulators.find do |sim|
+        sim.instruments_identifier(xcode) == udid_or_name ||
+              sim.udid == udid_or_name
+      end
+
+      !simulator.nil?
+    else
+      false
+    end
   end
 
   # @!visibility private

data/lib/calabash-cucumber/playback_helpers.rb

@@ -55,8 +55,18 @@ module Calabash
 
       # @!visibility private
       def load_playback_data(recording_name, options={})
+
         device = options['DEVICE'] || ENV['DEVICE'] || 'iphone'
 
+        # Xcode 7/iOS 9 - Playback file not found for rotation #837
+        # As of iOS 7 and Xcode 5.1.1, the only part of the playback API that
+        # is being used is the rotation API.  We've incorrectly been using
+        # iPhone recordings for iPad rotations.  The iPhone recordings are
+        # working, so I am not inclined to make any dramatic changes.
+        if device != 'iphone' || device != 'ipad'
+          device = 'iphone'
+        end
+
         major = Calabash::Cucumber::Launcher.launcher.ios_major_version
 
         unless major
@@ -212,4 +222,4 @@ EOF
 
     end
   end
-end
+end

data/lib/calabash-cucumber/version.rb

@@ -3,10 +3,10 @@ module Calabash
 
     # @!visibility public
     # The Calabash iOS gem version.
-    VERSION = '0.15.0'
+    VERSION = '0.16.1'
 
     # @!visibility public
     # The minimum required version of the Calabash embedded server.
-    MIN_SERVER_VERSION = '0.15.0'
+    MIN_SERVER_VERSION = '0.16.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.1
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-07 00:00:00.000000000 Z
+date: 2015-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -146,7 +146,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.3
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -156,7 +156,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.3
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'