calabash-cucumber 0.9.22 → 0.9.23

data/bin/calabash-ios

@@ -23,6 +23,10 @@ if cmd == 'help'
   exit 0
 elsif cmd == 'gen'
   calabash_scaffold
+  exit 0
+elsif cmd == 'download'
+  calabash_download(ARGV)
+  exit 0
 elsif cmd == 'setup'
   calabash_setup(ARGV)
   exit 0

data/bin/calabash-ios-helpers.rb

@@ -13,9 +13,11 @@ def print_usage
       prints more detailed help information.
     gen
       generate a features folder structure.
-    setup (EXPERIMENTAL)
+    setup (EXPERIMENTAL) [opt path]?
       setup your XCode project for calabash-ios)
-    check (EXPERIMENTAL)
+    download [opt path]?
+      downloads latest compatible version of calabash.framework
+    check (EXPERIMENTAL) [opt path to .ipa/.app]?
       check whether an app or ipa is linked with calabash.framework
     sim locale [lang] [regional]?
       change locale and regional settings in all iOS Simulators
@@ -48,7 +50,6 @@ def ensure_correct_path(args)
   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

data/bin/calabash-ios-setup.rb

@@ -1,15 +1,21 @@
 require "calabash-cucumber/version"
 
 
-def dup_scheme(project_name, pbx_dir)
+def dup_scheme(project_name, pbx_dir, target)
 
   userdata_dirs = Dir.foreach("#{pbx_dir}/xcuserdata").find_all { |x|
     /\.xcuserdatad$/.match(x)
   }
 
+  target_name = target.name.value
+
+  if target_name.start_with?'"' and target_name.end_with?'"'
+    target_name = target_name[1..target_name.length-2]
+  end
+
   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"))
+    scheme_to_find = Regexp.new(Regexp.escape("#{target_name}.xcscheme"))
+    cal_scheme_to_find = Regexp.new(Regexp.escape("#{target_name}-cal.xcscheme"))
     schemes = Dir.foreach("#{pbx_dir}/xcuserdata/#{userdata_dir}/xcschemes")
     scheme = schemes.find do |scheme|
       scheme_to_find.match(scheme)
@@ -20,19 +26,19 @@ def dup_scheme(project_name, pbx_dir)
 
     if scheme.nil?
       puts "-"*10 + "Warning" + "-"*10
-      puts "Unable to find scheme: #{project_name}.xcscheme."
+      puts "Unable to find scheme: #{target_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 "Scheme: #{target_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"
+          puts "Duplicating scheme #{target_name}.xcscheme as #{target_name}-cal.xcscheme"
 
           doc = REXML::Document.new(File.new("#{pbx_dir}/xcuserdata/#{userdata_dir}/xcschemes/#{scheme}"))
 
@@ -48,12 +54,13 @@ def dup_scheme(project_name, pbx_dir)
           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"))
+          doc.write(File.open("#{pbx_dir}/xcuserdata/#{userdata_dir}/xcschemes/#{target_name}-cal.xcscheme", "w"))
         end
       end
     end
 
   end
+  "#{target_name}-cal"
 end
 
 
@@ -63,11 +70,11 @@ def calabash_setup(args)
   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)
+    target = setup_project(project_name, project_path, xpath)
+    scheme = dup_scheme(project_name, xpath, target)
     msg("Setup done") do
 
-      puts "Please validate by running the #{project_name}-cal scheme"
+      puts "Please validate by running the #{scheme} scheme"
       puts "from Xcode."
       puts "When starting the iOS Simulator using the"
       puts "new scheme: #{project_name}-cal, you should see:\n\n"
@@ -123,6 +130,72 @@ def find_project_files(args)
   return project_name, dir_to_search, File.expand_path("#{dir_to_search}/#{xc_project_file}")
 end
 
+def calabash_download(args)
+  project_name, project_path, xpath = find_project_files(args)
+  download_calabash(project_path)
+end
+
+def download_calabash(project_path)
+  file = 'calabash.framework'
+  ##Download calabash.framework
+  if not Dir.exists?(File.join(project_path, file))
+    msg("Info") do
+      zip_file = "calabash.framework-#{ENV['FRAMEWORK_VERSION']||Calabash::Cucumber::FRAMEWORK_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'
+
+      uri = URI.parse "http://cloud.github.com/downloads/calabash/calabash-ios/#{zip_file}"
+      success = false
+      Net::HTTP.start(uri.host, uri.port) do |http|
+        request = Net::HTTP::Get.new uri.request_uri
+
+        http.request request do |response|
+          if response.code == '200'
+            open zip_file, 'wb' do |io|
+              response.read_body do |chunk|
+                print "."
+                io.write chunk
+              end
+            end
+            success = true
+          else
+             puts "Got bad response code #{response.code}."
+             puts "Aborting..."
+          end
+        end
+      end
+      if success
+        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)
+      else
+        exit 0
+      end
+    end
+  else
+    msg("Info") do
+      puts "Found calabash.framework in #{File.expand_path(project_path)}."
+      puts "Shall I delete it and download the latest matching version?"
+      puts "Please answer yes (y) or no (n)"
+      answer = STDIN.gets.chomp
+      if (answer == 'yes' or answer == 'y')
+        FileUtils.rm_r File.join(project_path, file)
+        return download_calabash(project_path)
+      else
+        puts "Not downloading..."
+      end
+    end
+  end
+  file
+end
+
 def setup_project(project_name, project_path, path)
   ##Ensure exists and parse
   proj_file = "#{path}/project.pbxproj"
@@ -139,7 +212,7 @@ def setup_project(project_name, project_path, path)
   FileUtils.cd project_path
   ##Backup
   msg("Info") do
-    puts "Making backup of project file: #{proj_file}.bak"
+    puts "Making backup of project file: #{proj_file}"
     if File.exists? "#{proj_file}.bak"
       msg("Error") do
         puts "Backup file already exists. #{proj_file}.bak"
@@ -151,43 +224,7 @@ def setup_project(project_name, project_path, path)
     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-#{ENV['CALABASH_VERSION']||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'
-
-      uri = URI.parse "http://cloud.github.com/downloads/calabash/calabash-ios/#{zip_file}"
-
-      Net::HTTP.start(uri.host, uri.port) 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 = download_calabash(project_path)
 
 
   file_ref = pbx.sections['PBXFileReference'].find do |fr|
@@ -253,7 +290,15 @@ def setup_project(project_name, project_path, path)
     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")
+      target_names = targets.map do |t|
+        n = t.name.value
+        if n.length>2 and n.end_with?'"' and n.start_with?'"'
+          n = n[1..n.length-2]
+        end
+        n
+      end
+
+      puts target_names.join("\n")
 
       found = nil
       until found do
@@ -265,13 +310,28 @@ def setup_project(project_name, project_path, path)
           target = preferred_target
           found = true
         else
-          target = found = targets.find { |t| t.name.value == answer }
+          target = found = targets.find { |t| t.name.value == answer || t.name.value=="\"#{answer}\""}
         end
       end
     end
   end
 
+  ##project level build conf
+  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
+
+  project_cal_bc = PBXProject::PBXTypes::XCBuildConfiguration.new(:name => "Calabash")
+  project_cal_bc.buildSettings = project_cal_build_settings
+  project_cal_bc.comment = "Calabash"
 
+  ##target level build conf
   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" }
@@ -279,30 +339,17 @@ def setup_project(project_name, project_path, path)
   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'] || []
-
   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?
+  unless 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"
@@ -313,9 +360,6 @@ def setup_project(project_name, project_path, path)
     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++"')
@@ -327,14 +371,13 @@ def setup_project(project_name, project_path, path)
   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"
+  targets.each do |target|
+    bc_list_id = target.buildConfigurationList.value
+    bc_list = pbx.find_item :guid => bc_list_id, :type => PBXProject::PBXTypes::XCConfigurationList
+    bc_list.buildConfigurations << PBXProject::PBXTypes::BasicValue.new(:value => cal_bc.guid, :comment => "Calabash")
+  end
 
-  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
@@ -350,9 +393,9 @@ def setup_project(project_name, project_path, path)
     sp << PBXProject::PBXTypes::BasicValue.new(:value => "\"$(SRCROOT)\"") unless srcroot
     bc.buildSettings["FRAMEWORK_SEARCH_PATHS"] = sp
   end
-
+  FileUtils.cd pwd
   pbx.write_to :file => proj_file
-
+  return target
 end
 
 

data/doc/calabash-ios-help.txt

@@ -1,12 +1,14 @@
 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]
+  <command-name> can be one of
+    help
+    gen
+    setup (EXPERIMENTAL) [opt path]?
+    download [opt path]?
+    check (EXPERIMENTAL) [opt path to .ipa/.app]?
+    sim locale [lang] [regional]?
+    sim reset
+    sim acc
+    sim device [iPad, iPhone, iPhone_Retina]
 
   Commands:
   gen creates a skeleton features dir. This is usually used once when
@@ -14,9 +16,12 @@ Usage: calabash-ios <command-name> [parameters]
       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).
+        with calabash-ios-server. It is your responsibility to ensure
+        that your production build does not link with calabash.framework.
+        setup will try to ensure this, but you should check manually.
+
+        setup will download calabash.framework and modify 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).
 
@@ -24,15 +29,28 @@ Usage: calabash-ios <command-name> [parameters]
           - add the calabash.framework to your Frameworks folder
           - add $(SRCROOT) to framework search path
           - link with calabash.framework (target can be chosen)
+          - link with Apple's CFNetwork.framework
           - create a new Build configuration: Calabash
           - ensure calabash.framework is loaded in Calabash configuration
-          - create a new scheme name project-cal
+          - 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.
 
+  download [opt_path]?
+        downloads latest compatible version of calabash.framework.
+        It should be run from a directory containing an Xcode project,
+        or optionally opt_path should be supplied and pointing to a
+        directory containing an Xcode project.
+        Download will download the latest version that matches the
+        currently installed calabash-cucumber gem.
+        To update Calabash for your project run
+
+        gem update calabash-cucumber
+        calabash-ios download
+
   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

data/features-skeleton/support/launch.rb

@@ -33,7 +33,7 @@ require 'calabash-cucumber/launch/simulator_helper'
 
 def relaunch
   if ENV['NO_LAUNCH'].nil?
-    Calabash::Cucumber::SimulatorHelper.relaunch(app_path,ENV['SDK_VERSION'],ENV['DEVICE'])
+    Calabash::Cucumber::SimulatorHelper.relaunch(app_path,ENV['SDK_VERSION'],ENV['DEVICE'] || 'iphone')
   end
 end
 

data/lib/calabash-cucumber/operations.rb

@@ -185,7 +185,16 @@ module Operations
 
   def load_playback_data(recording,options={})
     os = options["OS"] || ENV["OS"]
-    device = options["DEVICE"] || ENV["DEVICE"]
+    if not os and ENV['SDK_VERSION']
+       sdk = ENV['SDK_VERSION']
+       if sdk[0] != '4' and sdk[0] != '5'
+         raise "SDK_VERSION should be 4.x or 5.x"
+       end
+       os = "ios#{sdk[0]}"
+    elsif os.nil? and ENV['SDK_VERSION'].nil?
+      raise "Either SDK_VERSION or OS environment vars must be set."
+    end
+    device = options["DEVICE"] || ENV["DEVICE"] || "iphone"
 
     rec_dir = ENV['PLAYBACK_DIR'] || "#{Dir.pwd}/playback"
     if !recording.end_with?".base64"
@@ -233,10 +242,21 @@ module Operations
     File.open("_recording.plist",'wb') do |f|
         f.write res
     end
-    file_name = "#{file_name}_#{ENV['OS']}_#{ENV['DEVICE']}.base64"
+    device = ENV['DEVICE'] || 'iphone'
+    os = ENV['OS']
+    if not os and ENV['SDK_VERSION']
+       sdk = ENV['SDK_VERSION']
+       if sdk[0] != '4' and sdk[0] != '5'
+         raise "SDK_VERSION should be 4.x or 5.x"
+       end
+       os = "ios#{sdk[0]}"
+    elsif os.nil? and ENV['SDK_VERSION'].nil?
+      raise "Either SDK_VERSION or OS environment vars must be set."
+    end
+    file_name = "#{file_name}_#{os}_#{device}.base64"
     system("/usr/bin/plutil -convert binary1 -o _recording_binary.plist _recording.plist")
     system("openssl base64 -in _recording_binary.plist -out #{file_name}")
-    system("rm _recording.plist _recording_binary.plist")
+    #system("rm _recording.plist _recording_binary.plist")
     file_name
   end
 

data/lib/calabash-cucumber/version.rb

@@ -1,5 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = "0.9.22"
+    VERSION = "0.9.23"
+    FRAMEWORK_VERSION = "0.9.23"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.22
+  version: 0.9.23
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-04 00:00:00.000000000 Z
+date: 2012-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70329976661400 !ruby/object:Gem::Requirement
+  requirement: &70321592588020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70329976661400
+  version_requirements: *70321592588020
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70329976660760 !ruby/object:Gem::Requirement
+  requirement: &70321592587020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70329976660760
+  version_requirements: *70321592587020
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
-  requirement: &70329976660080 !ruby/object:Gem::Requirement
+  requirement: &70321592585620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70329976660080
+  version_requirements: *70321592585620
 - !ruby/object:Gem::Dependency
   name: sim_launcher
-  requirement: &70329976659660 !ruby/object:Gem::Requirement
+  requirement: &70321592585040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70329976659660
+  version_requirements: *70321592585040
 - !ruby/object:Gem::Dependency
   name: slowhandcuke
-  requirement: &70329976659240 !ruby/object:Gem::Requirement
+  requirement: &70321592584620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70329976659240
+  version_requirements: *70321592584620
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
-  requirement: &70329976675180 !ruby/object:Gem::Requirement
+  requirement: &70321592584120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70329976675180
+  version_requirements: *70321592584120
 - !ruby/object:Gem::Dependency
   name: pbxproject
-  requirement: &70329976674760 !ruby/object:Gem::Requirement
+  requirement: &70321592583460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70329976674760
+  version_requirements: *70321592583460
 description: calabash-cucumber drives tests for native iOS apps. You must link your
   app with calabash-ios-server framework to execute tests.
 email: