calabash-cucumber 0.9.152 → 0.9.153

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e5d32bd3de7fc4255e3c73c5c94a1b437445bda
-  data.tar.gz: def9cece9fcf16b4e2f1dc552b0cb0faa0e9b095
+  metadata.gz: 0013596c606dae1ae15bdd511ff80df2828f5cd1
+  data.tar.gz: e7b227e7ed17db7c74590184fa245204510bf503
 SHA512:
-  metadata.gz: 24b3c029c87ec6c03e1303726298590e02dd4fcc21d9fdc49f456f2b0cf34e8f7cdfaaa5ac41a23e9dd49a1ed4b7ee41edf7a4d2949a09f3065a85bd7cdc0a71
-  data.tar.gz: e83946d9e1bb3725edaa5240541ca55e18a9356a0e063bfd071a48b790a8f04eefc41154882adaeb59f78d78aca04f385238563fe959a1803f2f606414d0b7b1
+  metadata.gz: ed9bb7e55df24f89f862bb87e62fd8ed29ca3bc2160e674e60ba7330b1b7f57d235b60e9051e69d55738acf56d24ae7388e0e86f05d4e1af56530233b0df4db9
+  data.tar.gz: e5b448303482fece80fc706b37e292624aab14b09e4589a41e4f120388ed2639aad59b9bcf0ad0a8a31609af69821a73a41036e934b1a0babcc23fe4f63be936

data/bin/calabash-ios-setup.rb

@@ -186,8 +186,8 @@ def validate_setup(args)
   else
     dd_dir = Calabash::Cucumber::SimulatorHelper.derived_data_dir_for_project
       if not dd_dir
-        puts "Unable to find iOS project."
-        puts "You should run this command from an iOS project directory."
+        puts "Unable to find iOS XCode project."
+        puts "You should run this command from an XCode project directory."
         exit 1
       end
       app_bundles = Dir.glob(File.join(dd_dir, "Build", "Products", "*", "*.app"))

data/calabash-cucumber.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency( "location-one", "~>0.0.10")
   s.add_dependency( "httpclient","~> 2.3.3")
   s.add_dependency( "bundler", "~> 1.1")
-  s.add_dependency( "run_loop", "~> 0.0.19" )
+  s.add_dependency( "run_loop", "~> 0.0.20" )
   s.add_dependency( "awesome_print")
 
 end

data/lib/calabash-cucumber/core.rb

@@ -341,7 +341,7 @@ module Calabash
         end
       end
 
-      def background(secs)
+      def send_app_to_background(secs)
         uia_send_app_to_background(secs)
       end
 
@@ -514,7 +514,6 @@ EOF
         res['results']
       end
 
-      # not called? -jjm 2013-08-16
       def interpolate(recording, options={})
         data = load_playback_data(recording)
 
@@ -548,7 +547,12 @@ EOF
         os = ENV['OS']
 
         unless os
-          major = Calabash::Cucumber::SimulatorHelper.ios_major_version
+          if @calabash_launcher && @calabash_launcher.active?
+            major = @calabash_launcher.ios_major_version
+          else
+            major = Calabash::Cucumber::SimulatorHelper.ios_major_version
+          end
+
           unless major
             raise <<EOF
           Unable to determine iOS major version
@@ -645,11 +649,10 @@ EOF
       ## args :app for device bundle id, for sim path to app
       ##
       def start_test_server_in_background(args={})
-        target = args[:device_target] || :simulator
         stop_test_server
-        @calabash_launcher = Calabash::Cucumber::Launcher.new(target)
+        @calabash_launcher = Calabash::Cucumber::Launcher.new()
         @calabash_launcher.relaunch(args)
-
+        @calabash_launcher
       end
 
       def stop_test_server

data/lib/calabash-cucumber/keyboard_helpers.rb

@@ -43,6 +43,7 @@ module Calabash
               raise "Char #{chr} is not yet supported in iOS7"
             end
           end
+          res = {'results' => []}
         else
           res = http({:method => :post, :path => 'keyboard'},
                      {:key => chr, :events => load_playback_data("touch_done")})

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

@@ -35,7 +35,6 @@ module Calabash
         simulator.quit_simulator
       end
 
-
       def self.derived_data_dir_for_project
         dir = project_dir
         xcode_workspace_name = ''
@@ -117,19 +116,39 @@ module Calabash
         File.expand_path(ENV['PROJECT_DIR'] || Dir.pwd)
       end
 
