letsencrypt-cli 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5daeb88cfefed35938043bd207c5f0da83e5459
-  data.tar.gz: c957d6ef5ff7b213b7c20e6d0cd1d29f71da898f
+  metadata.gz: c4eb9d68be78e9203cd742d79ae99edbb4da397f
+  data.tar.gz: d0c8b29ee9be5371c44743beed65afb0bad9ebff
 SHA512:
-  metadata.gz: ca8f5bdbd2f673933c945bec5a952e327aa20e96c9e51c9e14d27c1eb9ccbe52fad6c0a4df1c721310d545a28c1613830203f7034601a62d64bd60f08e748a1c
-  data.tar.gz: 289b3b107fae7f86377a1606debc2dbccbd3eecdeecf128a1efb4c44fbc781acb2b2bc1230d9b152b30e0e12316d2a987175298639a847aa5c9f892ae3150760
+  metadata.gz: 0c4e4b92a4bb85d480d0439f521559f88b1c4ecbf504f7ff571e67d2e0d523b0a1eb82c64072d3a6eadf910aeb54b62a6481d07332d799c3a9861864d68f764b
+  data.tar.gz: ec42ddcc2a121f002072bcb1c4ad25a097449960c9f283dde9d7dfba37c916dbc10c59f6f758d96ae00c9d22fda4a9e27e0fb55036a9437195c6bdd17ae2e04e

data/lib/letsencrypt/cli/acme_wrapper.rb

@@ -132,7 +132,12 @@ class AcmeWrapper
       log "Certificate '#{@options[:certificate_path]}' missing domains #{missing_domains.join(' ')}. Existing: #{domains_in_cert.join(' ')}", :warn
       return false
     end
-    renew_on = cert.not_after.to_date - @options[:days_valid]
+    expires_on = cert.not_after.to_date
+    if expires_on <= Date.today
+      log "Certificate '#{@options[:certificate_path]}' has expired on #{expires_on}.", :warn
+      return false
+    end
+    renew_on = expires_on - @options[:days_valid]
     if renew_on > Date.today
       log "Certificate '#{@options[:certificate_path]}' still valid till #{cert.not_after.to_date}.", :warn
       log "Won't renew until #{renew_on} (#{@options[:days_valid]} days before)", :warn

data/lib/letsencrypt/cli/app.rb

@@ -82,9 +82,10 @@ module Letsencrypt
       method_option :key_length, desc: "Length of private key", default: 2048, type: :numeric
       method_option :days_valid, desc: "If the --certificate-path already exists, only create new stuff, if that certificate isn't valid for less than the given number of days", default: 30, type: :numeric
       method_option :webroot_path, desc: "Path to mapped .well-known/acme-challenge folder (no subdirs will be created)", aliases: '-w', required: true
-      method_option :key_directory, desc: "Base directory of key creation. A subfolder with the first domain will be created where all certs + key are stored", default: "~/certs/"
+      method_option :key_directory, desc: "Base directory for certificate storage.", default: "~/certs/"
+      method_option :sub_directory, desc: "Sub-directory name in base directory where all certs + key are stored. If not set, the first domain name will be used", default: nil
       def manage(*domains)
-        key_dir = File.join(@options[:key_directory], domains.first)
+        key_dir = File.join(@options[:key_directory], @options[:sub_directory] || domains.first)
         FileUtils.mkdir_p(key_dir)
         @options = @options.merge(
           :private_key_path  => File.join(key_dir, 'key.pem'),

data/lib/letsencrypt/cli/version.rb

@@ -1,5 +1,5 @@
 module Letsencrypt
   module Cli
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: letsencrypt-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Stefan Wienert
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-31 00:00:00.000000000 Z
+date: 2016-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acme-client