calabash-cucumber 0.9.17 → 0.9.19

data/Gemfile

@@ -1,4 +1,4 @@
 source "http://rubygems.org"
 
-# Specify your gem's dependencies in calabash-cucumber.gemspec
+# Specify your gem's dependencies in calabash-ios-cucumber.gemspec
 gemspec

data/Gemfile.lock

@@ -1,36 +1,49 @@
 PATH
   remote: .
   specs:
-    calabash-cucumber (0.9.1)
+    calabash-cucumber (0.9.18)
+      CFPropertyList
       cucumber
       json
       net-http-persistent
-      rspec (~> 2.7.0)
+      pbxproject
+      sim_launcher
+      slowhandcuke
 
 GEM
   remote: http://rubygems.org/
   specs:
+    CFPropertyList (2.0.17)
+      libxml-ruby (>= 1.1.0)
+      rake (>= 0.7.0)
     builder (3.0.0)
-    cucumber (1.1.3)
+    cucumber (1.1.9)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.6.7)
+      gherkin (~> 2.9.0)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.6)
     diff-lcs (1.1.3)
-    gherkin (2.6.9)
+    gherkin (2.9.0)
       json (>= 1.4.6)
-    json (1.6.4)
-    net-http-persistent (2.3.3)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
+    json (1.6.5)
+    libxml-ruby (2.2.2)
+    net-http-persistent (2.5.2)
+    pbxproject (0.2.4)
+    rack (1.4.1)
+    rack-protection (1.2.0)
+      rack
+    rake (0.9.2.2)
+    sim_launcher (0.3.7)
+      sinatra
+    sinatra (1.3.2)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
+      tilt (~> 1.3, >= 1.3.3)
+    slowhandcuke (0.0.3)
+      cucumber
     term-ansicolor (1.0.7)
+    tilt (1.3.3)
 
 PLATFORMS
   ruby

data/bin/calabash-ios

@@ -0,0 +1,52 @@
+#!/usr/bin/env ruby
+
+require 'fileutils'
+require 'CFPropertyList'
+require 'rexml/document'
+require 'pbxproject'
+require File.join(File.dirname(__FILE__),"calabash-ios-helpers")
+require File.join(File.dirname(__FILE__),"calabash-ios-generate")
+require File.join(File.dirname(__FILE__),"calabash-ios-setup")
+require File.join(File.dirname(__FILE__),"calabash-ios-sim")
+
+@features_dir = File.join(FileUtils.pwd, "features")
+@source_dir = File.join(File.dirname(__FILE__), '..', 'features-skeleton')
+@iphonesim = File.absolute_path(File.join(File.dirname(__FILE__), 'iphonesim'))
+@script_dir = File.join(File.dirname(__FILE__), '..', 'scripts')
+
+if (ARGV.length == 0)
+  print_usage
+  exit 0
+end
+cmd = ARGV.shift
+if cmd == 'help'
+  print_help
+  exit 0
+elsif cmd == 'gen'
+  calabash_scaffold
+elsif cmd == 'setup'
+  calabash_setup(ARGV)
+  exit 0
+elsif cmd == 'sim'
+  if ARGV.length == 0
+    print_usage
+    exit 0
+  end
+  subcmd = ARGV.shift
+
+  if subcmd == 'reset'
+    calabash_sim_reset
+  elsif subcmd == 'acc'
+    calabash_sim_accessibility
+  elsif subcmd == 'locale'
+    calabash_sim_locale(ARGV)
+  elsif subcmd == 'device'
+    calabash_sim_device(ARGV)
+  else
+    print_usage
+  end
+else
+  print_usage
+end
+
+

data/bin/calabash-ios-generate.rb

@@ -0,0 +1,26 @@
+
+def calabash_scaffold
+  if File.exists?(@features_dir)
+    puts "A features directory already exists. Stopping..."
+    #puts "Run calabash-ios update for update instructions."
+    exit 1
+  end
+  msg("Question") do
+    puts "I'm about to create a subdirectory called features."
+    puts "features will contain all your calabash tests."
+    puts "Please hit return to confirm that's what you want."
+  end
+  exit 2 unless STDIN.gets.chomp == ''
+
+  FileUtils.cp_r(@source_dir, @features_dir)
+  FileUtils.mv "#{@features_dir}/.irbrc", "."
+  FileUtils.mv "#{@features_dir}/irb_ios4.sh", "."
+  FileUtils.mv "#{@features_dir}/irb_ios5.sh", "."
+
+  msg("Info") do
+    puts "features subdirectory created. \n"
+    puts "Try executing \n\nDEVICE=iphone OS=ios5 cucumber"
+    puts "\n (replace ios5 with ios4 if running iOS 4.x simulator.\nReplace iphone with ipad if running iPad simulator.).\n"
+  end
+
+end

data/bin/calabash-ios-helpers.rb

@@ -0,0 +1,62 @@
+def msg(title, &block)
+  puts "\n" + "-"*10 + title + "-"*10
+  block.call
+  puts "-"*10 + "-------" + "-"*10 + "\n"
+end
+
+
+def print_usage
+  puts <<EOF
+  Usage: calabash-ios <command-name> [parameters]
+  <command-name> can be one of
+    help
+      prints more detailed help information.
+    gen
+      generate a features folder structure.
+    setup (EXPERIMENTAL)
+      setup your XCode project for calabash-ios)
+    sim locale [lang] [regional]?
+      change locale and regional settings in all iOS Simulators
+    sim reset
+      reset content and settings in all iOS Simulators
+    sim acc
+      enable accessibility in all iOS Simulators
+    sim device [iPad, iPhone, iPhone_Retina]
+      change the default iOS Simulator device.
+EOF
+end
+def print_help
+  file = File.join(File.dirname(__FILE__), '..', 'doc', 'calabash-ios-help.txt')
+  system("less #{file}")
+end
+
+def ensure_correct_path(args)
+  dir_to_search = nil
+  if args.length == 1
+    dir_to_search = args[0]
+    if not Dir.exists?(dir_to_search)
+      puts "Path: #{dir_to_search} is not a directory."
+      puts "It should be your project directory (i.e., the one containing your <projectname.xcodeproject>)."
+      exit 1
+    end
+  else
+    dir_to_search = "."
+  end
+
+  project_files = Dir.foreach(dir_to_search).find_all { |x| /\.xcodeproj$/.match(x) }
+  if project_files.empty?
+    puts "Found no *.xcodeproj files in dir #{dir_to_search}."
+    puts "Please run calabash-ios setup <project path>"
+    exit 1
+  end
+  if project_files.count > 1
+    puts "Found several *.xcodeproj files in dir #{dir_to_search}."
+    puts "Found: #{project_files.join("\n")}"
+    puts "We don't yet support this. Please setup calabash manually."
+    exit 1
+  end
+  return dir_to_search,project_files
+end
+
+
+####

data/bin/calabash-ios-setup.rb

@@ -0,0 +1,328 @@
+def dup_scheme(project_name, pbx_dir)
+
+  userdata_dirs = Dir.foreach("#{pbx_dir}/xcuserdata").find_all { |x|
+    /\.xcuserdatad$/.match(x)
+  }
+
+  userdata_dirs.each do |userdata_dir|
+    scheme_to_find = Regexp.new(Regexp.escape("#{project_name}.xcscheme"))
+    cal_scheme_to_find = Regexp.new(Regexp.escape("#{project_name}-cal.xcscheme"))
+    schemes = Dir.foreach("#{pbx_dir}/xcuserdata/#{userdata_dir}/xcschemes")
+    scheme = schemes.find do |scheme|
+      scheme_to_find.match(scheme)
+    end
+    cal_scheme = schemes.find do |scheme|
+      cal_scheme_to_find.match(scheme)
+    end
+
+    if scheme.nil?
+      puts "-"*10 + "Warning" + "-"*10
+      puts "Unable to find scheme: #{project_name}.xcscheme."
+      puts "You must manually create a scheme."
+      puts "Make sure your scheme uses the Calabash build configuration."
+      puts "-"*10 + "-------" + "-"*10
+    else
+      if not cal_scheme.nil?
+        msg("Warning") do
+          puts "Scheme: #{project_name}-cal.xcscheme already exists."
+          puts "Will not try to duplicate #{project_name}.xcscheme."
+        end
+      else
+        msg("Action") do
+          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.write(File.open("#{pbx_dir}/xcuserdata/#{userdata_dir}/xcschemes/#{project_name}-cal.xcscheme", "w"))
+        end
+      end
+    end
+
+  end
+end
+
+
+def calabash_setup(args)
+  puts "Checking if Xcode is running..."
+  res = `ps x -o pid,command | grep -v grep | grep Xcode.app/Contents/MacOS/Xcode`
+  if res==""
+    puts "Xcode not running."
+    project_name, project_path, xpath = find_project_files(args)
+    setup_project(project_name, project_path, xpath)
+    dup_scheme(project_name, xpath)
+    msg("Setup done") do
+
+      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 '  "Started LPHTTP server on port 37265"'
+      puts "\nin the application log in Xcode."
+      puts "\n\n"
+      puts "After validating, you can generate a features folder:"
+      puts "Go to your project (the dir containing the .xcodeproj file)."
+      puts "Then run calabash-ios gen"
+      puts "(if you don't already have a features folder)."
+    end
+
+  else
+    puts "Xcode is running. We'll be changing the project file so we'd better stop it."
+    puts "Shall I stop Xcode? Please answer yes (y) or no (n)"
+    answer = STDIN.gets.chomp
+    if (answer == 'yes' or answer == 'y')
+      res.split("\n").each do |line|
+        pid = line.split(" ")[0]
+        if system("kill #{pid}")
+          puts "Stopped XCode. Retrying... "
+          calabash_setup(args)
+        else
+          puts "Killing Xcode seemed to fail :( Aborting..."
+        end
+      end
+    else
+      puts "Please stop Xcode and try again."
+      exit(0)
+    end
+  end
+end
+
+def find_project_files(args)
+  dir_to_search, project_files = ensure_correct_path(args)
+
+  xc_project_file = project_files[0]
+  project_name = xc_project_file.split(".xcodeproj")[0]
+  puts "Found Project: #{project_name}"
+  pbx_dir = "#{dir_to_search}/#{xc_project_file}"
+  pbx_files = Dir.foreach(pbx_dir).find_all { |x| /\.pbxproj$/.match(x) }
+  if pbx_files.empty?
+    puts "Found no *.pbxproj files in dir #{xc_project_file}."
+    puts "Please setup calabash manually."
+    exit 1
+  elsif pbx_files.count > 1
+    puts "Found several *.pbxproj files in dir #{xc_project_file}."
+    puts "Found: #{pbx_files.join("\n")}"
+    puts "We don't yet support this. Please setup calabash manually."
+    exit 1
+  end
+
+  return project_name, dir_to_search, File.expand_path("#{dir_to_search}/#{xc_project_file}")
+end
+
+def setup_project(project_name, project_path, path)
+  ##Ensure exists and parse
+  proj_file = "#{path}/project.pbxproj"
+  if not File.exists?(proj_file)
+    msg("Error") do
+      puts "Directory #{path} doesn't contain #{proj_file}"
+    end
+    exit 1
+  end
+  pbx = PBXProject::PBXProject.new(:file => proj_file)
+  pbx.parse
+
+  pwd = FileUtils.pwd
+  FileUtils.cd project_path
+  ##Backup
+  msg("Info") do
+    puts "Making backup of project file: #{proj_file}.bak"
+    if File.exists? "#{proj_file}.bak"
+      msg("Error") do
+        puts "Backup file already exists. #{proj_file}.bak"
+        puts "For safety, I won't overwrite this file."
+        puts "You must manually move this file, if you want to"
+        puts "Run calabash-ios setup again."
+      end
+      exit 1
+    end
+    FileUtils.cp(proj_file, "#{proj_file}.bak")
+  end
+  file = 'calabash.framework'
+  ##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}"
+      require 'uri'
+      require 'net/https'
+
+      uri = URI.parse "https://raw.github.com/calabash/calabash-ios/master/frameworks/#{zip_file}"
+
+      Net::HTTP.start(uri.host, uri.port,
+                      :use_ssl => uri.scheme == 'https') do |http|
+        request = Net::HTTP::Get.new uri.request_uri
+
+        http.request request do |response|
+          open zip_file, 'wb' do |io|
+            response.read_body do |chunk|
+              print "."
+              io.write chunk
+            end
+          end
+        end
+      end
+      puts "\nDownload done: #{file}. Unzipping..."
+      if not system("unzip -C -K -o -q -d #{project_path} #{zip_file}")
+        msg("Error") do
+          puts "Unable to unzip file: #{zip_file}"
+          puts "You must install manually."
+        end
+        exit 1
+      end
+      FileUtils.rm(zip_file)
+    end
+
+  else
+    puts "Found calabash.framework. Will not download."
+  end
+
+
+  file_ref = pbx.sections['PBXFileReference'].find do |fr|
+    /calabash\.framework/.match(fr.path)
+  end
+
+  if file_ref
+    msg("Error") do
+      puts "Your project already contains a file reference to calabash.framework."
+      puts "I was not expecting this. Aborting."
+    end
+    exit 1
+  end
+
+  msg("Info") do
+    puts "Setting up project file for calabash-ios."
+  end
+
+
+  ## Augment
+  f = PBXProject::PBXTypes::PBXFileReference.new(:path => file, :lastKnownFileType => "wrapper.framework", :sourceTree => '"<group>"')
+  f.comment = "calabash.framework"
+  pbx.add_item f
+  bf = PBXProject::PBXTypes::PBXBuildFile.new(:comment => "calabash.framework in Frameworks", :fileRef => f.guid)
+  bf.comment = "calabash.framework in Frameworks"
+  pbx.add_item bf
+
+  group = pbx.find_item :name => "Frameworks", :type => PBXProject::PBXTypes::PBXGroup
+  group.add_children f
+
+  build_phase_entry = PBXProject::PBXTypes::BasicValue.new(:value => bf.guid, :comment => bf.comment)
+  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
+    f = PBXProject::PBXTypes::PBXFileReference.new(:path => "System/Library/Frameworks/CFNetwork.framework", :lastKnownFileType => "wrapper.framework", :sourceTree => 'SDKROOT')
+    f.comment = "CFNetwork.framework"
+    f.name = f.comment
+    pbx.add_item f
+    bf = PBXProject::PBXTypes::PBXBuildFile.new(:comment => "CFNetwork.framework in Frameworks", :fileRef => f.guid)
+    bf.comment = "CFNetwork.framework in Frameworks"
+    pbx.add_item bf
+    group.add_children f
+    build_phase_entry = PBXProject::PBXTypes::BasicValue.new(:value => bf.guid, :comment => bf.comment)
+    pbx.sections['PBXFrameworksBuildPhase'][0].files << build_phase_entry
+  end
+
+
+  targets = pbx.sections['PBXNativeTarget']
+  target = nil
+  if targets.count == 0
+    msg("Error") do
+      puts "Unable to find targets in project."
+      puts "Aborting..."
+    end
+    exit 1
+  elsif (targets.count == 1)
+    target = targets[0]
+  else
+    preferred_target = targets.find { |t| t.name.value == project_name }
+    msg("Question") do
+      puts "You have several targets..."
+      puts (targets.map { |t| t.name.value }).join("\n")
+
+      found = nil
+      until found do
+        puts "Please specify which is your production app target."
+        puts "Please enter target name."
+        puts "Hit Enter for default choice: #{preferred_target.name.value}" unless preferred_target.nil?
+        answer = STDIN.gets.chomp
+        if (preferred_target and answer == '')
+          target = preferred_target
+          found = true
+        else
+          target = found = targets.find { |t| t.name.value == answer }
+        end
+      end
+    end
+  end
+
+
+  bc_list_id = target.buildConfigurationList.value
+  bc_list = pbx.find_item :guid => bc_list_id, :type => PBXProject::PBXTypes::XCConfigurationList
+  bc_ref = bc_list.buildConfigurations.find { |bc| bc.comment =="Debug" }
+  bc_id = bc_ref.value
+  bc = pbx.find_item :guid => bc_id, :type => PBXProject::PBXTypes::XCBuildConfiguration
+  cal_build_settings = bc.buildSettings.clone
+
+
+  bc.buildSettings.each do |k, v|
+    cal_build_settings[k] = v.clone
+  end
+
+  project_bc_id = pbx.sections['PBXProject'][0].buildConfigurationList.value
+  project_bc_list = pbx.find_item :guid => project_bc_id, :type => PBXProject::PBXTypes::XCConfigurationList
+  project_bc_ref = project_bc_list.buildConfigurations.find { |bc| bc.comment =="Debug" }
+  project_bc_id = project_bc_ref.value
+  project_bc = pbx.find_item :guid => project_bc_id, :type => PBXProject::PBXTypes::XCBuildConfiguration
+  project_cal_build_settings = project_bc.buildSettings.clone
+  project_bc.buildSettings.each do |k, v|
+    project_cal_build_settings[k] = v.clone
+  end
+
+
+  ld_flags = cal_build_settings['OTHER_LDFLAGS'] || []
+  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++"')
+
+
+  cal_build_settings['OTHER_LDFLAGS'] = ld_flags
+
+  cal_bc = PBXProject::PBXTypes::XCBuildConfiguration.new(:name => "Calabash")
+  cal_bc.buildSettings = cal_build_settings
+  cal_bc.comment = "Calabash"
+
+  project_cal_bc = PBXProject::PBXTypes::XCBuildConfiguration.new(:name => "Calabash")
+  project_cal_bc.buildSettings = project_cal_build_settings
+  project_cal_bc.comment = "Calabash"
+
+  bc_list.buildConfigurations << PBXProject::PBXTypes::BasicValue.new(:value => cal_bc.guid, :comment => "Calabash")
+  project_bc_list.buildConfigurations << PBXProject::PBXTypes::BasicValue.new(:value => project_cal_bc.guid, :comment => "Calabash")
+  FileUtils.cd pwd
+
+
+  pbx.sections['XCBuildConfiguration']<<project_cal_bc
+  pbx.sections['XCBuildConfiguration']<<cal_bc
+
+  pbx.sections['XCBuildConfiguration'].each do |bc|
+    sp = bc.buildSettings["FRAMEWORK_SEARCH_PATHS"] || []
+    if not sp.is_a?Array
+      sp = [sp]
+    end
+    inherit = sp.find { |x| x.value == '"$(inherited)"' }
+    srcroot = sp.find { |x| p x.value;x.value == "\"$(SRCROOT)\""}
+    p 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
+  end
+
+  pbx.write_to :file => proj_file
+
+end
+
+

data/bin/calabash-ios-sim.rb

@@ -0,0 +1,88 @@
+def quit_sim
+  `echo 'application "iPhone Simulator" quit' | osascript`
+end
+def calabash_sim_reset
+  reset_script = File.absolute_path("#{@script_dir}/reset_simulator.scpt")
+  sdks = `#{@iphonesim} showsdks`.split("\n")
+  sdks.each do |sdk_path_str|
+    sdk_path = sdk_path_str.split(" ")
+    `#{@iphonesim} launch DUMMY_APP #{sdk_path[0]} ipad 2> /dev/null`
+    system("osascript #{reset_script}")
+    `#{@iphonesim} launch DUMMY_APP #{sdk_path[0]} iphone 2> /dev/null`
+    system("osascript #{reset_script}")
+  end
+
+  quit_sim
+
+end
+
+def calabash_sim_accessibility
+  dirs = Dir.glob(File.join(File.expand_path("~/Library"),"Application Support","iPhone Simulator","*.*","Library","Preferences"))
+  dirs.each do |sim_pref_dir|
+    fp = File.absolute_path("#{@script_dir}/data/")
+    FileUtils.cp("#{fp}/com.apple.Accessibility.plist", sim_pref_dir)
+  end
+end
+
+def calabash_sim_locale(args)
+
+  prefs_path = File.absolute_path("#{@script_dir}/data/.GlobalPreferences.plist")
+  plist = CFPropertyList::List.new(:file => prefs_path)
+  hash = CFPropertyList.native_types(plist.value)
+
+
+  if args.length == 0
+    print_usage
+    puts "Options: \n"
+    puts hash['AppleLanguages'].join("\n")
+    exit 0
+  end
+  lang = args.shift
+  reg = nil
+  if args.length == 1
+    reg = args.shift
+  end
+
+  langs = hash['AppleLanguages']
+  lang_index = langs.find_index {|l| l == lang}
+
+  if lang_index.nil?
+    puts "Unable to find #{lang}..."
+    puts "Options:\n#{langs.join("\n")}"
+    exit 0
+  end
+
+  langs[0],langs[lang_index] = langs[lang_index],langs[0]
+
+
+  if reg
+    hash['AppleLocale'] = reg
+  end
+  res_plist = CFPropertyList::List.new
+  res_plist.value = CFPropertyList.guess(hash)
+  dirs = Dir.glob(File.join(File.expand_path("~/Library"),"Application Support","iPhone Simulator","*.*","Library","Preferences"))
+  dirs.each do |sim_pref_dir|
+    res_plist.save("#{sim_pref_dir}/.GlobalPreferences.plist", CFPropertyList::List::FORMAT_BINARY)
+  end
+
+
+end
+
+
+def calabash_sim_device(args)
+  quit_sim
+  options = ["iPad", "iPhone", "iPhone_Retina"]
+  if args.length != 1 or not options.find {|x| x == args[0]}
+    print_usage
+    puts "Unrecognized args: #{args}"
+    puts "should be one of #{options}"
+    exit(0)
+  end
+  path =File.join(File.expand_path("~/Library"),"Preferences","com.apple.iphonesimulator.plist")
+  plist = CFPropertyList::List.new(:file => path)
+  hash = CFPropertyList.native_types(plist.value)
+  hash['SimulateDevice'] = args[0].gsub("iPhone_Retina","iPhone (Retina)")
+  plist.value = CFPropertyList.guess(hash)
+  plist.save(path, CFPropertyList::List::FORMAT_BINARY)
+end
+

data/calabash-cucumber.gemspec

@@ -13,12 +13,15 @@ Gem::Specification.new do |s|
   s.description = %q{calabash-cucumber drives tests for native iOS apps. You must link your app with calabash-ios-server framework to execute tests.}
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.executables   = "calabash-ios"
   s.require_paths = ["lib"]
 
   s.add_dependency( "cucumber" )
-  s.add_dependency( "rspec", ["~> 2.7.0"] )
   s.add_dependency( "json" )
+  s.add_dependency( "CFPropertyList" )
+  s.add_dependency( "sim_launcher" )
   s.add_dependency( "slowhandcuke" )
   s.add_dependency( "net-http-persistent" )
+  s.add_dependency( "pbxproject" )
+
 end

data/doc/calabash-ios-help.txt

@@ -0,0 +1,45 @@
+Usage: calabash-ios <command-name> [parameters]
+    <command-name> can be one of
+      help
+      gen
+      setup [path]? (Note: EXPERIMENTAL)
+      sim locale [lang] [regional]?
+      sim reset     (Note: EXPERIMENTAL)
+      sim acc
+      sim device [iPad, iPhone, iPhone_Retina]
+
+  Commands:
+  gen creates a skeleton features dir. This is usually used once when
+      setting up calabash to ensure that the features folder contains
+      the right step definitions and environment to run with cucumber.
+
+  setup [path]? (EXPERIMENTAL) Automates setting up your iOS Xcode project
+        with calabash-io-server. It will download calabash.framework
+        and modifying you Xcode project file.
+        The parameter [path] is optional (default is the current dir).
+        If specified [path] should be the path to your iOS Xcode project
+        (i.e., the folder which contains projectname.xcodeproj).
+
+        The following modifications are made
+          - add the calabash.framework to your Frameworks folder
+          - add $(SRCROOT) to framework search path
+          - link with calabash.framework (target can be chosen)
+          - create a new Build configuration: Calabash
+          - ensure calabash.framework is loaded in Calabash configuration
+          - create a new scheme name project-cal
+
+        Your Xcode project file will be backed up as project.pbxproj.bak.
+        The backup is placed in the .xcodeproj folder for your project.
+        If something goes wrong. Close Xcode and copy project.pbxproj.bak
+        to project.pbxproj inside your .xcodeproj folder.
+
+  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,
+      da_DK, en_US.
+
+  sim reset (EXPERIMENTAL) Will select "Reset Content and Settings"
+      in the iOS Simulators using AppleScript.
+
+  sim device [device] Will set the default iOS Simulator device.
+      [device] can be one of iPad, iPhone, iPhone_Retina.

data/features-skeleton/support/launch.rb

@@ -0,0 +1,55 @@
+########################################
+#                                      #
+#       Important Note                 #
+#                                      #
+#   When running calabash-ios tests at #
+#   www.lesspainful.com                #
+#   this file will be overwritten by   #
+#   a file which automates             #
+#   app launch on devices.             #
+#                                      #
+#   Don't rely on this file being      #
+#   present when running at            #
+#   lesspainful.com.                   #
+#                                      #
+#  Only put stuff here to automate     #
+#  iOS Simulator.                      #
+#                                      #
+#  You can put your app bundle path    #
+#  for automating simulator app start: #
+#  Uncomment APP_BUNDLE_PATH =..       #
+#                                      #
+########################################
+
+require 'calabash-cucumber/launch/simulator_helper'
+
+# Uncomment and replace ?? appropriately
+# This should point to your Simulator build
+# which includes calabash framework
+# this is usually the Calabash build configuration
+# of your production target.
+#APP_BUNDLE_PATH = "~/Library/Developer/Xcode/DerivedData/??/Build/Products/Calabash-iphonesimulator/??.app""
+#
+
+def relaunch
+  if ENV['NO_LAUNCH'].nil?
+    Calabash::Cucumber::SimulatorHelper.relaunch(app_path,ENV['SDK_VERSION'],ENV['DEVICE'])
+  end
+end
+
+
+def app_path
+  ENV['APP_BUNDLE_PATH'] || (defined?(APP_BUNDLE_PATH) && APP_BUNDLE_PATH)
+end
+
+##TODO Reset simulator between features!
+
+Before do |scenario|
+  relaunch
+end
+
+at_exit do
+  if ENV['NO_LAUNCH'].nil?
+    Calabash::Cucumber::SimulatorHelper.stop
+  end
+end

data/lib/calabash-cucumber/calabash_helper.rb

@@ -0,0 +1,13 @@
+require 'pbxproject'
+
+module Calabash module Cucumber
+
+module ProjectHelper
+
+  def self.setup_project(path)
+    puts path
+  end
+
+
+end
+end end

data/lib/calabash-cucumber/calabash_steps.rb

@@ -10,7 +10,7 @@ end
 
 # -- Touch --#
 Then /^I (?:press|touch) on screen (\d+) from the left and (\d+) from the top$/ do |x, y|
-  touch(nil, {:x => x.to_i, :y => y.to_i})
+  touch(nil, {:offset => {:x => x.to_i, :y => y.to_i}})
   sleep(STEP_PAUSE)
 end
 
@@ -281,7 +281,7 @@ Then /^I should not see "([^\"]*)"$/ do |expected_mark|
   res = query("view marked:'#{expected_mark}'")
   res.concat query("view text:'#{expected_mark}'")
   unless res.empty?
-    screenshot_and_raise "Expected no element with text nor accessibilityLabel: #{expected_mark}, found #{res}"
+    screenshot_and_raise "Expected no element with text nor accessibilityLabel: #{expected_mark}, found #{res.join(", ")}"
   end
 end
 

data/lib/calabash-cucumber/launch/simulator_helper.rb

@@ -0,0 +1,167 @@
+require 'net/http/persistent'
+require 'sim_launcher'
+require 'CFPropertyList'
+
+module Calabash
+  module Cucumber
+
+    module SimulatorHelper
+
+      DEFAULT_DERIVED_DATA = File.expand_path("~/Library/Developer/Xcode/DerivedData/*/info.plist")
+      MAX_PING_ATTEMPTS = 5
+
+      def self.relaunch(path, sdk = nil, version = 'iphone')
+
+        app_bundle_path = app_bundle_or_raise(path)
+        ensure_connectivity(app_bundle_path, sdk, version)
+
+      end
+
+      def self.stop
+        simulator = SimLauncher::Simulator.new
+        simulator.quit_simulator
+      end
+
+
+      def self.derived_data_dir_for_project
+        dir = project_dir
+
+        info_plist = Dir.glob(DEFAULT_DERIVED_DATA).find { |plist_file|
+          plist = CFPropertyList::List.new(:file => plist_file)
+          hash = CFPropertyList.native_types(plist.value)
+          ws_dir = File.dirname(hash['WorkspacePath']).downcase
+          p_dir = dir.downcase
+          ws_dir == p_dir
+        }
+        File.dirname(info_plist) unless info_plist.nil?
+      end
+
+      def self.project_dir
+        File.expand_path(ENV['PROJECT_DIR'] || Dir.pwd)
+      end
+
+      def self.app_bundle_or_raise(path)
+        dd_dir = derived_data_dir_for_project
+        app_bundles = Dir.glob(File.join(dd_dir, "Build", "Products", "*", "*.app"))
+        bundle_path = nil
+
+        if path and not Dir.exist?(path)
+          puts "Unable to find .app bundle at #{path}"
+          if dd_dir.nil?
+            raise "Unable to find Project for #{project_dir} in #{%x[ls #{DEFAULT_DERIVED_DATA}]}"
+          end
+          if app_bundles.empty?
+            raise "Can't find build in #{dd_dir}/Build/Products/*/*.app'. Have you built your app for simulator?"
+          end
+          msg = "Try setting APP_BUNDLE_PATH in features/support/launch.rb to one of:\n\n"
+          msg << app_bundles.join("\n")
+          raise msg
+        elsif path
+          bundle_path = path
+        else
+          sim_dirs = Dir.glob(File.join(dd_dir, "Build", "Products", "*-iphonesimulator", "*.app"))
+          if sim_dirs.empty?
+            msg = ["Unable to auto detect APP_BUNDLE_PATH."]
+            msg << "Have you built your app for simulator?."
+            msg << "Searched dir: #{dd_dir}/Build/Products"
+            msg << "Please build your app from Xcode"
+            msg << "You should build the -cal scheme or your calabash target."
+            msg << ""
+            msg << "Alternatively, specify APP_BUNDLE_PATH in features/support/launch.rb"
+            msg << "This should point to the location of your built app linked with calabash.\n"
+            raise msg.join("\n")
+          end
+          preferred_dir = find_preferred_dir(sim_dirs)
+          if preferred_dir.nil?
+            msg = ["Error... Unable to find APP_BUNDLE_PATH."]
+            msg << "Cannot find a built app that is linked with calabash.framework"
+            msg << "Please build your app from Xcode"
+            msg << "You should build the -cal scheme or your calabash target."
+            msg << ""
+            msg << "Alternatively, specify APP_BUNDLE_PATH in features/support/launch.rb"
+            msg << "This should point to the location of your built app linked with calabash.\n"
+            raise msg.join("\n")
+          end
+          puts("-"*37)
+          puts "Auto detected APP_BUNDLE_PATH:\n\n"
+
+          puts "APP_BUNDLE_PATH=#{preferred_dir || sim_dirs[0]}\n\n"
+          puts "Please verify!"
+          puts "If this is wrong please set it as APP_BUNDLE_PATH in features/support/launch.rb\n"
+          puts("-"*37)
+          bundle_path = sim_dirs[0]
+        end
+        bundle_path
+      end
+
+      def self.find_preferred_dir(sim_dirs)
+
+        pref = sim_dirs.find do |d|
+          out = `otool #{d}/* -o | grep CalabashServer`
+          /CalabashServer/.match(out)
+        end
+
+        if pref.nil?
+          pref = sim_dirs.find {|d| /Calabash-iphonesimulator/.match(d)}
+        end
+        pref
+      end
+
+      def self.ensure_connectivity(app_bundle_path, sdk, version)
+        begin
+          Timeout::timeout(15) do
+            connected = false
+            until connected
+              simulator = launch(app_bundle_path, sdk, version)
+              num_pings = 0
+              until connected or (num_pings == MAX_PING_ATTEMPTS)
+                begin
+                    connected = (ping_app == '405')
+                rescue Exception => e
+                  if (num_pings > 2) then p e end
+                ensure
+                  num_pings += 1
+                  unless connected
+                    sleep 1
+                  end
+                end
+              end
+            end
+          end
+        rescue
+          msg = "Unable to make connection to Calabash Server at #{ENV['DEVICE_ENDPOINT']|| "http://localhost:37265/"}\n"
+          msg << "Make sure you've' linked correctly with calabash.framework and set Other Linker Flags.\n"
+          msg << "See: http://github.com/calabash/calabash-ios"
+          raise msg
+        end
+      end
+
+
+      def self.launch(app_bundle_path, sdk, version)
+        simulator = SimLauncher::Simulator.new
+        simulator.quit_simulator
+        simulator.launch_ios_app(app_bundle_path, sdk, version)
+        simulator
+      end
+
+      def self.ping_app
+        url = URI.parse (ENV['DEVICE_ENDPOINT']|| "http://localhost:37265/")
+        puts "Ping #{url}..."
+        http = Net::HTTP.new(url.host, url.port)
+        res = http.start do |sess|
+          sess.request Net::HTTP::Get.new url.path
+        end
+        status = res.code
+        begin
+          http.finish if http and http.started?
+        rescue Exception => e
+          puts "Finish #{e}"
+        end
+        status
+      end
+    end
+
+
+  end
+end
+

data/lib/calabash-cucumber/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.17
+  version: 0.9.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-16 00:00:00.000000000 Z
+date: 2012-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70251124926540 !ruby/object:Gem::Requirement
+  requirement: &70257557882100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,32 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70251124926540
+  version_requirements: *70257557882100
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70251124925540 !ruby/object:Gem::Requirement
+  name: json
+  requirement: &70257557881400 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70251124925540
+  version_requirements: *70257557881400
 - !ruby/object:Gem::Dependency
-  name: json
-  requirement: &70251124924180 !ruby/object:Gem::Requirement
+  name: CFPropertyList
+  requirement: &70257557880780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70257557880780
+- !ruby/object:Gem::Dependency
+  name: sim_launcher
+  requirement: &70257557880220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70251124924180
+  version_requirements: *70257557880220
 - !ruby/object:Gem::Dependency
   name: slowhandcuke
-  requirement: &70251124923320 !ruby/object:Gem::Requirement
+  requirement: &70257557878640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70251124923320
+  version_requirements: *70257557878640
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
-  requirement: &70251124922760 !ruby/object:Gem::Requirement
+  requirement: &70257557878060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70257557878060
+- !ruby/object:Gem::Dependency
+  name: pbxproject
+  requirement: &70257557877640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,13 +87,13 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70251124922760
+  version_requirements: *70257557877640
 description: calabash-cucumber drives tests for native iOS apps. You must link your
   app with calabash-ios-server framework to execute tests.
 email:
 - karl@lesspainful.com
 executables:
-- calabash
+- calabash-ios
 extensions: []
 extra_rdoc_files: []
 files:
@@ -82,9 +104,15 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- bin/calabash
+- bin/calabash-ios
+- bin/calabash-ios-generate.rb
+- bin/calabash-ios-helpers.rb
+- bin/calabash-ios-setup.rb
+- bin/calabash-ios-sim.rb
+- bin/iphonesim
 - calabash-cucumber.gemspec
 - copy_resources.sh
+- doc/calabash-ios-help.txt
 - epl-v10.html
 - features-skeleton/.irbrc
 - features-skeleton/irb_ios4.sh
@@ -93,10 +121,13 @@ files:
 - features-skeleton/step_definitions/calabash_steps.rb
 - features-skeleton/support/env.rb
 - features-skeleton/support/hooks.rb
+- features-skeleton/support/launch.rb
 - lib/calabash-cucumber.rb
+- lib/calabash-cucumber/calabash_helper.rb
 - lib/calabash-cucumber/calabash_steps.rb
 - lib/calabash-cucumber/color_helper.rb
 - lib/calabash-cucumber/cucumber.rb
+- lib/calabash-cucumber/launch/simulator_helper.rb
 - lib/calabash-cucumber/operations.rb
 - lib/calabash-cucumber/resources/cell_swipe_ios4_ipad.base64
 - lib/calabash-cucumber/resources/cell_swipe_ios4_iphone.base64
@@ -161,6 +192,9 @@ files:
 - lib/calabash-cucumber/resources/touch_ios5_ipad.base64
 - lib/calabash-cucumber/resources/touch_ios5_iphone.base64
 - lib/calabash-cucumber/version.rb
+- scripts/data/.GlobalPreferences.plist
+- scripts/data/com.apple.Accessibility.plist
+- scripts/reset_simulator.scpt
 homepage: http://www.lesspainful.com/calabash
 licenses: []
 post_install_message: 

data/bin/calabash

@@ -1,76 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'fileutils'
-
-features_dir = File.join( FileUtils.pwd, "features" )
-source_dir = File.join( File.dirname(__FILE__), '..', 'features-skeleton' )
-
-if File.exists?( features_dir )
-  if (ARGV.length == 1 && ARGV[0] == 'update')
-    features_dir =  File.join( FileUtils.pwd, "features_template")
-    if File.exists?( features_dir )
-      puts "Working directory #{features_dir} already exist."
-      puts "Please move it and run calabash update again to continue."
-      exit 2
-    end
-    FileUtils.cp_r( source_dir, features_dir)
-    puts <<EOS
-
------------ Instructions -----------
-
-Copied files to #{features_dir}.
-You must manually merge files from
-
-  features_template/step_definitions
-  features_template/support
-
-To your ./features dir.
-
-If you haven't edited any of the files:
-
-  features/support/env.rb
-  features/support/hooks.rb
-  features/step_definitions/ilesspainful_steps.rb
-
-You can simply copy files from
-
-  features_template/step_definitions
-  features_template/support
-
-to the corresponding dirs in features.
-You must also delete: features/step_definitions/ilesspainful_steps.rb
-
-Otherwise, if you have edited any of the files,
-you must manually merge them with those of features_template.
-
-It is important that you remove any reference to
-the ilesspainfulclient-cucumber gem if present in your files.
-
-When you are done, you should delete features_template.
-
-If in doubt, contact Karl Krukow <karl@lesspainful.com>
------------------------------------
-EOS
-    exit
-  else
-    puts "A features directory already exists. I won't overwrite it. Giving up."
-    puts "Run calabash update for update instructions."
-  end
-  exit 1
-else
-  puts "I'm about to create a subdirectory called features."
-  puts "features will contain all your calabash tests."
-  puts "Please hit return to confirm that's what you want."
-  exit 2 unless STDIN.gets.chomp == ''
-
-  FileUtils.cp_r( source_dir, features_dir )
-  FileUtils.mv "#{features_dir}/.irbrc", "."
-  FileUtils.mv "#{features_dir}/irb_ios4.sh", "."
-  FileUtils.mv "#{features_dir}/irb_ios5.sh", "."
-
-  puts "features subdirectory created. Try starting you app in the iOS simulator "
-  puts "using the Calabash target (see calabash-ios-server for how to create the target).\n"
-  puts "Then try executing \n\nSTEP_PAUSE=2 OS=ios5 DEVICE=iphone cucumber"
-  puts "\n (replace ios5 with ios4 if running iOS 4.x simulator.\nReplace iphone with ipad if running iPad simulator.).\n"
-
-end