letsencrypt_webfaction 1.1.8 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4abb9871a5f7f8f9839c45ef8a55de46d46a9c5
-  data.tar.gz: 62ec80d2bbc7dc7b0a166cb2ccbb75e18c953c37
+  metadata.gz: 8ac49657153360e6bee3e88beb0cf90ba58849eb
+  data.tar.gz: b1da0829bf31d762898e8040643d3c4a86bea8d4
 SHA512:
-  metadata.gz: 673412c0a0b6d9d2f0e238b4c62e8a64880280c1c08c69317ff4ae56fa8e1f5949319f6401415ecfc80687427f67aac1343cd4b2da64a589834f5e0a00b43e85
-  data.tar.gz: ad158c80ab95779bf688eeabd209bd1ae62bc9464415f8feb3e88a4fcb3f420809587bb42bec7f2cbe87dd48a3e939f2109ce2566e95d00e7ee7ebaefc709904
+  metadata.gz: 7b9faffb8512abe29eea9d4ea5268ddf600de29cb5257300e6a47ad157d50e2a7eee0442c0d8d6a61691e554c1f1e817a21a72773179fad0995f633f5aab0c6c
+  data.tar.gz: 044d7d24e039c562ffb4f1c121f54aba50d03144ff9c2b870315577700619a129ddfcecd57bc14969e242693d88242c4cb16c470ff758fd063c84f79875d59fc

data/.gitignore

@@ -13,3 +13,6 @@
 
 # Ignore local config.
 /.bundle
+
+# Ignore spec next-failure file.
+/spec/.examples.txt

data/.rubocop.yml

@@ -4,6 +4,7 @@ AllCops:
     - 'bin/*'
     # Keep rubocop from scanning installed gems.
     - 'vendor/**/*'
+  TargetRubyVersion: 2.1
 # Line length is something that isn't dogmatic. 80 chars is a good recommendation.
 Metrics/LineLength:
   Enabled: false

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+v2.0.0
+
+* Switch to using the Webfaction API for certificate installation.
+
+*MIGRATION NOTES*
+
+* New required parameters for Webfaction API: `username` and `password`. It is recommended that these be passed in a config file instead of being command line arguments.
+* `--account_email`, `--admin_notification_email`, and `--support_email` are gone. `--letsencrypt_account_email` remains and needs to be set directly.
+* Pony and direct emailing are gone. Since this utility uses the admin interface, the only reason to send emails are for errors, which are handled with the `MAILTO` string in the crontab, per the readme.
+* `--cert_name` is a new conditional param. This defaults to the first domain given, with dots replaced by underscores.
+* `--servername` and `--api_url` are new params with sane defaults.
+
 v1.1.8
 
 * Remove accidental runtime dependency on Pry.

data/Gemfile

@@ -2,3 +2,14 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in test_gem.gemspec
 gemspec
+
+group :development, :test do
+  gem 'bundler', '~> 1.11'
+  gem 'rake', '~> 10.0'
+  gem 'rspec', '~> 3.4'
+  gem 'rubocop', '~> 0.37'
+  gem 'simplecov', '~> 0.11'
+  gem 'pry', '~> 0.10'
+  gem 'pry-byebug', '~> 3.3'
+  gem 'webmock', '~> 2.1'
+end

data/README.md

@@ -2,7 +2,7 @@
 
 LetsEncrypt utility client for WebFaction hosts.
 
-This tool simplifies the manual process of using LetsEncrypt on WebFaction hosts. It can be added to the Cron scheduled task runner where it will validate your domains automatically, place the generated certificates in a common folder, and then email the WebFaction Support team to request installation, also notifying you.
+This tool automates the process of using LetsEncrypt on WebFaction hosts. It can be added to the Cron scheduled task runner where it will validate your domains automatically, obtain the certificates, and then install them using the Webfaction API.
 
 For more documentation, as well as walkthroughs, [see the wiki](https://github.com/will-in-wi/letsencrypt-webfaction/wiki)!
 
@@ -18,9 +18,9 @@ For more documentation, as well as walkthroughs, [see the wiki](https://github.c
 
 [Certbot](https://certbot.eff.org/) is the "official" (in that it was the first and to some extent reference client) Let's Encrypt client. Let's Encrypt decided to focus Certbot on a particular use case, namely the configuration of servers which are directly facing the internet and can have the Certbot application run as root. For other use cases, they encourage the implementation of other clients tailored to different cases. This has spawned a wide variety of alternative implementations.
 
-LetsEncrypt WebFaction is just such an alternative implementation. It was built because the WebFaction use case does not fit in the Certbot preconditions, namely that users don't have root access to change the frontend Nginx server configuration. WebFaction thus far requires that we place the certificate and private key somewhere on the server and then submit a ticket to install the certificate. This is exactly the workflow that is being automated.
+LetsEncrypt WebFaction is just such an alternative implementation. It was built because the WebFaction use case does not fit in the Certbot preconditions, namely that users don't have root access to change the frontend Nginx server configuration. WebFaction has a custom API we use to install the certificate.
 
-Certbot could probably be used in "manual" mode to create the certificate on disk, and then something else wired up to make the certificate installation request. For various reasons, I decided not to do this. If someone creates instructions to do this, I'd be happy to link to it from [the wiki](https://github.com/will-in-wi/letsencrypt-webfaction/wiki).
+Certbot could probably be used in "webroot" mode to create the certificate on disk, and have someone write a custom plugin to install using the API. For various reasons, I decided not to do this. If someone creates instructions to do this, I'd be happy to link to it from [the wiki](https://github.com/will-in-wi/letsencrypt-webfaction/wiki).
 
 ## Prerequisite topics
 
@@ -67,7 +67,7 @@ This will simplify the running of the LetsEncrypt WebFaction command, by setting
 
 After saving `~/.bash_profile`, run the command `source $HOME/.bash_profile` to apply the new settings.
 
-Now, you are ready to run `letsencrypt_webfaction` from your SSH session to get certificates. See below for usage. 
+Now, you are ready to run `letsencrypt_webfaction` from your SSH session to get certificates. See below for usage.
 
 ### RBEnv
 
@@ -75,13 +75,13 @@ This method is useful if you are already using RBEnv to manage Ruby, or if you a
 
 Follow the instructions to [set up RBEnv](https://github.com/rbenv/rbenv) and [Ruby Build](https://github.com/rbenv/ruby-build#readme) on your WebFaction server.
 
-Once you have done so, install Ruby 2.1+ (probably 2.3.0 at time of writing). Then set the local Ruby and install the Gem. Finally unset the local Ruby so that you don't run into problems.
+Once you have done so, install Ruby 2.1+ (probably 2.3.1 at time of writing). Then set the local Ruby and install the Gem. Finally unset the local Ruby so that you don't run into problems.
 
-    $ rbenv install 2.3.0 # Installs Ruby 2.3.0
-    $ rbenv local 2.3.0 # Sets Ruby 2.3.0 as the default version in the current folder.
+    $ rbenv install 2.3.1 # Installs Ruby 2.3.1
+    $ rbenv local 2.3.1 # Sets Ruby 2.3.1 as the default version in the current folder.
     $ gem install letsencrypt_webfaction # Installs this utility from RubyGems.
     $ rbenv rehash # Makes RBenv aware of the letsencrypt_webfaction utility.
-    $ rm .ruby-version # Unsets Ruby 2.3.0 as the default version in the current folder.
+    $ rm .ruby-version # Unsets Ruby 2.3.1 as the default version in the current folder.
 
 ## Usage
 
@@ -89,19 +89,19 @@ Once you have done so, install Ruby 2.1+ (probably 2.3.0 at time of writing). Th
 
 The syntax of the letsencrypt_webfaction command is as follows:
 
-    $ letsencrypt_webfaction --account_email <email-address> --domains <domain[,domain[,domain...]]> --public <server-folder>
+    $ letsencrypt_webfaction --letsencrypt_account_email <email-address> --domains <domain[,domain[,domain...]]> --public <server-folder> --username <webfaction-username> --password <webfaction-password>
 
 
 ### Options:
 
 The basic parameters are as follows:
 
-* `--account_email`
+* `--letsencrypt_account_email`
 
-    Your WebFaction contact email address.
+    The email address you want associated with the issued certificates.
+
+* `--domains`
 
-* `--domains` 
-    
     The domains for which you want to create certificates, separated by commas (with no spaces). The domains must be served from the same folder. There is one certificate per webapp, regardless of how many domains are served from it.
 
 * `--public`
@@ -114,24 +114,32 @@ The basic parameters are as follows:
 
     In some cases (such as with some Node.js or Python applications), you may need to create this folder. See [here](https://github.com/will-in-wi/letsencrypt-webfaction/issues/24) for an example of this workaround.
 
-If you have several webapps, then you will need to issue the command several times. The command can be run from any folder. 
+* `--username`
+
+    The username you use to log into the Webfaction control panel.
+
+* `--password`
+
+    The password you use to log into the Webfaction control panel.
+
+    It is better to place this in a config file than to put it in the command line.
+
+If you have several webapps, then you will need to issue the command several times. The command can be run from any folder.
 
 Other parameters (which are generally best left to their default values, unless you have a perticular need to change them) can be found in the `config.defaults.yml` configuration file (see below in the "More detailed examples" section).
 
 ### Example
-Here is a basic example which issues one certificate for both yourdomain.com and www.yourdomain.com, both of which are served by `~/webapps/yourapp/wordpress` and your WebFaction contact email address is you@youremail.com. This assumes that both yourdomain.com and www.yourdomain.com are served from the same folder. 
+Here is a basic example which issues one certificate for both yourdomain.com and www.yourdomain.com, both of which are served by `~/webapps/yourapp/wordpress` and your WebFaction contact email address is you@youremail.com. This assumes that both yourdomain.com and www.yourdomain.com are served from the same folder.
 
-    $ letsencrypt_webfaction --account_email you@youremail.com --domains yourdomain.com,www.yourdomain.com --public ~/webapps/yourapp/wordpress/
+    $ letsencrypt_webfaction --letsencrypt_account_email you@youremail.com --domains yourdomain.com,www.yourdomain.com --public ~/webapps/yourapp/wordpress/
 
 ### Testing
 
-To test certificate issuance, consider using the [LetsEncrypt staging server](https://community.letsencrypt.org/t/testing-against-the-lets-encrypt-staging-environment/6763). This doesn't have the rate limit of 5 certs per domain every 7 days. You can add the `--endpoint https://acme-staging.api.letsencrypt.org/` parameter to the `letsencrypt_webfaction` command to do so. 
-
-When testing, you will also want to change the `--support_email` parameter, so that an email is not sent needlessly to WebFaction Support. To do this, add `--support_email ""` (so no support email is sent) or `--support_email you@youremail.com` (so the support email is sent to you).
+To test certificate issuance, consider using the [LetsEncrypt staging server](https://community.letsencrypt.org/t/testing-against-the-lets-encrypt-staging-environment/6763). This doesn't have the rate limit of 5 certs per domain every 7 days. You can add the `--endpoint https://acme-staging.api.letsencrypt.org/` parameter to the `letsencrypt_webfaction` command to do so.
 
 A test command could thus be something like the following:
 
-    $ letsencrypt_webfaction --account_email you@youremail.com --domains yourdomain.com,www.yourdomain.com --public ~/webapps/yourapp/wordpress/ --endpoint https://acme-staging.api.letsencrypt.org/ --support_email you@youremail.com
+    $ letsencrypt_webfaction --letsencrypt_account_email you@youremail.com --domains yourdomain.com,www.yourdomain.com --public ~/webapps/yourapp/wordpress/ --endpoint https://acme-staging.api.letsencrypt.org/
 
 
 ### Operation
@@ -153,9 +161,9 @@ Normally, you will run the script manually once to get the certificate, and then
 Your Cron task could look something like:
 
     # System Ruby Installation
-    0 4 1 */2 *     PATH=$PATH:$GEM_HOME/bin GEM_HOME=$HOME/.letsencrypt_webfaction/gems RUBYLIB=$GEM_HOME/lib ruby2.2 $HOME/.letsencrypt_webfaction/gems/bin/letsencrypt_webfaction --account_email [you@youremail.com] --domains [yourdomain.com,www.yourdomain.com] --public ~/webapps/[yourapp/your_public_html]/
+    0 4 1 */2 *     PATH=$PATH:$GEM_HOME/bin:/usr/local/bin GEM_HOME=$HOME/.letsencrypt_webfaction/gems RUBYLIB=$GEM_HOME/lib ruby2.2 $HOME/.letsencrypt_webfaction/gems/bin/letsencrypt_webfaction --letsencrypt_account_email [you@youremail.com] --domains [yourdomain.com,www.yourdomain.com] --public ~/webapps/[yourapp/your_public_html]/
     # RBEnv Installation
-    0 4 1 */2 *     RBENV_ROOT=~/.rbenv RBENV_VERSION=2.3.0 ~/.rbenv/bin/rbenv exec letsencrypt_webfaction --account_email [you@youremail.com] --domains [yourdomain.com,www.yourdomain.com] --public ~/webapps/[yourapp/your_public_html]/
+    0 4 1 */2 *     RBENV_ROOT=~/.rbenv RBENV_VERSION=2.3.1 ~/.rbenv/bin/rbenv exec letsencrypt_webfaction --letsencrypt_account_email [you@youremail.com] --domains [yourdomain.com,www.yourdomain.com] --public ~/webapps/[yourapp/your_public_html]/
 
 This [would run](http://crontab.guru/#0_4_1_*/2_*) at 4 a.m. on the first day of January, March, May, July, September, and November. Certificates expire three months after issuance, so modify as desired (for example, you may want to run the task every two months initially, to be sure that everything is working before extending the period). Change the date of the Cron task so that WebFaction staff don't simultaneously receive all certificate change requests on the first day of the month.
 
@@ -182,7 +190,7 @@ To upgrade, run one of the following two commands to fetch and install the newes
 GEM_HOME=$HOME/.letsencrypt_webfaction/gems RUBYLIB=$GEM_HOME/lib gem2.2 install letsencrypt_webfaction
 
 # For RBenv
-RBENV_VERSION=2.3.0 gem install letsencrypt_webfaction
+RBENV_VERSION=2.3.1 gem install letsencrypt_webfaction
 ```
 
 ### More detailed examples

data/config.defaults.yml

@@ -4,7 +4,9 @@ endpoint: 'https://acme-v01.api.letsencrypt.org/'
 domains: []
 public: ''
 output_dir: '~/le_certs/'
-support_email: 'support@webfaction.com'
-account_email: ''
-admin_notification_email: '' # Defaults to the value given in account_email.
-letsencrypt_account_email: '' # Defaults to the value given in account_email.
+letsencrypt_account_email: ''
+api_url: 'https://api.webfaction.com/'
+username: ''
+password: ''
+servername: ''
+cert_name: ''

data/config.example.yml

@@ -2,7 +2,7 @@
 
 key_size: 4096
 endpoint: 'https://acme-v01.api.letsencrypt.org/'
-account_email: 'me@example.com'
+letsencrypt_account_email: 'me@example.com'
 domains:
   - 'example.com'
   - 'www.example.com'

data/letsencrypt_webfaction.gemspec

@@ -29,13 +29,4 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.1.0'
 
   spec.add_runtime_dependency 'acme-client', '>=0.4.1'
-  spec.add_runtime_dependency 'pony', '~> 1.11'
-
-  spec.add_development_dependency 'bundler', '~> 1.11'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.4'
-  spec.add_development_dependency 'rubocop', '~> 0.37'
-  spec.add_development_dependency 'simplecov', '~> 0.11'
-  spec.add_development_dependency 'pry', '~> 0.10'
-  spec.add_development_dependency 'pry-byebug', '~> 3.3'
 end

data/lib/letsencrypt_webfaction.rb

@@ -1,3 +1,3 @@
 module LetsencryptWebfaction
-  VERSION = '1.1.8'.freeze
+  VERSION = '2.0.0'.freeze
 end

data/lib/letsencrypt_webfaction/application.rb

@@ -3,9 +3,8 @@ require 'acme-client'
 
 require 'letsencrypt_webfaction/args_parser'
 require 'letsencrypt_webfaction/domain_validator'
-require 'letsencrypt_webfaction/certificate_writer'
-require 'letsencrypt_webfaction/instructions'
-require 'letsencrypt_webfaction/emailer'
+require 'letsencrypt_webfaction/certificate_installer'
+require 'letsencrypt_webfaction/webfaction_api_credentials'
 
 module LetsencryptWebfaction
   class Application
@@ -24,24 +23,16 @@ module LetsencryptWebfaction
       return unless validator.validate!
 
       # Write the obtained certificates.
-      certificate_writer.write!
-
-      # Send emails.
-      emailer.send!
+      certificate_installer.install!
     end
 
     private
 
-    def emailer
-      @emails ||= LetsencryptWebfaction::Emailer.new instructions, support_email: @options.support_email, account_email: @options.account_email, notification_email: @options.admin_notification_email, email_configuration: @options.email_configuration
-    end
-
-    def instructions
-      @instructions ||= LetsencryptWebfaction::Instructions.new certificate_writer.output_dir, @options.domains
-    end
-
-    def certificate_writer
-      @certificate_writer ||= LetsencryptWebfaction::CertificateWriter.new(@options.output_dir, @options.domains.first, certificate)
+    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
     end
 
     def certificate

data/lib/letsencrypt_webfaction/args_parser.rb

@@ -1,4 +1,5 @@
 require 'optparse'
+require 'socket'
 require 'yaml'
 
 require 'letsencrypt_webfaction'
@@ -19,10 +20,12 @@ module LetsencryptWebfaction
       Field::ListField.new(:domains, 'Comma separated list of domains. The first one will be the common name.', [ArrayValidator.new]),
       Field.new(:public, 'Location on the filesystem served by the desired site (e.g. ~/webapps/myapp/public_html)', [StringValidator.new]),
       Field.new(:output_dir, 'Location on the filesystem to which the certs will be saved.', [StringValidator.new]),
-      Field.new(:support_email, 'The email address of the ISP support.', []),
-      Field.new(:account_email, 'The email address associated with your account.', [StringValidator.new]),
-      Field.new(:admin_notification_email, 'The email address associated with your account. Defaults to the value of account_email.', []),
-      Field.new(:letsencrypt_account_email, 'The email address associated with your account. Defaults to the value of account_email.', []),
+      Field.new(:letsencrypt_account_email, 'The email address associated with your account.', [StringValidator.new]),
+      Field.new(:api_url, 'The URL to the Webfaction API.', [StringValidator.new]),
+      Field.new(:username, 'The username for your Webfaction account.', [StringValidator.new]),
+      Field.new(:password, 'The password for your Webfaction account.', [StringValidator.new]),
+      Field.new(:servername, 'The server on which this application resides (e.g. Web123).', [StringValidator.new]),
+      Field.new(:cert_name, 'The name of the certificate in the Webfaction UI.', [StringValidator.new]),
     ].freeze
 
     # Set up getters.
@@ -114,15 +117,17 @@ module LetsencryptWebfaction
     end
 
     def parse!
+      # rubocop:disable Style/GuardClause
       opt_parser.parse!(@options)
 
-      # Set defaults from other fields.
-      if @admin_notification_email.nil? || @admin_notification_email == ''
-        @admin_notification_email = @account_email
+      # Set default hostname
+      if @servername.nil? || @servername == ''
+        @servername = Socket.gethostname.split('.')[0].sub(/^./, &:upcase)
       end
 
-      if @letsencrypt_account_email.nil? || @letsencrypt_account_email == ''
-        @letsencrypt_account_email = @account_email
+      # Set default cert_name
+      if @cert_name.nil? || @cert_name == ''
+        @cert_name = @domains[0].tr('.', '_') if @domains.any?
       end
     end
   end

data/lib/letsencrypt_webfaction/certificate_installer.rb

@@ -0,0 +1,38 @@
+require 'xmlrpc/client'
+
+module LetsencryptWebfaction
+  class CertificateInstaller
+    WEBFACTION_API_VERSION = 2
+
+    def initialize(cert_name, certificate, credentials)
+      @cert_name = cert_name
+      @certificate = certificate
+      @credentials = credentials
+    end
+
+    def install!
+      cert_list = server_client.call('list_certificates', session_id)
+      action = if cert_list.find { |cert| cert['name'] == @cert_name }
+                 'update_certificate'
+               else
+                 'create_certificate'
+               end
+      server_client.call(action, session_id, @cert_name, @certificate.to_pem, @certificate.request.private_key.to_pem, @certificate.chain_to_pem)
+
+      true
+    end
+
+    private
+
+    def server_client
+      @server_client ||= XMLRPC::Client.new2(@credentials.api_server)
+    end
+
+    def session_id
+      @session_id ||= begin
+        login_resp = server_client.call('login', @credentials.username, @credentials.password, @credentials.servername, WEBFACTION_API_VERSION)
+        login_resp[0]
+      end
+    end
+  end
+end

data/lib/letsencrypt_webfaction/webfaction_api_credentials.rb

@@ -0,0 +1,15 @@
+module LetsencryptWebfaction
+  class WebfactionApiCredentials
+    attr_reader :username
+    attr_reader :password
+    attr_reader :servername
+    attr_reader :api_server
+
+    def initialize(username:, password:, servername:, api_server:)
+      @username = username
+      @password = password
+      @servername = servername
+      @api_server = api_server
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: letsencrypt_webfaction
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 2.0.0
 platform: ruby
 authors:
 - William Johnston
@@ -30,7 +30,7 @@ cert_chain:
   urnVFSXSvmjoq2UEqNf39Ffw4ZJ2QYuxlOLEInXhf1Rij1+KYHwHoT6qaOmk+fgY
   XWr3WAp8Tv/ogSwGuBGWtsjMTEzbRxAJbRXQDFEMeXJAvzon0o6hUtU=
   -----END CERTIFICATE-----
-date: 2016-08-20 00:00:00.000000000 Z
+date: 2016-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acme-client
@@ -46,118 +46,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.1
-- !ruby/object:Gem::Dependency
-  name: pony
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.11'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.11'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.11'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.37'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.37'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.11'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.3'
 description: A tool to simplify the manual process of using LetsEncrypt on Webfaction
   hosts. It can be added to cron where it will validate your domains automatically,
   place the generated certs in a common folder, and then email the WebFaction support
@@ -196,10 +84,9 @@ files:
 - lib/letsencrypt_webfaction/args_parser/defined_values_validator.rb
 - lib/letsencrypt_webfaction/args_parser/field.rb
 - lib/letsencrypt_webfaction/args_parser/string_validator.rb
-- lib/letsencrypt_webfaction/certificate_writer.rb
+- lib/letsencrypt_webfaction/certificate_installer.rb
 - lib/letsencrypt_webfaction/domain_validator.rb
-- lib/letsencrypt_webfaction/emailer.rb
-- lib/letsencrypt_webfaction/instructions.rb
+- lib/letsencrypt_webfaction/webfaction_api_credentials.rb
 homepage: https://github.com/will-in-wi/letsencrypt-webfaction
 licenses:
 - MIT
@@ -220,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: LetsEncrypt utility client for WebFaction hosts.

data/lib/letsencrypt_webfaction/certificate_writer.rb

@@ -1,35 +0,0 @@
-module LetsencryptWebfaction
-  class CertificateWriter
-    attr_reader :output_dir
-
-    def initialize(output_dir, domain, certificate)
-      @certificate = certificate
-
-      cert_date = Time.now.strftime('%Y%m%d%H%M%S')
-
-      expanded_dir = File.expand_path(output_dir)
-      @output_dir = File.join(expanded_dir, domain, cert_date)
-    end
-
-    def write!
-      create_folder!
-
-      # Save the certificate and key
-      write_file!('privkey.pem', @certificate.request.private_key.to_pem)
-      write_file!('cert.pem', @certificate.to_pem)
-      write_file!('chain.pem', @certificate.chain_to_pem)
-      write_file!('fullchain.pem', @certificate.fullchain_to_pem)
-    end
-
-    private
-
-    def create_folder!
-      # Make sure the output directory exists.
-      FileUtils.mkdir_p(output_dir)
-    end
-
-    def write_file!(filename, data)
-      File.write(File.join(@output_dir, filename), data)
-    end
-  end
-end

data/lib/letsencrypt_webfaction/emailer.rb

@@ -1,36 +0,0 @@
-require 'pony'
-
-module LetsencryptWebfaction
-  class Emailer
-    SUBJECT_MESSAGE = 'New certificate installation'.freeze
-
-    def initialize(instructions, support_email: '', account_email: '', notification_email: '', email_configuration: {})
-      @instructions = instructions
-
-      raise Error, 'Missing account_email' if account_email == '' || account_email.nil?
-      raise Error, 'Missing notification_email' if notification_email == '' || notification_email.nil?
-
-      @support_email = support_email
-      @account_email = account_email
-      @notification_email = notification_email
-
-      Pony.options = email_configuration
-    end
-
-    def send!
-      send_to_support!
-      send_to_account!
-    end
-
-    def send_to_support!
-      return if @support_email.nil? || @support_email == ''
-      Pony.mail(to: @support_email, from: @account_email, subject: SUBJECT_MESSAGE, body: @instructions.instructions)
-    end
-
-    def send_to_account!
-      Pony.mail(to: @notification_email, from: @notification_email, subject: SUBJECT_MESSAGE, body: @instructions.full_message(support_email: @support_email != ''))
-    end
-
-    class Error < StandardError; end
-  end
-end

data/lib/letsencrypt_webfaction/instructions.rb

@@ -1,48 +0,0 @@
-module LetsencryptWebfaction
-  class Instructions
-    def initialize(output_dir, domains)
-      @output_dir = output_dir
-      @domains = domains
-    end
-
-    def context(support_email: true)
-      out = 'LetsEncrypt Webfaction has generated a new certificate for ' \
-        "#{to_sentence @domains}. The certificates have been placed in " \
-        "#{@output_dir}. "
-
-      out << if support_email
-               'WebFaction support has been contacted with the following message:'
-             else
-               'Go to https://help.webfaction.com, log in, and paste the ' \
-               'following text into a new ticket:'
-             end
-
-      out
-    end
-
-    def instructions
-      "Please apply the new certificate in #{@output_dir} to " \
-      "#{to_sentence @domains}. Thanks!"
-    end
-
-    def full_message(support_email: true)
-      context(support_email: support_email) + "\n\n" + instructions
-    end
-
-    private
-
-    # Borrowed (with simplifications) from ActiveSupport.
-    def to_sentence(str)
-      case str.length
-      when 0
-        ''
-      when 1
-        str[0].to_s.dup
-      when 2
-        "#{str[0]} and #{str[1]}"
-      else
-        "#{str[0...-1].join(', ')}, and #{str[-1]}"
-      end
-    end
-  end
-end