calabash-cucumber 0.9.93 → 0.9.94

data/Gemfile.lock

@@ -1,9 +1,11 @@
 PATH
   remote: .
   specs:
-    calabash-cucumber (0.9.92)
+    calabash-cucumber (0.9.94)
       CFPropertyList
+      bundler (~> 1.1)
       cucumber
+      httpclient (~> 2.2.7)
       json
       location-one (~> 0.0.5)
       sim_launcher (= 0.3.8)
@@ -23,6 +25,7 @@ GEM
     geocoder (1.1.2)
     gherkin (2.11.1)
       json (>= 1.4.6)
+    httpclient (2.2.7)
     json (1.7.4)
     location-one (0.0.5)
       geocoder (~> 1.1)

data/bin/calabash-ios

@@ -47,6 +47,10 @@ elsif cmd == 'check'
 elsif cmd == 'submit'
   calabash_submit(ARGV)
   exit 0
+elsif cmd == 'version'
+  require 'calabash-cucumber'
+  puts Calabash::Cucumber::VERSION
+  exit 0
 elsif cmd == 'sim'
   if ARGV.length == 0
     print_usage

data/calabash-cucumber.gemspec

@@ -22,5 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency( "sim_launcher", "0.3.8") #Recommended by Pete for now
   s.add_dependency( "slowhandcuke" )
   s.add_dependency( "location-one", "~>0.0.5")
+  s.add_dependency( "httpclient","~> 2.2.7")
+  s.add_dependency( "bundler", "~> 1.1")
 
 end

data/lib/calabash-cucumber/core.rb

@@ -1,3 +1,5 @@
+require 'httpclient'
+
 module Calabash
   module Cucumber
     module Core
@@ -302,36 +304,16 @@ module Calabash
       end
 
       def http(options, data=nil)
-        url = url_for(options[:path])
-        if options[:method] == :post
-          req = Net::HTTP::Post.new url.path
+        options[:uri] = url_for(options[:path])
+        options[:method] = options[:method] || :get
+        if data
           if options[:raw]
-            req.body=data
+            options[:body] = data
           else
-            req.body = data.to_json
+            options[:body] = data.to_json
           end
-
-        else
-          req = Net::HTTP::Get.new url.path
-          if data
-            if URI.respond_to? :encode_www_form
-              url.query = URI.encode_www_form(data)
-            else
-              ##suport only "safe" ascii params for now
-              url.query = enum.map do |k, v|
-                "#{k.to_s}=#{v.to_s}"
-              end.join('&')
-            end
-            resp = Net::HTTP.get_response(url)
-            if resp.is_a? Net::HTTPSuccess
-              return resp.body
-            else
-              raise "HTTP-level Error #{resp}"
-            end
-          end
-
         end
-        make_http_request(url, req)
+        make_http_request(options)
       end
 
 
@@ -349,29 +331,48 @@ module Calabash
 
       CAL_HTTP_RETRY_COUNT=3
 
-      def make_http_request(url, req)
+      def make_http_request(options)
         body = nil
         CAL_HTTP_RETRY_COUNT.times do |count|
           begin
-            if not (@http) or not (@http.started?)
-              @http = init_request(url)
-              @http.start
+            if not @http
+              @http = init_request(options)
+            end
+            if options[:method] == :post
+              body = @http.post(options[:uri], options[:body]).body
+            else
+              body = @http.get(options[:uri], options[:body]).body
             end
-            body = @http.request(req).body
             break
-          rescue Errno::ECONNRESET, EOFError, Errno::ECONNREFUSED, Errno::EPIPE, Timeout::Error => e
-
+          rescue HTTPClient::TimeoutError => e
             if count < CAL_HTTP_RETRY_COUNT-1
-              if e.is_a?(Timeout::Error)
-                sleep(5)
-              else
-                sleep(0.3)
-              end
-              puts "Retrying.. #{e.class}: (#{e})"
+              sleep(0.5)
+              @http.reset_all
+              @http=nil
+              STDOUT.write "Retrying.. #{e.class}: (#{e})\n"
+              STDOUT.flush
+
             else
               puts "Failing... #{e.class}"
               raise e
             end
+          rescue Exception => e
+            case e
+              when Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::ECONNABORTED, Errno::ETIMEDOUT
+                if count < CAL_HTTP_RETRY_COUNT-1
+                  sleep(0.5)
+                  @http.reset_all
+                  @http=nil
+                  STDOUT.write "Retrying.. #{e.class}: (#{e})\n"
+                  STDOUT.flush
+
+                else
+                  puts "Failing... #{e.class}"
+                  raise e
+                end
+              else
+                raise e
+            end
           end
         end
 
@@ -379,13 +380,10 @@ module Calabash
       end
 
       def init_request(url)
-        http = Net::HTTP.new(url.host, url.port)
-        if http.respond_to? :open_timeout=
-          http.open_timeout==15
-        end
-        if http.respond_to?(:read_timeout=)
-          http.read_timeout = 30
-        end
+        http = HTTPClient.new
+        http.connect_timeout = 15
+        http.send_timeout = 15
+        http.receive_timeout = 15
         http
       end
     end

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = "0.9.93"
+    VERSION = "0.9.94"
     FRAMEWORK_VERSION = "0.9.93"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.93
+  version: 0.9.94
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-15 00:00:00.000000000 Z
+date: 2012-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -107,6 +107,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.5
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.7
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 description: calabash-cucumber drives tests for native iOS apps. You must link your
   app with calabash-ios-server framework to execute tests.
 email: