sumomo 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eedd627e371d22547e9f4a25f5eb7f913116a391
-  data.tar.gz: 3ed9a3f02775ede22c5072ea0b1f9136e9242489
+  metadata.gz: da1b5b6612475c1c796f2fc3e25d24b941e6a37f
+  data.tar.gz: b67672d8fb1595aa5c373bf694f675440bbe1839
 SHA512:
-  metadata.gz: 8a542867a471555b413c97eda75e6bf42b3d44d4b763f682982150de9b8beccffaee828930df0ada01958f70cf0f47e0e7ff5d31a93298cd9c8037fa684461c1
-  data.tar.gz: f7d7a7e77372122f0a97cef34e99bee744a6159caf8f0f675793819f2c3a74f93f39265483f377996e04708d96dacfe211c05998a44ab51dedc49d1fbb6e8871
+  metadata.gz: 85a1b46df2f52fb00d462c509094cd1b544f1acc5f3b34f29fd28ceaeaf0d88461fbeaac31af43fe537cf81f51c751b1940597543ed8c9ed7146d42daaaf50f3
+  data.tar.gz: 9a36dbedaa1bbe0a366625255b44a3bb78ad435ded63669294ee5e8401e135ecdae0dfe2fe63e8fd133187c6421849a40ad9a5c170d5fc936f6f465d2c42ae5c

data/lib/sumomo/api.rb

@@ -177,6 +177,7 @@ module Sumomo
                 HostedZoneId dns[:hosted_zone]
                 Name domain_name
                 Type "CNAME"
+                ResourceRecords [ call("Fn::Join", "", [api, ".execute-api.", ref("AWS::Region"), ".amazonaws.com"]) ]
             end
             domain_name
         else

data/lib/sumomo/cdn.rb

@@ -1,12 +1,15 @@
 
 module Sumomo
   module Stack
-    def make_cdn_from_dir(domain:, dir:, low_ttl: [])
+    def make_cdn_from_dir(domain:, dns:nil, name:nil, dir:, low_ttl: [])
 
         bucket_name = @bucket_name
 
+        name ||= make_default_resource_name("CDN")
+
         puts "Uploading files..."
-        `aws s3 sync #{dir} "s3://#{bucket_name}/uploads/#{domain}" --size-only --delete`
+        `aws --version`
+        `aws s3 --region #{@region} sync #{dir} "s3://#{bucket_name}/uploads/#{domain}" --size-only --delete`
         puts "Done."
 
         oai = make "Custom::OriginAccessIdentity"
@@ -29,7 +32,7 @@ module Sumomo
             })
         end
 
-        make "AWS::CloudFront::Distribution" do
+        cdn = make "AWS::CloudFront::Distribution", name: name do
             DistributionConfig do
                 Origins [{
                     Id: "originBucket",
@@ -77,6 +80,30 @@ module Sumomo
                 end
             end
         end
+
+        root_name = /(?<root_name>[^.]+\.[^.]+)$/.match(domain)[:root_name]
+
+        if !dns
+
+        elsif dns[:type] == :cloudflare
+            make "Custom::CloudflareDNSEntry", name: "#{name}CloudFlareEntry" do
+                Key dns[:key]
+                Email dns[:email]
+                Domain root_name
+                Entry domain.sub(/#{root_name}$/, "").chomp(".")
+                CNAME cdn.DomainName
+            end
+        elsif dns[:type] == :route53
+            make "AWS::Route53::RecordSet", name: "#{name}Route53Entry" do
+                HostedZoneId dns[:hosted_zone]
+                Name domain
+                Type "CNAME"
+                ResourceRecords [ cdn.DomainName ]
+            end
+        end
+
+        cdn
+
     end
   end
 end

data/lib/sumomo/version.rb

@@ -1,3 +1,3 @@
 module Sumomo
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

data/sumomo.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "momo", "0.4.1"
   spec.add_dependency "s3cabinet"
-  spec.add_dependency "aws-sdk", "2.10.9"
+  spec.add_dependency "aws-sdk", "~> 2"
   spec.add_dependency "rubyzip"
   spec.add_dependency "activesupport"
   spec.add_dependency "hashie"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sumomo
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - David Siaw
@@ -84,16 +84,16 @@ dependencies:
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.9
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.9
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement