letsencrypt_webfaction 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c590b0a45e8aff3a06c033469cd8865f3f2ab229
-  data.tar.gz: a23692c8443dca9cddff66e96fb9302a84c2cd71
+  metadata.gz: 70cdf0bbd92fee6c754762d779ad9637d851fb6d
+  data.tar.gz: 500669496025c30fdfe9d6e61071d1bbce4559c1
 SHA512:
-  metadata.gz: c0f00eb5e332f28a8ff4d64f00038243d917849ff3e57e871e78c0c21d500a99d2da351145fca630c72840e1e8768fd37866d2060407771e33b30607d69e401e
-  data.tar.gz: 2e7d7232dac737f2573834db8f5844d52ffbd58e52fc906555e4dba730eb87b9f106b439253afdeffd2142256b9deeb671de51b88b4e7d620d354472f9a2ce25
+  metadata.gz: cd47d7ec3b7158705d045ee282985d50687a1338ee068a696814327cb95e545481a9700fb6b82dee0a98c21608ddbf4c8caf88b2c260ab67e93a8f24604c4afd
+  data.tar.gz: 5ea1ca661317976e585fc974d732225c15b2b359495065e5772b6125a6dcea7ad6ef118149adc772d678575661eec7e5c8a5d111308adc12b3bee289a35093b8

data/.rubocop.yml

@@ -11,6 +11,9 @@ Metrics/LineLength:
 # This requires leading comments which can tend to be redundant.
 Style/Documentation:
   Enabled: false
+# I prefer my underscore convention.
+Naming/MemoizedInstanceVariableName:
+  Enabled: false
 
 Metrics/BlockLength:
   Exclude:
@@ -21,6 +24,10 @@ Metrics/BlockLength:
 Layout/IndentHeredoc:
   Enabled: false
 
+# When we use $stderr.puts, we don't see that as verbose.
+Style/StderrPuts:
+  Enabled: false
+
 # Extra cops:
 
 # Encourages block syntax for things like File.open
@@ -46,7 +53,9 @@ Lint/LiteralInInterpolation:
   Enabled: true
 
 # Personal preference. Makes the diffs smaller.
-Style/TrailingCommaInLiteral:
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: consistent_comma
+Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: consistent_comma
 Style/TrailingCommaInArguments:
   EnforcedStyleForMultiline: consistent_comma

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+v2.2.2
+
+* Removes `output_dir` from configuration as it hasn't been used since 1..
+* Rubocop cleanups.
+* Fix situation where cert_name has invalid chars. Fixes #114.
+
 v2.2.1
 
 * Fixes issue where older (pre-2.1.0) configs would have a string as the domain. Converts this to array internally.

data/Gemfile

@@ -9,7 +9,7 @@ group :development, :test do
   gem 'pry-byebug', '~> 3.3'
   gem 'rake', '~> 10.0'
   gem 'rspec', '~> 3.4'
-  gem 'rubocop', '~> 0.37'
+  gem 'rubocop', '~> 0.51'
   gem 'simplecov', '~> 0.11'
   gem 'webmock', '~> 2.1'
 end

data/README.md

@@ -167,9 +167,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:/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]/ --quiet
+    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]/ --quiet --username [yourusername] --password [yourpassword]
     # RBEnv Installation
-    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]/ --quiet
+    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]/ --quiet --username [yourusername] --password [yourpassword]
 
 *Note the usage of `--quiet` to keep the success message from being shown and emailed.*
 
@@ -177,7 +177,7 @@ This [would run](http://crontab.guru/#0_4_1_*/2_*) at 4 a.m. on the first day of
 
 If you have more than one Cron task running like this, you may want to set the environment variables at the top of the file, and create a config file containing the contact information.
 
-If you want to be notified upon failure, you can add `MAILTO=[you@youremail.com]` to the top of the crontab. This will send you an email whenever any cron job outputs standard out or standard error, which is generally good practice.
+If you want to be notified upon failure, you can add `MAILTO=[you@youremail.com]` to the top of the crontab. This will send you an email whenever any cron job outputs standard out or standard error, which is generally good practice. According to the Webfaction [Cron documentaion](https://docs.webfaction.com/software/general.html#scheduling-tasks-with-cron) some webfaction servers also require you to add `MAILFROM=[you@youremail.com]` to the top of the crontab.
 
 ## Upgrading
 

data/config.defaults.yml

@@ -3,7 +3,6 @@ key_size: 4096
 endpoint: 'https://acme-v01.api.letsencrypt.org/'
 domains: []
 public: []
-output_dir: '~/le_certs/'
 letsencrypt_account_email: ''
 api_url: 'https://api.webfaction.com/'
 username: ''

data/config.example.yml

@@ -3,8 +3,6 @@
 key_size: 4096
 endpoint: 'https://acme-v01.api.letsencrypt.org/'
 letsencrypt_account_email: 'me@example.com'
-domains:
-  - 'example.com'
-  - 'www.example.com'
+domains: ['example.com','www.example.com']
 # The webroot of the application.
 public: '/home/myuser/webapps/myapp/public_html'

data/letsencrypt_webfaction.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'letsencrypt_webfaction'
 

data/lib/letsencrypt_webfaction.rb

@@ -1,3 +1,3 @@
 module LetsencryptWebfaction
-  VERSION = '2.2.1'.freeze
+  VERSION = '2.2.2'.freeze
 end

data/lib/letsencrypt_webfaction/args_parser.rb

@@ -19,7 +19,6 @@ module LetsencryptWebfaction
       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(:output_dir, 'Location on the filesystem to which the certs will be saved.', [StringValidator.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]),
@@ -127,7 +126,6 @@ module LetsencryptWebfaction
     end
 
     def parse!
-      # rubocop:disable Style/GuardClause
       opt_parser.parse!(@options)
 
       # Set default hostname
@@ -137,8 +135,9 @@ module LetsencryptWebfaction
 
       # Set default cert_name
       if @cert_name.nil? || @cert_name == ''
-        @cert_name = @domains[0].tr('.', '_') if @domains.any?
+        @cert_name = @domains[0] if @domains.any?
       end
+      @cert_name = @cert_name.gsub(/[^a-zA-Z\d_]/, '_')
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: letsencrypt_webfaction
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - William Johnston
@@ -30,7 +30,7 @@ cert_chain:
   Bgn1/q+P8H+/qkt6w5h8UzWYyXRlEjWvSJEjkNU0C05GQ0w0GFiqd62CgQty5xpa
   7M3NhWEjOZHE18Ro4Vy9CQCJxUasYC4JUMMQ9tQBW+vYIgHfBn0+xlw=
   -----END CERTIFICATE-----
-date: 2017-10-01 00:00:00.000000000 Z
+date: 2018-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acme-client