calabash-cucumber 0.9.121 → 0.9.122

data/features-skeleton/support/launch.rb

@@ -43,7 +43,7 @@ def reset_app_jail(sdk, app_path)
   end
 end
 
-def relaunch
+def relaunch(args=nil)
   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)
@@ -51,7 +51,7 @@ def relaunch
       reset_app_jail(sdk, path)
     end
 
-    Calabash::Cucumber::SimulatorHelper.relaunch(path,sdk,ENV['DEVICE'] || 'iphone')
+    Calabash::Cucumber::SimulatorHelper.relaunch(path,sdk,ENV['DEVICE'] || 'iphone', args)
   end
 end
 

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

@@ -18,10 +18,10 @@ module Calabash
 
       DEFAULT_SIM_RETRY = 2
 
-      def self.relaunch(path, sdk = nil, version = 'iphone')
+      def self.relaunch(path, sdk = nil, version = 'iphone', args = nil)
 
         app_bundle_path = app_bundle_or_raise(path)
-        ensure_connectivity(app_bundle_path, sdk, version)
+        ensure_connectivity(app_bundle_path, sdk, version, args)
 
       end
 
@@ -169,7 +169,7 @@ module Calabash
         end
       end
 
-      def self.ensure_connectivity(app_bundle_path, sdk, version)
+      def self.ensure_connectivity(app_bundle_path, sdk, version, args = nil)
         begin
           max_retry_count = (ENV['MAX_CONNECT_RETRY'] || DEFAULT_SIM_RETRY).to_i
           timeout = (ENV['CONNECT_TIMEOUT'] || DEFAULT_SIM_WAIT).to_i
@@ -183,7 +183,7 @@ module Calabash
             puts "(#{retry_count}.) Start Simulator #{sdk}, #{version}, for #{app_bundle_path}"
             begin
               Timeout::timeout(timeout, TimeoutErr) do
-                simulator = launch(app_bundle_path, sdk, version)
+                simulator = launch(app_bundle_path, sdk, version, args)
                 until connected
                   begin
                     connected = (ping_app == '405')
@@ -195,6 +195,7 @@ module Calabash
                     if connected
                       server_version = get_version
                       if server_version
+                        p server_version
                         unless version_check(server_version)
                           msgs = ["You're running an older version of Calabash server with a newer client",
                                   "Client:#{Calabash::Cucumber::VERSION}",
@@ -220,7 +221,8 @@ module Calabash
               puts "Timed out..."
             end
           end
-        rescue
+        rescue e
+          p e
           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 << "Make sure you don't have a firewall blocking traffic to #{ENV['DEVICE_ENDPOINT']|| "http://localhost:37265/"}.\n"
@@ -229,10 +231,10 @@ module Calabash
       end
 
 
-      def self.launch(app_bundle_path, sdk, version)
+      def self.launch(app_bundle_path, sdk, version, args = nil)
         simulator = SimLauncher::Simulator.new
         simulator.quit_simulator
-        simulator.launch_ios_app(app_bundle_path, sdk, version)
+        simulator.launch_ios_app(app_bundle_path, sdk, version) #, args wait for update to sim launcher
         simulator
       end
 
@@ -264,9 +266,10 @@ module Calabash
           if res['iOS_version']
             @ios_version = res['iOS_version']
           end
+          res
         rescue
+          nil
         end
-        nil
       end
 
       def self.ios_version

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = "0.9.121"
+    VERSION = "0.9.122"
     FRAMEWORK_VERSION = "0.9.120"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.121
+  version: 0.9.122
   prerelease: 
 platform: ruby
 authors: