[Bug 847685] seperate connection errors from timeouts

Add a more descriptive error message for timeouts stating that the
operation may have finished even though there was a timeout

lib/rhc-rest.rb

@@ -78,8 +78,10 @@ def request(request)
           @@headers["cookie"] = "rh_sso=#{rh_sso}"
         end
         return parse_response(response) unless response.nil? or response.code == 204
-      rescue RestClient::RequestTimeout, RestClient::ServerBrokeConnection => e
-        raise ConnectionException.new("Connection to server timed out or got interrupted: #{e.message}")
+      rescue RestClient::RequestTimeout => e
+        raise TimeoutException.new("Connection to server timed out. It is possible the operation finished without being able to report success. Use 'rhc domain show' or 'rhc app status' to check the status of your applications.") 
+      rescue RestClient::ServerBrokeConnection => e
+        raise ConnectionException.new("Connection to server got interrupted: #{e.message}")
       rescue RestClient::ExceptionWithResponse => e
         process_error_response(e.response)
       rescue Exception => e

lib/rhc-rest/exceptions/exceptions.rb

@@ -70,6 +70,6 @@ class UnAuthorizedException < Rhc::Rest::ClientErrorException; end
     class ResourceAccessException < Rhc::Rest::BaseException; end
     #I/O Exceptions Connection timeouts, etc
     class ConnectionException < Rhc::Rest::BaseException; end
-
+    class TimeoutException < ConnectionException; end
   end
 end

spec/rhc/rest_spec.rb

@@ -283,7 +283,7 @@ module Rhc
                                             :method  => 'get',
                                             :headers => {:accept => :json}
                                             )
-          lambda { subject.request(request) }.should raise_error(Rhc::Rest::ConnectionException, 'Connection to server timed out or got interrupted: Request Timeout')
+          lambda { subject.request(request) }.should raise_error(Rhc::Rest::TimeoutException, "Connection to server timed out. It is possible the operation finished without being able to report success. Use 'rhc domain show' or 'rhc app status' to check the status of your applications.")
         end
       end
 
@@ -296,7 +296,7 @@ module Rhc
                                             :method  => 'get',
                                             :headers => {:accept => :json}
                                             )
-          lambda { subject.request(request) }.should raise_error(Rhc::Rest::ConnectionException, 'Connection to server timed out or got interrupted: Lost Server Connection')
+          lambda { subject.request(request) }.should raise_error(Rhc::Rest::ConnectionException, 'Connection to server got interrupted: Lost Server Connection')
         end
       end