letscert 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cfc8029c8899c6a18ee1c61144cbf6b5ed7abe1
-  data.tar.gz: a3d1003fa3e102cbd986253947a3fd9df60d14ae
+  metadata.gz: 9713b8f8c57715a49c9a47ee496be861b140605e
+  data.tar.gz: b066af17d583c2a87e246729fe4ec52478b529b2
 SHA512:
-  metadata.gz: 4dcc9323bc64e22f3268c3c16dd7958bf94c7a78612b6826b568b263994cc8659c681139fa87ceda200dc6d567d7df5455c192f1753b385ecc116ef0d4253696
-  data.tar.gz: f6001ff81d51e9d3cc183bc1a4b2d737be4194c93a75788f7f53233d5e8f24a4b2f7165d1788a251570003b63756dafdaf7b4c5db07f9ce410276d7eca0d1d2b
+  metadata.gz: cf1ee72bfb5f7e348ab4dbe35a674e2c723e8004f241a28a705787d9947ab1d1abe1fd0b8788d84f3b7c8734ccd34f6cc6b44b1513f1f5c239b788506a757410
+  data.tar.gz: b2bf80554770b4545bf343b12676412b6074979dc92d6e9966ac7bdc9922bef503afa201dd538d20f187f7146f4388ff9ecadab073aec0019dcd824e4f6963bd

data/Gemfile

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'rubocop', '~> 0.42.0', require: false
+gem 'rubocop', '~> 0.45', require: false

data/letscert.gemspec

@@ -23,7 +23,7 @@ EOF
 
   s.required_ruby_version = '>= 2.1.0'
 
-  s.add_dependency 'acme-client', '~>0.4.0'
+  s.add_dependency 'acme-client', '~>0.5.0'
 
   s.add_development_dependency 'bundler', '~> 1.12'
   s.add_development_dependency 'rake', '~> 10.0'

data/lib/letscert/certificate.rb

@@ -201,6 +201,7 @@ module LetsCert
     def check_roots(roots)
       no_roots = roots.select { |_k, v| v.nil? }
 
+      # rubocop:disable Style/GuardClause
       unless no_roots.empty?
         raise Error, 'root for the following domain(s) are not specified: ' \
                      "#{no_roots.keys.join(', ')}.\nTry --default_root or " \
@@ -288,10 +289,14 @@ module LetsCert
     def renewal_necessary?(valid_min)
       now = Time.now.utc
       diff = (@cert.not_after - now).to_i
-      logger.debug { "Certificate expires in #{diff}s on #{@cert.not_after}" \
-                     " (relative to #{now})" }
 
-      diff < valid_min
+      if diff < valid_min
+        true
+      else
+        logger.info { "Certificate expires in #{ValidTime.time_in_words diff}" \
+                      " on #{@cert.not_after} (relative to #{now})" }
+        false
+      end
     end
 
     # Generate new certificate for given domains with existing private key

data/lib/letscert/io_plugins/account_key.rb

@@ -46,5 +46,5 @@ module LetsCert
 
   end
 
-  IOPlugin.register(AccountKey, 'account_key.json')
+  IOPlugin.register(AccountKey, 'account_key.json'.freeze)
 end

data/lib/letscert/io_plugins/cert_file.rb

@@ -45,6 +45,6 @@ module LetsCert
 
   end
 
-  IOPlugin.register(CertFile, 'cert.pem', :pem)
-  IOPlugin.register(CertFile, 'cert.der', :der)
+  IOPlugin.register(CertFile, 'cert.pem'.freeze, :pem)
+  IOPlugin.register(CertFile, 'cert.der'.freeze, :der)
 end

data/lib/letscert/io_plugins/chain_file.rb

@@ -49,5 +49,5 @@ module LetsCert
 
   end
 
-  IOPlugin.register(ChainFile, 'chain.pem', :pem)
+  IOPlugin.register(ChainFile, 'chain.pem'.freeze, :pem)
 end

data/lib/letscert/io_plugins/full_chain_file.rb

@@ -54,5 +54,5 @@ module LetsCert
 
   end
 
-  IOPlugin.register(FullChainFile, 'fullchain.pem', :pem)
+  IOPlugin.register(FullChainFile, 'fullchain.pem'.freeze, :pem)
 end

data/lib/letscert/io_plugins/key_file.rb

@@ -45,6 +45,6 @@ module LetsCert
 
   end
 
-  IOPlugin.register(KeyFile, 'key.pem', :pem)
-  IOPlugin.register(KeyFile, 'key.der', :der)
+  IOPlugin.register(KeyFile, 'key.pem'.freeze, :pem)
+  IOPlugin.register(KeyFile, 'key.der'.freeze, :der)
 end

data/lib/letscert/io_plugins/openssl_io_plugin.rb

@@ -32,10 +32,7 @@ module LetsCert
     # @param [:pem,:der] type
     # @raise [ArgumentError] unsupported type
     def initialize(name, type)
-      case type
-      when :pem
-      when :der
-      else
+      unless [:pem, :der].include? type
         raise ArgumentError, 'type should be :pem or :der'
       end
 

data/lib/letscert/runner.rb

@@ -25,8 +25,8 @@ require 'fileutils'
 
 require_relative 'io_plugin'
 require_relative 'certificate'
+require_relative 'valid_time'
 require_relative 'runner/logger_formatter'
-require_relative 'runner/valid_time'
 
 module LetsCert
 
@@ -105,6 +105,7 @@ module LetsCert
     # @raise [OptionParser::InvalidOption] on unrecognized or malformed option
     # @return [void]
     # rubocop:disable Metrics/MethodLength
+    # rubocop:disable Metrics/BlockLength
     def parse_options
       @opt_parser = OptionParser.new do |opts|
         opts.banner = 'Usage: lestcert [options]'

data/lib/letscert/valid_time.rb

@@ -0,0 +1,88 @@
+# The MIT License (MIT)
+#
+# Copyright (c) 2016 Sylvain Daubert
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+module LetsCert
+
+  # Class used to process validation time from String.
+  # @author Sylvain Daubert
+  class ValidTime
+
+    # Number of seconds in one minute
+    SECONDS_IN_ONE_MINUTE = 60
+    # Number of seconds in one hour
+    SECONDS_IN_ONE_HOUR = 60 * 60
+    # Number of seconds in one day
+    SECONDS_IN_ONE_DAY = 24 * 60 * 60
+
+    # Get time in words (e.g. xx days or xx hours)
+    # @param [Integer] seconds
+    # @return [String]
+    def self.time_in_words(seconds)
+      if seconds < SECONDS_IN_ONE_MINUTE
+        '%u seconds' % seconds
+      elsif seconds < SECONDS_IN_ONE_HOUR
+        'about %u minutes' % (seconds / SECONDS_IN_ONE_MINUTE)
+      elsif seconds < SECONDS_IN_ONE_DAY
+        'about %u hours' % (seconds / SECONDS_IN_ONE_HOUR)
+      else
+        'about %u days' % (seconds / SECONDS_IN_ONE_DAY)
+      end
+    end
+
+    # @param [String] str time string. May be:
+    #   * an integer -> time in seconds
+    #   * an integer plus a letter:
+    #     * 30m: 30 minutes,
+    #     * 30h: 30 hours,
+    #     * 30d: 30 days.
+    def initialize(str)
+      m = str.match(/^(\d+)([mhd])?$/)
+      if m
+        @seconds = case m[2]
+                   when nil
+                     m[1].to_i
+                   when 'm'
+                     m[1].to_i * SECONDS_IN_ONE_MINUTE
+                   when 'h'
+                     m[1].to_i * SECONDS_IN_ONE_HOUR
+                   when 'd'
+                     m[1].to_i * SECONDS_IN_ONE_DAY
+                   end
+      else
+        raise OptionParser::InvalidArgument,
+              "invalid argument: valid-min #{str}"
+      end
+      @string = str
+    end
+
+    # Get time in seconds
+    # @return [Integer]
+    def to_seconds
+      @seconds
+    end
+
+    # Get time as string
+    # @return [String]
+    def to_s
+      @string
+    end
+  end
+end

data/lib/letscert/version.rb

@@ -1,6 +1,6 @@
 module LetsCert
 
   # Letscert version number
-  VERSION = '0.4.4'.freeze
+  VERSION = '0.4.5'.freeze
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: letscert
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Sylvain Daubert
@@ -31,7 +31,7 @@ cert_chain:
   dMi8WSKt03lfzyxIqZseBwVYYn+XMlzCcJLXCUgZXHcBRRRDH5wGDqOqXjL25b2O
   6m3JJngqkCFrOw==
   -----END CERTIFICATE-----
-date: 2016-11-01 00:00:00.000000000 Z
+date: 2016-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acme-client
@@ -39,14 +39,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -164,7 +164,7 @@ files:
 - lib/letscert/loggable.rb
 - lib/letscert/runner.rb
 - lib/letscert/runner/logger_formatter.rb
-- lib/letscert/runner/valid_time.rb
+- lib/letscert/valid_time.rb
 - lib/letscert/version.rb
 homepage: https://github.com/sdaubert/letscert
 licenses:

data/lib/letscert/runner/valid_time.rb

@@ -1,69 +0,0 @@
-# The MIT License (MIT)
-#
-# Copyright (c) 2016 Sylvain Daubert
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-module LetsCert
-  class Runner
-
-    # Class used to process validation time from String.
-    # @author Sylvain Daubert
-    class ValidTime
-
-      # @param [String] str time string. May be:
-      #   * an integer -> time in seconds
-      #   * an integer plus a letter:
-      #     * 30m: 30 minutes,
-      #     * 30h: 30 hours,
-      #     * 30d: 30 days.
-      def initialize(str)
-        m = str.match(/^(\d+)([mhd])?$/)
-        if m
-          @seconds = case m[2]
-                     when nil
-                       m[1].to_i
-                     when 'm'
-                       m[1].to_i * 60
-                     when 'h'
-                       m[1].to_i * 60 * 60
-                     when 'd'
-                       m[1].to_i * 24 * 60 * 60
-                     end
-        else
-          raise OptionParser::InvalidArgument,
-                "invalid argument: --valid-min #{str}"
-        end
-        @string = str
-      end
-
-      # Get time in seconds
-      # @return [Integer]
-      def to_seconds
-        @seconds
-      end
-
-      # Get time as string
-      # @return [String]
-      def to_s
-        @string
-      end
-    end
-
-  end
-end