calabash-cucumber 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 796a5dc37f43d2e7d150bb8929c5e52d16176966
-  data.tar.gz: 851e40fd7aaea029233f34abccf91c9e7807fbfa
+  metadata.gz: 897651c4a4fa6614afc67e03db8ef2e6765460f8
+  data.tar.gz: a99ac89d631f74da261382d01be1280e09e28a8d
 SHA512:
-  metadata.gz: 0cbd4f06733e34268ba2ecbeec32c9b8cf8e50d61dc09520039b53778fec9dc0f9560107ba417a2c4dac3f29cf2ce47968e8223934f117545825b5a7454b980f
-  data.tar.gz: 7e744d481c1125fdedd329be21b14cc4363d5a8f3f6a95e623f76ee921477bf1d231c782efcb807e87bf18bf9136c5acc429b99812155862add9b08bd043a5db
+  metadata.gz: acbdeaff512e94a5dbf62756e684e3bec5cdca1f664c98aca2938dc937b1d03453c61afa8f9989aab30ba91efdea587cdcf088ded1f055d6aa8350d2112ea263
+  data.tar.gz: b55621291aecd6e071f628509e1ffe75f878ac1bd222493bfb8e53bb4832bf38393473df00d4c2706234ae730023314dbbaf9e9ff7bc77d9dd8f60f6a447f2da

data/lib/calabash-cucumber.rb

@@ -8,6 +8,7 @@ require 'calabash-cucumber/version'
 require 'calabash-cucumber/date_picker'
 require 'calabash-cucumber/ipad_1x_2x'
 require 'calabash-cucumber/utils/logging'
+require 'calabash-cucumber/deprecated'
 
 # stubs for documentation
 

data/lib/calabash-cucumber/core.rb

@@ -761,13 +761,46 @@ module Calabash
         res['result']
       end
 
-      # Kills the app.
-      def calabash_exit
+      # Attempts to shut the app down gracefully by simulating the transition
+      # to closed steps.  The server will attempt to ensure that the following
+      # UIApplicationDelegate methods methods are called (in order).
+      #
+      # ```
+      #  - (void)applicationWillResignActive:(UIApplication *)application
+      #  - (void)applicationWillTerminate:(UIApplication *)application
+      # ```
+      #
+      # @todo Shutdown the CalabashServer and close connections.
+      #
+      # @param [Hash] opts Options for controlling the app shutdown process.
+      # @option opts [Float] :post_resign_active_delay (0.4) How long to wait
+      #  after calling 'application will resign active' before calling
+      #  'app will terminate'.
+      # @option opts [Float] :post_will_terminate_delay (0.4) How long to wait
+      #  after calling 'application will resign active' before calling 'exit'.
+      # @option opts [Integer] :exit_code What code should the application
+      #  exit with?  This exit code may or may not be used!  If the
+      #  UIApplication responds to `terminateWithSuccess`, then that method will
+      #  be called.  The exit code for `terminateWithSuccess` is undefined.
+      def calabash_exit(opts={})
+        default_opts = {:post_resign_active_delay => 0.4,
+                        :post_will_terminate_delay => 0.4,
+                        :exit_code => 0}
+        merged_opts = default_opts.merge(opts)
         # Exiting the app shuts down the HTTP connection and generates ECONNREFUSED,
         # or HTTPClient::KeepAliveDisconnected
         # which needs to be suppressed.
         begin
-          http({:method => :post, :path => 'exit', :retryable_errors => Calabash::Cucumber::HTTPHelpers::RETRYABLE_ERRORS - [Errno::ECONNREFUSED, HTTPClient::KeepAliveDisconnected]})
+          http({
+                     :method => :post,
+                     :path => 'exit',
+                     :retryable_errors => Calabash::Cucumber::HTTPHelpers::RETRYABLE_ERRORS - [Errno::ECONNREFUSED, HTTPClient::KeepAliveDisconnected]
+               },  {
+                     :post_resign_active_delay => merged_opts[:post_resign_active_delay],
+                     :post_will_terminate_delay => merged_opts[:post_will_terminate_delay],
+                     :exit_code => merged_opts[:exit_code]
+               }
+          )
         rescue Errno::ECONNREFUSED, HTTPClient::KeepAliveDisconnected
           []
         end

data/lib/calabash-cucumber/deprecated.rb

@@ -0,0 +1,34 @@
+require 'run_loop'
+require 'calabash-cucumber/utils/logging'
+
+module Calabash
+  module Cucumber
+
+    include Calabash::Cucumber::Logging
+
+    # @!visibility private
+    def self.const_missing(const_name)
+      if const_name == :FRAMEWORK_VERSION
+        _deprecated('0.9.169', 'FRAMEWORK_VERSION has been deprecated - there is no replacement', :warn)
+        return nil
+      end
+      raise(NameError, "uninitialized constant Calabash::Cucumber::#{const_name}")
+    end
+
+    # A model of a release version that can be used to compare two version.
+    #
+    # Calabash tries very hard to comply with Semantic Versioning rules. However,
+    # the semantic versioning spec is incompatible with RubyGem's patterns for
+    # pre-release gems.
+    #
+    # > "But returning to the practical: No release version of SemVer is compatible with Rubygems." - _David Kellum_
+    #
+    # Calabash version numbers will be in the form `<major>.<minor>.<patch>[.pre<N>]`.
+    #
+    # @see http://semver.org/
+    # @see http://gravitext.com/2012/07/22/versioning.html
+    class Version < RunLoop::Version
+
+    end
+  end
+end

data/lib/calabash-cucumber/launch/simulator_launcher.rb

@@ -3,6 +3,7 @@ require 'json'
 require 'net/http'
 require 'cfpropertylist'
 require 'calabash-cucumber/utils/logging'
+require 'run_loop'
 
 module Calabash
   module Cucumber
@@ -71,7 +72,7 @@ module Calabash
 
       # Stops (quits) the simulator.
       def stop
-        self.simulator.quit_simulator
+        RunLoop::SimControl.new.quit_sim
       end
 
 

data/lib/calabash-cucumber/launcher.rb

@@ -250,31 +250,54 @@ class Calabash::Cucumber::Launcher
     default_opts = {:sdk => nil, :path => nil}
     merged_opts = default_opts.merge opts
 
-    sdk ||= merged_opts[:sdk] || sdk_version || self.simulator_launcher.sdk_detector.latest_sdk_version
-    path ||= merged_opts[:path] || self.simulator_launcher.app_bundle_or_raise(app_path)
+    sim_control = opts.fetch(:sim_control, RunLoop::SimControl.new)
+    if sim_control.xcode_version_gte_6?
+      default_sim = RunLoop::Core.default_simulator(sim_control.xctools)
+      name_or_udid = merged_opts[:udid] || ENV['DEVICE_TARGET'] || default_sim
+
+      target_simulator = nil
+      sim_control.simulators.each do |device|
+        instruments_launch_name = "#{device.name} (#{device.version.to_s} Simulator)"
+        if instruments_launch_name == name_or_udid or device.udid == name_or_udid
+          target_simulator = device
+        end
+      end
+
+      if target_simulator.nil?
+        raise "Could not find a simulator that matches '#{name_or_udid}'"
+      end
 
-    app = File.basename(path)
+      sim_control.reset_sim_content_and_settings({:sim_udid => target_simulator.udid})
+    else
+      sdk ||= merged_opts[:sdk] || sdk_version || self.simulator_launcher.sdk_detector.latest_sdk_version
+      path ||= merged_opts[:path] || self.simulator_launcher.app_bundle_or_raise(app_path)
 
-    directories_for_sdk_prefix(sdk).each do |sdk_dir|
-      app_dir = File.expand_path("#{sdk_dir}/Applications")
-      next unless File.exists?(app_dir)
+      app = File.basename(path)
 
-      bundle = `find "#{app_dir}" -type d -depth 2 -name "#{app}" | head -n 1`
+      directories_for_sdk_prefix(sdk).each do |sdk_dir|
+        app_dir = File.expand_path("#{sdk_dir}/Applications")
+        next unless File.exists?(app_dir)
 
-      next if bundle.empty? # Assuming we're already clean
+        bundle = `find "#{app_dir}" -type d -depth 2 -name "#{app}" | head -n 1`
 
-      if debug_logging?
-        puts "Reset app state for #{bundle}"
-      end
-      sandbox = File.dirname(bundle)
-      ['Library', 'Documents', 'tmp'].each do |content_dir|
-        FileUtils.rm_rf(File.join(sandbox, content_dir))
+        next if bundle.empty? # Assuming we're already clean
+
+        if debug_logging?
+          puts "Reset app state for #{bundle}"
+        end
+        sandbox = File.dirname(bundle)
+        ['Library', 'Documents', 'tmp'].each do |content_dir|
+          FileUtils.rm_rf(File.join(sandbox, content_dir))
+        end
       end
     end
   end
 
-  # Simulates touching the iOS Simulator > Reset Content and Settings... menu
-  # item.
+  # Erases the contents and setting for every available simulator.
+  #
+  # For Xcode 6, this is equivalent to calling: `$ xcrun simctl erase` on
+  # every available simulator.  For Xcode < 6, it is equivalent to touching
+  # the 'Reset Content & Settings' menu item.
   #
   # @note
   #  **WARNING** This is a destructive operation.  You have been warned.
@@ -282,9 +305,9 @@ class Calabash::Cucumber::Launcher
   # @raise RuntimeError if called when targeting a physical device
   def reset_simulator
     if device_target?
-      raise "calling 'reset_simulator' when targeting a device is not allowed"
+      raise "Calling 'reset_simulator' when targeting a device is not allowed"
     end
