certman 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d89d9a320523fc5a4210da7f05b4ec2361ecfcdb
-  data.tar.gz: 65d4716ae2aaa87a25089a76f47fadb013f231b9
+  metadata.gz: 4d6988b46822e6553cc575f7e35892a81d7cda4c
+  data.tar.gz: e17c100e724f69cd10f8a70f7d36d8a0871aacdf
 SHA512:
-  metadata.gz: 83536f29827dabfa6bfa44323401c86d1a27f6b5a7b26577c088d2bf715b61e1a16e942eddc541e90aa4340077cc345154bd6767fe261d90a128af01e9f476ad
-  data.tar.gz: d4e8e82cf020c029a28af49998d92e029c311dd14477a631026c50fd6adfc12c8c3877b71a3ee41786ee185cac0f1e82c1e1b19b7981c17e1d2fce740d945f6f
+  metadata.gz: 9a03d13182aaae1bce1764fac694039cb6b900fcebc78bb8b3515f18758de04c67b374f3bb2875cddbd1c72bf27b0fb6575cd9a78cb080c6123ca0004a473591
+  data.tar.gz: 98d3f4f5be6e3cbcc1578ec0a000eaf346d90002a03f95184cc46651d3318fc562c473516a8d8a7023d035d4ab54f9d4addc8d94dc5b02638c8c53f529062c10

data/lib/certman/cli.rb

@@ -7,7 +7,7 @@ module Certman
       prompt = TTY::Prompt.new
       return unless prompt.yes?(pastel.red("NOTICE! Your selected region is *#{Aws.config[:region]}*. \
 Certman create certificate on *#{Aws.config[:region]}*. OK?"))
-      unless ['us-east-1', 'us-west-2', 'eu-west-1'].include?(Aws.config[:region])
+      unless Certman::Resource::SES::REGIONS.include?(Aws.config[:region])
         return unless prompt.yes?(pastel.red('NOTICE! Certman use *us-east-1* S3/SES. OK?'))
       end
       return unless prompt.yes?(pastel.red('NOTICE! When requesting, Certman replace Active Receipt Rule Set. OK?'))

data/lib/certman/client.rb

@@ -102,7 +102,7 @@ module Certman
 
     def enforce_region_to_us_east_1
       region = Aws.config[:region]
-      unless ['us-east-1', 'us-west-2', 'eu-west-1'].include?(Aws.config[:region])
+      unless Certman::Resource::SES::REGIONS.include?(Aws.config[:region])
         Aws.config[:region] = 'us-east-1'
       end
       yield
@@ -171,19 +171,15 @@ module Certman
     end
 
     def bucket_name
-      @bucket_name ||= if "#{@domain}-generated-by-certman-for-ses-inbound-".length < 63
-                         "#{@domain}-generated-by-certman-for-ses-inbound-"
-                       elsif "#{@domain}-certman-".length < 63
-                         "#{@domain}-certman-"
+      @bucket_name ||= if "#{@domain}-certman".length < 63
+                         "#{@domain}-certman"
                        else
-                         "#{Digest::SHA1.hexdigest(@domain)}-certman-"
+                         "#{Digest::SHA1.hexdigest(@domain)}-certman"
                        end
     end
 
     def rule_name
-      @rule_name ||= if "S3RuleGeneratedByCertman_#{@domain}".length < 64
-                       "S3RuleGeneratedByCertman_#{@domain}"
-                     elsif "RuleCertman_#{@domain}".length < 64
+      @rule_name ||= if "RuleCertman_#{@domain}".length < 64
                        "RuleCertman_#{@domain}"
                      else
                        "RuleCertman_#{Digest::SHA1.hexdigest(@domain)}"
@@ -191,9 +187,7 @@ module Certman
     end
 
     def rule_set_name
-      @rule_set_name ||= if "RuleSetGeneratedByCertman_#{@domain}".length < 64
-                           "RuleSetGeneratedByCertman_#{@domain}"
-                         elsif "RuleSetCertman_#{@domain}".length < 64
+      @rule_set_name ||= if "RuleSetCertman_#{@domain}".length < 64
                            "RuleSetCertman_#{@domain}"
                          else
                            "RuleSetCertman_#{Digest::SHA1.hexdigest(@domain)}"

data/lib/certman/resource/ses.rb

@@ -1,6 +1,8 @@
 module Certman
   module Resource
     module SES
+      REGIONS = %w(us-east-1 us-west-2 eu-west-1)
+
       def create_domain_identity
         res = ses.verify_domain_identity(domain: @domain)
         @token = res.verification_token

data/lib/certman/version.rb

@@ -1,3 +1,3 @@
 module Certman
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: certman
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-09 00:00:00.000000000 Z
+date: 2017-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk