frank-cucumber 1.1.4.pre1 → 1.1.5

data/frank-skeleton/frankify.xcconfig.tt

@@ -1,4 +1,5 @@
 INSTALL_PATH = /./
 
 FRANK_LDFLAGS = -all_load -ObjC -framework CFNetwork -framework Security -lShelley <%= @without_http_server ? "" : "-lCocoaHTTPServer" %> -lFrank
+FRANK_MAC_LDFLAGS = -all_load -ObjC -framework CFNetwork -framework Security -LFrank <%= @without_http_server ? "" : "-lCocoaHTTPServerMac" %> -lFrankMac
 GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = FRANKIFIED

data/lib/frank-cucumber/cli.rb

@@ -1,12 +1,13 @@
-begin 
+begin
   require 'pry'
-rescue LoadError 
+rescue LoadError
 end
 
 require 'thor'
 require 'frank-cucumber/launcher'
 require 'frank-cucumber/console'
 require 'frank-cucumber/frankifier'
+require 'frank-cucumber/mac_launcher'
 
 module Frank
   class CLI < Thor
@@ -36,7 +37,7 @@ module Frank
     desc "update", "updates the frank server components inside your Frank directory"
     long_desc "This updates the parts of Frank that are embedded inside your app (e.g. libFrank.a and frank_static_resources.bundle)"
     def update
-      %w{libFrank.a libShelley.a}.each do |f|
+      %w{libFrank.a libCocoaHTTPServer.a libShelley.a libFrankMac.a libCocoaHTTPServerMac.a}.each do |f|
         copy_file f, File.join( 'Frank', f ), :force => true
       end
       directory( 'frank_static_resources.bundle', 'Frank/frank_static_resources.bundle', :force => true )
@@ -48,6 +49,7 @@ module Frank
       method_option option
     end
     method_option 'arch', :type => :string, :default => 'i386'
+    method_option 'mac', :type => :boolean, :default => false
     method_option :noclean, :type => :boolean, :default => false, :aliases => '--nc', :desc => "Don't clean the build directory before building"
     def build
       clean = !options['noclean']
@@ -75,22 +77,36 @@ module Frank
         build_steps = 'clean ' + build_steps
       end
 
-      extra_opts = XCODEBUILD_OPTIONS.map{ |o| "-#{o} #{options[o]}" if options[o] }.compact.join(' ')
-      extra_opts += " -arch #{options['arch']}"
+      extra_opts = XCODEBUILD_OPTIONS.map{ |o| "-#{o} \"#{options[o]}\"" if options[o] }.compact.join(' ')
 
-      run %Q|xcodebuild -xcconfig Frank/frankify.xcconfig #{build_steps} #{extra_opts} -configuration Debug -sdk iphonesimulator DEPLOYMENT_LOCATION=YES DSTROOT="#{build_output_dir}" FRANK_LIBRARY_SEARCH_PATHS="\\"#{frank_lib_directory}\\""|
+      if options['mac']
+        run %Q|xcodebuild -xcconfig Frank/frankify.xcconfig #{build_steps} #{extra_opts} -configuration Debug DEPLOYMENT_LOCATION=YES DSTROOT="#{build_output_dir}" FRANK_LIBRARY_SEARCH_PATHS="\\"#{frank_lib_directory}\\""|
+      else
+        extra_opts += " -arch #{options['arch']}"
+
+        run %Q|xcodebuild -xcconfig Frank/frankify.xcconfig #{build_steps} #{extra_opts} -configuration Debug -sdk iphonesimulator DEPLOYMENT_LOCATION=YES DSTROOT="#{build_output_dir}" FRANK_LIBRARY_SEARCH_PATHS="\\"#{frank_lib_directory}\\""|
+      end
 
       app = Dir.glob("#{build_output_dir}/*.app").delete_if { |x| x =~ /\/#{app_bundle_name}$/ }
       app = app.first
       FileUtils.cp_r("#{app}/.", frankified_app_dir)
 
-      fix_frankified_apps_bundle_identifier
+      if options['mac']
+        in_root do
+          FileUtils.cp_r(
+            File.join( 'Frank',static_bundle),
+            File.join( frankified_app_dir, "Contents", "Resources", static_bundle )
+          )
+        end
+      else
+        fix_frankified_apps_bundle_identifier
 
-      in_root do
-        FileUtils.cp_r( 
-          File.join( 'Frank',static_bundle),
-          File.join( frankified_app_dir, static_bundle ) 
-        )
+        in_root do
+          FileUtils.cp_r(
+            File.join( 'Frank',static_bundle),
+            File.join( frankified_app_dir, static_bundle )
+          )
+        end
       end
     end
 
@@ -102,7 +118,7 @@ module Frank
 
     desc "launch", "open the Frankified app in the simulator"
     method_option :debug, :type => :boolean, :default => false
-    method_option :idiom, :banner => 'iphone|ipad', :type => :string, :default => (ENV['FRANK_SIM_IDIOM'] || 'iphone')
+    method_option :idiom, :banner => 'iphone|ipad|mac', :type => :string, :default => (ENV['FRANK_SIM_IDIOM'] || 'iphone')
     def launch
       $DEBUG = options[:debug]
       launcher = case options[:idiom].downcase
@@ -110,8 +126,10 @@ module Frank
         SimLauncher::DirectClient.for_iphone_app( frankified_app_dir )
       when 'ipad'
         SimLauncher::DirectClient.for_ipad_app( frankified_app_dir )
+      when 'mac'
+        Frank::MacLauncher.new( frankified_app_dir )
       else
-        say "idiom must be either iphone or ipad. You supplied '#{options[:idiom]}'", :red
+        say "idiom must be either iphone, ipad, or mac. You supplied '#{options[:idiom]}'", :red
         exit 10
       end
 
@@ -138,15 +156,15 @@ module Frank
     desc 'console', "launch a ruby console connected to your Frankified app"
     def console
       # TODO: check whether app is running (using ps or similar), and launch it if it's not
-      
+
       begin
         require 'pry'
       rescue LoadError
         say 'The Frank console requires the pry gem.'
         say 'Simply run `sudo gem install pry` (the `sudo` bit might be optional), and then try again. Thanks!'
-        exit 41 
+        exit 41
       end
-  
+
       Frank::Cucumber::FrankHelper.use_shelley_from_now_on
       console = Frank::Console.new
       if console.check_for_running_app
@@ -163,7 +181,7 @@ module Frank
     def app_bundle_name
       "#{product_name}.app"
     end
-    
+
     def frank_lib_directory
       File.expand_path "Frank"
     end
@@ -178,9 +196,9 @@ module Frank
 
     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 
+      # bundle identifier as a previously installed app but which is in fact a different app. This impacts us because our
       # Frankified app is different but has the same bundle identifier as the standard non-Frankified app which most users
-      # will want to have installed in the simulator as well. 
+      # will want to have installed in the simulator as well.
       #
       # We work around this by modifying the Frankified app's bundle identifier inside its Info.plist.
       inside frankified_app_dir do

data/lib/frank-cucumber/frank_helper.rb

@@ -4,6 +4,7 @@ require 'frank-cucumber/host_scripting'
 require 'frank-cucumber/wait_helper'
 require 'frank-cucumber/keyboard_helper'
 require 'frank-cucumber/scroll_helper'
+require 'frank-cucumber/gesture_helper'
 require 'frank-cucumber/location_helper'
 require 'frank-cucumber/bonjour'
 
@@ -27,6 +28,7 @@ module FrankHelper
   include WaitHelper
   include KeyboardHelper
   include ScrollHelper
+  include GestureHelper
   include HostScripting
   include LocationHelper
 

data/lib/frank-cucumber/frankifier.rb

@@ -41,7 +41,7 @@ class Frankifier
       projects.first
     else
       choice = ask_menu(
-        "I found more than one .xcodeproj. Which is the main app project that you wish to Frankify?", 
+        "I found more than one .xcodeproj. Which is the main app project that you wish to Frankify?",
         projects.map(&:basename)
       )
       projects[choice]
@@ -60,7 +60,7 @@ class Frankifier
       targets.first
     else
       choice = ask_menu(
-        "I found more than one target in this project. Which is the main app target that you wish to Frankify?", 
+        "I found more than one target in this project. Which is the main app target that you wish to Frankify?",
         targets.map(&:name)
       )
       targets.to_a[choice]
@@ -71,8 +71,19 @@ class Frankifier
     puts "Frankifying target [#{@target.name}] in project #{@xcodeproj_path.basename}"
   end
 
+  def target_is_mac
+    settings = @target.build_configurations.first.build_settings['SDKROOT'] \
+      || @project.build_configurations.first.build_settings['SDKROOT']
+
+    return settings.include? 'macosx'
+  end
+
   def add_linker_flag
-    add_frank_entry_to_build_setting( 'OTHER_LDFLAGS', 'FRANK_LDFLAGS' )
+    if target_is_mac
+      add_frank_entry_to_build_setting( 'OTHER_LDFLAGS', 'FRANK_MAC_LDFLAGS' )
+    else
+      add_frank_entry_to_build_setting( 'OTHER_LDFLAGS', 'FRANK_LDFLAGS' )
+    end
   end
 
   def add_library_search_path
@@ -97,16 +108,16 @@ class Frankifier
   end
 
   def check_target_build_configuration_is_valid!
-    unless @target.build_configuration_list.build_settings(@target_build_configuration) 
+    unless @target.build_configuration_list.build_settings(@target_build_configuration)
       say %Q|I'm trying to Frankify the '#{@target_build_configuration}' build configuration, but I don't see it that build configuration in your XCode target. Here's a list of the build configurations I see:|
-      @target.build_configuration_list.build_configurations.each do |bc| 
+      @target.build_configuration_list.build_configurations.each do |bc|
         say "  '#{bc.name}'"
       end
       say ''
       say %Q|Please specify one of those build configurations using the --build_configuration flag|
       exit
     end
-    
+
   end
 
   def build_settings_to_edit
@@ -121,7 +132,7 @@ class Frankifier
   def ask_menu message, options
     option_lines = options.each_with_index.map{ |o,i| "#{i+1}: #{o}" }
     full_message = ([message,'']+option_lines+[">"]).join("\n")
-    
+
     allowed_range = (1..options.length)
     valid_choice = nil
     until valid_choice

data/lib/frank-cucumber/gesture_helper.rb

@@ -0,0 +1,68 @@
+module Frank
+	module Cucumber
+		module GestureHelper
+
+			# Touch and hold the selector for a given duration
+			#
+			# @param [String] selector a view selector.
+			# @param [Number] duration the duration of the touch, the default is 1.
+			#
+			# @return [Array<Boolean>] an array indicating for each view which matched the selector whether it was touched or not.
+			#
+			# @raise an expection if no views matched the selector
+			# @raise an expection if no views which matched the selector could be touched
+			def tap_and_hold( selector, duration = 1 )
+				touch_successes = frankly_map( selector, "touchAndHold:", duration )
+				raise "Could not find anything matching [#{selector}] to long touch" if touch_successes.empty?
+			    raise "Some views could not be long touched (probably because they are not within the current viewport)" if touch_successes.include?(false)
+			end
+
+			# Touch and hold the selector at a specific point for a given duration
+			#
+			# @param [String] selector a view selector.
+			# @param [Number] duration the duration of the touch, the default is 1.
+			# @param [Number] x the x-coordinate to touch
+			# @param [Number] y the y-coordinate to touch
+			#
+			# @return [Array<Boolean>] an array indicating for each view which matched the selector whether it was touched or not.
+			#
+			# @raise an expection if no views matched the selector
+			# @raise an expection if no views which matched the selector could be touched
+			def tap_and_hold_point( selector, x, y, duration = 1 )
+				touch_successes = frankly_map( selector, "touchAndHold:x:y:", duration, x, y )
+				raise "Could not find anything matching [#{selector}] to long touch" if touch_successes.empty?
+			    raise "Some views could not be long touched (probably because they are not within the current viewport)" if touch_successes.include?(false)
+			end
+
+			# Double tap the selector
+			#
+			# @param [String] selector a view selector.
+			#
+			# @return [Array<Boolean>] an array indicating for each view which matched the selector whether it was touched or not.
+			#
+			# @raise an expection if no views matched the selector
+			# @raise an expection if no views which matched the selector could be touched
+			def double_tap( selector )
+				touch_successes = frankly_map( selector, "doubleTap"  )
+				raise "Could not find anything matching [#{selector}] to double tap" if touch_successes.empty?
+			    raise "Some views could not be double tap (probably because they are not within the current viewport)" if touch_successes.include?(false)
+			end
+
+			# Double tap the selector at a specific point
+			#
+			# @param [String] selector a view selector.
+			# @param [Number] x the x-coordinate to touch
+			# @param [Number] y the y-coordinate to touch
+			#
+			# @return [Array<Boolean>] an array indicating for each view which matched the selector whether it was touched or not.
+			#
+			# @raise an expection if no views matched the selector
+			# @raise an expection if no views which matched the selector could be touched
+			def double_tap_point( selector, x, y )
+				touch_successes = frankly_map( selector, "doubleTapx:y:", x, y )
+				raise "Could not find anything matching [#{selector}] to double tap" if touch_successes.empty?
+			    raise "Some views could not be double tap (probably because they are not within the current viewport)" if touch_successes.include?(false)
+			end
+		end
+	end
+end

data/lib/frank-cucumber/mac_launcher.rb

@@ -0,0 +1,35 @@
+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

data/lib/frank-cucumber/version.rb

@@ -1,5 +1,5 @@
 module Frank
   module Cucumber
-    VERSION = "1.1.4.pre1"
+    VERSION = "1.1.5"
   end
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: frank-cucumber
 version: !ruby/object:Gem::Version
-  version: 1.1.4.pre1
-  prerelease: 6
+  version: 1.1.5
+  prerelease: 
 platform: ruby
 authors:
 - Pete Hodgson
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-17 00:00:00.000000000 Z
+date: 2013-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -240,7 +240,9 @@ files:
 - frank-skeleton/features/support/env.rb
 - frank-skeleton/frankify.xcconfig.tt
 - frank-skeleton/libCocoaHTTPServer.a
+- frank-skeleton/libCocoaHTTPServerMac.a
 - frank-skeleton/libFrank.a
+- frank-skeleton/libFrankMac.a
 - frank-skeleton/libShelley.a
 - lib/frank-cucumber.rb
 - lib/frank-cucumber/app_bundle_locator.rb
@@ -253,11 +255,13 @@ files:
 - lib/frank-cucumber/frank_localize.rb
 - lib/frank-cucumber/frankifier.rb
 - lib/frank-cucumber/gateway.rb
+- lib/frank-cucumber/gesture_helper.rb
 - lib/frank-cucumber/host_scripting.rb
 - lib/frank-cucumber/keyboard_helper.rb
 - 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/rect.rb
 - lib/frank-cucumber/scroll_helper.rb
 - lib/frank-cucumber/version.rb
@@ -365,9 +369,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