calabash-cucumber 0.9.19 → 0.9.20

data/bin/calabash-ios

@@ -27,6 +27,9 @@ elsif cmd == 'gen'
 elsif cmd == 'setup'
   calabash_setup(ARGV)
   exit 0
+elsif cmd == 'check'
+  validate_setup(ARGV)
+  exit 0
 elsif cmd == 'sim'
   if ARGV.length == 0
     print_usage

data/bin/calabash-ios-helpers.rb

@@ -15,6 +15,8 @@ def print_usage
       generate a features folder structure.
     setup (EXPERIMENTAL)
       setup your XCode project for calabash-ios)
+    check (EXPERIMENTAL)
+      check whether an app or ipa is linked with calabash.framework
     sim locale [lang] [regional]?
       change locale and regional settings in all iOS Simulators
     sim reset

data/bin/calabash-ios-setup.rb

@@ -1,3 +1,5 @@
+require "calabash-cucumber/version"
+
 def dup_scheme(project_name, pbx_dir)
 
   userdata_dirs = Dir.foreach("#{pbx_dir}/xcuserdata").find_all { |x|
@@ -32,9 +34,19 @@ def dup_scheme(project_name, pbx_dir)
           puts "Duplicating scheme #{project_name}.xcscheme as #{project_name}-cal.xcscheme"
 
           doc = REXML::Document.new(File.new("#{pbx_dir}/xcuserdata/#{userdata_dir}/xcschemes/#{scheme}"))
+
           doc.elements.each("Scheme/LaunchAction") do |la|
             la.attributes["buildConfiguration"] = "Calabash"
           end
+          doc.elements.each("Scheme/ArchiveAction") do |la|
+            la.attributes["buildConfiguration"] = "Calabash"
+          end
+          doc.elements.each("Scheme/AnalyzeAction") do |la|
+            la.attributes["buildConfiguration"] = "Calabash"
+          end
+          doc.elements.each("Scheme/ProfileAction") do |la|
+            la.attributes["buildConfiguration"] = "Calabash"
+          end
           doc.write(File.open("#{pbx_dir}/xcuserdata/#{userdata_dir}/xcschemes/#{project_name}-cal.xcscheme", "w"))
         end
       end
@@ -57,7 +69,7 @@ def calabash_setup(args)
       puts "Please validate by running the #{project_name}-cal scheme"
       puts "from Xcode."
       puts "When starting the iOS Simulator using the"
-      puts "new scheme: #{project_name}-cal, you should see:\n"
+      puts "new scheme: #{project_name}-cal, you should see:\n\n"
       puts '  "Started LPHTTP server on port 37265"'
       puts "\nin the application log in Xcode."
       puts "\n\n"
@@ -142,16 +154,14 @@ def setup_project(project_name, project_path, path)
   ##Download calabash.framework
   if not Dir.exists?(File.join(project_path, file))
     msg("Info") do
-      zip_file = 'calabash.framework-0.9.15.zip'
-      puts "Did not find calabash.framework. I'll download the latest version...'"
-      puts "https://raw.github.com/calabash/calabash-ios/master/frameworks/#{zip_file}"
+      zip_file = "calabash.framework-#{Calabash::Cucumber::VERSION}.zip"
+      puts "Did not find calabash.framework. I'll download it...'"
+      puts "http://cloud.github.com/downloads/calabash/calabash-ios/#{zip_file}"
       require 'uri'
-      require 'net/https'
 
-      uri = URI.parse "https://raw.github.com/calabash/calabash-ios/master/frameworks/#{zip_file}"
+      uri = URI.parse "http://cloud.github.com/downloads/calabash/calabash-ios/#{zip_file}"
 
-      Net::HTTP.start(uri.host, uri.port,
-                      :use_ssl => uri.scheme == 'https') do |http|
+      Net::HTTP.start(uri.host, uri.port) do |http|
         request = Net::HTTP::Get.new uri.request_uri
 
         http.request request do |response|
@@ -211,7 +221,7 @@ def setup_project(project_name, project_path, path)
   pbx.sections['PBXFrameworksBuildPhase'][0].files << build_phase_entry
 
 
-  #TODO first check if already linking with CFNetwork
+
   cfnet = pbx.find_item :name => "CFNetwork.framework", :type => PBXProject::PBXTypes::PBXFileReference
 
   unless cfnet
@@ -285,6 +295,26 @@ def setup_project(project_name, project_path, path)
 
 
   ld_flags = cal_build_settings['OTHER_LDFLAGS'] || []
+
+  if not ld_flags.is_a?Array
+    ld_flags = [ld_flags]
+  end
+  danger = ld_flags.find_all {|f| /-ObjC/i.match(f.value) || /-all_load/i.match(f.value)}
+
+  if not danger.empty?
+    msg("Error") do
+      puts "Detected Other Linker Flag: #{(danger.map {|d| d.value}).join(", ")}"
+      puts "calabash-ios setup does not yet support this scenario"
+      puts "(why? karl@lesspainful.com)"
+      puts "You must manually setup ios see:"
+      puts "https://github.com/calabash/calabash-ios"
+    end
+    exit 1
+  end
+
+
+
+
   ld_flags << PBXProject::PBXTypes::BasicValue.new(:value => '"-force_load"')
   ld_flags << PBXProject::PBXTypes::BasicValue.new(:value => '"$(SRCROOT)/calabash.framework/calabash"')
   ld_flags << PBXProject::PBXTypes::BasicValue.new(:value => '"-lstdc++"')
@@ -314,8 +344,7 @@ def setup_project(project_name, project_path, path)
       sp = [sp]
     end
     inherit = sp.find { |x| x.value == '"$(inherited)"' }
-    srcroot = sp.find { |x| p x.value;x.value == "\"$(SRCROOT)\""}
-    p srcroot
+    srcroot = sp.find { |x| x.value == "\"$(SRCROOT)\""}
     sp << PBXProject::PBXTypes::BasicValue.new(:value => '"$(inherited)"') unless inherit
     sp << PBXProject::PBXTypes::BasicValue.new(:value => "\"$(SRCROOT)\"") unless srcroot
     bc.buildSettings["FRAMEWORK_SEARCH_PATHS"] = sp
@@ -326,3 +355,120 @@ def setup_project(project_name, project_path, path)
 end
 
 
+
+require 'calabash-cucumber/launch/simulator_helper'
+def validate_setup(args)
+  if args.length > 0
+    if args[0].end_with?(".ipa")
+      validate_ipa(args[0])
+    elsif args[0].end_with?(".app")
+      validate_app(args[0])
+    end
+  else
+    dd_dir = Calabash::Cucumber::SimulatorHelper.derived_data_dir_for_project
+      if not dd_dir
+        puts "Unable to find iOS project."
+        puts "You should run this command from an iOS project directory."
+        exit 1
+      end
+      app_bundles = Dir.glob(File.join(dd_dir, "Build", "Products", "*", "*.app"))
+      sim_dirs = Dir.glob(File.join(dd_dir, "Build", "Products", "Debug-iphonesimulator", "*.app"))
+      sim_dirs = sim_dirs.concat(Dir.glob(File.join(dd_dir, "Build", "Products", "Calabash-iphonesimulator", "*.app")))
+      if sim_dirs.empty?
+        msg = ["Have you built your app for simulator?"]
+        msg << "You should build the -cal scheme and your normal scheme"
+        msg << "(with configuration Debug)."
+        msg << "Searched dir: #{dd_dir}/Build/Products"
+        msg("Error") do
+          puts msg.join("\n")
+        end
+        exit 1
+      elsif sim_dirs.count != 2
+        msg = ["Have you built your app for simulator?"]
+        msg << "You should build the -cal scheme and your normal scheme"
+        msg << "(with configuration Debug)."
+        msg << "Searched dir: #{dd_dir}/Build/Products"
+        msg("Error") do
+          puts msg.join("\n")
+        end
+        exit 1
+      end
+      out_debug = `otool #{sim_dirs[0]}/* -o 2> /dev/null | grep CalabashServer`
+      out_cal = `otool #{sim_dirs[1]}/* -o 2> /dev/null | grep CalabashServer 2> /dev/null`
+      ok = (not /CalabashServer/.match(out_debug)) and /CalabashServer/.match(out_cal)
+      if ok
+        msg("OK") do
+          puts "Your configuration seems ok."
+          puts "app in directory:"
+          puts sim_dirs[0]
+          puts "does not have calabash.framework linked in."
+          puts "directory:"
+          puts sim_dirs[1]
+          puts "does."
+        end
+      else
+        msg("Fail") do
+          puts "Your configuration looks bad."
+          if (not /CalabashServer/.match(out_debug))
+            puts "WARNING: You Debug build seems to be linking with Calabash."
+            puts "You should restore your xcodeproject file from backup."
+          else
+            puts "app in directory"
+            puts sim_dirs[1]
+            puts "does not have calabash.framework linked in."
+          end
+        end
+      end
+  end
+
+
+end
+
+def validate_ipa(ipa)
+  require 'tmpdir'
+  fail = false
+  Dir.mktmpdir do |dir|
+    if not system("unzip -C -K -o -q -d #{dir} #{ipa}")
+      msg("Error") do
+        puts "Unable to unzip ipa: #{ipa}"
+      end
+      Dir
+      fail = true
+    end
+
+    app_dir = Dir.foreach("#{dir}/Payload").find {|d| /\.app$/.match(d)}
+    app = app_dir.split(".")[0]
+    res = `otool #{dir}/Payload/#{app_dir}/#{app} -o 2> /dev/null | grep CalabashServer`
+    msg("Info") do
+      if /CalabashServer/.match(res)
+        puts "Ipa: #{ipa} *contains* calabash.framework"
+      else
+        puts "Ipa: #{ipa} *does not contain* calabash.framework"
+      end
+    end
+
+  end
+  if fail 
+    exit(1)
+  end
+  
+end
+
+def validate_app(app)
+  if not Dir.exists?app
+    msg("Error") do
+      puts "Path: #{app} is not a directory."
+    end
+    exit 1
+  end
+  out = `otool #{app}/* -o 2> /dev/null | grep CalabashServer`
+
+  msg("Info") do
+    if /CalabashServer/.match(out)
+      puts "App: #{app} *contains* calabash.framework"
+    else
+      puts "App: #{app} *does not contain* calabash.framework"
+    end
+  end
+
+end

data/doc/calabash-ios-help.txt

@@ -33,6 +33,14 @@ Usage: calabash-ios <command-name> [parameters]
         If something goes wrong. Close Xcode and copy project.pbxproj.bak
         to project.pbxproj inside your .xcodeproj folder.
 
+  check (EXPERIMENTAL) [.app or .ipa]?
+        check whether an app or ipa is linked with calabash.framework
+        if called without parameter [.app or .ipa] then pwd should be
+        a directory containing an xcodeproj. In this case we'll check
+        the default Xcode simulator build path for a Debug and Calabash
+        build configurations. We check that Debug doesn't link with
+        calabash.framework but Calabash does.
+
   sim locale  [lang] [regional]? Changes the regional settings
       for the iOS Simulators. You must ensure the correct format
       for the optional regional parameter, for example,

data/features-skeleton/support/launch.rb

@@ -10,7 +10,7 @@
 #                                      #
 #   Don't rely on this file being      #
 #   present when running at            #
-#   lesspainful.com.                   #
+#   www.lesspainful.com.               #
 #                                      #
 #  Only put stuff here to automate     #
 #  iOS Simulator.                      #

data/lib/calabash-cucumber/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Cucumber
-    VERSION = "0.9.19"
+    VERSION = "0.9.20"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.19
+  version: 0.9.20
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70257557882100 !ruby/object:Gem::Requirement
+  requirement: &70182882346360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70257557882100
+  version_requirements: *70182882346360
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70257557881400 !ruby/object:Gem::Requirement
+  requirement: &70182882345940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70257557881400
+  version_requirements: *70182882345940
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
-  requirement: &70257557880780 !ruby/object:Gem::Requirement
+  requirement: &70182882345520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70257557880780
+  version_requirements: *70182882345520
 - !ruby/object:Gem::Dependency
   name: sim_launcher
-  requirement: &70257557880220 !ruby/object:Gem::Requirement
+  requirement: &70182882345080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70257557880220
+  version_requirements: *70182882345080
 - !ruby/object:Gem::Dependency
   name: slowhandcuke
-  requirement: &70257557878640 !ruby/object:Gem::Requirement
+  requirement: &70182882344640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70257557878640
+  version_requirements: *70182882344640
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
-  requirement: &70257557878060 !ruby/object:Gem::Requirement
+  requirement: &70182882344220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70257557878060
+  version_requirements: *70182882344220
 - !ruby/object:Gem::Dependency
   name: pbxproject
-  requirement: &70257557877640 !ruby/object:Gem::Requirement
+  requirement: &70182882343800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70257557877640
+  version_requirements: *70182882343800
 description: calabash-cucumber drives tests for native iOS apps. You must link your
   app with calabash-ios-server framework to execute tests.
 email: