acmesmith 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51baf45477f91b7ca8981c3e8da445348f44528f
-  data.tar.gz: 7ec32294fede6b7dd89e6f651e25dcb967d6a878
+  metadata.gz: 0a2e1bf037c36dc0857c9cdde9192e9dffe196a6
+  data.tar.gz: d04ffac3735b0af4b0e9394749ae015d9dc16eb3
 SHA512:
-  metadata.gz: 2deb54d234db5b03fa4b989e84b31a199973896daae57d8da3353e829f0dec3c094332837bebaba2dc9f1597a36d6516aa7da009352d66170c4b045d50e26d86
-  data.tar.gz: 4764a56467552cf763878b1857ef5989a2162cbb3013a1e28aa7ed3f343e849bb02cb6470414dbfc6af0073b7dfb86172d98847237b6bcd9b4a9fb58cbc9e967
+  metadata.gz: 44f73438e93e201a937a769ae8481c8696144d190c238584af7cfec216616f9c76d8bfe5cb4f4fe4c3f4d107435e2e288fdfdde0394c992835c2ccb554abc088
+  data.tar.gz: 58efd6b4f0dc19f0602cf69f41ccf5a4659a3e58b58e8fdf4da5df09701e1da749da1d8ed69c5b407b5beb415ddcb9daea18d3122ca3dadbc883e9acf4321507

data/README.md

@@ -139,9 +139,9 @@ challenge_responders:
       #   "example.org.": "/hostedzone/DEADBEEF"
 ```
 
-### Post Issueing Hooks
+### Post Issuing Hooks
 
-Post issueing hooks are configurable actions that are executed
+Post issuing hooks are configurable actions that are executed
 when a new certificate has been succesfully issued. The hooks are
 sequentially executed in the same order as they are configured, and they
 are configurable per certificate's common-name.
@@ -151,7 +151,7 @@ are configurable per certificate's common-name.
 Execute specified command on a shell. Environment variable `${COMMON_NAME}` is available.
 
 ```
-post_issueing_hooks:
+post_issuing_hooks:
   "test.example.com":
     - shell:
         command: mail -s "New cert for ${COMMON_NAME} has been issued" user@example.com < /dev/null
@@ -167,7 +167,7 @@ post_issueing_hooks:
 Import certificate into AWS ACM.
 
 ```
-post_issueing_hooks:
+post_issuing_hooks:
   "test.example.com":
     - acm:
         region: us-east-1 # required

data/lib/acmesmith/client.rb

@@ -103,8 +103,13 @@ module Acmesmith
       cert
     end
 
+    def post_issue_hooks(common_name)
+      cert = storage.get_certificate(common_name)
+      execute_post_issue_hooks(cert)
+    end
+
     def execute_post_issue_hooks(certificate)
-      hooks = config.post_issueing_hooks(certificate.common_name)
+      hooks = config.post_issuing_hooks(certificate.common_name)
       hooks.each do |hook|
         hook.run(certificate: certificate)
       end

data/lib/acmesmith/command.rb

@@ -26,7 +26,7 @@ module Acmesmith
       puts cert.certificate.to_pem
     end
 
-    desc "post-issue-hooks COMMON_NAME", "Run all post-issueing hooks for common name. (for testing purpose)"
+    desc "post-issue-hooks COMMON_NAME", "Run all post-issuing hooks for common name. (for testing purpose)"
     def post_issue_hooks(common_name)
       client.post_issue_hooks(common_name)
     end

data/lib/acmesmith/config.rb

@@ -1,7 +1,7 @@
 require 'yaml'
 require 'acmesmith/storages'
 require 'acmesmith/challenge_responders'
-require 'acmesmith/post_issueing_hooks'
+require 'acmesmith/post_issuing_hooks'
 
 module Acmesmith
   class Config
@@ -22,6 +22,11 @@ module Acmesmith
       unless @config['endpoint']
         raise ArgumentError, "config['endpoint'] must be provided, e.g. https://acme-v01.api.letsencrypt.org/ or https://acme-staging.api.letsencrypt.org/"
       end
+
+      if @config['post_issueing_hooks']
+        warn '!! Deprecation warning: configuration "post_issueing_hooks" is now "post_issuing_hooks" (what a typo!). It will not work in the future release.'
+        @config['post_issuing_hooks'] = @config.delete('post_issueing_hooks')
+      end
     end
 
     def [](key)
@@ -51,12 +56,12 @@ module Acmesmith
       end
     end
 
-    def post_issueing_hooks(common_name)
-      if @config.key?('post_issueing_hooks') && @config['post_issueing_hooks'].key?(common_name)
-        specs = @config['post_issueing_hooks'][common_name]
+    def post_issuing_hooks(common_name)
+      if @config.key?('post_issuing_hooks') && @config['post_issuing_hooks'].key?(common_name)
+        specs = @config['post_issuing_hooks'][common_name]
         specs.flat_map do |specs_sub|
           specs_sub.map do |k, v|
-            PostIssueingHooks.find(k).new(**v.map{ |k_,v_| [k_.to_sym, v_]}.to_h)
+            PostIssuingHooks.find(k).new(**v.map{ |k_,v_| [k_.to_sym, v_]}.to_h)
           end
         end
       else

data/lib/acmesmith/post_issueing_hooks.rb

@@ -1,9 +1,5 @@
-require 'acmesmith/utils/finder'
+require 'acmesmith/post_issuing_hooks'
+
+warn "!! DEPRECATION WARNING: PostIssueingHooks is deprecated, use PostIssuingHooks (#{caller[0]})"
+
 
-module Acmesmith
-  module PostIssueingHooks
-    def self.find(name)
-      Utils::Finder.find(self, 'acmesmith/post_issueing_hooks', name)
-    end
-  end
-end

data/lib/acmesmith/post_issueing_hooks/base.rb

@@ -1,21 +1,9 @@
-module Acmesmith
-  module PostIssueingHooks
-    class Base
-      attr_reader :certificate
-
-      def common_name
-        certificate.common_name
-      end
+require 'acmesmith/post_issuing_hooks/base'
 
-      def run(certificate:)
-        @certificate = certificate
-        execute
-      end
+warn "!! DEPRECATION WARNING: PostIssueingHooks::Base is deprecated, use PostIssuingHooks::Base (#{caller[0]})"
 
-      def execute
-        raise NotImplementedError
-      end
-    end
+module Acmesmith
+  module PostIssueingHooks
+    Base = PostIssuingHooks::Base
   end
 end
-

data/lib/acmesmith/post_issuing_hooks.rb

@@ -0,0 +1,26 @@
+require 'acmesmith/utils/finder'
+
+module Acmesmith
+  module PostIssueingHooks
+    def self.find(name)
+      warn "!! DEPRECATION WARNING: PostIssueingHooks.find is deprecated, use PostIssuingHooks.find (#{caller[0]})"
+      return Utils::Finder.find(self, 'acmesmith/post_issueing_hooks', name)
+    end
+  end
+
+  module PostIssuingHooks
+    def self.find(name)
+      begin 
+        return Utils::Finder.find(self, 'acmesmith/post_issuing_hooks', name)
+      rescue Utils::Finder::NotFound => e
+        begin
+          klass = Utils::Finder.find(PostIssueingHooks, 'acmesmith/post_issueing_hooks', name)
+          warn "!! DEPRECATION WARNING (#{klass}): Placing in acmesmith/post_issueing_hooks/... is deprecated. Move to acmesmith/post_issuing_hooks/..."
+          return klass
+        rescue Utils::Finder::NotFound
+          raise e
+        end
+      end
+    end
+  end
+end

data/lib/acmesmith/{post_issueing_hooks → post_issuing_hooks}/acm.rb

@@ -1,8 +1,8 @@
 require 'aws-sdk'
-require 'acmesmith/post_issueing_hooks/base'
+require 'acmesmith/post_issuing_hooks/base'
 
 module Acmesmith
-  module PostIssueingHooks
+  module PostIssuingHooks
     class Acm < Base
       def initialize(certificate_arn: nil, region:)
         @certificate_arn = certificate_arn

data/lib/acmesmith/post_issuing_hooks/base.rb

@@ -0,0 +1,21 @@
+module Acmesmith
+  module PostIssuingHooks
+    class Base
+      attr_reader :certificate
+
+      def common_name
+        certificate.common_name
+      end
+
+      def run(certificate:)
+        @certificate = certificate
+        execute
+      end
+
+      def execute
+        raise NotImplementedError
+      end
+    end
+  end
+end
+

data/lib/acmesmith/{post_issueing_hooks → post_issuing_hooks}/shell.rb

@@ -1,8 +1,8 @@
 require 'open3'
-require 'acmesmith/post_issueing_hooks/base'
+require 'acmesmith/post_issuing_hooks/base'
 
 module Acmesmith
-  module PostIssueingHooks
+  module PostIssuingHooks
     class Shell < Base
       def initialize(command:, ignore_failure: false)
         @command = command

data/lib/acmesmith/utils/finder.rb

@@ -1,7 +1,9 @@
 module Acmesmith
   module Utils
     module Finder
-      def self.find(const, prefix, name)
+      class NotFound < StandardError; end
+
+      def self.find(const, prefix, name, error: true)
         retried = false
         constant_name = name.to_s.gsub(/\A.|_./) { |s| s[-1].upcase }
 
@@ -18,7 +20,11 @@ module Acmesmith
             retry
           end
 
-          nil
+          if error
+            raise NotFound, "Couldn't find #{name.inspect} for #{const}"
+          else
+            nil
+          end
         end
       end
     end

data/lib/acmesmith/version.rb

@@ -1,3 +1,3 @@
 module Acmesmith
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acmesmith
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - sorah (Shota Fukumori)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-29 00:00:00.000000000 Z
+date: 2017-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acme-client
@@ -128,9 +128,11 @@ files:
 - lib/acmesmith/command.rb
 - lib/acmesmith/config.rb
 - lib/acmesmith/post_issueing_hooks.rb
-- lib/acmesmith/post_issueing_hooks/acm.rb
 - lib/acmesmith/post_issueing_hooks/base.rb
-- lib/acmesmith/post_issueing_hooks/shell.rb
+- lib/acmesmith/post_issuing_hooks.rb
+- lib/acmesmith/post_issuing_hooks/acm.rb
+- lib/acmesmith/post_issuing_hooks/base.rb
+- lib/acmesmith/post_issuing_hooks/shell.rb
 - lib/acmesmith/storages.rb
 - lib/acmesmith/storages/base.rb
 - lib/acmesmith/storages/filesystem.rb
@@ -159,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: ACME client (Let's encrypt client) to manage certificate in multi server