lib/letsencrypt_webfaction/application.rb in letsencrypt_webfaction-2.0.0 vs lib/letsencrypt_webfaction/application.rb in letsencrypt_webfaction-2.0.1

@@ -14,10 +14,16 @@
 
     def run!
       # Validate that the correct options were passed.
       validate_options!
 
+      # Check credentials
+      unless api_credentials.valid?
+        $stderr.puts 'WebFaction API username, password, and/or servername are incorrect. Login failed.'
+        exit 1
+      end
+
       # Register the private key.
       register_key!
 
       # Validate the domains.
       return unless validator.validate!
@@ -26,14 +32,15 @@
       certificate_installer.install!
     end
 
     private
 
+    def api_credentials
+      @_api_credentials ||= LetsencryptWebfaction::WebfactionApiCredentials.new username: @options.username, password: @options.password, servername: @options.servername, api_server: @options.api_url
+    end
+
     def certificate_installer
-      @certificate_installer ||= begin
-        credentials = LetsencryptWebfaction::WebfactionApiCredentials.new username: @options.username, password: @options.password, servername: @options.servername, api_server: @options.api_url
-        LetsencryptWebfaction::CertificateInstaller.new(@options.cert_name, certificate, credentials)
-      end
+      @certificate_installer ||= LetsencryptWebfaction::CertificateInstaller.new(@options.cert_name, certificate, api_credentials)
     end
 
     def certificate
       # We can now request a certificate, you can pass anything that returns
       # a valid DER encoded CSR when calling to_der on it, for example a