-    reset_simulator_content_and_settings
+    RunLoop::SimControl.new.reset_sim_content_and_settings
   end
 
   # @!visibility private
@@ -484,8 +507,17 @@ class Calabash::Cucumber::Launcher
     #TODO stopping is currently broken, but this works anyway because instruments stop the process before relaunching
     RunLoop.stop(run_loop) if run_loop
 
+    # @todo Don't overwrite the _args_ parameter!
     args = default_launch_args.merge(args)
 
+    # 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
+
     args[:app] = args[:app] || args[:bundle_id] || app_path || detect_app_bundle_from_args(args)
 
 
@@ -530,7 +562,10 @@ class Calabash::Cucumber::Launcher
       if sdk.nil? and args[:device_target] == 'simulator'
         sdk = :all
       end
-      reset_app_sandbox({:sdk => sdk, :path => args[:app]})
+      reset_app_sandbox({:sdk => sdk,
+                         :path => args[:app],
+                         :udid => args[:udid],
+                         :sim_control => args[:sim_control]})
     end
 
     if args[:privacy_settings]
@@ -555,14 +590,6 @@ class Calabash::Cucumber::Launcher
     if run_with_instruments?(args)
       # 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?
@@ -608,6 +635,10 @@ class Calabash::Cucumber::Launcher
           break
         end
       end
+
+      # Device could not be found; kick the problem down the road.
+      return :preferences if target_device.nil?
+
       # Preferences strategy works for iOS < 8.0, but not for iOS >= 8.0.
       if target_device.version < RunLoop::Version.new('8.0')
         :preferences

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

@@ -3,6 +3,7 @@ require 'calabash-cucumber/utils/plist_buddy'
 require 'calabash-cucumber/utils/logging'
 require 'sim_launcher'
 require 'cfpropertylist'
+require 'run_loop'
 
 module Calabash
   module Cucumber
@@ -30,14 +31,12 @@ module Calabash
       # simulator, but in case we can, this method will quit the simulator
       # that is indicated by `xcode-select` or `DEVELOPER_DIR`.
       def quit_simulator
-        dev_dir = xcode_developer_dir
-        system "/usr/bin/osascript -e 'tell application \"#{dev_dir}/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone Simulator.app\" to quit'"
+        RunLoop::SimControl.new.quit_sim
       end
 
       # Launches the iOS Simulator indicated by `xcode-select` or `DEVELOPER_DIR`.
       def launch_simulator
-        dev_dir = xcode_developer_dir
-        system "open -a \"#{dev_dir}/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone Simulator.app\""
+        RunLoop::SimControl.new.launch_sim
       end
 
       # Resets the simulator content and settings.  It is analogous to touching

data/lib/calabash-cucumber/version.rb

@@ -1,41 +1,13 @@
-require 'calabash-cucumber/utils/logging'
-require 'run_loop/version'
-
 module Calabash
   module Cucumber
 
     # @!visibility public
     # The Calabash iOS gem version.
-    VERSION = '0.10.1'
+    VERSION = '0.10.2'
 
     # @!visibility public
     # The minimum required version of the calabash.framework or, for Xamarin
     # users, the Calabash component.
-    MIN_SERVER_VERSION = '0.10.1'
-
-    # @!visibility private
-    def self.const_missing(const_name)
-      if const_name == :FRAMEWORK_VERSION
-        _deprecated('0.9.169', 'FRAMEWORK_VERSION has been deprecated - there is no replacement', :warn)
-        return nil
-      end
-      raise(NameError, "uninitialized constant Calabash::Cucumber::#{const_name}")
-    end
-
-    # A model of a release version that can be used to compare two version.
-    #
-    # Calabash tries very hard to comply with Semantic Versioning rules. However,
-    # the semantic versioning spec is incompatible with RubyGem's patterns for
-    # pre-release gems.
-    #
-    # > "But returning to the practical: No release version of SemVer is compatible with Rubygems." - _David Kellum_
-    #
-    # Calabash version numbers will be in the form `<major>.<minor>.<patch>[.pre<N>]`.
-    #
-    # @see http://semver.org/
-    # @see http://gravitext.com/2012/07/22/versioning.html
-    class Version < RunLoop::Version
-
-    end
+    MIN_SERVER_VERSION = '0.10.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-18 00:00:00.000000000 Z
+date: 2014-10-01 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.3
+        version: 1.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.8
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -273,6 +273,7 @@ files:
 - lib/calabash-cucumber/core.rb
 - lib/calabash-cucumber/cucumber.rb
 - lib/calabash-cucumber/date_picker.rb
+- lib/calabash-cucumber/deprecated.rb
 - lib/calabash-cucumber/device.rb
 - lib/calabash-cucumber/environment_helpers.rb
 - lib/calabash-cucumber/failure_helpers.rb