@@ -8,6 +8,7 @@ class PreferencesController < OSX::NSWindowController notify :host_version_accepted, :when => :host_version_acceptable notify :host_version_not_accepted, :when => :host_version_inacceptable notify :host_credentials_invalid, :when => :host_credentials_invalid + notify :host_check_failed, :when => :host_check_failed ib_outlet :preferences_window ib_outlet :table_view @@ -88,6 +89,13 @@ class PreferencesController < OSX::NSWindowController host.find_projects end + def host_check_failed(notification) + return if @host_field.nil? + host = notification.object + show_alert("There was an error trying to fetch the data for the host, are you sure the URL is correct?", "Please have a good look at the data and try again.") + reset_spinner + end + def host_version_not_accepted(notification) return if @host_field.nil? host = notification.object controller/preferences_controller.rb @@ -65,11 +65,15 @@ class Host < OSX::NSObject end def version_check_failed(url, error) - case error.code + puts "HELLO" + code = error.code unless error.is_a?(Fixnum) + case code when -1003: notify_host_unreachable self when -1012: notify_host_credentials_invalid self + else + notify_host_check_failed self end end model/host.rb @@ -21,6 +21,7 @@ class LoadOperation < OSX::NSOperation def start request = NSURLRequest.requestWithURL_cachePolicy_timeoutInterval(@url, NSURLRequestReloadIgnoringLocalCacheData, 10.0) + NSURLRequest.setAllowsAnyHTTPSCertificate_forHost(true, request.URL.host) @connection = NSURLConnection.connectionWithRequest_delegate(request, self) setExecuting true end model/load_operation.rb a63dcdc4dfee01c9bc062fc98cac0aee2c8c56c6 Mathias Meyer meyer@paperplanes.de http://github.com/mattmatt/macistrano/commit/570f08e4912443d002cf238eb958ef1a4ba95c2c 570f08e4912443d002cf238eb958ef1a4ba95c2c 2009-02-22T12:54:38-08:00 2009-02-22T12:54:38-08:00 Added some minor fixes to improve error handling when checking the host, and added a nasty but apparently widely-used tweak for self-signed certificates. 3bb01387781c1edb22b82a29f2cf4e3577441e09 Mathias Meyer meyer@paperplanes.de