Merge remote-tracking branch 'moredip/master'

TestingWithFrank · Sep 22, 2013 · 087c4f3 · 087c4f3
2 parents 950675e + 07c3ac9
commit 087c4f3
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/gem/lib/frank-cucumber/cli.rb b/gem/lib/frank-cucumber/cli.rb
@@ -131,7 +131,7 @@ def build(*args)
       else
         extra_opts += " -arch #{options['arch']}"
 
-        run %Q|xcodebuild -xcconfig #{xcconfig_file} #{build_steps} #{extra_opts} #{separate_configuration_option} -sdk iphonesimulator DEPLOYMENT_LOCATION=YES DSTROOT="#{build_output_dir}" FRANK_LIBRARY_SEARCH_PATHS="#{frank_lib_search_paths}" #{xcodebuild_args}|
+        run %Q|xcodebuild -xcconfig #{xcconfig_file} #{build_steps} #{extra_opts} #{separate_configuration_option} -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO DEPLOYMENT_LOCATION=YES DSTROOT="#{build_output_dir}" FRANK_LIBRARY_SEARCH_PATHS="#{frank_lib_search_paths}" #{xcodebuild_args}|
       end
       exit $?.exitstatus if not $?.success?
 
@@ -205,6 +205,8 @@ def inspect
     end
 
     desc 'console', "launch a ruby console connected to your Frankified app"
+    method_option :bonjour, :type => :boolean, :default => false, :aliases => :b, :desc => "find Frank via Bonjour." 
+    method_option :server, :type => :string, :default => false, :aliases => :s, :desc => "server URL for Frank."
     def console
       # TODO: check whether app is running (using ps or similar), and launch it if it's not
 
@@ -218,6 +220,8 @@ def console
 
       Frank::Cucumber::FrankHelper.use_shelley_from_now_on
       console = Frank::Console.new
+      Frank::Cucumber::FrankHelper.test_on_physical_device_via_bonjour if options[:bonjour]
+      Frank::Cucumber::FrankHelper.server_base_url = options[:server] if options[:server]
       if console.check_for_running_app
         console.pry
       end

diff --git a/gem/lib/frank-cucumber/host_scripting.rb b/gem/lib/frank-cucumber/host_scripting.rb
@@ -48,7 +48,7 @@ def simulator_reset_data
 tell application "System Events"
   click menu item 5 of menu 1 of menu bar item 2 of menu bar 1 of process "#{Localize.t(:iphone_simulator)}"
   delay 0.5
-  click button 2 of window 1 of process "#{Localize.t(:iphone_simulator)}"
+  click button "#{Localize.t(:iphone_simulator_reset)}" of window 1 of process "#{Localize.t(:iphone_simulator)}"
 end tell
   APPLESCRIPT} 
 end

diff --git a/gem/lib/frank-cucumber/localize.yml b/gem/lib/frank-cucumber/localize.yml
@@ -1,5 +1,6 @@
 en:
   iphone_simulator: iPhone Simulator
+  iphone_simulator_reset: Reset
   hardware: Hardware
   home: Home
   rotate_left: Rotate Left
@@ -12,6 +13,7 @@ en:
 
 fr:
   iphone_simulator: Simulateur iOS
+  iphone_simulator_reset: Réinitialiser
   hardware: Matériel
   home: Écran d’accueil
   rotate_left: Rotation à gauche
@@ -24,6 +26,7 @@ fr:
 
 de:
   iphone_simulator: iOS-Simulator
+  iphone_simulator_reset: Zurücksetzen
   hardware: Hardware
   home: Home
   rotate_left: Links drehen
@@ -36,6 +39,7 @@ de:
 
 ru:
   iphone_simulator: Симулятор iOS
+  iphone_simulator_reset: Сбросить
   hardware: Аппаратура
   home: Экран «Домой»
   rotate_left: Повернуть влево
@@ -48,6 +52,7 @@ ru:
 
 zh:
   iphone_simulator: iOS 模拟器
+  iphone_simulator_reset: 还原
   hardware: 硬件
   home: 首页
   rotate_left: 向左旋转
@@ -60,6 +65,7 @@ zh:
 
 ja:
   iphone_simulator: iOSシミュレータ
+  iphone_simulator_reset: リセット
   hardware: ハードウェア
   home: ホーム
   rotate_left: 反時計回りに回転
@@ -72,6 +78,7 @@ ja:
 
 es:
   iphone_simulator: Simulador iOS
+  iphone_simulator_reset: Restablecer
   hardware: Hardware
   home: Inicio
   rotate_left: Girar a la izquierda
@@ -84,6 +91,7 @@ es:
 
 it:
   iphone_simulator: Simulatore iOS
+  iphone_simulator_reset: Reimposta
   hardware: Hardware
   home: Home
   rotate_left: Ruota a sinistra

diff --git a/gem/lib/frank-cucumber/rect.rb b/gem/lib/frank-cucumber/rect.rb
@@ -1,3 +1,5 @@
+require "ostruct"
+
 module Frank module Cucumber
 
   class Rect