letsencrypt_webfaction 2.2.3 → 3.0.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: letsencrypt_webfaction
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 3.0.0
 platform: ruby
 authors:
 - William Johnston
@@ -10,9 +10,9 @@ bindir: exe
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDhTCCAm2gAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMRAwDgYDVQQDDAd3aWxs
+  MIIDhTCCAm2gAwIBAgIBATANBgkqhkiG9w0BAQsFADBEMRAwDgYDVQQDDAd3aWxs
   aWFtMRwwGgYKCZImiZPyLGQBGRYMam9obnN0b25oYXVzMRIwEAYKCZImiZPyLGQB
-  GRYCdXMwHhcNMTcwNDIyMTMzODM5WhcNMTgwNDIyMTMzODM5WjBEMRAwDgYDVQQD
+  GRYCdXMwHhcNMTgwNjEwMTMxNTEwWhcNMTkwNjEwMTMxNTEwWjBEMRAwDgYDVQQD
   DAd3aWxsaWFtMRwwGgYKCZImiZPyLGQBGRYMam9obnN0b25oYXVzMRIwEAYKCZIm
   iZPyLGQBGRYCdXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDl8XJy
   iFDfTJHbPnQ43vJKAjVPwxRnPhThFeWgYlZ//SU6ZbO4GqewDSMyCrjtWOq+mE59
@@ -23,14 +23,14 @@ cert_chain:
   gkKUO+QWHBNH4QL3AgMBAAGjgYEwfzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAd
   BgNVHQ4EFgQUFOFAV8TE1Qa285rrUux+StPq5WowIgYDVR0RBBswGYEXd2lsbGlh
   bUBqb2huc3RvbmhhdXMudXMwIgYDVR0SBBswGYEXd2lsbGlhbUBqb2huc3Rvbmhh
-  dXMudXMwDQYJKoZIhvcNAQEFBQADggEBAKpT/kZxUP3ZmywvtVjwYy2iqKglGPfp
-  VUrMDaz3M96EFMH2FGMQDDumCR4OrBvc5URigGhj0qZYJmgBmkCW/gw2sv9RfuZb
-  btwEZHcHJrWHW6ys0mD0aGZGptsLbxmm+VJhXNWHKu30Wbmm4yt4lk5atOprYGKp
-  M/z07wMPdG5bNazz5iNkuW2HyYJV6BArUfD5fF04m856frBJytLkVe5Q1L83wi7g
-  Bgn1/q+P8H+/qkt6w5h8UzWYyXRlEjWvSJEjkNU0C05GQ0w0GFiqd62CgQty5xpa
-  7M3NhWEjOZHE18Ro4Vy9CQCJxUasYC4JUMMQ9tQBW+vYIgHfBn0+xlw=
+  dXMudXMwDQYJKoZIhvcNAQELBQADggEBAEZ6tJ2dwjke8nJbBATwwqwqqyISybGc
+  /uw0ApMsYfK0pninuCV5jfpm4WbmqokqNOfbYvlHLpBKGz7uxJRKOioe6Ivl7LJu
+  EHiagTaawLYJK0tZ3fH4K7VFx4pXNIbg6LYzOTIflaBQkVSkaVNfrczTJM11aADC
+  qy0EH65AuAgNtypTvnCKGB6pztMIgxK0FTSdZnnxtC1ReQ1U8MpsaYpOap2Yvofo
+  ilYPju4QWNSvpNVhV+T7JUvAHXva3Rayfp8SKRpvX8ZpRCjvpYfgbmNxXO2ST1qb
+  KBba/yJfCMh+B65HfRUXBQRRDtJ2Vu8i0WmRUKenahAnpkkeVmqhWwY=
   -----END CERTIFICATE-----
-date: 2018-04-03 00:00:00.000000000 Z
+date: 2018-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acme-client
@@ -46,6 +46,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: toml-rb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 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
@@ -73,20 +87,23 @@ files:
 - bin/rubocop
 - bin/setup
 - certs/will_in_wi.pem
-- config.defaults.yml
-- config.example.yml
+- docs/rbenv.md
+- docs/upgrading.md
 - exe/letsencrypt_webfaction
 - letsencrypt_webfaction.gemspec
 - lib/letsencrypt_webfaction.rb
 - lib/letsencrypt_webfaction/application.rb
-- lib/letsencrypt_webfaction/args_parser.rb
-- lib/letsencrypt_webfaction/args_parser/array_validator.rb
-- 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/application/init.rb
+- lib/letsencrypt_webfaction/application/run.rb
 - lib/letsencrypt_webfaction/certificate_installer.rb
+- lib/letsencrypt_webfaction/certificate_issuer.rb
 - lib/letsencrypt_webfaction/domain_validator.rb
+- lib/letsencrypt_webfaction/errors.rb
+- lib/letsencrypt_webfaction/logger_output.rb
+- lib/letsencrypt_webfaction/options.rb
+- lib/letsencrypt_webfaction/options/certificate.rb
 - lib/letsencrypt_webfaction/webfaction_api_credentials.rb
+- templates/letsencrypt_webfaction.toml
 homepage: https://github.com/will-in-wi/letsencrypt-webfaction
 licenses:
 - MIT
@@ -107,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: LetsEncrypt utility client for WebFaction hosts.

data/config.defaults.yml

@@ -1,12 +0,0 @@
-key_size: 4096
-# We need an ACME server to talk to, see github.com/letsencrypt/boulder
-endpoint: 'https://acme-v01.api.letsencrypt.org/'
-domains: []
-public: []
-letsencrypt_account_email: ''
-api_url: 'https://api.webfaction.com/'
-username: ''
-password: ''
-servername: ''
-cert_name: ''
-quiet: false

data/config.example.yml

@@ -1,8 +0,0 @@
-# See config.defaults.yml for all available settings.
-
-key_size: 4096
-endpoint: 'https://acme-v01.api.letsencrypt.org/'
-letsencrypt_account_email: 'me@example.com'
-domains: ['example.com','www.example.com']
-# The webroot of the application.
-public: '/home/myuser/webapps/myapp/public_html'

data/lib/letsencrypt_webfaction/args_parser.rb

@@ -1,143 +0,0 @@
-require 'optparse'
-require 'socket'
-require 'yaml'
-
-require 'letsencrypt_webfaction'
-require 'letsencrypt_webfaction/args_parser/field'
-require 'letsencrypt_webfaction/args_parser/string_validator'
-require 'letsencrypt_webfaction/args_parser/defined_values_validator'
-require 'letsencrypt_webfaction/args_parser/array_validator'
-
-module LetsencryptWebfaction
-  class ArgsParser
-    BANNER = 'Usage: letsencrypt_webfaction [options]'.freeze
-    DEFAULTS_PATH = 'config.defaults.yml'.freeze
-    VALID_KEY_SIZES = [2048, 4096].freeze
-
-    FIELDS = [
-      Field::IntegerField.new(:key_size, 'Size of private key (e.g. 4096)', [DefinedValuesValidator.new(VALID_KEY_SIZES)]),
-      Field.new(:endpoint, 'ACME endpoint (e.g. https://acme-v01.api.letsencrypt.org/)', [StringValidator.new]),
-      Field::ListField.new(:domains, 'Comma separated list of domains. The first one will be the common name.', [ArrayValidator.new]),
-      Field::ListField.new(:public, 'Locations on the filesystem served by the desired sites (e.g. "~/webapps/myapp/public_html,~/webapps/myapp1/public_html")', [ArrayValidator.new]),
-      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]),
-      Field::BooleanField.new(:quiet, 'Whether to display text on success.', []),
-    ].freeze
-
-    # Set up getters.
-    FIELDS.map(&:identifier).each do |field|
-      attr_reader field
-    end
-
-    # Set up boolean getters
-    FIELDS.reject(&:value?).map(&:identifier).each do |field|
-      define_method "#{field}?" do
-        instance_variable_get("@#{field}") || false
-      end
-    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
-
-      @errors = {}
-
-      # Set defaults from default config file.
-      file_path = File.join(File.dirname(__FILE__), '../../', DEFAULTS_PATH)
-      load_config!(File.expand_path(file_path))
-
-      # TODO: Rework this to not exit on instantiation due to help text or version.
-      parse!
-    end
-
-    def errors
-      errors = {}
-
-      FIELDS.each do |field|
-        val = instance_variable_get("@#{field.identifier}")
-        next if field.valid? val
-        errors[field.identifier] ||= []
-        errors[field.identifier] << "Invalid #{field.identifier} '#{val}'"
-      end
-
-      errors
-    end
-
-    def valid?
-      errors.empty?
-    end
-
-    private
-
-    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}", field.sanitize(config[field.identifier.to_s]))
-      end
-
-      @email_configuration = config['email_configuration'] || {}
-    end
-
-    def handle_config(opts)
-      opts.on('--config=CONFIG', 'Path to config file. Arguments passed to the program will override corresponding directives in the config file.') do |c|
-        # Set defaults.
-        load_config!(c)
-      end
-    end
-
-    def handle_help(opts)
-      opts.on('-h', '--help', 'Prints this help') do
-        puts opts
-        exit
-      end
-    end
-
-    def handle_version(opts)
-      opts.on_tail('--version', 'Show version') do
-        puts LetsencryptWebfaction::VERSION
-        exit
-      end
-    end
-
-    def handle_field(opts, field)
-      argument = "--#{field.identifier}"
-      argument += "=#{field.identifier.upcase}" if field.value?
-      opts.on(argument, field.description) do |val|
-        instance_variable_set("@#{field.identifier}", field.sanitize(val))
-      end
-    end
-
-    def opt_parser
-      OptionParser.new do |opts|
-        opts.banner = BANNER
-
-        handle_config(opts)
-        handle_help(opts)
-        handle_version(opts)
-        FIELDS.each { |field| handle_field(opts, field) }
-      end
-    end
-
-    def parse!
-      opt_parser.parse!(@options)
-
-      # Set default hostname
-      if @servername.nil? || @servername == ''
-        @servername = Socket.gethostname.split('.')[0].sub(/^./, &:upcase)
-      end
-
-      # Set default cert_name
-      if @cert_name.nil? || @cert_name == ''
-        @cert_name = @domains[0] if @domains.any?
-      end
-      @cert_name = @cert_name.gsub(/[^a-zA-Z\d_]/, '_')
-    end
-  end
-end

data/lib/letsencrypt_webfaction/args_parser/array_validator.rb

@@ -1,9 +0,0 @@
-module LetsencryptWebfaction
-  class ArgsParser
-    class ArrayValidator
-      def valid?(val)
-        !val.nil? && !val.empty?
-      end
-    end
-  end
-end

data/lib/letsencrypt_webfaction/args_parser/defined_values_validator.rb

@@ -1,13 +0,0 @@
-module LetsencryptWebfaction
-  class ArgsParser
-    class DefinedValuesValidator
-      def initialize(values = [])
-        @values = values
-      end
-
-      def valid?(val)
-        @values.include? val
-      end
-    end
-  end
-end

data/lib/letsencrypt_webfaction/args_parser/field.rb

@@ -1,48 +0,0 @@
-module LetsencryptWebfaction
-  class ArgsParser
-    class Field
-      attr_reader :identifier, :description, :validators
-
-      def initialize(identifier, description, validators = [])
-        @identifier = identifier
-        @description = description
-        @validators = validators
-      end
-
-      def sanitize(val)
-        val
-      end
-
-      def valid?(val)
-        validators.reject { |validator| validator.valid?(val) }.empty?
-      end
-
-      def value?
-        true
-      end
-
-      class IntegerField < Field
-        def sanitize(val)
-          val.to_i
-        end
-      end
-
-      class ListField < Field
-        def sanitize(val)
-          return val if val.is_a?(Array)
-          val.split(',').map(&:strip).compact
-        end
-      end
-
-      class BooleanField < Field
-        def sanitize(val)
-          val || false
-        end
-
-        def value?
-          false
-        end
-      end
-    end
-  end
-end

data/lib/letsencrypt_webfaction/args_parser/string_validator.rb

@@ -1,9 +0,0 @@
-module LetsencryptWebfaction
-  class ArgsParser
-    class StringValidator
-      def valid?(val)
-        !val.nil? && val != ''
-      end
-    end
-  end
-end