-      def self.app_bundle_or_raise(path)
+      def self.detect_app_bundle(path=nil,device_build_dir='iPhoneSimulator')
+        begin
+          app_bundle_or_raise(path,device_build_dir)
+        rescue =>e
+          nil
+        end
+      end
+
+      def self.app_bundle_or_raise(path=nil, device_build_dir='iPhoneSimulator')
         bundle_path = nil
         path = File.expand_path(path) if path
 
         if path and not File.directory?(path)
-          puts "Unable to find .app bundle at #{path}. It should be an .app directory."
-          dd_dir = derived_data_dir_for_project
-          app_bundles = Dir.glob(File.join(dd_dir, "Build", "Products", "*", "*.app"))
-          msg = "Try setting APP_BUNDLE_PATH in features/support/01_launch.rb to one of:\n\n"
-          msg << app_bundles.join("\n")
-          raise msg
+          raise "Unable to find .app bundle at #{path}. It should be an .app directory."
         elsif path
           bundle_path = path
+        elsif xamarin_project?
+          bundle_path = bundle_path_from_xamarin_project(device_build_dir)
+          unless bundle_path
+            msg = ["Detected Xamarin project, but did not detect built app linked with Calabash"]
+            msg << "You should build your project from Xamarin Studio"
+            msg << "Make sure you build for Simulator and that you're using the Calabash components"
+            raise msg.join("\n")
+          end
+          if FULL_CONSOLE_OUTPUT
+            puts("-"*37)
+            puts "Auto detected APP_BUNDLE_PATH:\n\n"
+
+            puts "APP_BUNDLE_PATH=#{preferred_dir || sim_dirs[0]}\n\n"
+            puts "Please verify!"
+            puts "If this is wrong please set it as APP_BUNDLE_PATH in features/support/01_launch.rb\n"
+            puts("-"*37)
+          end
         else
           dd_dir = derived_data_dir_for_project
           sim_dirs = Dir.glob(File.join(dd_dir, "Build", "Products", "*-iphonesimulator", "*.app"))
@@ -169,10 +188,50 @@ module Calabash
         bundle_path
       end
 
+      def self.xamarin_project?
+        xamarin_ios_csproj_path != nil
+      end
+
+      def self.xamarin_ios_csproj_path
+        solution_path = Dir['*.Xamarin.sln'].first
+        if solution_path
+          project_dir = Dir.pwd
+        else
+          solution_path = Dir[File.join('..','*.Xamarin.sln')].first
+          project_dir = File.expand_path('..') if solution_path
+        end
+        return nil unless project_dir
+
+        ios_project_dir = Dir[File.join(project_dir,'*.iOS')].first
+        return nil unless ios_project_dir && File.directory?(ios_project_dir)
+        ios_project_dir
+      end
+
+      def self.bundle_path_from_xamarin_project(device_build_dir='iPhoneSimulator')
+        ios_project_path = xamarin_ios_csproj_path
+        conf_glob = File.join(ios_project_path,'bin',device_build_dir,'*')
+        built_confs = Dir[conf_glob]
+
+        calabash_build = built_confs.find {|path| File.basename(path) == 'Calabash'}
+        debug_build = built_confs.find {|path| File.basename(path) == 'Debug'}
+
+        bundle_path = [calabash_build, debug_build, *built_confs].find do |path|
+          next unless path && File.directory?(path)
+          app_dir = Dir[File.join(path,'*.app')].first
+          app_dir && linked_with_calabash?(app_dir)
+        end
+
+        Dir[File.join(bundle_path,'*.app')].first if bundle_path
+      end
+
+      def self.linked_with_calabash?(d)
+        out = `otool "#{File.expand_path(d)}"/* -o 2> /dev/null | grep CalabashServer`
+        /CalabashServer/.match(out)
+      end
+
       def self.find_preferred_dir(sim_dirs)
         sim_dirs.find do |d|
-          out = `otool "#{File.expand_path(d)}"/* -o 2> /dev/null | grep CalabashServer`
-          /CalabashServer/.match(out)
+          linked_with_calabash?(d)
         end
       end
 

data/lib/calabash-cucumber/launcher.rb

@@ -2,15 +2,17 @@ require 'calabash-cucumber/launch/simulator_helper'
 require 'sim_launcher'
 require 'calabash-cucumber/device'
 require 'run_loop'
-
+require 'cfpropertylist'
 
 class Calabash::Cucumber::Launcher
   attr_accessor :run_loop
-  attr_accessor :device_target
   attr_accessor :device
 
+  @@launcher = nil
+
   class StartError < RuntimeError
     attr_accessor :error
