calabash-cucumber 0.9.47 → 0.9.48

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    calabash-cucumber (0.9.41)
+    calabash-cucumber (0.9.48)
       CFPropertyList
       cucumber
       json
@@ -26,8 +26,8 @@ GEM
     gherkin (2.9.0)
       json (>= 1.4.6)
     json (1.6.5)
-    libxml-ruby (2.2.2)
-    net-http-persistent (2.5.2)
+    libxml-ruby (2.3.0)
+    net-http-persistent (2.6)
     rack (1.4.1)
     rack-protection (1.2.0)
       rack

data/bin/calabash-ios-setup.rb

@@ -45,9 +45,6 @@ def calabash_setup(args)
       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)."
-      sleep 2
-      system(%Q[open "#{xpath}"])
-
     end
 
   else
@@ -97,6 +94,15 @@ def calabash_download(args)
   download_calabash(File.expand_path("."))
 end
 
+def has_proxy?
+  ENV['http_proxy'] ? true : false
+end
+
+def proxy
+  url_parts = URI.split(ENV['http_proxy'])
+  [url_parts[2], url_parts[3]]
+end
+
 def download_calabash(project_path)
   file = 'calabash.framework'
   ##Download calabash.framework
@@ -109,7 +115,13 @@ def download_calabash(project_path)
 
       uri = URI.parse "http://cloud.github.com/downloads/calabash/calabash-ios/#{zip_file}"
       success = false
-      Net::HTTP.start(uri.host, uri.port) do |http|
+      if has_proxy?
+        proxy_url = proxy
+        connection = Net::HTTP::Proxy(proxy_url[0], proxy_url[1])
+      else
+        connection = Net::HTTP
+      end
+      connection.start(uri.host, uri.port) do |http|
         request = Net::HTTP::Get.new uri.request_uri
 
         http.request request do |response|

data/features-skeleton/support/launch.rb

@@ -22,18 +22,36 @@
 ########################################
 
 require 'calabash-cucumber/launch/simulator_helper'
+require 'sim_launcher'
 
 # 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""
+#APP_BUNDLE_PATH = "~/Library/Developer/Xcode/DerivedData/??/Build/Products/Calabash-iphonesimulator/??.app"
 #
 
+def reset_app_jail(sdk, app_path)
+  app = File.basename(app_path)
+  bundle = `find "#{ENV['HOME']}/Library/Application Support/iPhone Simulator/#{sdk}/Applications/" -type d -depth 2 -name #{app} | head -n 1`
+  return if bundle.empty? # Assuming we're already clean
+
+  sandbox = File.dirname(bundle)
+  ['Library', 'Documents', 'tmp'].each do |dir|
+    FileUtils.rm_rf(File.join(sandbox, dir))
+  end
+end
+
 def relaunch
-  if ENV['NO_LAUNCH'].nil?
-    Calabash::Cucumber::SimulatorHelper.relaunch(app_path,ENV['SDK_VERSION'],ENV['DEVICE'] || 'iphone')
+  if ENV['NO_LAUNCH']!="1"
+    sdk = ENV['SDK_VERSION'] || SimLauncher::SdkDetector.new().latest_sdk_version
+    path = Calabash::Cucumber::SimulatorHelper.app_bundle_or_raise(app_path)
+    if ENV['RESET_BETWEEN_SCENARIOS']=="1"
+      reset_app_jail(sdk, path)
+    end
+
+    Calabash::Cucumber::SimulatorHelper.relaunch(path,sdk,ENV['DEVICE'] || 'iphone')
   end
 end
 
@@ -42,14 +60,12 @@ 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? and ENV['NO_STOP'].nil?
+  if ENV['NO_LAUNCH']!="1" and ENV['NO_STOP']!="1"
     Calabash::Cucumber::SimulatorHelper.stop
   end
-end
+end

data/lib/calabash-cucumber/operations.rb

@@ -394,7 +394,7 @@ module Operations
 
 
   def url_for( verb )
-    url = URI.parse (ENV['DEVICE_ENDPOINT']|| "http://localhost:37265/")
+    url = URI.parse(ENV['DEVICE_ENDPOINT']|| "http://localhost:37265/")
     url.path = '/'+verb
     url
   end

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = "0.9.47"
-    FRAMEWORK_VERSION = "0.9.43"
+    VERSION = "0.9.48"
+    FRAMEWORK_VERSION = "0.9.48"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.47
+  version: 0.9.48
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-12 00:00:00.000000000 Z
+date: 2012-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70176435685240 !ruby/object:Gem::Requirement
+  requirement: &70222530853720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70176435685240
+  version_requirements: *70222530853720
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70176435684360 !ruby/object:Gem::Requirement
+  requirement: &70222530851080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70176435684360
+  version_requirements: *70222530851080
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
-  requirement: &70176435683740 !ruby/object:Gem::Requirement
+  requirement: &70222530848560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70176435683740
+  version_requirements: *70222530848560
 - !ruby/object:Gem::Dependency
   name: sim_launcher
-  requirement: &70176435683060 !ruby/object:Gem::Requirement
+  requirement: &70222530846780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70176435683060
+  version_requirements: *70222530846780
 - !ruby/object:Gem::Dependency
   name: slowhandcuke
-  requirement: &70176435682580 !ruby/object:Gem::Requirement
+  requirement: &70222530845600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70176435682580
+  version_requirements: *70222530845600
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
-  requirement: &70176435682040 !ruby/object:Gem::Requirement
+  requirement: &70222530843660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70176435682040
+  version_requirements: *70222530843660
 description: calabash-cucumber drives tests for native iOS apps. You must link your
   app with calabash-ios-server framework to execute tests.
 email: