letsencrypt_webfaction 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2d709e490a30b32d1606e0603cca2c3e4e986813
-  data.tar.gz: 8089c0a8d1937633b300e9f81abcc5d7289621c1
+SHA256:
+  metadata.gz: 4c4a64d238719879ad06960eb2cd9f6d563d8ed9bd5196087a7786d6ed06d40e
+  data.tar.gz: a98a94eff65248af07a9e5bb3f8f2a58f526e8ccaf1c13d1cf9e4b69ac854e54
 SHA512:
-  metadata.gz: 09355bdc2f2c0fa9721ed53a88a0f9ae92e0cba782f3cc59797117771644041ae837222ed24990d58ddc6b4fe441289accfde2b172eda6527abbaf486ddbb2f2
-  data.tar.gz: 33e97c3dd6c2085b3831b852000289ab8d8001df3ab7d01d7227dbb866dff215062770a26a273911372454937c85c0b4b91a8e7d6524f62f4a4a66004c26d3be
+  metadata.gz: b6875968dd2e9c00d9e5bba5fb7a9c3df70fb0da19224e093d7a64d60e0ef34386f827c807bdf5f3e23b6607fb820108843b5014cb836c5b2c930a9dddb8e14d
+  data.tar.gz: 1ccc78c90709c904fa9fa9b09b50b4f1a7a95318864a195c19cc6e0e189d0e4e77ed48ff1a5e918d936fcb587950624e1ac05e3919962008099b1e0025dcf520

data.tar.gz.sig

@@ -1,4 +1 @@
-��h�^�j=����e����AYn�\��+�f�;���
-��6G�Z��]�9�30���c
-��ut�U��}J���>��������P[&�	�m�����C�
-�����H��ei��^�>Cg;�nCl�U�ı�
+"�-8p�)�S�n���|%^k��SZ�teV�:[v
B��{Z�������⛱�q p����oi*�Js5�Z6*

data/.rubocop.yml

@@ -6,9 +6,9 @@ AllCops:
     - 'bin/*'
     # Keep rubocop from scanning installed gems.
     - 'vendor/**/*'
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.4
 # Line length is something that isn't dogmatic. 80 chars is a good recommendation.
-Metrics/LineLength:
+Layout/LineLength:
   Enabled: false
 # This requires leading comments which can tend to be redundant.
 Style/Documentation:
@@ -26,10 +26,6 @@ Metrics/ModuleLength:
     # Tests involve piles of code.
     - 'spec/**/*'
 
-# I'm not pulling in a library, or forcing Ruby 2.3+
-Layout/IndentHeredoc:
-  Enabled: false
-
 # When we use $stderr.puts, we don't see that as verbose.
 Style/StderrPuts:
   Enabled: false
@@ -70,3 +66,19 @@ Style/TrailingCommaInArguments:
 # Seems buggy for now.
 Layout/ClosingHeredocIndentation:
   Enabled: false
+
+# Enable new cops
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+Lint/RaiseException:
+  Enabled: true
+Lint/StructNewOverride:
+  Enabled: true
+Style/ExponentialNotation:
+  Enabled: true
+Style/HashEachMethods:
+  Enabled: true
+Style/HashTransformKeys:
+  Enabled: true
+Style/HashTransformValues:
+  Enabled: true

data/.travis.yml

@@ -1,5 +1,7 @@
 language: ruby
 rvm:
-  - 2.3.1
-  - 2.2
+  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
 cache: bundler

data/CHANGELOG.md

@@ -2,6 +2,10 @@ Unreleased
 
 * Your change here!
 
+v4.0.1
+
+* Require Ruby >=2.4 (mostly because Faraday, which this depends on, doesn't support 2.2 anymore. Also not support 2.3 because of the xmlrpc library extraction. This just makes things easier, and it seems like WebFaction supports this new version of Ruby everywhere now.)
+
 v4.0.0
 
 * Support ACMEv2

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in test_gem.gemspec
@@ -9,7 +11,7 @@ group :development, :test do
   gem 'pry-doc'
   gem 'rake', '~> 12.0'
   gem 'rspec', '~> 3.4'
-  gem 'rubocop', '~> 0.68.0' # Forcing 0.68, as Ruby 2.2 is unsupported after this.
+  gem 'rubocop', '~> 0.82.0'
   gem 'rubocop-performance'
   gem 'simplecov', '~> 0.11'
   gem 'timecop', '~> 0.9.1'

data/README.md

@@ -61,14 +61,14 @@ All places where you need to substitute a value specific to your setup will be d
 Run the following command in an SSH session to install the letsencrypt_webfaction package via the [RubyGems package management site](https://rubygems.org/gems/letsencrypt_webfaction):
 
 ```sh
-GEM_HOME=$HOME/.letsencrypt_webfaction/gems RUBYLIB=$GEM_HOME/lib gem2.2 install letsencrypt_webfaction
+GEM_HOME=$HOME/.letsencrypt_webfaction/gems RUBYLIB=$GEM_HOME/lib gem2.4 install letsencrypt_webfaction
 ```
 
 Add the following to `~/.bash_profile` (using, for example, an FTP client or your favorite text editor):
 
 ```sh
 function letsencrypt_webfaction {
-    GEM_HOME=$HOME/.letsencrypt_webfaction/gems PATH=$PATH:$GEM_HOME/bin RUBYLIB=$GEM_HOME/lib ruby2.2 $HOME/.letsencrypt_webfaction/gems/bin/letsencrypt_webfaction $*
+    GEM_HOME=$HOME/.letsencrypt_webfaction/gems PATH=$PATH:$GEM_HOME/bin RUBYLIB=$GEM_HOME/lib ruby2.4 $HOME/.letsencrypt_webfaction/gems/bin/letsencrypt_webfaction $*
 }
 ```
 This will simplify the running of the LetsEncrypt WebFaction command, by setting some variables in advance.
@@ -131,7 +131,7 @@ The Cron task should run daily (or however often you prefer) and will only renew
 Your Cron task should look like:
 
 ```cron
-18 3 * * *     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 run --quiet
+18 3 * * *     PATH=$PATH:$GEM_HOME/bin:/usr/local/bin GEM_HOME=$HOME/.letsencrypt_webfaction/gems RUBYLIB=$GEM_HOME/lib ruby2.4 $HOME/.letsencrypt_webfaction/gems/bin/letsencrypt_webfaction run --quiet
 ```
 
 *Note the usage of `--quiet` to keep the success message from being shown and emailed.*
@@ -148,14 +148,14 @@ You can find the current version by running `letsencrypt_webfaction --version`.
 
 [The changelog](CHANGELOG.md) describes changes from version to version.
 
-LetsEncrypt WebFaction follows [Semantic Versioning](http://semver.org/). In a nutshell, a version number such as `1.2.3` is divided as `major.minor.patch`. When the major version is incremented, you will probably have to change something about the configuration to make it work. The changelog will let you know what changes you need to make. When the minor version is incremented, there are new features but existing features haven't changed. If the patch version is incremented, the changes are all under the hood and shouldn't change or add any existing features.
+LetsEncrypt WebFaction follows [Semantic Versioning](http://semver.org/). In a nutshell, a version number such as `1.2.4` is divided as `major.minor.patch`. When the major version is incremented, you will probably have to change something about the configuration to make it work. The changelog will let you know what changes you need to make. When the minor version is incremented, there are new features but existing features haven't changed. If the patch version is incremented, the changes are all under the hood and shouldn't change or add any existing features.
 
 TL;DR: Be careful with major version upgrades and you should be fine with upgrading to minor or patch releases.
 
 To upgrade, run the following command to fetch and install the newest version from RubyGems:
 
 ```sh
-GEM_HOME=$HOME/.letsencrypt_webfaction/gems RUBYLIB=$GEM_HOME/lib gem2.2 install letsencrypt_webfaction
+GEM_HOME=$HOME/.letsencrypt_webfaction/gems RUBYLIB=$GEM_HOME/lib gem2.4 install letsencrypt_webfaction
 ```
 
 ## Development

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'

data/docs/rbenv.md

@@ -4,22 +4,20 @@ 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+, but <2.4 (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.
+Once you have done so, install Ruby 2.4+. 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.1 # Installs Ruby 2.3.1
-    $ rbenv local 2.3.1 # Sets Ruby 2.3.1 as the default version in the current folder.
+    $ rbenv install 2.7.0 # Installs Ruby 2.7.0
+    $ rbenv local 2.7.0 # Sets Ruby 2.7.0 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.1 as the default version in the current folder.
-
-*Ruby 2.4.0+ is not supported since they removed the XMLRPC library from core and moved it to a gem. This Gem doesn't work in Ruby <2.3, leaving us with an issue as the majority of system Rubies used with this project are <2.4. So don't use 2.4 for now. If you absolutely want to, make sure you install the xmlrpc gem manually.*
+    $ rm .ruby-version # Unsets Ruby 2.7.0 as the default version in the current folder.
 
 ## Cron usage
 
 Instead of the cron command in the readme, when using rbenv it would look like the following:
 
 ```cron
-18 3 * * *     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]
+18 3 * * *     RBENV_ROOT=~/.rbenv RBENV_VERSION=2.7.0 ~/.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]
 ```
 
 ## Upgrading
@@ -27,5 +25,5 @@ Instead of the cron command in the readme, when using rbenv it would look like t
 To upgrade the installed version, run:
 
 ```sh
-RBENV_VERSION=2.3.1 gem install letsencrypt_webfaction
+RBENV_VERSION=2.7.0 gem install letsencrypt_webfaction
 ```

data/docs/upgrading.md

@@ -7,6 +7,23 @@ Switching to ACMEv2 broke backwards compatibility in a couple ways.
 directory = "https://acme-staging-v02.api.letsencrypt.org/directory" # Staging
 #directory = "https://acme-v02.api.letsencrypt.org/directory" # Production
 ```
+- You need to change all references from Ruby 2.2 to 2.4.
+Run:
+```bash
+GEM_HOME=$HOME/.letsencrypt_webfaction/gems RUBYLIB=$GEM_HOME/lib gem2.4 install letsencrypt_webfaction
+```
+And then change
+```bash
+function letsencrypt_webfaction {
+    GEM_HOME=$HOME/.letsencrypt_webfaction/gems PATH=$PATH:$GEM_HOME/bin RUBYLIB=$GEM_HOME/lib ruby2.2 $HOME/.letsencrypt_webfaction/gems/bin/letsencrypt_webfaction $*
+}
+```
+to
+```bash
+function letsencrypt_webfaction {
+    GEM_HOME=$HOME/.letsencrypt_webfaction/gems PATH=$PATH:$GEM_HOME/bin RUBYLIB=$GEM_HOME/lib ruby2.4 $HOME/.letsencrypt_webfaction/gems/bin/letsencrypt_webfaction $*
+}
+```
 
 # Upgrading from v2 to v3
 

data/exe/letsencrypt_webfaction

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'letsencrypt_webfaction/application'
 require 'letsencrypt_webfaction/errors'

data/letsencrypt_webfaction.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'letsencrypt_webfaction'
@@ -25,11 +27,9 @@ Gem::Specification.new do |spec|
   spec.cert_chain  = ['certs/will_in_wi.pem']
   spec.signing_key = File.expand_path('~/.ssh/gem-private_key.pem') if $PROGRAM_NAME.end_with?('gem')
 
-  spec.required_ruby_version = '>= 2.2.0'
+  spec.required_ruby_version = '>= 2.4.0'
 
   spec.add_runtime_dependency 'acme-client', '~> 2.0'
-  spec.add_runtime_dependency 'toml-rb', '~> 1.1'
-
-  # This will be required for Ruby 2.4. But it is incompatible for Ruby <2.3. Unsupporting Ruby 2.4 for the moment.
-  # spec.add_runtime_dependency 'xmlrpc', '~> 0.3.0'
+  spec.add_runtime_dependency 'toml-rb', '~> 2.0'
+  spec.add_runtime_dependency 'xmlrpc', '~> 0.3.0'
 end

data/lib/letsencrypt_webfaction.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LetsencryptWebfaction
-  VERSION = '4.0.0'.freeze
+  VERSION = '4.0.1'
 end

data/lib/letsencrypt_webfaction/application.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'letsencrypt_webfaction/application/init'
 require 'letsencrypt_webfaction/application/run'
 require 'letsencrypt_webfaction/application/version'

data/lib/letsencrypt_webfaction/application/init.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'letsencrypt_webfaction/options'
 
 require 'pathname'

data/lib/letsencrypt_webfaction/application/run.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'letsencrypt_webfaction/options'
 require 'letsencrypt_webfaction/errors'
 require 'letsencrypt_webfaction/webfaction_api_credentials'

data/lib/letsencrypt_webfaction/application/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'letsencrypt_webfaction'
 
 module LetsencryptWebfaction

data/lib/letsencrypt_webfaction/certificate_installer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'xmlrpc/client'
 
 module LetsencryptWebfaction

data/lib/letsencrypt_webfaction/certificate_issuer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'acme-client'
 require 'letsencrypt_webfaction/domain_validator'
 require 'letsencrypt_webfaction/certificate_installer'

data/lib/letsencrypt_webfaction/domain_validator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 
 module LetsencryptWebfaction

data/lib/letsencrypt_webfaction/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LetsencryptWebfaction
   class Error < StandardError; end
   class InvalidConfigValueError < Error; end

data/lib/letsencrypt_webfaction/logger_output.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LetsencryptWebfaction
   class LoggerOutput
     attr_accessor :quiet

data/lib/letsencrypt_webfaction/options.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'toml-rb'
 require 'socket'
 
@@ -7,7 +9,7 @@ module LetsencryptWebfaction
   class Options
     NON_BLANK_FIELDS = %i[username password letsencrypt_account_email directory api_url servername].freeze
 
-    WEBFACTION_API_URL = 'https://api.webfaction.com/'.freeze
+    WEBFACTION_API_URL = 'https://api.webfaction.com/'
 
     def initialize(args)
       @config = args

data/lib/letsencrypt_webfaction/options/certificate.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LetsencryptWebfaction
   class Options
     class Certificate
@@ -43,7 +45,7 @@ module LetsencryptWebfaction
           e[:method] = 'must be "http01"' unless SUPPORTED_VALIDATION_METHODS.include?(validation_method)
           e[:public] = "can't be empty" if public_dirs.none?
           e[:name] = "can't be blank" if cert_name.nil? || cert_name == ''
-          e[:name] = 'can only include letters, numbers, and underscores' if cert_name =~ VALID_CERT_NAME
+          e[:name] = 'can only include letters, numbers, and underscores' if VALID_CERT_NAME.match?(cert_name)
           e[:key_size] = "must be one of #{VALID_KEY_SIZES.join(', ')}" unless VALID_KEY_SIZES.include?(key_size)
         end
       end

data/lib/letsencrypt_webfaction/webfaction_api_credentials.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'xmlrpc/client'
 
 module LetsencryptWebfaction

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: letsencrypt_webfaction
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - William Johnston
@@ -30,7 +30,7 @@ cert_chain:
   is7nzWq9MtbVDHPaE5a10t+7UoSjPzWFe4qKnxjB8RjfGymDvy4+H2eJbRQE932E
   Dm3/IFNc1K3ekU2WQEZ3O0WHQY8bCBgCAD/U/CiTaLUOm4VsPnYLAx4=
   -----END CERTIFICATE-----
-date: 2020-04-16 00:00:00.000000000 Z
+date: 2020-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acme-client
@@ -52,14 +52,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: xmlrpc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 0.3.0
 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
@@ -117,15 +131,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: LetsEncrypt utility client for WebFaction hosts.