frank-cucumber 1.1.11.pre1 → 1.1.12

data/lib/frank-cucumber/cli.rb

@@ -109,6 +109,7 @@ module Frank
 
         run %Q|xcodebuild -xcconfig Frank/frankify.xcconfig #{build_steps} #{extra_opts} #{separate_configuration_option} -sdk iphonesimulator DEPLOYMENT_LOCATION=YES DSTROOT="#{build_output_dir}" FRANK_LIBRARY_SEARCH_PATHS="\\"#{frank_lib_directory}\\""|
       end
+      exit $?.exitstatus if not $?.success?
 
       app = Dir.glob("#{build_output_dir}/*.app").delete_if { |x| x =~ /\/#{app_bundle_name}$/ }
       app = app.first
@@ -251,7 +252,7 @@ module Frank
           projects = workspace.projpaths
 
           projects.each { | current_project |
-            lines = `xcodebuild -project #{current_project} -list`
+            lines = `xcodebuild -project "#{current_project}" -list`
 
             found_schemes = false
 
@@ -304,7 +305,7 @@ module Frank
 
       if options["target"] != nil
         project.targets.each { | proj_target |
-          if target.name == options["target"]
+          if proj_target.name == options["target"]
             target = proj_target
           end
         }

data/lib/frank-cucumber/frank_mac_helper.rb

@@ -4,16 +4,46 @@ module Frank module Cucumber
 
 module FrankHelper
 
+  def perform_action_on_selector( action, selector )
+    touch_successes = frankly_map( selector, action )
+    raise "could not find anything matching [#{selector}] which supports that action" if touch_successes == nil or touch_successes.empty?
+    raise "some objects do not support that action" if touch_successes.include?(false)
+  end
+
   def simulate_click( selector )
-    touch_successes = frankly_map( selector, 'FEX_simulateClick' )
-    raise "could not find anything matching [#{selector}] to press" if touch_successes == nil or touch_successes.empty?
-    raise "some objects do not support the press action" if touch_successes.include?(false)
+    perform_action_on_selector( 'FEX_simulateClick', selector )
   end
 
   def bring_to_front( selector )
-    touch_successes = frankly_map( selector, 'FEX_raise' )
-    raise "could not find anything matching [#{selector}] to bring to the front" if touch_successes == nil or touch_successes.empty?
-    raise "some objects do not support the bring to front action" if touch_successes.include?(false)
+    perform_action_on_selector( 'FEX_raise', selector )
+  end
+
+  def cancel( selector )
+    perform_action_on_selector( 'FEX_cancel', selector )
+  end
+
+  def confirm( selector )
+    perform_action_on_selector( 'FEX_confirm', selector )
+  end
+
+  def decrement_value( selector )
+    perform_action_on_selector( 'FEX_decrement', selector )
+  end
+
+  def delete_value( selector )
+    perform_action_on_selector( 'FEX_delete', selector )
+  end
+
+  def increment_value( selector )
+    perform_action_on_selector( 'FEX_increment', selector )
+  end
+
+  def pick( selector )
+    perform_action_on_selector( 'FEX_pick', selector )
+  end
+
+  def show_menu( selector )
+    perform_action_on_selector( 'FEX_showMenu', selector )
   end
 
 end

data/lib/frank-cucumber/host_scripting.rb

@@ -29,6 +29,19 @@ module HostScripting
     APPLESCRIPT}
   end
 
+  def quit_double_simulator
+    %x{osascript<<APPLESCRIPT
+      activate application "iPhone Simulator"
+      tell application "System Events"
+        tell process "#{Localize.t(:iphone_simulator)}"
+          if (value of static text 1 of window 1) is "#{Localize.t(:only_one_simulator)}" then
+            click button 1 of window 1
+          end if
+        end tell
+      end tell
+    }
+  end
+
 def simulator_reset_data
   %x{osascript<<APPLESCRIPT
 activate application "iPhone Simulator"

data/lib/frank-cucumber/keyboard_helper.rb

@@ -11,15 +11,15 @@ module KeyboardHelper
   # An implicit return is appended to the key sequence, unless you explicitly specify otherwise by setting the :append_return option to false.
   #
   # @example
-  #   # press the X, -, Y, and z keys on the 
+  #   # press the X, -, Y, and z keys on the
   #   # iOS keyboard, then press return
   #   type_into_keyboard("X-Yz")
   #
-  #   # press the 1, 2, and 3 keys on the 
+  #   # press the 1, 2, and 3 keys on the
   #   # iOS keyboard, but don't press return afterwards
   #   type_into_keyboard("123", :append_return => false)
   #
-  #   # press the 1, 2, and 3 keys on the 
+  #   # press the 1, 2, and 3 keys on the
   #   # iOS keyboard, but don't press return afterwards
   #   type_into_keyboard("123", :append_return => false)
   #
@@ -34,11 +34,27 @@ module KeyboardHelper
     if( options[:append_return] )
       text_to_type = text_to_type+"\n" unless text_to_type.end_with?("\n")
     end
-    res = frank_server.send_post( 
+    res = frank_server.send_post(
       'type_into_keyboard',
       :text_to_type => text_to_type
     )
     Frank::Cucumber::Gateway.evaluate_frankly_response( res, "typing the following into the keyboard '#{text_to_type}'" )
   end
+
+  def type_shortcut(*args)
+    if args[0].kind_of?(Array)
+      return type_shortcut(*args)
+    else
+      key = args.pop
+
+      res = frank_server.send_post(
+        'type_into_keyboard',
+        :text_to_type => key,
+        :modifiers => args
+      )
+
+      Frank::Cucumber::Gateway.evaluate_frankly_response(res, "typing the following shortcut into the keyboard '#{key}' with modifiers #{args}")
+    end
+  end
 end
 end end

data/lib/frank-cucumber/launcher.rb

@@ -52,19 +52,17 @@ module Launcher
     end
 
     num_timeouts = 0
-    loop do
-      begin
-        simulator.relaunch
-        wait_for_frank_to_come_up
-        break # if we make it this far without an exception then we're good to move on
-
-      rescue Timeout::Error
-        num_timeouts += 1
-        puts "Encountered #{num_timeouts} timeouts while launching the app."
-        if num_timeouts > 3
-          raise "Encountered #{num_timeouts} timeouts in a row while trying to launch the app." 
-        end
+    begin
+      simulator.relaunch
+      wait_for_frank_to_come_up
+    rescue Timeout::Error
+      num_timeouts += 1
+      puts "Encountered #{num_timeouts} timeouts while launching the app."
+      if num_timeouts > 3
+        raise "Encountered #{num_timeouts} timeouts in a row while trying to launch the app."
       end
+      quit_double_simulator
+      retry
     end
 
   end

data/lib/frank-cucumber/localize.yml

@@ -8,6 +8,7 @@ en:
   simulate_memory_warning: Simulate Memory Warning
   toggle_in_call_status_bar: Toggle In-Call Status Bar
   simulate_hardware_keyboard: Simulate Hardware Keyboard
+  only_one_simulator: Only one iOS Simulator can run at a time.
 
 fr:
   iphone_simulator: Simulateur iOS
@@ -19,6 +20,7 @@ fr:
   simulate_memory_warning: Simuler un avertissement de mémoire
   toggle_in_call_status_bar: Afficher/Masquer la barre d'état d'appel en cour
   simulate_hardware_keyboard: Simuler un clavier matériel
+  only_one_simulator: Un seul Simulateur iOS peut être exécuté à la fois.
 
 de:
   iphone_simulator: iOS-Simulator
@@ -30,6 +32,7 @@ de:
   simulate_memory_warning: Speicherwarnhinweis simulieren
   toggle_in_call_status_bar: Status für eingeh. Anrufe ein/aus
   simulate_hardware_keyboard: Hardware-Tastatur simulieren
+  only_one_simulator: Es kann jeweils nur eine iOS-Simulator-Instanz aktiv sein.
 
 ru:
   iphone_simulator: Симулятор iOS
@@ -41,6 +44,7 @@ ru:
   simulate_memory_warning: Симулировать предупреждение о нехватке памяти
   toggle_in_call_status_bar: Переключить на строку состояния поступающего вызова
   simulate_hardware_keyboard: Симулировать физическую клавиатуру
+  only_one_simulator: Два и более Симуляторов iOS не могут быть запущены одновременно.
 
 zh:
   iphone_simulator: iOS 模拟器
@@ -52,6 +56,7 @@ zh:
   simulate_memory_warning: 模拟内存警告
   toggle_in_call_status_bar: 切换呼叫状态栏
   simulate_hardware_keyboard: 模拟硬件键盘
+  only_one_simulator: 一次只能运行一个“iOS 模拟器”。
 
 ja:
   iphone_simulator: iOSシミュレータ
@@ -63,6 +68,7 @@ ja:
   simulate_memory_warning: メモリ警告をシミュレート
   toggle_in_call_status_bar: 着信ステータスバーを切り替える
   simulate_hardware_keyboard: ハードウェアキーボードをシミュレート
+  only_one_simulator: 実行できるiOSシミュレータは1度に1つのみです。
 
 es:
   iphone_simulator: Simulador iOS
@@ -74,3 +80,4 @@ es:
   simulate_memory_warning: Simular aviso de memoria
   toggle_in_call_status_bar: Activar/Desactivar barra de estado durante llamada
   simulate_hardware_keyboard: Simular teclado físico
+  only_one_simulator: Sólo se puede ejecutar un Simulador iOS a la vez.

data/lib/frank-cucumber/version.rb

@@ -1,5 +1,5 @@
 module Frank
   module Cucumber
-    VERSION = "1.1.11.pre1"
+    VERSION = "1.1.12"
   end
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: frank-cucumber
 version: !ruby/object:Gem::Version
-  version: 1.1.11.pre1
-  prerelease: 7
+  version: 1.1.12
+  prerelease: 
 platform: ruby
 authors:
 - Pete Hodgson
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-24 00:00:00.000000000 Z
+date: 2013-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -376,9 +376,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24