calabash-cucumber 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c85d9115ce76a776bd6f092ae9096cdea9d0880
-  data.tar.gz: 926a2acd95744bac3039630088b4348f13a074f4
+  metadata.gz: 796a5dc37f43d2e7d150bb8929c5e52d16176966
+  data.tar.gz: 851e40fd7aaea029233f34abccf91c9e7807fbfa
 SHA512:
-  metadata.gz: 21f0e1cf1cbaa40681a878d22e772c45e5027679d9d11965a35c3ad77b3647867301fd897d25476e8f4bd13cabae593855e1a239998eb56b07c92be53665bd04
-  data.tar.gz: 5958dc93df0f60224aa85be1fa87c0ceb1b0ec79834ed88fa1cd86950445432fa26c2b039ac252748ca995b8ab30dfb78583d1672c096b5f088562ec2a0da94d
+  metadata.gz: 0cbd4f06733e34268ba2ecbeec32c9b8cf8e50d61dc09520039b53778fec9dc0f9560107ba417a2c4dac3f29cf2ce47968e8223934f117545825b5a7454b980f
+  data.tar.gz: 7e744d481c1125fdedd329be21b14cc4363d5a8f3f6a95e623f76ee921477bf1d231c782efcb807e87bf18bf9136c5acc429b99812155862add9b08bd043a5db

data/lib/calabash-cucumber/launcher.rb

@@ -6,7 +6,6 @@ require 'calabash-cucumber/actions/instruments_actions'
 require 'calabash-cucumber/actions/playback_actions'
 require 'run_loop'
 require 'cfpropertylist'
-require 'calabash-cucumber/version'
 require 'calabash-cucumber/utils/logging'
 require 'calabash/dylibs'
 
@@ -554,7 +553,20 @@ class Calabash::Cucumber::Launcher
     end
 
     if run_with_instruments?(args)
-      args[:uia_strategy] ||= :preferences
+      # Patch for bug in Xcode 6 GM + iOS 8 device testing.
+      # http://openradar.appspot.com/radar?id=5891145586442240
+      #
+      # RunLoop::Core.run_with_options can reuse the SimControl instance.  Many
+      # of the Xcode tool calls, like instruments -s templates, take a long time
+      # to execute.  The SimControl instance has XCTool attribute which caches
+      # the results of many of these time-consuming calls so they only need to
+      # be called 1 time per launch.
+      # @todo Use SimControl in Launcher in place of methods like simulator_target?
+      args[:sim_control] = RunLoop::SimControl.new
+      uia_strategy = default_uia_strategy(args, args[:sim_control])
+      args[:uia_strategy] ||= uia_strategy
+      calabash_info "Using uia strategy: '#{args[:uia_strategy]}'" if debug_logging?
+
       self.run_loop = new_run_loop(args)
       self.actions= Calabash::Cucumber::InstrumentsActions.new
     else
@@ -574,6 +586,37 @@ class Calabash::Cucumber::Launcher
     end
   end
 
+  # @!visibility private
+  #
+  # Choose the appropriate default UIA strategy based on the test target.
+  #
+  # This is a temporary (I hope) fix for a UIAApplication bug in
+  # setPreferencesValueForKey on iOS 8 devices in Xcode 6 GM.
+  #
+  # rdar://18296714
+  # http://openradar.appspot.com/radar?id=5891145586442240
+  def default_uia_strategy(launch_args, sim_control)
+    # Preferences strategy works on Xcode iOS Simulators.
+    if RunLoop::Core.simulator_target?(launch_args, sim_control)
+      :preferences
+    else
+      target_udid = launch_args[:device_target]
+      target_device = nil
+      sim_control.xctools.instruments(:devices).each do |device|
+        if device.udid == target_udid
+          target_device = device
+          break
+        end
+      end
+      # Preferences strategy works for iOS < 8.0, but not for iOS >= 8.0.
+      if target_device.version < RunLoop::Version.new('8.0')
+        :preferences
+      else
+        :host
+      end
+    end
+  end
+
   # @!visibility private
   def detect_device_from_args(args)
     if args[:app] && File.directory?(args[:app])
@@ -911,13 +954,13 @@ class Calabash::Cucumber::Launcher
     @@server_version = self.device.server_version
   end
 
-  # checks the server and gem version compatibility and generates a warning if
+  # @!visibility private
+  # Checks the server and gem version compatibility and generates a warning if
   # the server and gem are not compatible.
   #
-  # WIP:  this is a proof-of-concept implementation and requires _strict_
-  # equality.  in the future we should allow minimum framework compatibility.
+  # @note  This is a proof-of-concept implementation and requires _strict_
+  #  equality.  in the future we should allow minimum framework compatibility.
   #
-  # @!visibility private
   # @return [nil] nothing to return
   def check_server_gem_compatibility
     app_bundle_path = self.launch_args[:app]
@@ -932,18 +975,18 @@ class Calabash::Cucumber::Launcher
       return nil
     end
 
-    server_version = Calabash::Cucumber::Version.new(server_version)
-    gem_version = Calabash::Cucumber::Version.new(Calabash::Cucumber::VERSION)
-    min_server_version = Calabash::Cucumber::Version.new(Calabash::Cucumber::MIN_SERVER_VERSION)
+    server_version = RunLoop::Version.new(server_version)
+    gem_version = RunLoop::Version.new(Calabash::Cucumber::VERSION)
+    min_server_version = RunLoop::Version.new(Calabash::Cucumber::MIN_SERVER_VERSION)
 
     if server_version < min_server_version
-      msgs = []
-      msgs << 'server version is not compatible with gem version'
-      msgs << 'please update your server and gem'
-      msgs << "       gem version: '#{gem_version}'"
-      msgs << "min server version: '#{min_server_version}'"
-      msgs << "    server version: '#{server_version}'"
-
+      msgs = [
+            'The server version is not compatible with gem version.',
+            'Please update your server.',
+            'https://github.com/calabash/calabash-ios/wiki/B1-Updating-your-Calabash-iOS-version',
+            "       gem version: '#{gem_version}'",
+            "min server version: '#{min_server_version}'",
+            "    server version: '#{server_version}'"]
       calabash_warn("#{msgs.join("\n")}")
     else
       if full_console_logging?

data/lib/calabash-cucumber/utils/xctools.rb

@@ -1,4 +1,5 @@
 require 'open3'
+require 'run_loop'
 
 module Calabash
   module Cucumber
@@ -21,10 +22,7 @@ module Calabash
       #
       # @return [String] path to current developer directory
       def xcode_developer_dir
-        # respect DEVELOPER_DIR
-        return ENV['DEVELOPER_DIR'] if ENV['DEVELOPER_DIR']
-        # fall back to xcode-select
-        `xcode-select --print-path`.chomp
+        RunLoop::XCTools.new.xcode_developer_dir
       end
 
       # @deprecated 0.10.0 not replaced
@@ -54,17 +52,11 @@ module Calabash
       def instruments(cmd=nil)
         instruments = 'xcrun instruments'
         return instruments if cmd == nil
-
         case cmd
           when :version
-            # instruments, version 5.1.1 (55045)
-            # noinspection RubyUnusedLocalVariable
-            Open3.popen3("#{instruments}") do |stdin, stdout, stderr, wait_thr|
-              stderr.read.chomp.split(' ')[2]
-            end
+            RunLoop::XCTools.new.instruments(cmd).to_s
           when :sims
-            devices = `#{instruments} -s devices`.chomp.split("\n")
-            devices.select { |device| device.downcase.include?('simulator') }
+            RunLoop::XCTools.new.instruments(cmd)
           else
             candidates = [:version, :sims]
             raise(ArgumentError, "expected '#{cmd}' to be one of '#{candidates}'")
@@ -82,11 +74,8 @@ module Calabash
       #   a major.minor[.patch] version string
       #
       # @return [Boolean] true if the version is >= 5.*
-      def instruments_supports_hyphen_s?(version=instruments(:version))
-        tokens = version.split('.')
-        return false if tokens[0].to_i < 5
-        return false if tokens[1].to_i < 1
-        true
+      def instruments_supports_hyphen_s?(version)
+        RunLoop::XCTools.new.instruments_supports_hyphen_s?(version)
       end
 
       # Returns a list of installed simulators by calling `$ instruments -s devices`.
@@ -96,12 +85,8 @@ module Calabash
       # @raise [RuntimeError] if the currently active instruments version does
       #   not support the -s flag
       def installed_simulators
-        unless instruments_supports_hyphen_s?
-          raise(RuntimeError, "instruments '#{instruments(:version)}' does not support '-s devices' arguments")
-        end
         instruments(:sims)
       end
-
     end
   end
-end
+end

data/lib/calabash-cucumber/version.rb

@@ -1,16 +1,17 @@
 require 'calabash-cucumber/utils/logging'
+require 'run_loop/version'
 
 module Calabash
   module Cucumber
 
     # @!visibility public
     # The Calabash iOS gem version.
-    VERSION = '0.10.0'
+    VERSION = '0.10.1'
 
     # @!visibility public
     # The minimum required version of the calabash.framework or, for Xamarin
     # users, the Calabash component.
-    MIN_SERVER_VERSION = '0.10.0'
+    MIN_SERVER_VERSION = '0.10.1'
 
     # @!visibility private
     def self.const_missing(const_name)
@@ -33,320 +34,8 @@ module Calabash
     #
     # @see http://semver.org/
     # @see http://gravitext.com/2012/07/22/versioning.html
-    class Version
-
-      # @!attribute [rw] major
-      #   @return [Integer] the major version
-      attr_accessor :major
-
-      # @!attribute [rw] minor
-      #   @return [Integer] the minor version
-      attr_accessor :minor
-
-      # @!attribute [rw] patch
-      #   @return [Integer] the patch version
-      attr_accessor :patch
-
-      # @!attribute [rw] pre
-      #   @return [Boolean] true if this is a pre-release version
-      attr_accessor :pre
-
-      # @!attribute [rw] pre_version
-      #   @return [Integer] if this is a pre-release version, returns the
-      #     pre-release version; otherwise this is nil
-      attr_accessor :pre_version
-
-      # Creates a new Version instance with all the attributes set.
-      #
-      # @example
-      #  version = Version.new(0.10.1)
-      #  version.major       => 0
-      #  version.minor       => 10
-      #  version.patch       => 1
-      #  version.pre         => false
-      #  version.pre_release => nil
-      #
-      # @example
-      #  version = Version.new(1.6.3.pre5)
-      #  version.major       => 1
-      #  version.minor       => 6
-      #  version.patch       => 3
-      #  version.pre         => true
-      #  version.pre_release => 5
-      #
-      # @param [String] version the version string to parse.
-      # @raise [ArgumentError] if version is not in the form 5, 6.1, 7.1.2, 8.2.3.pre1
-      def initialize(version)
-        tokens = version.strip.split('.')
-        count = tokens.count
-        if tokens.empty?
-          raise ArgumentError, "expected '#{version}' to be like 5, 6.1, 7.1.2, 8.2.3.pre1"
-        end
-
-        if count < 4 and tokens.any? { |elm| elm =~ /\D/ }
-          raise ArgumentError, "expected '#{version}' to be like 5, 6.1, 7.1.2, 8.2.3.pre1"
-        end
-
-        if count == 4
-          @pre = tokens[3]
-          pre_tokens = @pre.scan(/\D+|\d+/)
-          @pre_version = pre_tokens[1].to_i if pre_tokens.count == 2
-        end
-
-        @major, @minor, @patch = version.split('.').map(&:to_i)
-      end
-
-      # Returns an string representation of this version.
-      # @return [String] a string in the form `<major>.<minor>.<patch>[.pre<N>]`
-      def to_s
-        str = [@major, @minor, @patch].compact.join('.')
-        str = "#{str}.#{@pre}" if @pre
-        str
-      end
-
-      # Compare this version to another for equality.
-      # @param [Version] other the version to compare against
-      # @return [Boolean] true if this Version is the same as `other`
-      def == (other)
-        Version.compare(self, other) == 0
-      end
-
-      # Compare this version to another for inequality.
-      # @param [Version] other the version to compare against
-      # @return [Boolean] true if this Version is not the same as `other`
-      def != (other)
-        Version.compare(self, other) != 0
-      end
-
-      # Is this version less-than another version?
-      # @param [Version] other the version to compare against
-      # @return [Boolean] true if this Version is less-than `other`
-      def < (other)
-        Version.compare(self, other) < 0
-      end
-
-      # Is this version greater-than another version?
-      # @param [Version] other the version to compare against
-      # @return [Boolean] true if this Version is greater-than `other`
-      def > (other)
-        Version.compare(self, other) > 0
-      end
-
-      # Is this version less-than or equal to another version?
-      # @param [Version] other the version to compare against
-      # @return [Boolean] true if this Version is less-than or equal `other`
-      def <= (other)
-        Version.compare(self, other) <= 0
-      end
-
-      # Is this version greater-than or equal to another version?
-      # @param [Version] other the version to compare against
-      # @return [Boolean] true if this Version is greater-than or equal `other`
-      def >= (other)
-        Version.compare(self, other) >= 0
-      end
-
-      # Compare version `a` to version `b`.
-      #
-      # @example
-      #   compare Version.new(0.10.0), Version.new(0.9.0)  =>  1
-      #   compare Version.new(0.9.0),  Version.new(0.10.0) => -1
-      #   compare Version.new(0.9.0),  Version.new(0.9.0)  =>  0
-      #
-      # @return [Integer] an integer `(-1, 1)`
-      def self.compare(a, b)
-
-        if a.major != b.major
-          return a.major > b.major ? 1 : -1
-        end
-
-        if a.minor != b.minor
-          return a.minor.to_i  > b.minor.to_i ? 1 : -1
-        end
-
-        if a.patch != b.patch
-          return a.patch.to_i > b.patch.to_i ? 1 : -1
-        end
-
-        return 1 if a.pre and (not b.pre)
-        return -1 if (not a.pre) and b.pre
-
-        return 1 if a.pre_version and (not b.pre_version)
-        return -1 if (not a.pre_version) and b.pre_version
-
-        if a.pre_version != b.pre_version
-          return a.pre_version.to_i > b.pre_version.to_i ? 1 : -1
-        end
-
-        0
-
-      end
-    end
-  end
-end
-
-# These are unit tests.
-#
-# $ ruby lib/calabash-cucumber/version.rb
-#
-# todo move to rspec
-if __FILE__ == $0
-  require 'test/unit'
-
-  # @!visibility private
-  # Unit testing of Version class
-  class LocalTest < Test::Unit::TestCase
-    include Calabash::Cucumber
-
-    # @!visibility private
-    def test_version
-      a = Version.new('0.9.169')
-      assert_equal(0, a.major)
-      assert_equal(9, a.minor)
-      assert_equal(169, a.patch)
-      assert_nil(a.pre)
-      assert_nil(a.pre_version)
-    end
-
-    # @!visibility private
-    def test_new_passed_invalid_arg
-
-      assert_raise(ArgumentError) { Version.new(' ') }
-      assert_raise(ArgumentError) { Version.new('5.1.pre3') }
-      assert_raise(ArgumentError) { Version.new('5.pre2') }
+    class Version < RunLoop::Version
 
     end
-
-    # @!visibility private
-    def test_unnumbered_prerelease
-      a = Version.new('0.9.169.pre')
-      assert_equal('pre', a.pre)
-      assert_nil(a.pre_version)
-    end
-
-    # @!visibility private
-    def test_numbered_prerelease
-      a = Version.new('0.9.169.pre1')
-      assert_equal('pre1', a.pre)
-      assert_equal(1, a.pre_version)
-    end
-
-    # @!visibility private
-    def test_compare_equal
-      a = Version.new('0.9.169')
-      b = Version.new('0.9.169')
-      assert(a == b)
-
-      a = Version.new('0.9.169.pre')
-      b = Version.new('0.9.169.pre')
-      assert(a == b)
-
-      a = Version.new('0.9.169.pre2')
-      b = Version.new('0.9.169.pre2')
-      assert(a == b)
-
-    end
-
-    # @!visibility private
-    def test_compare_not_equal
-      a = Version.new('0.9.168')
-      b = Version.new('0.9.169')
-      assert(a != b)
-
-      a = Version.new('0.9.169')
-      b = Version.new('0.9.169.pre1')
-      assert(a != b)
-
-      a = Version.new('0.9.169.pre')
-      b = Version.new('0.9.169.pre1')
-      assert(a != b)
-
-      a = Version.new('0.9.169.pre1')
-      b = Version.new('0.9.169.pre2')
-      assert(a != b)
-    end
-
-    # @!visibility private
-    def test_compare_lt
-      a = Version.new('0.9.168')
-      b = Version.new('0.9.169')
-      assert(a < b)
-
-      a = Version.new('0.9.169')
-      b = Version.new('0.9.169.pre')
-      assert(a < b)
-
-      a = Version.new('0.9.169.pre')
-      b = Version.new('0.9.169.pre1')
-      assert(a < b)
-
-      a = Version.new('0.9.169.pre1')
-      b = Version.new('0.9.169.pre2')
-      assert(a < b)
-    end
-
-    # @!visibility private
-    def test_compare_gt
-      a = Version.new('0.9.169')
-      b = Version.new('0.9.168')
-      assert(a > b)
-
-      a = Version.new('0.9.169.pre')
-      b = Version.new('0.9.169')
-      assert(a > b)
-
-      a = Version.new('0.9.169.pre1')
-      b = Version.new('0.9.169.pre')
-      assert(a > b)
-
-      a = Version.new('0.9.169.pre2')
-      b = Version.new('0.9.169.pre1')
-      assert(a > b)
-    end
-
-    # @!visibility private
-    def test_compare_lte
-      a = Version.new('0.9.168')
-      b = Version.new('0.9.169')
-      assert(a <= b)
-      a = Version.new('0.9.169')
-      assert(a <= b)
-    end
-
-    # @!visibility private
-    def test_compare_gte
-      a = Version.new('0.9.169')
-      b = Version.new('0.9.168')
-      assert(a >= b)
-      b = Version.new('0.9.169')
-      assert(a >= b)
-    end
-
-    # @!visibility private
-    def test_compare_missing_patch_level
-      a = Version.new('6.0')
-      b = Version.new('5.1.1')
-      assert(Version.compare(a, b) == 1)
-      assert(a > b)
-
-      a = Version.new('5.1.1')
-      b = Version.new('6.0')
-      assert(Version.compare(a, b) == -1)
-      assert(a < b)
-    end
-
-    # @!visibility private
-    def test_compare_missing_minor_level
-      a = Version.new('5.1')
-      b = Version.new('5.1.1')
-      assert(Version.compare(a, b) == -1)
-      assert(a < b)
-
-      a = Version.new('5.1.1')
-      b = Version.new('5.1')
-      assert(Version.compare(a, b) == 1)
-      assert(a > b)
-    end
-
   end
 end

data/lib/calabash-cucumber/wait_helpers.rb

@@ -46,7 +46,7 @@ module Calabash
             :timeout_message => 'Timed out waiting...',
             # Calabash will generate a screenshot by default if waiting times out
             :screenshot_on_error => true
-      }.freeze
+      }
 
       # Waits for a condition to be true. The condition is specified by a given block that is called repeatedly.
       # If the block returns a 'trueish' value the condition is considered true and

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-09 00:00:00.000000000 Z
+date: 2014-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement