frank-cucumber 1.1.13.pre1 → 1.2.0.pre1

data/lib/frank-cucumber.rb

@@ -7,6 +7,7 @@ require 'frank-cucumber/mac_launcher'
 
 World(Frank::Cucumber::ColorHelper)
 World(Frank::Cucumber::FrankHelper)
+World(Frank::Cucumber::FrankMacHelper)
 World(Frank::Cucumber::Launcher)
 
 AfterConfiguration do

data/lib/frank-cucumber/cli.rb

@@ -9,7 +9,6 @@ require 'frank-cucumber/console'
 require 'frank-cucumber/frankifier'
 require 'frank-cucumber/mac_launcher'
 require 'frank-cucumber/plugins/plugin'
-require 'xcodeproj'
 
 module Frank
   class CLI < Thor
@@ -56,6 +55,10 @@ module Frank
         copy_file f, File.join( 'Frank', f ), :force => true
       end
       directory( 'frank_static_resources.bundle', 'Frank/frank_static_resources.bundle', :force => true )
+
+      if yes? "\nOne or more static libraries may have been updated. For these changes to take effect the 'frankified_build' directory must be cleaned. Would you like me to do that now? Type 'y' or 'yes' to delete the contents of frankified_build."
+        remove_file('Frank/frankified_build')
+      end
     end
 
     XCODEBUILD_OPTIONS = %w{workspace project scheme target configuration}
@@ -67,6 +70,7 @@ module Frank
     WITHOUT_DEPS = 'without-dependencies'
     method_option 'no-plugins', :type => :boolean, :default => false, :aliases => '--np', :desc => 'Disable plugins'
     method_option 'arch', :type => :string, :default => 'i386'
+    method_option 'mac', :type => :string, :default => false
     method_option :noclean, :type => :boolean, :default => false, :aliases => '--nc', :desc => "Don't clean the build directory before building"
     method_option WITHOUT_DEPS, :type => :array, :desc => 'An array (space separated list) of plugin dependencies to exclude'
     def build(*args)
@@ -110,7 +114,7 @@ module Frank
       xcconfig_file = 'Frank/frank.xcconfig'
       File.open(xcconfig_file,'w') {|f| f.write(xcconfig_data) }
 
-      extra_opts = XCODEBUILD_OPTIONS.map{ |o| "-#{o} \"#{options[o]}\"" if options[o] }.compact.join(' ')
+      extra_opts = XCODEBUILD_OPTIONS.map{ |o| "-#{o} \"#{options[o]}\"" if options[o] and (o != "target" or options['workspace'] == nil)}.compact.join(' ')
 
       # If there is a scheme specified we don't want to inject the default configuration
       # If there is a configuration specified, we also do not want to inject the default configuration
@@ -120,11 +124,9 @@ module Frank
         separate_configuration_option = "-configuration Debug"
       end
 
-      build_mac = determine_build_patform(options) == :osx
-
       xcodebuild_args = args.join(" ")
 
-      if build_mac
+      if options['mac']
         run %Q|xcodebuild -xcconfig #{xcconfig_file} #{build_steps} #{extra_opts} #{separate_configuration_option} DEPLOYMENT_LOCATION=YES DSTROOT="#{build_output_dir}" FRANK_LIBRARY_SEARCH_PATHS="#{frank_lib_search_paths}" #{xcodebuild_args}|
       else
         extra_opts += " -arch #{options['arch']}"
@@ -137,7 +139,7 @@ module Frank
       app = app.first
       FileUtils.cp_r("#{app}/.", frankified_app_dir)
 
-      if build_mac
+      if options['mac']
         in_root do
           FileUtils.cp_r(
             File.join( 'Frank',static_bundle),
@@ -275,88 +277,6 @@ module Frank
       end
     end
 
-    # The xcodeproj gem doesn't currently support schemes, and schemes have been difficult
-    # to figure out. I plan to either implement schemes in xcodeproj at a later date, or
-    # wait for them to be implemented, and then fix this function
-    def determine_build_patform ( options )
-      project_path = nil
-
-      if options["workspace"] != nil
-        if options["scheme"] != nil
-          workspace = Xcodeproj::Workspace.new_from_xcworkspace(options["workspace"])
-          projects = workspace.projpaths
-
-          projects.each { | current_project |
-            lines = `xcodebuild -project "#{current_project}" -list`
-
-            found_schemes = false
-
-            lines.split("\n").each { | line |
-              if found_schemes
-                line = line[8..-1]
-
-                if line == ""
-                  found_schemes = false
-                else
-                  if line == options["scheme"]
-                    project_path = current_project
-                  end
-                end
-
-              else
-                line = line [4..-1]
-
-                if line == "Schemes:"
-                  found_schemes = true
-                end
-
-              end
-            }
-          }
-        else
-          say "You must specify a scheme if you specify a workplace"
-          exit 10
-        end
-      else
-        project_path = options["project"]
-      end
-
-      if project_path == nil
-        Dir.foreach(Dir.pwd) { | file |
-          if file.end_with? ".xcodeproj"
-            if project_path != nil
-              say "You must specify a project if there are more than one .xcodeproj bundles in a directory"
-              exit 10
-            else
-              project_path = file
-            end
-          end
-        }
-      end
-
-      project = Xcodeproj::Project.new(project_path)
-
-      target = nil
-
-      if options["target"] != nil
-        project.targets.each { | proj_target |
-          if proj_target.name == options["target"]
-            target = proj_target
-          end
-        }
-      else
-        target = project.targets[0]
-      end
-
-      if target == nil
-        say "Unable to determine a target from the options provided. Assuming iOS"
-        return :ios
-      end
-
-      return target.platform_name
-
-    end
-
     def each_plugin_path(&block)
       plugin_glob = File.join("#{plugin_dir}",'*')
       Dir[plugin_glob].map do |plugin_path|

data/lib/frank-cucumber/console.rb

@@ -5,6 +5,7 @@ require 'frank-cucumber/launcher'
 module Frank
   class Console
     include Frank::Cucumber::FrankHelper
+    include Frank::Cucumber::FrankMacHelper
     include Frank::Cucumber::Launcher
 
     def check_for_running_app

data/lib/frank-cucumber/frank.xcconfig.erb

@@ -6,6 +6,12 @@ INSTALL_PATH = /./
 
 <% plugin_names = plugins.map {|plugin| plugin.name } %>
 
-FRANK_LDFLAGS = $(FRANK_CORE_LDFLAGS) <%= plugin_names.map {|name| "$(#{name.upcase}_LDFLAGS)"}.join(' ') %>
+FRANK_LDFLAGS_iphoneos = $(FRANK_CORE_LDFLAGS) <%= plugin_names.map {|name| "$(#{name.upcase}_LDFLAGS)"}.join(' ') %>
+
+FRANK_LDFLAGS_macosx = $(FRANK_CORE_MAC_LDFLAGS) <%= plugin_names.map {|name| "$(#{name.upcase}_MAC_LDFLAGS)"}.join(' ') %>
+
+FRANK_LDFLAGS_iphonesimulator = $(FRANK_LDFLAGS_iphoneos)
+
+FRANK_LDFLAGS = $(FRANK_LDFLAGS_$(PLATFORM_NAME))
 
 FRANK_GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = $(FRANK_CORE_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS) <%= plugin_names.map {|name| "$(#{name.upcase}_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS)"}.join(' ') %>

data/lib/frank-cucumber/frank_mac_helper.rb

@@ -2,50 +2,117 @@ require 'frank-cucumber/frank_helper'
 
 module Frank module Cucumber
 
-module FrankHelper
+module FrankMacHelper
 
+  # Performs a click at the center of the selected object.
+  #
+  # This method creates CGEvents to move and click the mouse. Before calling this method,
+  # you should make sure that the element that you want to click is frontmost by calling
+  # bring_to_front.
+  #
+  # This method is designed to act on a single object, so do not pass a selector that will
+  # return multiple objects.
+  def click ( selector )
+    frame = accessibility_frame(selector)
+    frankly_map( selector, 'FEX_mouseDownX:y:', frame.center.x, frame.center.y )
+    frankly_map( selector, 'FEX_mouseUpX:y:', frame.center.x, frame.center.y )
+  end
+
+  # Performs a double-click at the center of the selected object.
+  #
+  # This method creates CGEvents to move and click the mouse. Before calling this method,
+  # you should make sure that the element that you want to click is frontmost by calling
+  # bring_to_front.
+  #
+  # This method is designed to act on a single object, so do not pass a selector that will
+  # return multiple objects.
+  def double_click ( selector )
+    click(selector)
+    click(selector)
+  end
+
+  #@api private
   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
 
+  # Simulates the effect of clicking on the selected objects without actually moving the
+  # mouse or clicking.
+  #
+  # If the object supports the NSAccessibilityPressAction, that action is performed.
+  # Otherwise, if the object is a table cell or row, that row is selected,
+  # Otherwise, if the object is an NSView, it is made the first responder, if possible
+  # Otherwise, if the object is a menu item, it opens its submenu if it has one, or
+  # performs it's action if not.
   def simulate_click( selector )
     perform_action_on_selector( 'FEX_simulateClick', selector )
   end
 
+  # Brings the selected application or window to the front.
   def bring_to_front( selector )
     perform_action_on_selector( 'FEX_raise', selector )
   end
 
+  # Cancels the current action, such as editing a text field.
   def cancel( selector )
     perform_action_on_selector( 'FEX_cancel', selector )
   end
 
+  # Finishes the current action, such as editing a text field.
   def confirm( selector )
     perform_action_on_selector( 'FEX_confirm', selector )
   end
 
+  # Decrements the value of NSSliders, NSSteppers, and similar controls
   def decrement_value( selector )
     perform_action_on_selector( 'FEX_decrement', selector )
   end
 
+  # Deletes the user-inputted value
   def delete_value( selector )
     perform_action_on_selector( 'FEX_delete', selector )
   end
 
+  # Increments the value of NSSliders, NSSteppers, and similar controls
   def increment_value( selector )
     perform_action_on_selector( 'FEX_increment', selector )
   end
 
+  # Selects a menu item. This action is considered "outdated" by the Accessibility API, so
+  # don't use it without a good reason.
   def pick( selector )
     perform_action_on_selector( 'FEX_pick', selector )
   end
 
+  # Shows the contextual menu associated with the selector. This is the menu that would
+  # appear if the user right-clicked the selector, or, in some cases, held down the left
+  # mouse button on the selector.
   def show_menu( selector )
     perform_action_on_selector( 'FEX_showMenu', selector )
   end
 
+  # Expands the row the selector belongs to in an NSOutlineView. Do not expand more than
+  # one row at a time.
+  def expand_row( selector )
+    perform_action_on_selector( 'FEX_expand', selector )
+  end
+
+  # Collapses the row the selector belongs to in an NSOutlineView. Do not expand more than
+  # one row at a time.
+  def collapse_row( selector )
+    perform_action_on_selector( 'FEX_collapse', selector )
+  end
+
+  # @return [Boolean] whether the rows the selectors belong to in an NSOutlineView are all
+  # expanded
+  def row_is_expanded( selector )
+    successes = frankly_map( selector, "FEX_isExpanded" )
+    return false if successes == nil or successes.empty?
+    return !successes.include?(false)
+  end
+
 end
 
 end

data/lib/frank-cucumber/frankifier.rb

@@ -39,12 +39,12 @@ class Frankifier
       unless File.exists?(xcodeproj)
         raise "Project file '#{xcodeproj}' does not exist. Please specify the relative path."
       end
-      
+
       @xcodeproj_path = Pathname.new(xcodeproj)
       @project = Xcodeproj::Project.new(@xcodeproj_path)
     end
   end
-  
+
   def decide_on_project
     projects = Pathname.glob( @root+'*.xcodeproj' )
     xcodeproj = case projects.size
@@ -86,19 +86,8 @@ 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
-    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
+    add_frank_entry_to_build_setting( 'OTHER_LDFLAGS', 'FRANK_LDFLAGS' )
   end
 
   def add_library_search_path

data/lib/frank-cucumber/keyboard_helper.rb

@@ -41,6 +41,15 @@ module KeyboardHelper
     Frank::Cucumber::Gateway.evaluate_frankly_response( res, "typing the following into the keyboard '#{text_to_type}'" )
   end
 
+  # Type a keyboard shortcut (Mac only)
+  #
+  # This function takes as arguments either a single string, or an array of strings, with
+  # each string representing a different key to press. Modifier keys are represented by
+  # the strings "command", "shift", "option", and "control".
+  #
+  # For example, to sent a keyboard shortcut to quit the app, you would call
+  #
+  # type shortcut "command", "q"
   def type_shortcut(*args)
     if args[0].kind_of?(Array)
       return type_shortcut(*args)

data/lib/frank-cucumber/version.rb

@@ -1,5 +1,5 @@
 module Frank
   module Cucumber
-    VERSION = "1.1.13.pre1"
+    VERSION = "1.2.0.pre1"
   end
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: frank-cucumber
 version: !ruby/object:Gem::Version
-  version: 1.1.13.pre1
-  prerelease: 7
+  version: 1.2.0.pre1
+  prerelease: 6
 platform: ruby
 authors:
 - Pete Hodgson
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2013-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber