stackup 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd8f6344aa29806003cac476d52ecd7070747ec3
-  data.tar.gz: 1a64e7205d279d0e7922171de005ac6ddcbb08ef
+  metadata.gz: 4c9c28add918e16fcf983d251ccc71266f985fee
+  data.tar.gz: 9d2254d1f66e6c89b112b1c9c8af9d70c0450aa7
 SHA512:
-  metadata.gz: abbf1538c8f0a04dcbd72b180803f7eb9211c07ec74eda51078135f40fd31088eaf6a3442688a6a92cee886799374475f7c4ca5ea9a350fc6fb6b6ea2ccc7b33
-  data.tar.gz: 6fd7cb6adb0b1bd846ab7a347be74f630a4ac6514db282d1f5cd3073991ce0155f80b09b100e32fbcd965f1ad30b6ab6d9caf9c7e0342756d6ee7b9c8a34dee8
+  metadata.gz: 277e194f8345b2cde8bbc8649309ef3c9487982e69a79b9ff290a4d0d1b595fa91866c446b302deac95ebf24e43d53d86cd35063d9b31746d7d9eca8a74207f2
+  data.tar.gz: f0189757457cd35688b220f6ee22240a4224740321b856821d3d8df162f527afc289451e61d4a1f1a3816c3e5db9cbf94e8031024ec378fbf11643a9d07bb990

data/CHANGES.md

@@ -1,4 +1,4 @@
-## 1.1.0 (2017-02-23)
+## 1.1.1 (2017-02-23)
 
 * The `stackup` CLI now allows stack template and policy documents to be specified as URLs.
   * Template URL must point to a template stored in an Amazon S3 bucket, e.g. `https://s3-ap-southeast-2.amazonaws.com/bucket/template.json`.

data/bin/stackup

@@ -132,7 +132,7 @@ Clamp do
   def parameters_from_files
     parameter_sources.map { |src|
       Stackup::Parameters.new(src.data).to_hash
-    }.inject(:merge)
+    }.inject({}, :merge)
   end
 
   subcommand "status", "Print stack status." do
@@ -179,7 +179,7 @@ Clamp do
       end
       options = {}
       if template_source
-        if is_s3_url?(template_source.location)
+        if template_source.s3?
           options[:template_url] = template_source.location
         else
           options[:template] = template_source.data
@@ -189,7 +189,7 @@ Clamp do
       options[:parameters] = parameters
       options[:tags] = tag_source.data if tag_source
       if policy_source
-        if is_s3_url?(policy_source.location)
+        if policy_source.s3?
           options[:stack_policy_url] = policy_source.location
         else
           options[:stack_policy] = policy_source.data
@@ -216,10 +216,6 @@ Clamp do
       end
     end
 
-    def is_s3_url?(location)
-      location =~ %r{^https://s3\w*.amazonaws.com}
-    end
-
   end
 
   subcommand "diff", "Compare template/params to current stack." do

data/lib/stackup/source.rb

@@ -14,6 +14,11 @@ module Stackup
 
     attr_reader :location
 
+    def s3?
+      uri.scheme == "https" &&
+      uri.host =~ %r{(^|\.)s3(-\w+-\w+-\d)?\.amazonaws\.com$}
+    end
+
     def body
       @body ||= read
     end
@@ -38,8 +43,12 @@ module Stackup
       end
     rescue Errno::ENOENT
       raise ReadError, "no such file: #{location.inspect}"
+    rescue Errno::ECONNREFUSED => e
+      raise ReadError, "cannot read #{location.inspect} - #{e.message}"
     rescue OpenURI::HTTPError => e
-      raise ReadError, "#{e}: #{location.inspect}"
+      raise ReadError, "cannot read #{location.inspect} - #{e.message}"
+    rescue SocketError => e
+      raise ReadError, "cannot read #{location.inspect} - #{e.message}"
     end
 
     def parse_body

data/lib/stackup/version.rb

@@ -1,5 +1,5 @@
 module Stackup
 
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 
 end

data/spec/stackup/source_spec.rb

@@ -12,7 +12,7 @@ describe Stackup::Source do
 
     let(:json_file) { File.join(example_dir, "template.json") }
 
-    subject(:source) { described_class.new(json_file) }
+    subject(:src) { described_class.new(json_file) }
 
     describe "#body" do
 
@@ -30,13 +30,17 @@ describe Stackup::Source do
 
     end
 
+    it "is not S3" do
+      expect(subject).not_to be_s3
+    end
+
   end
 
   context "from a YAML file" do
 
     let(:yaml_file) { File.join(example_dir, "template.yml") }
 
-    subject(:source) { described_class.new(yaml_file) }
+    subject(:src) { described_class.new(yaml_file) }
 
     describe "#body" do
 
@@ -60,7 +64,7 @@ describe Stackup::Source do
 
     let(:bogus_file) { "notreallythere.json" }
 
-    subject(:source) { described_class.new(bogus_file) }
+    subject(:src) { described_class.new(bogus_file) }
 
     describe "#body" do
 
@@ -72,4 +76,54 @@ describe Stackup::Source do
 
   end
 
+  context "with an HTTP URL" do
+
+    let(:url) { "https://example.com/template.json" }
+
+    subject(:src) { described_class.new(url) }
+
+    it "is not S3" do
+      expect(subject).not_to be_s3
+    end
+
+  end
+
+  context "with an S3 URL" do
+
+    let(:s3_url) { "https://s3.amazonaws.com/bucket/template.json" }
+
+    subject(:src) { described_class.new(s3_url) }
+
+    context "with bucket in path" do
+
+      let(:s3_url) { "https://s3.amazonaws.com/bucket/template.json" }
+
+      it "is S3" do
+        expect(subject).to be_s3
+      end
+
+    end
+
+    context "with bucket in host" do
+
+      let(:s3_url) { "https://bucket.s3.amazonaws.com/template.json" }
+
+      it "is S3" do
+        expect(subject).to be_s3
+      end
+
+    end
+
+    context "with bucket region" do
+
+      let(:s3_url) { "https://bucket.s3-ap-northeast-3.amazonaws.com/template.json" }
+
+      it "is S3" do
+        expect(subject).to be_s3
+      end
+
+    end
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stackup
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Mike Williams