+
     def initialize(err)
       self.error= err
     end
@@ -20,52 +22,19 @@ class Calabash::Cucumber::Launcher
     end
   end
 
-  def self.launcher(device_target=:simulator)
-    @@launcher ||= Launcher.new(device_target)
-  end
-
-  def self.launcher_if_used
-    @@launcher
-  end
-
-  def initialize(device_target=:simulator)
-    self.device_target = device_target
-    @@launcher = self
-  end
-
   class CalabashLauncherTimeoutErr < Timeout::Error
   end
 
-  def calabash_no_stop?
-    calabash_no_launch? or ENV['NO_STOP']=="1"
-  end
-
-  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 reset_between_scenarios?
-    ENV['RESET_BETWEEN_SCENARIOS']=="1"
+  def self.launcher
+    @@launcher ||= Launcher.new
   end
 
-  def device_env
-    ENV['DEVICE'] || 'iphone'
+  def self.launcher_if_used
+    @@launcher
   end
 
-  def active?
-    (simulator_target? || device_target?) && (not run_loop.nil?)
+  def initialize
+    @@launcher = self
   end
 
   def ios_major_version
@@ -78,12 +47,9 @@ class Calabash::Cucumber::Launcher
     device.ios_version
   end
 
-
   def reset_app_jail(sdk=nil, path=nil)
-    return if device_target?
-
-    sdk = sdk || ENV['SDK_VERSION'] || SimLauncher::SdkDetector.new().latest_sdk_version
-    path = path || Calabash::Cucumber::SimulatorHelper.app_bundle_or_raise(app_path)
+    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`
@@ -95,35 +61,136 @@ class Calabash::Cucumber::Launcher
     end
   end
 
-  def relaunch(args={})
-    RunLoop.stop(run_loop) if 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 device_tgt.nil? || device_tgt.downcase == 'device'
+        device_tgt = RunLoop::Core.detect_connected_device
+      end
 
-    if device_target?
-      default_args = {:app => ENV['BUNDLE_ID']}
-      target = ENV['DEVICE_TARGET']
-      if target != 'DEVICE'
-        default_args[:udid] = target
+      if device_tgt
+        args[:device_target] = args[:udid] = device_tgt
+      else
+        args[:device_target] = 'simulator'
       end
-      default_args
-      self.run_loop = new_run_loop(default_args.merge(args))
     else
+      args[:device_target] = 'simulator'
+    end
+
 
-      sdk = sdk_version || SimLauncher::SdkDetector.new().latest_sdk_version
+    args
+  end
+
+  def default_launch_method
+    return :instruments unless sdk_version
+    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 File.directory?(args[:app])
+      args[:app] = File.expand_path(args[:app])
+    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
+      # 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 reset_between_scenarios?
-        reset_app_jail(sdk, path)
-      end
+      Calabash::Cucumber::SimulatorHelper.relaunch(path, sdk, args[:device].to_s, args)
+    end
+    before = Time.now
+    ensure_connectivity
+  end
 
-      if simulator_target?
-        default_args = {:app => path, :device => device_env.to_sym}
-        self.run_loop = new_run_loop(default_args.merge(args))
-      else
-        ## sim launcher
-        Calabash::Cucumber::SimulatorHelper.relaunch(path, sdk, device_env, args)
+  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
-    ensure_connectivity
+    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
+    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)
@@ -132,6 +199,7 @@ class Calabash::Cucumber::Launcher
       begin
         return RunLoop.run(args)
       rescue RunLoop::TimeoutError => e
+        last_err = e
         if ENV['CALABASH_FULL_CONSOLE_OUTPUT'] == '1'
           puts "retrying run loop..."
         end
@@ -192,7 +260,7 @@ class Calabash::Cucumber::Launcher
 
     end
 
-    if status=='200'
+    if status == '200'
       version_body = JSON.parse(res.body)
       self.device = Calabash::Cucumber::Device.new(url, version_body)
     end
@@ -204,14 +272,72 @@ class Calabash::Cucumber::Launcher
     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
     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
+
+  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
+
+  def calabash_no_stop?
+    calabash_no_launch? or ENV['NO_STOP']=="1"
+  end
+
+  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 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
+
+
 end
 

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = '0.9.152'
-    FRAMEWORK_VERSION = '0.9.151'
+    VERSION = '0.9.153'
+    FRAMEWORK_VERSION = '0.9.153'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.152
+  version: 0.9.153
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-07 00:00:00.000000000 Z
+date: 2013-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.19
+        version: 0.0.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.19
+        version: 0.0.20
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement