calabash-cucumber 0.9.33 → 0.9.34

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    calabash-cucumber (0.9.33)
+    calabash-cucumber (0.9.34)
       CFPropertyList
       cucumber
       json

data/bin/calabash-ios-setup.rb

@@ -459,8 +459,8 @@ def validate_setup(args)
         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`
+      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
@@ -504,7 +504,7 @@ def validate_ipa(ipa)
 
     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`
+    res = `otool "#{File.expand_path(dir)}/Payload/#{app_dir}/#{app}" -o 2> /dev/null | grep CalabashServer`
     msg("Info") do
       if /CalabashServer/.match(res)
         puts "Ipa: #{ipa} *contains* calabash.framework"
@@ -527,7 +527,7 @@ def validate_app(app)
     end
     exit 1
   end
-  out = `otool #{app}/* -o 2> /dev/null | grep CalabashServer`
+  out = `otool "#{File.expand_path(app)}"/* -o 2> /dev/null | grep CalabashServer`
 
   msg("Info") do
     if /CalabashServer/.match(out)

data/bin/calabash-ios-sim.rb

@@ -4,7 +4,7 @@ def quit_sim
   `echo 'application "iPhone Simulator" quit' | osascript`
 end
 def calabash_sim_reset
-  reset_script = File.absolute_path("#{@script_dir}/reset_simulator.scpt")
+  reset_script = File.expand_path("#{@script_dir}/reset_simulator.scpt")
   launcher = SimLauncher::Simulator.new
   sdks = SimLauncher::SdkDetector.new(launcher).available_sdk_versions
   sdks.each do |sdk_path_str|
@@ -21,14 +21,14 @@ 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/")
+    fp = File.expand_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")
+  prefs_path = File.expand_path("#{@script_dir}/data/.GlobalPreferences.plist")
   plist = CFPropertyList::List.new(:file => prefs_path)
   hash = CFPropertyList.native_types(plist.value)
 

data/lib/calabash-cucumber/calabash_steps.rb

@@ -207,6 +207,7 @@ Then /^I swipe on cell number (\d+)$/ do |index|
   sleep(STEP_PAUSE)
 end
 
+
 ##pinch##
 Then /^I pinch to zoom (in|out)$/ do |in_out|
   pinch(in_out)

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

@@ -113,7 +113,7 @@ module Calabash
       def self.find_preferred_dir(sim_dirs)
 
         pref = sim_dirs.find do |d|
-          out = `otool #{d}/* -o | grep CalabashServer`
+          out = `otool "#{File.expand_path(d)}"/* -o 2> /dev/null | grep CalabashServer`
           /CalabashServer/.match(out)
         end
 
@@ -161,7 +161,7 @@ module Calabash
       end
 
       def self.ping_app
-        url = URI.parse (ENV['DEVICE_ENDPOINT']|| "http://localhost:37265/")
+        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|

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = "0.9.33"
+    VERSION = "0.9.34"
     FRAMEWORK_VERSION = "0.9.33"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.33
+  version: 0.9.34
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-14 00:00:00.000000000 Z
+date: 2012-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70104146652560 !ruby/object:Gem::Requirement
+  requirement: &70183192423920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70104146652560
+  version_requirements: *70183192423920
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70104146651260 !ruby/object:Gem::Requirement
+  requirement: &70183192423440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70104146651260
+  version_requirements: *70183192423440
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
-  requirement: &70104146650040 !ruby/object:Gem::Requirement
+  requirement: &70183192422700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70104146650040
+  version_requirements: *70183192422700
 - !ruby/object:Gem::Dependency
   name: sim_launcher
-  requirement: &70104146648600 !ruby/object:Gem::Requirement
+  requirement: &70183206106000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70104146648600
+  version_requirements: *70183206106000
 - !ruby/object:Gem::Dependency
   name: slowhandcuke
-  requirement: &70104146647640 !ruby/object:Gem::Requirement
+  requirement: &70183206105340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70104146647640
+  version_requirements: *70183206105340
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
-  requirement: &70104146646860 !ruby/object:Gem::Requirement
+  requirement: &70183206103560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70104146646860
+  version_requirements: *70183206103560
 - !ruby/object:Gem::Dependency
   name: pbxproject
-  requirement: &70104146646160 !ruby/object:Gem::Requirement
+  requirement: &70183206103040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70104146646160
+  version_requirements: *70183206103040
 description: calabash-cucumber drives tests for native iOS apps. You must link your
   app with calabash-ios-server framework to execute tests.
 email: