frank-cucumber 1.2.0 → 1.2.1

data/frank-skeleton/frank_static_resources.bundle/js/ersatz_view.js

@@ -191,11 +191,11 @@
             fill: "#aaff00",
             opacity: 0.8,
             stroke: "black",
-            transform: _this.backdropTransformer.push().translate(origin.x, origin.y).descAndPop(),
+            transform: _this.backdropTransformer.push().translate(origin.x * resolution.scale, origin.y * resolution.scale).descAndPop(),
             x: 0,
             y: 0,
-            width: size.width,
-            height: size.height
+            width: size.width *resolution.scale,
+            height: size.height * resolution.scale
           });
         });
       }

data/frank-skeleton/frank_static_resources.bundle/js/frank.js

@@ -114,7 +114,7 @@
       fetchDevice: fetchDevice,
       requestSnapshotRefresh: requestSnapshotRefresh,
       baseScreenshotUrl: function() {
-        return cacheBust(baseUrlFor('/screenshot'));
+        return cacheBust(baseUrlFor('/screenshot/allwindows/'));
       },
       snapshotUrlForViewWithUid: function(uid) {
         return cacheBust(baseUrlFor("/screenshot/view-snapshot/" + uid));

data/frank-skeleton/frankify.xcconfig.tt

@@ -3,4 +3,4 @@ INSTALL_PATH = /./
 FRANK_CORE_LDFLAGS = -all_load -ObjC -framework CFNetwork -framework Security <%= @libs.map { |lib| "-l#{lib}" }.join(' ') %>
 FRANK_CORE_MAC_LDFLAGS = -all_load -ObjC -framework CFNetwork -framework Security <%= @libsMac.map { |lib| "-l#{lib}" }.join(' ') %>
 
-FRANK_CORE_GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = FRANKIFIED
+GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = FRANKIFIED

data/lib/frank-cucumber.rb

@@ -3,7 +3,6 @@ require 'frank-cucumber/color_helper'
 require 'frank-cucumber/frank_helper'
 require 'frank-cucumber/frank_mac_helper'
 require 'frank-cucumber/launcher'
-require 'frank-cucumber/mac_launcher'
 
 World(Frank::Cucumber::ColorHelper)
 World(Frank::Cucumber::FrankHelper)

data/lib/frank-cucumber/cli.rb

@@ -7,12 +7,12 @@ require 'thor'
 require 'frank-cucumber/launcher'
 require 'frank-cucumber/console'
 require 'frank-cucumber/frankifier'
-require 'frank-cucumber/mac_launcher'
 require 'frank-cucumber/plugins/plugin'
 
 module Frank
   class CLI < Thor
     include Thor::Actions
+    include Frank::Cucumber::Launcher
 
     def self.source_root
       File.join( File.dirname(__FILE__), '..','..','frank-skeleton' )
@@ -131,7 +131,7 @@ module Frank
       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?
 
@@ -169,11 +169,11 @@ module Frank
     method_option :idiom, :banner => 'iphone|ipad', :type => :string, :default => (ENV['FRANK_SIM_IDIOM'] || 'iphone')
     def launch
       $DEBUG = options[:debug]
-      launcher = case options[:idiom].downcase
+      version = case options[:idiom].downcase
       when 'iphone'
-        SimLauncher::DirectClient.for_iphone_app( frankified_app_dir )
+        'iphone'
       when 'ipad'
-        SimLauncher::DirectClient.for_ipad_app( frankified_app_dir )
+        'ipad'
       else
         say "idiom must be either iphone or ipad. You supplied '#{options[:idiom]}'", :red
         exit 10
@@ -186,14 +186,9 @@ module Frank
           invoke :build
         end
 
-        if built_product_is_mac_app( frankified_app_dir )
-          launcher = Frank::MacLauncher.new( frankified_app_dir )
-          say "LAUNCHING APP..."
-        else
-          say "LAUNCHING IN THE SIMULATOR..."
-        end
+        say "LAUNCHING APP..."
 
-        launcher.relaunch
+        launch_app(frankified_app_dir, nil, version, false)
       end
     end
 
@@ -205,6 +200,8 @@ module Frank
     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 +215,8 @@ module Frank
 
       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
@@ -258,10 +257,6 @@ module Frank
       File.expand_path 'Frank/plugins'
     end
 
-    def built_product_is_mac_app ( app_dir )
-        return File.exists? File.join( app_dir, "Contents", "MacOS" )
-    end
-
     def fix_frankified_apps_bundle_identifier
       # as of iOS 6 the iOS Simulator locks up with a black screen if you try and launch an app which has the same
       # bundle identifier as a previously installed app but which is in fact a different app. This impacts us because our

data/lib/frank-cucumber/frank_helper.rb

@@ -442,6 +442,14 @@ module FrankHelper
     return frankly_device_name == "mac"
   end
 
+  # @return [String] the operating system version currently running the application
+  def frankly_os_version
+    res = frank_server.send_get( 'device' )
+    os_version = JSON.parse( res )['os_version']
+    puts "os_version reported as '#{os_version}'" if $DEBUG
+    os_version
+  end
+
   # Check whether Frank is able to communicate with the application under automation
   def frankly_ping
     frank_server.ping

data/lib/frank-cucumber/frankifier.rb

@@ -25,12 +25,14 @@ class Frankifier
     check_target_build_configuration_is_valid!
 
     say ''
-    add_linker_flag
+    project_changed |= add_linker_flag
 
     say ''
-    add_library_search_path
+    project_changed |= add_library_search_path
 
-    save_changes
+    if project_changed
+      save_changes
+    end
   end
 
   private
@@ -99,7 +101,7 @@ class Frankifier
 
     if setting_array.find{ |flag| flag.start_with? "$(FRANK_" }
       say "It appears that your '#{@target_build_configuration}' configuration's #{build_setting} build setting already include some FRANK setup. Namely: #{setting_array.inspect}. I won't change anything here."
-      return
+      return false
     end
 
     say "Adding $(inherited) and $(#{entry_to_add}) to your '#{@target_build_configuration}' configuration's #{build_setting} build setting ..."
@@ -109,6 +111,7 @@ class Frankifier
     say "... #{build_setting} is now: #{setting_array.inspect}"
 
     build_settings_to_edit[build_setting] = setting_array
+    true
   end
 
   def check_target_build_configuration_is_valid!

data/lib/frank-cucumber/host_scripting.rb

@@ -3,7 +3,7 @@ require 'frank-cucumber/frank_localize'
 module Frank module Cucumber
 
 module HostScripting
-  
+
   def start_recording
     %x{osascript<<APPLESCRIPT
 	tell application "QuickTime Player"
@@ -11,7 +11,7 @@ module HostScripting
 	  tell sr to start
 	end tell
   APPLESCRIPT}
-  
+
   end
 
   def stop_recording
@@ -20,20 +20,22 @@ module HostScripting
 	  set sr to (document 1)
 	  tell sr to stop
 	end tell
-  APPLESCRIPT}  
+  APPLESCRIPT}
   end
-  
+
   def quit_simulator
     %x{osascript<<APPLESCRIPT-
-      application "iPhone Simulator" quit
+      application id "com.apple.iphonesimulator" quit
     APPLESCRIPT}
   end
 
   def quit_double_simulator
     %x{osascript<<APPLESCRIPT
-      activate application "iPhone Simulator"
+      activate application id "com.apple.iphonesimulator"
       tell application "System Events"
-        tell process "#{Localize.t(:iphone_simulator)}"
+        set process_name_list to name of (application processes where bundle identifier is "com.apple.iphonesimulator")
+	    set process_name to first item of process_name_list
+        tell process process_name
           if (value of static text 1 of window 1) is "#{Localize.t(:only_one_simulator)}" then
             click button 1 of window 1
           end if
@@ -44,30 +46,34 @@ module HostScripting
 
 def simulator_reset_data
   %x{osascript<<APPLESCRIPT
-activate application "iPhone Simulator"
+activate application id "com.apple.iphonesimulator"
 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)}"
+  set process_name_list to name of (application processes where bundle identifier is "com.apple.iphonesimulator")
+  set process_name to first item of process_name_list
+  click menu item 5 of menu 1 of menu bar item 2 of menu bar 1 of process process_name
   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 process_name
 end tell
-  APPLESCRIPT} 
+  APPLESCRIPT}
 end
 
   #Note this needs to have "Enable access for assistive devices"
   #chcked in the Universal Access system preferences
   def simulator_hardware_menu_press( menu_label )
-    %x{osascript<<APPLESCRIPT
-activate application "iPhone Simulator"
+    %x{osascript -s o <<APPLESCRIPT
+activate application id "com.apple.iphonesimulator"
 tell application "System Events"
-	click menu item "#{menu_label}" of menu "#{Localize.t(:hardware)}" of menu bar of process "#{Localize.t(:iphone_simulator)}"
+    set process_name_list to name of (application processes where bundle identifier is "com.apple.iphonesimulator")
+	set process_name to first item of process_name_list
+	click menu item "#{menu_label}" of menu "#{Localize.t(:hardware)}" of menu bar of process process_name
 end tell
-  APPLESCRIPT}  
+  APPLESCRIPT}
   end
-  
+
   def press_home_on_simulator
     simulator_hardware_menu_press Localize.t(:home)
   end
-  
+
   def rotate_simulator_left
     simulator_hardware_menu_press Localize.t(:rotate_left)
   end
@@ -79,18 +85,18 @@ end tell
   def shake_simulator
     simulator_hardware_menu_press Localize.t(:shake_gesture)
   end
-  
+
   def simulate_memory_warning
     simulator_hardware_menu_press Localize.t(:simulate_memory_warning)
   end
-  
+
   def toggle_call_status_bar
     simulator_hardware_menu_press Localize.t(:toggle_call_status_bar)
   end
-  
+
   def simulate_hardware_keyboard
     simulator_hardware_menu_press Localize.t(:simulate_hardware_keyboard)
   end
-end 
+end
 
 end end

data/lib/frank-cucumber/launcher.rb

@@ -1,9 +1,12 @@
 require 'sim_launcher'
 require 'frank-cucumber/app_bundle_locator'
+require 'frank-cucumber/frank_helper'
 
 module Frank module Cucumber
 
-module Launcher 
+module Launcher
+    include Frank::Cucumber::FrankHelper
+
   attr_accessor :application_path, :sdk, :version
 
   def simulator_client
@@ -30,19 +33,26 @@ module Launcher
     end
   end
 
-  def launch_app(app_path, sdk = nil, version = 'iphone')
+  def launch_app(app_path, sdk = nil, version = 'iphone', wait_for_launch = true)
     @application_path = app_path
     @sdk = sdk
     @version = version
 
-    enforce(app_path)
+    if path_is_mac_app(@application_path)
+      launch_mac_app(wait_for_launch)
+    else
+      enforce(app_path)
+      launch_ios_app(wait_for_launch)
+    end
+  end
 
-    # kill the app if it's already running, just in case this helps 
-    # reduce simulator flakiness when relaunching the app. Use a timeout of 5 seconds to 
+  def launch_ios_app(wait_for_launch = true)
+    # kill the app if it's already running, just in case this helps
+    # reduce simulator flakiness when relaunching the app. Use a timeout of 5 seconds to
     # prevent us hanging around for ages waiting for the ping to fail if the app isn't running
     begin
       Timeout::timeout(5) { press_home_on_simulator if frankly_ping }
-    rescue Timeout::Error 
+    rescue Timeout::Error
     end
 
     if( ENV['USE_SIM_LAUNCHER_SERVER'] )
@@ -54,7 +64,10 @@ module Launcher
     num_timeouts = 0
     begin
       simulator.relaunch
-      wait_for_frank_to_come_up
+
+      if wait_for_launch
+        wait_for_frank_to_come_up
+      end
     rescue Timeout::Error
       num_timeouts += 1
       puts "Encountered #{num_timeouts} timeouts while launching the app."
@@ -66,5 +79,40 @@ module Launcher
     end
 
   end
+
+  def path_is_mac_app (app_dir)
+    return File.exists? File.join( app_dir, "Contents", "MacOS" )
+  end
+
+
+  def launch_mac_app(wait_for_launch = true)
+    `open "#{@application_path}"`
+
+    if wait_for_launch
+      wait_for_frank_to_come_up
+    end
+  end
+
+  def quit_mac_app_if_running
+    pid = `ps -ax | grep "#{@app_path}" | grep -v grep`
+
+    if pid != ""
+      pid = pid.strip.split[0]
+      `kill #{pid}`
+    end
+
+    Timeout::timeout(60) {
+      while pid != ""
+        pid = `ps -ax | grep "#{@app_path}" | grep -v grep`
+      end
+    }
+
+  end
+
+  def relaunch_mac_app
+    self.quit_if_running
+    self.launch
+  end
+
 end
 end end

data/lib/frank-cucumber/localize.yml

@@ -1,5 +1,6 @@
 en:
-  iphone_simulator: iPhone Simulator
+  iphone_simulator: iOS 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

data/lib/frank-cucumber/rect.rb

@@ -1,3 +1,5 @@
+require "ostruct"
+
 module Frank module Cucumber
 
   class Rect

data/lib/frank-cucumber/version.rb

@@ -1,5 +1,5 @@
 module Frank
   module Cucumber
-    VERSION = "1.2.0"
+    VERSION = "1.2.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: frank-cucumber
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-17 00:00:00.000000000 Z
+date: 2013-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -269,7 +269,6 @@ files:
 - lib/frank-cucumber/launcher.rb
 - lib/frank-cucumber/localize.yml
 - lib/frank-cucumber/location_helper.rb
-- lib/frank-cucumber/mac_launcher.rb
 - lib/frank-cucumber/plugins/plugin.rb
 - lib/frank-cucumber/rect.rb
 - lib/frank-cucumber/scroll_helper.rb

data/lib/frank-cucumber/mac_launcher.rb

@@ -1,35 +0,0 @@
-require "timeout"
-
-module Frank
-    class MacLauncher
-
-        def initialize(app_path)
-            @app_path = app_path
-        end
-
-        def launch
-            `open "#{@app_path}"`
-        end
-
-        def quit_if_running
-            pid = `ps -ax | grep "#{@app_path}" | grep -v grep`
-
-            if pid != ""
-                pid = pid.strip.split[0]
-                `kill #{pid}`
-            end
-
-            Timeout::timeout(60) {
-                while pid != ""
-                    pid = `ps -ax | grep "#{@app_path}" | grep -v grep`
-                end
-            }
-
-        end
-
-        def relaunch
-            self.quit_if_running
-            self.launch
-        end
-    end
-end