frank-cucumber 1.1.6 → 1.1.7

data/Rakefile

@@ -2,6 +2,26 @@ require 'bundler'
 require 'rake/testtask'
 Bundler::GemHelper.install_tasks
 
+desc 'check that the static libraries shipping with the gem have the same version number as the gem itself'
+task :check_lib_versions do
+  lib_path = File.expand_path( '../frank-skeleton/libFrank.a', __FILE__)
+  lib_version = `what #{lib_path}`.chomp.split("\n").last.split(" ").last
+  puts "LIBRARY VERSION: #{lib_version}"
+  puts "GEM VERSION:     #{Frank::Cucumber::VERSION}"
+  unless lib_version == Frank::Cucumber::VERSION
+    raise <<-EOS
+
+      RUH ROH.
+      static lib version doesn't match gem version.
+
+      to fix this:
+      (cd .. && rake build_for_release)
+    EOS
+  end
+end
+
+task :build => :check_lib_versions
+
 desc 'open up version.rb'
 task :edit_version do
   exec "vim #{File.dirname(__FILE__)}/lib/frank-cucumber/version.rb"

data/frank-skeleton/frankify.xcconfig.tt

@@ -1,5 +1,6 @@
 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 -lShelleyMac <%= @without_http_server ? "" : "-lCocoaHTTPServerMac" %> -lFrankMac
+FRANK_LDFLAGS = -all_load -ObjC -framework CFNetwork -framework Security -lShelley -lFrank <%= @libs.map { |lib| "-l#{lib}" }.join(' ') %>
+FRANK_MAC_LDFLAGS = -all_load -ObjC -framework CFNetwork -framework Security -lShelleyMac -lFrankMac <%= @libsMac.map { |lib| "-l#{lib}" }.join(' ') %>
+
 GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = FRANKIFIED

data/lib/frank-cucumber/cli.rb

@@ -24,11 +24,22 @@ module Frank
     end
 
     WITHOUT_SERVER = "without-cocoa-http-server"
+    WITHOUT_ASYNC_SOCKET = "without-cocoa-async-socket"
+    WITHOUT_LUMBERJACK = "without-cocoa-lumberjack"
     desc "setup", "set up your iOS app by adding a Frank subdirectory containing everything Frank needs"
     method_option WITHOUT_SERVER, :type => :boolean
+    method_option WITHOUT_ASYNC_SOCKET, :type => :boolean
+    method_option WITHOUT_LUMBERJACK, :type => :boolean
     method_option :build_configuration, :aliases=>'--conf', :type=>:string, :default => 'Debug'
     def setup
-      @without_http_server = options[WITHOUT_SERVER]
+      @libs = %w(Shelley CocoaAsyncSocket CocoaLumberjack CocoaHTTPServer Frank)
+      @libsMac = %w(CocoaAsyncSocketMac CocoaLumberjackMac CocoaHTTPServerMac FrankMac)
+      @libs -= %w(CocoaHTTPServer) if options[WITHOUT_SERVER]
+      @libsMac -= %w(CocoaHTTPServerMac) if options[WITHOUT_SERVER]
+      @libs -= %w(CocoaAsyncSocket) if options[WITHOUT_ASYNC_SOCKET]
+      @libsMac -= %w(CocoaAsyncSocketMac) if options[WITHOUT_ASYNC_SOCKET]
+      @libs -= %w(CocoaLumberjack) if options[WITHOUT_LUMBERJACK]
+      @libsMac -= %w(CocoaLumberjackMac) if options[WITHOUT_LUMBERJACK]
       directory ".", "Frank"
 
       Frankifier.frankify!( File.expand_path('.'), :build_config => options[:build_configuration] )
@@ -37,13 +48,13 @@ 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 libCocoaHTTPServer.a libShelley.a libFrankMac.a libCocoaHTTPServerMac.a libShelleyMac.a}.each do |f|
+      %w{libFrank.a libCocoaAsyncSocket.a libCocoaLumberjack.a libCocoaHTTPServer.a libShelley.a libFrankMac.a libShelleyMac libCocoaAsyncSocketMac.a libCocoaLumberjackMac.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 )
     end
 
-    XCODEBUILD_OPTIONS = %w{workspace scheme target}
+    XCODEBUILD_OPTIONS = %w{workspace scheme target configuration}
     desc "build", "builds a Frankified version of your native app"
     XCODEBUILD_OPTIONS.each do |option|
       method_option option
@@ -79,12 +90,20 @@ module Frank
 
       extra_opts = XCODEBUILD_OPTIONS.map{ |o| "-#{o} \"#{options[o]}\"" if options[o] }.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 
+      if options['scheme'] || options['configuration']
+        separate_configuration_option = ""
+      else
+        separate_configuration_option = "-configuration Debug"
+      end
+
       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}\\""|
+        run %Q|xcodebuild -xcconfig Frank/frankify.xcconfig #{build_steps} #{extra_opts} #{separate_configuration_option} 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}\\""|
+        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
 
       app = Dir.glob("#{build_output_dir}/*.app").delete_if { |x| x =~ /\/#{app_bundle_name}$/ }
@@ -118,7 +137,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|mac', :type => :string, :default => (ENV['FRANK_SIM_IDIOM'] || 'iphone')
+    method_option :idiom, :banner => 'iphone|ipad', :type => :string, :default => (ENV['FRANK_SIM_IDIOM'] || 'iphone')
     def launch
       $DEBUG = options[:debug]
       launcher = case options[:idiom].downcase
@@ -126,10 +145,8 @@ 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, ipad, or mac. You supplied '#{options[:idiom]}'", :red
+        say "idiom must be either iphone or ipad. You supplied '#{options[:idiom]}'", :red
         exit 10
       end
 
@@ -140,7 +157,12 @@ module Frank
           invoke :build
         end
 
-        say "LAUNCHING IN THE SIMULATOR..."
+        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
 
         launcher.relaunch
       end
@@ -194,6 +216,10 @@ module Frank
       File.join( build_output_dir, app_bundle_name )
     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

@@ -85,6 +85,7 @@ module FrankHelper
     touch_successes = frankly_map( selector, 'touch' )
     raise "could not find anything matching [#{selector}] to touch" if touch_successes.empty?
     raise "some views could not be touched (probably because they are not within the current viewport)" if touch_successes.include?(false)
+    touch_successes
   end
   
   # Indicate whether there are any views in the current view heirarchy which match the specified selector.

data/lib/frank-cucumber/frank_mac_helper.rb

@@ -4,8 +4,8 @@ module Frank module Cucumber
 
 module FrankHelper
 
-  def press( selector )
-    touch_successes = frankly_map( selector, 'FEX_press' )
+  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)
   end

data/lib/frank-cucumber/version.rb

@@ -1,5 +1,5 @@
 module Frank
   module Cucumber
-    VERSION = "1.1.6"
+    VERSION = "1.1.7"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: frank-cucumber
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-26 00:00:00.000000000 Z
+date: 2013-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -239,8 +239,12 @@ files:
 - frank-skeleton/features/step_definitions/launch_steps.rb
 - frank-skeleton/features/support/env.rb
 - frank-skeleton/frankify.xcconfig.tt
+- frank-skeleton/libCocoaAsyncSocket.a
+- frank-skeleton/libCocoaAsyncSocketMac.a
 - frank-skeleton/libCocoaHTTPServer.a
 - frank-skeleton/libCocoaHTTPServerMac.a
+- frank-skeleton/libCocoaLumberjack.a
+- frank-skeleton/libCocoaLumberjackMac.a
 - frank-skeleton/libFrank.a
 - frank-skeleton/libFrankMac.a
 - frank-skeleton/libShelley.a