motion-calabash 0.9.160 → 0.9.160.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07ff3173195fcb90b6bbdb65c00f103b6e979217
-  data.tar.gz: 9b43761b1815806bed83478b4f47666811cc4781
+  metadata.gz: 69d5a5633079bf4dcf584074416372d824c24f65
+  data.tar.gz: d0ecfba809c637c9e761f4b3b46ec3991ce3ecaa
 SHA512:
-  metadata.gz: 745ea9c67c0f2eacf0f015af8500560a1c3e305593d9ab12d8bd3c06444d709de7beb12bd7415d84821042c72482b61219d0bd412cd18aeae61c1b1ca2b5f988
-  data.tar.gz: 9b9b4bf0708dcd35136068ce5cbec7c8ebbaf2efc64e3280048771a2a68aefe7b7dffadd91420a800c77e21f14f8e1cb15b898124c7001a66911de631511a111
+  metadata.gz: 4e52523aa8e0a00c000c216cf3cc7aadf9e4b992b9cc570fbe35776ed7cf5f8e0b882832d5b37d697e228da2a6b3fb1ecd111a41db71efd786c8de5901c7a39b
+  data.tar.gz: 65a209bedd6949f609933f99380b3a8f48cb8ab73a0a2dd6ce1608c6b8b7cee9679b6999c0b38b9dcae45f9f5714566ad1295ed5b6de199cdb851f6da03ddc2f

data/lib/motion/project/calabash.rb

@@ -34,7 +34,7 @@ namespace 'calabash' do
 
   # Retrieve optional Calabash args.
   def gather_calabash_env
-    sdk = ENV['target'] || ENV['sdk'] || ENV['SDK_VERSION'] || "6.1" #Calabash env vars
+    sdk = ENV['target'] || ENV['sdk'] || ENV['SDK_VERSION'] || "7.0" #Calabash env vars
      major = sdk[0]
      os = ENV['os'] || ENV['OS']
      if os.nil?

data/motion-calabash.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.author = 'Karl Krukow'
   s.email = 'karl.krukow@xamarin.com'
   s.homepage = 'http://www.xamarin.com'
-  s.version = '0.9.160'
+  s.version = '0.9.160.1'
   s.summary = %q{Calabash support for RubyMotion}
   s.description = %q{This linkes-in calabash for iOS}
   s.files = ["lib/framework/libcalabashuni-0.9.160.a"].concat(`git ls-files`.split("\n"))

data/scripts/launch.rb

@@ -23,36 +23,59 @@
 
 require 'calabash-cucumber/launch/simulator_helper'
 require 'sim_launcher'
+require 'calabash-cucumber/device'
 require 'run_loop'
+require 'cfpropertylist'
 
-# Uncomment and replace ?? appropriately
-# This should point to your Simulator build
-# which includes calabash framework
-# this is usually the Calabash build configuration
-# of your production target.
-#APP_BUNDLE_PATH = "~/Library/Developer/Xcode/DerivedData/??/Build/Products/Calabash-iphonesimulator/??.app"
-#
+class Calabash::Cucumber::Launcher
+  attr_accessor :run_loop
+  attr_accessor :device
+  attr_accessor :launch_args
 
+  @@launcher = nil
 
-def calabash_no_stop?
-  ENV['NO_LAUNCH']=="1" or ENV['NO_STOP']=="1"
-end
+  class StartError < RuntimeError
+    attr_accessor :error
 
-def device_target?
-  ENV['DEVICE_TARGET'] == 'device'
-end
+    def initialize(err)
+      self.error= err
+    end
 
+    def to_s
+      "#{super.to_s}: #{error}"
+    end
+  end
 
-class MotionLauncherTimeoutErr < Timeout::Error
-end
+  class CalabashLauncherTimeoutErr < Timeout::Error
+  end
 
-class MotionLauncher
-  attr_accessor :run_loop
+  def self.launcher
+    @@launcher ||= Launcher.new
+  end
 
-  def reset_app_jail(sdk, app_path)
-    return if device_target?
+  def self.launcher_if_used
+    @@launcher
+  end
+
+  def initialize
+    @@launcher = self
+  end
+
+  def ios_major_version
+    return nil if device.nil? or device.ios_version.nil?
+    device.ios_major_version
+  end
+
+  def ios_version
+    return nil if device.nil?
+    device.ios_version
+  end
 
-    app = File.basename(app_path)
+  def reset_app_jail(sdk=nil, path=nil)
+    sdk ||= sdk_version || SimLauncher::SdkDetector.new().latest_sdk_version
+    path ||= Calabash::Cucumber::SimulatorHelper.app_bundle_or_raise(app_path)
+
+    app = File.basename(path)
     bundle = `find "#{ENV['HOME']}/Library/Application Support/iPhone Simulator/#{sdk}/Applications/" -type d -depth 2 -name "#{app}" | head -n 1`
     return if bundle.empty? # Assuming we're already clean
 
@@ -62,22 +85,172 @@ class MotionLauncher
     end
   end
 
-  def relaunch(args=nil)
-    if run_loop
-      RunLoop.stop(run_loop)
+  def default_launch_args
+    # APP_BUNDLE_PATH
+    # BUNDLE_ID
+    # APP (unifies APP_BUNDLE_PATH, BUNDLE_ID)
+    # DEVICE_TARGET
+    # SDK_VERSION
+    # RESET_BETWEEN_SCENARIOS
+    # DEVICE
+    # NO_LAUNCH
+    # NO_STOP
+
+    args = {
+        :launch_method => default_launch_method,
+        :reset => reset_between_scenarios?,
+        :bundle_id => ENV['BUNDLE_ID'],
+        :device => device_env,
+        :no_stop => calabash_no_stop?,
+        :no_launch => calabash_no_launch?,
+        :sdk_version => sdk_version
+    }
+
+    #:device_target will be set
+
+    if run_with_instruments?(args) && !simulator_target?
+      device_tgt = ENV['DEVICE_TARGET']
+      if detect_connected_device? && (device_tgt.nil? || device_tgt.downcase == 'device')
+        device_tgt = RunLoop::Core.detect_connected_device
+      end
+
+      if device_tgt
+        args[:device_target] = args[:udid] = device_tgt
+      else
+        args[:device_target] = 'simulator'
+      end
+    else
+      args[:device_target] = 'simulator'
     end
-    if device_target?
-      self.run_loop = RunLoop.run(:app => ENV['BUNDLE_ID'])
-      ensure_connectivity
+
+
+    args
+  end
+
+  def detect_connected_device?
+      return ENV['DETECT_CONNECTED_DEVICE'] != '0'
+  end
+
+  def default_launch_method
+    return :instruments unless sdk_version || use_instruments_env?
+    return :instruments if sdk_version.start_with?('7') # Only instruments supported for iOS7+
+    sim_detector = SimLauncher::SdkDetector.new()
+    available = sim_detector.available_sdk_versions.reject { |v| v.start_with?('7') }
+    if available.include?(sdk_version)
+      :sim_launcher
+    else
+      :instruments
+    end
+  end
+
+  def relaunch(args={})
+    RunLoop.stop(run_loop) if run_loop
+
+    args = default_launch_args.merge(args)
+
+    args[:app] = args[:app] || args[:bundle_id] || app_path || detect_app_bundle_from_args(args)
+
+
+    if args[:app]
+      if File.directory?(args[:app])
+        args[:app] = File.expand_path(args[:app])
+      else
+        # args[:app] is not a directory so must be a bundle id
+        if args[:device_target] == 'simulator' ## bundle id set, but simulator target
+          args[:app] = app_path || detect_app_bundle_from_args(args)
+        end
+      end
+    end
+
+    unless args[:app]
+      if args[:device_target]=='simulator'
+        device_xamarin_build_dir = 'iPhoneSimulator'
+      else
+        device_xamarin_build_dir = 'iPhone'
+      end
+      args[:app] = Calabash::Cucumber::SimulatorHelper.app_bundle_or_raise(app_path, device_xamarin_build_dir)
+    end
+
+    args[:bundle_id] ||= detect_bundle_id_from_app_bundle(args)
+
+    args[:device] ||= detect_device_from_args(args)
+
+
+    reset_app_jail if args[:reset]
+
+    if run_with_instruments?(args)
+      self.run_loop = new_run_loop(args)
     else
-      sdk = ENV['SDK_VERSION'] || SimLauncher::SdkDetector.new().latest_sdk_version
+      # run with sim launcher
+      sdk = sdk_version || SimLauncher::SdkDetector.new().available_sdk_versions.reverse.find { |x| !x.start_with?('7') }
       path = Calabash::Cucumber::SimulatorHelper.app_bundle_or_raise(app_path)
-      if ENV['RESET_BETWEEN_SCENARIOS']=="1"
-        reset_app_jail(sdk, path)
+      Calabash::Cucumber::SimulatorHelper.relaunch(path, sdk, args[:device].to_s, args)
+    end
+    self.launch_args = args
+    ensure_connectivity
+  end
+
+  def detect_device_from_args(args)
+    if args[:app] && File.directory?(args[:app])
+      # Derive bundle id from bundle_dir
+      plist_as_hash = info_plist_from_bundle_path(args[:app])
+      if plist_as_hash
+        device_family = plist_as_hash['UIDeviceFamily']
+        if device_family
+          first_device = device_family.first
+          if first_device == 2
+            return 'ipad'
+          else
+            return 'iphone'
+          end
+        end
+      end
+    else
+      args[:app]
+    end
+
+
+  end
+
+  def detect_app_bundle_from_args(args)
+    if args[:device_target]=='simulator'
+      device_xamarin_build_dir = 'iPhoneSimulator'
+    else
+      device_xamarin_build_dir = 'iPhone'
+    end
+    Calabash::Cucumber::SimulatorHelper.detect_app_bundle(nil, device_xamarin_build_dir)
+  end
+
+  def detect_bundle_id_from_app_bundle(args)
+    if args[:app] && File.directory?(args[:app])
+      # Derive bundle id from bundle_dir
+      plist_as_hash = info_plist_from_bundle_path(args[:app])
+      if plist_as_hash
+        plist_as_hash['CFBundleIdentifier']
       end
-      Calabash::Cucumber::SimulatorHelper.relaunch(path, sdk, ENV['DEVICE'] || 'iphone', args)
+    else
+      args[:app]
     end
+  end
 
+  def info_plist_from_bundle_path(bundle_path)
+    plist_path = File.join(bundle_path, 'Info.plist')
+    info_plist_as_hash(plist_path) if File.exist?(plist_path)
+  end
+
+  def new_run_loop(args)
+    last_err = nil
+    3.times do
+      begin
+        return RunLoop.run(args)
+      rescue RunLoop::TimeoutError => e
+        last_err = e
+        if ENV['CALABASH_FULL_CONSOLE_OUTPUT'] == '1'
+          puts "retrying run loop..."
+        end
+      end
+    end
+    raise StartError.new(last_err)
   end
 
   def ensure_connectivity
@@ -86,12 +259,14 @@ class MotionLauncher
       timeout = (ENV['CONNECT_TIMEOUT'] || 30).to_i
       retry_count = 0
       connected = false
-      puts "Waiting for App to be ready"
+      if ENV['CALABASH_FULL_CONSOLE_OUTPUT'] == '1'
+        puts "Waiting for App to be ready"
+      end
       until connected do
         raise "MAX_RETRIES" if retry_count == max_retry_count
         retry_count += 1
         begin
-          Timeout::timeout(timeout, MotionLauncherTimeoutErr) do
+          Timeout::timeout(timeout, CalabashLauncherTimeoutErr) do
             until connected
               begin
                 connected = (ping_app == '200')
@@ -104,11 +279,11 @@ class MotionLauncher
               end
             end
           end
-        rescue MotionLauncherTimeoutErr => e
+        rescue CalabashLauncherTimeoutErr => e
           puts "Timed out...Retry.."
         end
       end
-    rescue e
+    rescue RuntimeError => e
       p e
       msg = "Unable to make connection to Calabash Server at #{ENV['DEVICE_ENDPOINT']|| "http://localhost:37265/"}\n"
       msg << "Make sure you don't have a firewall blocking traffic to #{ENV['DEVICE_ENDPOINT']|| "http://localhost:37265/"}.\n"
@@ -121,7 +296,7 @@ class MotionLauncher
 
     http = Net::HTTP.new(url.host, url.port)
     res = http.start do |sess|
-      sess.request Net::HTTP::Get.new "version"
+      sess.request Net::HTTP::Get.new(ENV['CALABASH_VERSION_PATH'] || "version")
     end
     status = res.code
     begin
@@ -130,6 +305,11 @@ class MotionLauncher
 
     end
 
+    if status == '200'
+      version_body = JSON.parse(res.body)
+      self.device = Calabash::Cucumber::Device.new(url, version_body)
+    end
+
     status
   end
 
@@ -137,10 +317,6 @@ class MotionLauncher
     RunLoop.stop(run_loop)
   end
 
-  def app_path
-    ENV['APP_BUNDLE_PATH'] || (defined?(APP_BUNDLE_PATH) && APP_BUNDLE_PATH)
-  end
-
   def calabash_notify(world)
     if world.respond_to?(:on_launch)
       world.on_launch
@@ -148,24 +324,75 @@ class MotionLauncher
   end
 
 
-end
+  def info_plist_as_hash(plist_path)
+    unless File.exist?(plist_path)
+      raise "Unable to find Info.plist: #{plist_path}"
+    end
+    parsedplist = CFPropertyList::List.new(:file => plist_path)
+    CFPropertyList.native_types(parsedplist.value)
+  end
 
-AfterConfiguration do
-  system("rake device") if device_target?
-end
+  def detect_bundle_id
+    begin
+      bundle_path = Calabash::Cucumber::SimulatorHelper.app_bundle_or_raise(app_path)
+      plist_path = File.join(bundle_path, 'Info.plist')
+      info_plist_as_hash(plist_path)['CFBundleIdentifier']
+    rescue => e
+      raise "Unable to automatically find bundle id. Please set BUNDLE_ID environment variable. #{e}"
+    end
+  end
 
-Before do |scenario|
-  @launcher = MotionLauncher.new
-  @launcher.relaunch
-  @launcher.calabash_notify(self)
-end
+  def calabash_no_stop?
+    calabash_no_launch? or ENV['NO_STOP']=="1"
+  end
 
-After do |scenario|
-  unless calabash_no_stop?
-    if device_target?
-      @launcher.stop
-    else
-      Calabash::Cucumber::SimulatorHelper.stop
+  def calabash_no_launch?
+    ENV['NO_LAUNCH']=='1'
+  end
+
+  def device_target?
+    (ENV['DEVICE_TARGET'] != nil) && (not simulator_target?)
+  end
+
+  def simulator_target?
+    ENV['DEVICE_TARGET'] == 'simulator'
+  end
+
+  def sdk_version
+    ENV['SDK_VERSION']
+  end
+
+  def use_instruments_env?
+    ENV['LAUNCH_VIA'] == 'instruments'
+  end
+
+  def reset_between_scenarios?
+    ENV['RESET_BETWEEN_SCENARIOS']=="1"
+  end
+
+  def device_env
+    ENV['DEVICE']
+  end
+
+  def app_path
+    ENV['APP_BUNDLE_PATH'] || (defined?(APP_BUNDLE_PATH) && APP_BUNDLE_PATH) || ENV['APP']
+  end
+
+  def run_with_instruments?(args)
+    args[:launch_method] == :instruments
+  end
+
+  def active?
+    not run_loop.nil?
+  end
+
+  def inspect
+    msg = ["#{self.class}: Launch Method #{launch_args[:launch_method]}"]
+    if run_with_instruments?(self.launch_args) && self.run_loop
+      msg << "Log file: #{self.run_loop[:log_file]}"
     end
+    msg.join("\n")
   end
+
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-calabash
 version: !ruby/object:Gem::Version
-  version: 0.9.160
+  version: 0.9.160.1
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-07 00:00:00.000000000 Z
+date: 2013-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: calabash-cucumber