Fix rescue e and bump

TestingWithFrank · May 21, 2013 · 674e1a1 · 674e1a1
1 parent a9421ac
commit 674e1a1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/calabash-cucumber/calabash-cucumber.gemspec b/calabash-cucumber/calabash-cucumber.gemspec
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_dependency( "location-one", "~>0.0.9")
   s.add_dependency( "httpclient","2.3.2")
   s.add_dependency( "bundler", "~> 1.1")
-  s.add_dependency( "run_loop", "0.0.9" )
+  s.add_dependency( "run_loop", "~> 0.0.10" )
   s.add_dependency( "awesome_print")
 
 end
diff --git a/calabash-cucumber/lib/calabash-cucumber/launch/simulator_helper.rb b/calabash-cucumber/lib/calabash-cucumber/launch/simulator_helper.rb
@@ -226,10 +226,10 @@ def self.ensure_connectivity(app_bundle_path, sdk, version, args = nil)
                 end
               end
             rescue TimeoutErr => e
-              puts "Timed out..."
+              puts 'Timed out...'
             end
           end
-        rescue e
+        rescue RuntimeError => 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"

diff --git a/calabash-cucumber/lib/calabash-cucumber/launcher.rb b/calabash-cucumber/lib/calabash-cucumber/launcher.rb
@@ -123,7 +123,7 @@ def ensure_connectivity
           puts "Timed out...Retry.."
         end
       end
-    rescue e
+    rescue RuntimeError => e
       p e
       msg = "Unable to make connection to Calabash Server at #{ENV['DEVICE_ENDPOINT']|| "http://localhost:37265/"}\n"
       msg << "Make sure you don't have a firewall blocking traffic to #{ENV['DEVICE_ENDPOINT']|| "http://localhost:37265/"}.\n"
@@ -136,7 +136,7 @@ def ping_app
 
     http = Net::HTTP.new(url.host, url.port)
     res = http.start do |sess|
-      sess.request Net::HTTP::Get.new "version"
+      sess.request Net::HTTP::Get.new(ENV['CALABASH_VERSION_PATH'] || "version")
     end
     status = res.code
     begin

diff --git a/calabash-cucumber/lib/calabash-cucumber/version.rb b/calabash-cucumber/lib/calabash-cucumber/version.rb
@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = '0.9.145.pre4'
-    FRAMEWORK_VERSION = '0.9.145.pre4'
+    VERSION = '0.9.145.pre5'
+    FRAMEWORK_VERSION = '0.9.145.pre5'
   end
 end