calabash-cucumber 0.9.20 → 0.9.21

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    calabash-cucumber (0.9.18)
+    calabash-cucumber (0.9.20)
       CFPropertyList
       cucumber
       json
@@ -34,7 +34,7 @@ GEM
     rack-protection (1.2.0)
       rack
     rake (0.9.2.2)
-    sim_launcher (0.3.7)
+    sim_launcher (0.3.8)
       sinatra
     sinatra (1.3.2)
       rack (~> 1.3, >= 1.3.6)

data/bin/calabash-ios

@@ -11,7 +11,6 @@ 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)

data/bin/calabash-ios-setup.rb

@@ -1,5 +1,6 @@
 require "calabash-cucumber/version"
 
+
 def dup_scheme(project_name, pbx_dir)
 
   userdata_dirs = Dir.foreach("#{pbx_dir}/xcuserdata").find_all { |x|
@@ -154,7 +155,7 @@ 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-#{Calabash::Cucumber::VERSION}.zip"
+      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'
@@ -363,6 +364,11 @@ def validate_setup(args)
       validate_ipa(args[0])
     elsif args[0].end_with?(".app")
       validate_app(args[0])
+    else
+      msg("Error") do
+        puts "File should end with .app or .ipa"
+      end
+      exit 1
     end
   else
     dd_dir = Calabash::Cucumber::SimulatorHelper.derived_data_dir_for_project

data/bin/calabash-ios-sim.rb

@@ -1,14 +1,16 @@
+require 'sim_launcher'
+
 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")
+  launcher = SimLauncher::Simulator.new
+  sdks = SimLauncher::SdkDetector.new(launcher).available_sdk_versions
   sdks.each do |sdk_path_str|
-    sdk_path = sdk_path_str.split(" ")
-    `#{@iphonesim} launch DUMMY_APP #{sdk_path[0]} ipad 2> /dev/null`
+    launcher.launch_ios_app("DUMMY_APP",sdk_path_str,"ipad")
     system("osascript #{reset_script}")
-    `#{@iphonesim} launch DUMMY_APP #{sdk_path[0]} iphone 2> /dev/null`
+    launcher.launch_ios_app("DUMMY_APP",sdk_path_str,"iphone")
     system("osascript #{reset_script}")
   end
 

data/lib/calabash-cucumber/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.20
+  version: 0.9.21
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-01 00:00:00.000000000 Z
+date: 2012-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70182882346360 !ruby/object:Gem::Requirement
+  requirement: &70174271608780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70182882346360
+  version_requirements: *70174271608780
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70182882345940 !ruby/object:Gem::Requirement
+  requirement: &70174271608340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70182882345940
+  version_requirements: *70174271608340
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
-  requirement: &70182882345520 !ruby/object:Gem::Requirement
+  requirement: &70174271607880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70182882345520
+  version_requirements: *70174271607880
 - !ruby/object:Gem::Dependency
   name: sim_launcher
-  requirement: &70182882345080 !ruby/object:Gem::Requirement
+  requirement: &70174271607380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70182882345080
+  version_requirements: *70174271607380
 - !ruby/object:Gem::Dependency
   name: slowhandcuke
-  requirement: &70182882344640 !ruby/object:Gem::Requirement
+  requirement: &70174271606840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70182882344640
+  version_requirements: *70174271606840
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
-  requirement: &70182882344220 !ruby/object:Gem::Requirement
+  requirement: &70174271606200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70182882344220
+  version_requirements: *70174271606200
 - !ruby/object:Gem::Dependency
   name: pbxproject
-  requirement: &70182882343800 !ruby/object:Gem::Requirement
+  requirement: &70174271605320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70182882343800
+  version_requirements: *70174271605320
 description: calabash-cucumber drives tests for native iOS apps. You must link your
   app with calabash-ios-server framework to execute tests.
 email:
@@ -109,7 +109,6 @@ files:
 - 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