letsencrypt_webfaction 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bacf8a3dfdbc43a59c2442f47b15e5e2b2e8074a
-  data.tar.gz: 59d622ebb77d9e1020a5d36cc32ae0e63df5542c
+  metadata.gz: f80a89c3d834f421b0284b77471e9417384f7e67
+  data.tar.gz: 4446d3527bc746de8dc5f8b48dc1353b73eb2ba3
 SHA512:
-  metadata.gz: ca636c3c4df8b446035148ab57647f60491f9526f45cd1b0af3b6c9d4a1c124350fc9d09fe350c0711f801b6a6de3465f81b0e104ad7a18a76589768a46d2e57
-  data.tar.gz: edeae9fd9ed9d58cba1a0534edd0660453be82b2be65f144c222c2e8656d19260366e7bfeca3fbd6de774ba539749f8a5cf959f64c609913c77b48cb53d8bdb9
+  metadata.gz: 9b24b706c95298e09e2d126f53123240b4f2d12b32d1f1822c0c8c61704e6c43decb90fec32c9f3776b33891e75522619c65faae23f3551033b9f87554a51dcf
+  data.tar.gz: 29b1f9645e0162ab53654c50faa62153bc8cde3779714cd3534b975c427b7490b9e0d25708c121cf4ba700f02581dd2333fd0e0fcb850df486925e90cb7472a6

data/.codeclimate.yml

@@ -1,4 +1,3 @@
----
 engines:
   duplication:
     enabled: true
@@ -10,7 +9,8 @@ engines:
   rubocop:
     enabled: true
     checks:
-      Rubocop/Rails: false
+      Rubocop/Rails:
+        enabled: false
 ratings:
   paths:
   - "**.inc"

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.3.0
+  - 2.3.1
   - 2.2
   - 2.1
 before_install:

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+v1.1.0
+
+* Support for additional special email configuration.
+* Building on the previous feature, additional documentation around Gmail support.
+* Fix issue where users had to specify all params in a custom config file.
+
 v1.0.1
 
 * Clean up help response.

data/README.md

@@ -103,6 +103,29 @@ In the case of a PHP site, such as Drupal or Wordpress, look for the folder with
 
 In the case of a Rails app, look for a folder called `public/`. If you are deploying your app with Capistrano, this could show up in `/home/myuser/webapps/myapp/current/public/`.
 
+### Custom email configuration
+
+Particularly in the case of Gmail, you may need to override the default usage of Sendmail and use SMTP. You can add custom configuration to the config file you pass, in order to accomplish this.
+
+A Gmail example might be:
+
+```yaml
+email_configuration:
+  :via: 'smtp'
+  :via_options:
+    :address: 'smtp.gmail.com'
+    :port: '587'
+    :enable_starttls_auto: true
+    :user_name: 'myuser@gmail.com'
+    :password: 'password_see_note'
+    :authentication: 'plain'
+    :domain: 'localhost.localdomain' # the HELO domain provided by the client to the server
+```
+
+See the wiki for additional Gmail specific notes.
+
+For all possible options, see [the Pony configuration](https://github.com/benprew/pony).
+
 ## Development
 
 To run the script directly from the repository, use:

data/letsencrypt_webfaction.gemspec

@@ -14,8 +14,7 @@ Gem::Specification.new do |spec|
                        '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 you directions and example ' \
-                       'text to send the WebFaction support team.'
+                       'folder, and then email the WebFaction support team directions'
   spec.homepage      = 'https://github.com/will-in-wi/letsencrypt-webfaction'
   spec.license       = 'MIT'
 
@@ -25,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = %w(lib)
 
   spec.cert_chain  = ['certs/will_in_wi.pem']
-  spec.signing_key = File.expand_path('~/.ssh/gem-private_key.pem') if $0 =~ /gem\z/
+  spec.signing_key = File.expand_path('~/.ssh/gem-private_key.pem') if $PROGRAM_NAME.end_with?('gem')
 
   spec.required_ruby_version = '>= 2.1.0'
 

data/lib/letsencrypt_webfaction.rb

@@ -1,3 +1,3 @@
 module LetsencryptWebfaction
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/lib/letsencrypt_webfaction/application.rb

@@ -33,7 +33,7 @@ module LetsencryptWebfaction
     private
 
     def emailer
-      @emails ||= LetsencryptWebfaction::Emailer.new instructions, support_email: @options.support_email, account_email: @options.account_email, notification_email: @options.admin_notification_email
+      @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

data/lib/letsencrypt_webfaction/args_parser.rb

@@ -29,6 +29,9 @@ module LetsencryptWebfaction
       attr_reader field
     end
 
+    # EMail config is special, as it only comes from the config file, due to complexity.
+    attr_reader :email_configuration
+
     def initialize(options)
       @options = options
 
@@ -64,8 +67,11 @@ module LetsencryptWebfaction
     def load_config!(config_path)
       config = YAML.load_file(config_path)
       FIELDS.each do |field|
+        next unless config[field.identifier.to_s]
         instance_variable_set("@#{field.identifier}", config[field.identifier.to_s])
       end
+
+      @email_configuration = config['email_configuration'] || {}
     end
 
     def handle_config(opts)

data/lib/letsencrypt_webfaction/domain_validator.rb

@@ -45,9 +45,5 @@ module LetsencryptWebfaction
         File.write(File.join(@public_dir, challenge.filename), challenge.file_content)
       end
     end
-
-    def delete_files!
-      # TODO
-    end
   end
 end

data/lib/letsencrypt_webfaction/emailer.rb

@@ -4,7 +4,7 @@ module LetsencryptWebfaction
   class Emailer
     SUBJECT_MESSAGE = 'New certificate installation'.freeze
 
-    def initialize(instructions, support_email: '', account_email: '', notification_email: '')
+    def initialize(instructions, support_email: '', account_email: '', notification_email: '', email_configuration: {})
       @instructions = instructions
 
       raise Error, 'Missing account_email' if account_email == '' || account_email.nil?
@@ -13,6 +13,8 @@ module LetsencryptWebfaction
       @support_email = support_email
       @account_email = account_email
       @notification_email = notification_email
+
+      Pony.options = email_configuration
     end
 
     def send!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: letsencrypt_webfaction
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - William Johnston
@@ -30,7 +30,7 @@ cert_chain:
   urnVFSXSvmjoq2UEqNf39Ffw4ZJ2QYuxlOLEInXhf1Rij1+KYHwHoT6qaOmk+fgY
   XWr3WAp8Tv/ogSwGuBGWtsjMTEzbRxAJbRXQDFEMeXJAvzon0o6hUtU=
   -----END CERTIFICATE-----
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acme-client
@@ -160,8 +160,8 @@ dependencies:
         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 you directions and
-  example text to send the WebFaction support team.
+  place the generated certs in a common folder, and then email the WebFaction support
+  team directions
 email:
 - william@johnstonhaus.us
 executables: