stackup 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a76fe73e3081eb43b4b664f82ab8018f43d95e0
-  data.tar.gz: e888b62cdd79ecb05ae03c366b5deadcee497ddb
+  metadata.gz: 81fb1c62bb5b074f520f74488f5e030fa6366729
+  data.tar.gz: ca1c7d4a8117887dacd2b5a12aeaa2184395301e
 SHA512:
-  metadata.gz: 3d3b377393f712fe04de5ec8ce6b9a4527b8a9a1f15cef60c009483b0317d3d317f2ae453e75936e9b48f423644b63fbfa15b7c62f6b7c90ac16044c3bba17b3
-  data.tar.gz: 6f639914a99aed8803ee9a72cc3055b0f0071e0af561519c848b032d1e3ddb0e025f79ccd5c00eb00321e2ff130148ac98538ff8b5a840d2fcc7b279d60496f8
+  metadata.gz: d3734548eb85b676c9092a6a9ac18e191ed50ed8d255431cffaecd80f475e0ee316c0ce3c77269db5138c4b022bc60c43fb088154129ab96d3876b22069a3b34
+  data.tar.gz: dfc2b36b8e57da36eadd0f36e4635fec67fa294286d74964141e89f9d6a8b36560a41cb4891777b1fed2f6e619be61d929254e464744c1d3ebd059dc7f847a16

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    stackup (0.0.4)
+    stackup (0.0.5)
       aws-sdk (~> 2.0)
       clamp (~> 1.0)
 
@@ -11,18 +11,16 @@ GEM
     ast (2.1.0)
     astrolabe (1.3.1)
       parser (~> 2.2)
-    aws-sdk (2.1.21)
-      aws-sdk-resources (= 2.1.21)
-    aws-sdk-core (2.1.21)
+    aws-sdk (2.1.23)
+      aws-sdk-resources (= 2.1.23)
+    aws-sdk-core (2.1.23)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.1.21)
-      aws-sdk-core (= 2.1.21)
+    aws-sdk-resources (2.1.23)
+      aws-sdk-core (= 2.1.23)
     byebug (6.0.2)
     clamp (1.0.0)
     diff-lcs (1.2.5)
-    jmespath (1.0.2)
-      multi_json (~> 1.0)
-    multi_json (1.11.2)
+    jmespath (1.1.3)
     parser (2.2.2.6)
       ast (>= 1.1, < 3.0)
     powerpack (0.1.1)

data/lib/stackup/cli.rb

@@ -1,34 +1,34 @@
-module Stackup
-  class CLI < Clamp::Command
-
-    subcommand ["stack"], "Manage a stack." do
-      parameter "STACK-NAME", "Name of stack", :attribute_name => :stack_name
-
-      subcommand "deploy", "Create/update the stack" do
-        parameter "TEMPLATE", "CloudFormation template (.json)", :attribute_name => :template
-        parameter "PARAMETERS", "CloudFormation parameters (.json)", :attribute_name => :parameters
-
-        def execute
-          params = JSON.parse(parameters)
-          stack = Stackup::Stack.new(stack_name)
-          stack.create(template, params)
-        end
-      end
-
-      subcommand "delete", "Remove the stack." do
-        def execute
-          stack = Stackup::Stack.new(stack_name)
-          stack.delete
-        end
-      end
-
-      subcommand "outputs", "Stack outputs." do
-        def execute
-          stack = Stackup::Stack.new(stack_name)
-          stack.outputs
-        end
-      end
-    end
-
-  end
-end
+module Stackup
+  class CLI < Clamp::Command
+
+    subcommand ["stack"], "Manage a stack." do
+      parameter "STACK-NAME", "Name of stack", :attribute_name => :stack_name
+
+      subcommand "deploy", "Create/update the stack" do
+        parameter "TEMPLATE", "CloudFormation template (.json)", :attribute_name => :template
+        parameter "PARAMETERS", "CloudFormation parameters (.json)", :attribute_name => :parameters
+
+        def execute
+          params = JSON.parse(parameters)
+          stack = Stackup::Stack.new(stack_name)
+          stack.create(template, params)
+        end
+      end
+
+      subcommand "delete", "Remove the stack." do
+        def execute
+          stack = Stackup::Stack.new(stack_name)
+          stack.delete
+        end
+      end
+
+      subcommand "outputs", "Stack outputs." do
+        def execute
+          stack = Stackup::Stack.new(stack_name)
+          stack.outputs
+        end
+      end
+    end
+
+  end
+end

data/lib/stackup/stack.rb

@@ -1,81 +1,82 @@
-require "set"
-
-module Stackup
-  class Stack
-
-    attr_reader :stack, :name, :cf, :monitor
-    SUCESS_STATES = ["CREATE_COMPLETE", "UPDATE_COMPLETE"]
-    FAILURE_STATES = ["CREATE_FAILED", "DELETE_COMPLETE", "DELETE_FAILED", "UPDATE_ROLLBACK_FAILED", "ROLLBACK_FAILED", "ROLLBACK_COMPLETE", "ROLLBACK_FAILED", "UPDATE_ROLLBACK_COMPLETE", "UPDATE_ROLLBACK_FAILED"]
-    END_STATES = SUCESS_STATES + FAILURE_STATES
-
-    def initialize(name)
-      @cf = Aws::CloudFormation::Client.new
-      @stack = Aws::CloudFormation::Stack.new(:name => name, :client => cf)
-      @monitor = Stackup::Monitor.new(@stack)
-      @name = name
-    end
-
-    def create(template, parameters)
-      response = cf.create_stack(:stack_name => name,
-                                 :template_body => template,
-                                 :disable_rollback => true,
-                                 :parameters => parameters)
-      wait_till_end
-      !response[:stack_id].nil?
-    end
-
-    def deploy(template, parameters = [])
-      if deployed?
-        update(template, parameters)
-      else
-        create(template, parameters)
-      end
-    rescue Aws::CloudFormation::Errors::ValidationError => e
-      puts e.message
-    end
-
-    def update(template, parameters)
-      return false unless deployed?
-      response = cf.update_stack(:stack_name => name, :template_body => template, :parameters => parameters)
-      wait_till_end
-      !response[:stack_id].nil?
-    end
-
-    def delete
-      response = cf.delete_stack(:stack_name => name)
-      stack.wait_until(:max_attempts => 1000, :delay => 10) { |resource| display_events; END_STATES.include?(resource.stack_status) }
-    rescue Aws::CloudFormation::Errors::ValidationError
-      puts "Stack does not exist."
-    end
-
-    def outputs
-      puts stack.outputs.flat_map { |output| "#{output.output_key} - #{output.output_value}" }
-    end
-
-    def display_events
-      monitor.new_events.each do |e|
-        ts = e.timestamp.localtime.strftime("%H:%M:%S")
-        fields = [e.logical_resource_id, e.resource_status, e.resource_status_reason]
-        puts("[#{ts}] #{fields.compact.join(' - ')}")
-      end
-    end
-
-    def deployed?
-      !stack.stack_status.nil?
-    rescue Aws::CloudFormation::Errors::ValidationError => e
-      false
-    end
-
-    def valid?(template)
-      response = cf.validate_template(template)
-      response[:code].nil?
-    end
-
-    private
-
-    def wait_till_end
-      stack.wait_until(:max_attempts => 1000, :delay => 10) { |resource| display_events; END_STATES.include?(resource.stack_status) }
-    end
-
-  end
-end
+require "set"
+
+module Stackup
+  class Stack
+
+    attr_reader :stack, :name, :cf, :monitor
+    SUCESS_STATES = ["CREATE_COMPLETE", "UPDATE_COMPLETE"]
+    FAILURE_STATES = ["CREATE_FAILED", "DELETE_COMPLETE", "DELETE_FAILED", "UPDATE_ROLLBACK_FAILED", "ROLLBACK_FAILED", "ROLLBACK_COMPLETE", "ROLLBACK_FAILED", "UPDATE_ROLLBACK_COMPLETE", "UPDATE_ROLLBACK_FAILED"]
+    END_STATES = SUCESS_STATES + FAILURE_STATES
+
+    def initialize(name)
+      @cf = Aws::CloudFormation::Client.new
+      @stack = Aws::CloudFormation::Stack.new(:name => name, :client => cf)
+      @monitor = Stackup::Monitor.new(@stack)
+      @name = name
+    end
+
+    def create(template, parameters)
+      response = cf.create_stack(:stack_name => name,
+                                 :template_body => template,
+                                 :disable_rollback => true,
+                                 :capabilities => ["CAPABILITY_IAM"],
+                                 :parameters => parameters)
+      wait_till_end
+      !response[:stack_id].nil?
+    end
+
+    def deploy(template, parameters = [])
+      if deployed?
+        update(template, parameters)
+      else
+        create(template, parameters)
+      end
+    rescue Aws::CloudFormation::Errors::ValidationError => e
+      puts e.message
+    end
+
+    def update(template, parameters)
+      return false unless deployed?
+      response = cf.update_stack(:stack_name => name, :template_body => template, :parameters => parameters, :capabilities => ["CAPABILITY_IAM"])
+      wait_till_end
+      !response[:stack_id].nil?
+    end
+
+    def delete
+      response = cf.delete_stack(:stack_name => name)
+      stack.wait_until(:max_attempts => 1000, :delay => 10) { |resource| display_events; END_STATES.include?(resource.stack_status) }
+    rescue Aws::CloudFormation::Errors::ValidationError
+      puts "Stack does not exist."
+    end
+
+    def outputs
+      puts stack.outputs.flat_map { |output| "#{output.output_key} - #{output.output_value}" }
+    end
+
+    def display_events
+      monitor.new_events.each do |e|
+        ts = e.timestamp.localtime.strftime("%H:%M:%S")
+        fields = [e.logical_resource_id, e.resource_status, e.resource_status_reason]
+        puts("[#{ts}] #{fields.compact.join(' - ')}")
+      end
+    end
+
+    def deployed?
+      !stack.stack_status.nil?
+    rescue Aws::CloudFormation::Errors::ValidationError => e
+      false
+    end
+
+    def valid?(template)
+      response = cf.validate_template(template)
+      response[:code].nil?
+    end
+
+    private
+
+    def wait_till_end
+      stack.wait_until(:max_attempts => 1000, :delay => 10) { |resource| display_events; END_STATES.include?(resource.stack_status) }
+    end
+
+  end
+end

data/spec/stackup/stack_spec.rb

@@ -1,95 +1,95 @@
-require "spec_helper"
-
-describe Stackup::Stack do
-  let(:stack) { Stackup::Stack.new("stack_name") }
-  let(:template) { double(String) }
-  let(:cf_stack) { double(Aws::CloudFormation::Stack) }
-  let(:cf) { double(Aws::CloudFormation::Client) }
-  let(:parameters) { [] }
-
-  before do
-    allow(Aws::CloudFormation::Client).to receive(:new).and_return(cf)
-    allow(Aws::CloudFormation::Stack).to receive(:new).and_return(cf_stack)
-  end
-
-  context "deploy" do
-
-    it "should call create if stack is not deployed" do
-      allow(stack).to receive(:deployed?).and_return(false)
-      expect(stack).to receive(:create).and_return(true)
-      expect(stack.deploy(template, parameters)).to be true
-    end
-    it "should call update if stack is deployed" do
-      allow(stack).to receive(:deployed?).and_return(true)
-      expect(stack).to receive(:update).and_return(true)
-      expect(stack.deploy(template, parameters)).to be true
-    end
-  end
-
-  context "update" do
-    it "should allow stack update" do
-      allow(cf_stack).to receive(:stack_status).and_return("1")
-      response = Seahorse::Client::Http::Response.new
-      allow(response).to receive(:[]).with(:stack_id).and_return("1")
-      allow(cf).to receive(:update_stack).and_return(response)
-      allow(cf_stack).to receive(:wait_until).and_return(true)
-      expect(stack.update(template, parameters)).to be true
-    end
-
-    it "should not update if the stack is not deployed" do
-      allow(cf_stack).to receive(:stack_status).and_raise(Aws::CloudFormation::Errors::ValidationError.new("1", "2"))
-      expect(stack.update(template, parameters)).to be false
-    end
-  end
-
-  context "delete" do
-    it "should delete the stack if it exists?" do
-      response = double(Struct)
-      allow(cf).to receive(:delete_stack).and_return(response)
-      allow(cf_stack).to receive(:wait_until).and_return(response)
-      expect(stack.delete).to be response
-    end
-  end
-
-  context "create" do
-    let(:response) { Seahorse::Client::Http::Response.new }
-    it "should create stack if all is well" do
-      allow(response).to receive(:[]).with(:stack_id).and_return("1")
-      allow(cf).to receive(:create_stack).and_return(response)
-      allow(cf_stack).to receive(:wait_until).and_return(true)
-      expect(stack.create(template, parameters)).to be true
-    end
-
-    it "should return nil if stack was not created" do
-      allow(response).to receive(:[]).with(:stack_id).and_return(nil)
-      allow(cf).to receive(:create_stack).and_return(response)
-      allow(cf_stack).to receive(:wait_until).and_return(false)
-      expect(stack.create(template, parameters)).to be false
-    end
-  end
-
-  context "validate" do
-    it "should be valid if cf validate say so" do
-      allow(cf).to receive(:validate_template).and_return({})
-      expect(stack.valid?(template)).to be true
-    end
-
-    it "should be invalid if cf validate say so" do
-      allow(cf).to receive(:validate_template).and_return(:code => "404")
-      expect(stack.valid?(template)).to be false
-    end
-
-  end
-
-  context "deployed" do
-    it "should be true if it is already deployed" do
-      allow(cf_stack).to receive(:stack_status).and_return("CREATE_COMPLETE")
-      expect(stack.deployed?).to be true
-    end
-
-    it "should be false if it is not deployed" do
-      allow(cf_stack).to receive(:stack_status).and_raise(Aws::CloudFormation::Errors::ValidationError.new("1", "2"))
-      expect(stack.deployed?).to be false
-    end
-  end
-end
+require "spec_helper"
+
+describe Stackup::Stack do
+  let(:stack) { Stackup::Stack.new("stack_name") }
+  let(:template) { double(String) }
+  let(:cf_stack) { double(Aws::CloudFormation::Stack) }
+  let(:cf) { double(Aws::CloudFormation::Client) }
+  let(:parameters) { [] }
+
+  before do
+    allow(Aws::CloudFormation::Client).to receive(:new).and_return(cf)
+    allow(Aws::CloudFormation::Stack).to receive(:new).and_return(cf_stack)
+  end
+
+  context "deploy" do
+
+    it "should call create if stack is not deployed" do
+      allow(stack).to receive(:deployed?).and_return(false)
+      expect(stack).to receive(:create).and_return(true)
+      expect(stack.deploy(template, parameters)).to be true
+    end
+    it "should call update if stack is deployed" do
+      allow(stack).to receive(:deployed?).and_return(true)
+      expect(stack).to receive(:update).and_return(true)
+      expect(stack.deploy(template, parameters)).to be true
+    end
+  end
+
+  context "update" do
+    it "should allow stack update" do
+      allow(cf_stack).to receive(:stack_status).and_return("1")
+      response = Seahorse::Client::Http::Response.new
+      allow(response).to receive(:[]).with(:stack_id).and_return("1")
+      allow(cf).to receive(:update_stack).and_return(response)
+      allow(cf_stack).to receive(:wait_until).and_return(true)
+      expect(stack.update(template, parameters)).to be true
+    end
+
+    it "should not update if the stack is not deployed" do
+      allow(cf_stack).to receive(:stack_status).and_raise(Aws::CloudFormation::Errors::ValidationError.new("1", "2"))
+      expect(stack.update(template, parameters)).to be false
+    end
+  end
+
+  context "delete" do
+    it "should delete the stack if it exists?" do
+      response = double(Struct)
+      allow(cf).to receive(:delete_stack).and_return(response)
+      allow(cf_stack).to receive(:wait_until).and_return(response)
+      expect(stack.delete).to be response
+    end
+  end
+
+  context "create" do
+    let(:response) { Seahorse::Client::Http::Response.new }
+    it "should create stack if all is well" do
+      allow(response).to receive(:[]).with(:stack_id).and_return("1")
+      allow(cf).to receive(:create_stack).and_return(response)
+      allow(cf_stack).to receive(:wait_until).and_return(true)
+      expect(stack.create(template, parameters)).to be true
+    end
+
+    it "should return nil if stack was not created" do
+      allow(response).to receive(:[]).with(:stack_id).and_return(nil)
+      allow(cf).to receive(:create_stack).and_return(response)
+      allow(cf_stack).to receive(:wait_until).and_return(false)
+      expect(stack.create(template, parameters)).to be false
+    end
+  end
+
+  context "validate" do
+    it "should be valid if cf validate say so" do
+      allow(cf).to receive(:validate_template).and_return({})
+      expect(stack.valid?(template)).to be true
+    end
+
+    it "should be invalid if cf validate say so" do
+      allow(cf).to receive(:validate_template).and_return(:code => "404")
+      expect(stack.valid?(template)).to be false
+    end
+
+  end
+
+  context "deployed" do
+    it "should be true if it is already deployed" do
+      allow(cf_stack).to receive(:stack_status).and_return("CREATE_COMPLETE")
+      expect(stack.deployed?).to be true
+    end
+
+    it "should be false if it is not deployed" do
+      allow(cf_stack).to receive(:stack_status).and_raise(Aws::CloudFormation::Errors::ValidationError.new("1", "2"))
+      expect(stack.deployed?).to be false
+    end
+  end
+end

data/stackup.gemspec

@@ -1,21 +1,21 @@
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
-Gem::Specification.new do |spec|
-
-  spec.name          = "stackup"
-  spec.version       = "0.0.5"
-  spec.authors       = ["Arvind Kunday", "Mike Williams"]
-  spec.email         = ["arvind.kunday@rea-group.com", "mike.williams@rea-group.com"]
-  spec.summary       = "Tools for deployment to AWS"
-  spec.homepage      = "https://github.com/realestate-com-au/stackup"
-  spec.license       = "MIT"
-
-  spec.files         = Dir["**/*"].reject { |f| File.directory?(f) }
-  spec.executables   = spec.files.grep(/^bin/) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency "aws-sdk", "~> 2.0"
-  spec.add_dependency "clamp", "~> 1.0"
-
-end
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+Gem::Specification.new do |spec|
+
+  spec.name          = "stackup"
+  spec.version       = "0.0.6"
+  spec.authors       = ["Arvind Kunday", "Mike Williams"]
+  spec.email         = ["arvind.kunday@rea-group.com", "mike.williams@rea-group.com"]
+  spec.summary       = "Tools for deployment to AWS"
+  spec.homepage      = "https://github.com/realestate-com-au/stackup"
+  spec.license       = "MIT"
+
+  spec.files         = Dir["**/*"].reject { |f| File.directory?(f) }
+  spec.executables   = spec.files.grep(/^bin/) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency "aws-sdk", "~> 2.0"
+  spec.add_dependency "clamp", "~> 1.0"
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stackup
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Arvind Kunday
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -61,6 +61,7 @@ files:
 - pkg/stackup-0.0.3.gem
 - pkg/stackup-0.0.4.gem
 - pkg/stackup-0.0.5.gem
+- pkg/stackup-0.0.6.gem
 - sample.json
 - spec/spec_helper.rb
 - spec/stackup/monitor_spec.rb