stackup 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff49d4bc734ae1d359d0727319dfd73bafde86f9
-  data.tar.gz: 79b3705ee2af79a3a268e74b0a589ab2fbe8f107
+  metadata.gz: 3b649897af4dba63a33163c2c265e71e3883b73c
+  data.tar.gz: fb24cad02b8e50e5f7ee2f6411b7faa64cc18d3e
 SHA512:
-  metadata.gz: 5ea9f0efed3b79d32fc842a5a726114a7b5d70731626c355072ebc510e0ff016361e34db90f225ff3ec952cd229411a5d4dabd505901831393c825bc8753d0b7
-  data.tar.gz: d6a435c32e8203114d2f671ac56e66764d044da56b6e1f5c20227a6b80cfc6de2b511079f03538aed79b592efb866d6ddce843de1ac2a7f8b699aefa693895fd
+  metadata.gz: 68f9c58d118c8d766c4e2837bf8c0846fe08f240dbedf583d30fe3637554bbfa23efe320239ea29a5d8eb84b9890982ff6dac852ccdbcae437efc37da531e802
+  data.tar.gz: cf8dde6a511662558fc0a0a77f6ded5dc5d4d978c9e83c729f4b1fb80f3f59ec6165e952f17beb46279c0e0a55fa77c14b5a34b68dd3a48f96d5834036afe09c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    stackup (0.3.0)
+    stackup (0.4.0)
       aws-sdk (~> 2.0)
       clamp (~> 1.0)
       console_logger

data/bin/stackup

@@ -78,19 +78,32 @@ Clamp do
 
   subcommand "up", "Create/update the stack" do
 
-    option "--disable-rollback", :flag, "disable stack rollback"
+    option ["-t", "--template"], "FILE", "template file",
+           :attribute_name => :template_file
 
-    parameter "TEMPLATE", "CloudFormation template file",
-              :attribute_name => :template_file
+    option ["-T", "--use-previous-template"], :flag,
+           "reuse the existing template"
 
-    parameter "[PARAMETERS]", "CloudFormation parameters file",
-              :attribute_name => :parameters_file
+    option ["-p", "--parameters"], "FILE", "parameters file",
+           :attribute_name => :parameters_file
+
+    option "--policy", "FILE", "stack policy file",
+           :attribute_name => :policy_file
+
+    option "--on-failure", "ACTION",
+           "when stack creation fails: DO_NOTHING, ROLLBACK, or DELETE",
+           :default => "ROLLBACK"
 
     def execute
+      unless template_file || use_previous_template?
+        signal_usage_error "Specify either --template or --use-previous-template"
+      end
       options = {}
-      options[:template] = template
-      options[:parameters] = parameters if parameters
-      options[:disable_rollback] = disable_rollback?
+      options[:template] = load_data(template_file) if template_file
+      options[:on_failure] = on_failure
+      options[:parameters] = load_data(parameters_file) if parameters_file
+      options[:stack_policy] = load_data(policy_file) if policy_file
+      options[:use_previous_template] = use_previous_template?
       report_change do
         stack.create_or_update(options)
       end
@@ -104,14 +117,6 @@ Clamp do
       signal_error "no such file: #{file.inspect}"
     end
 
-    def template
-      @template ||= load_data(template_file)
-    end
-
-    def parameters
-      @parameters ||= load_data(parameters_file) if parameters_file
-    end
-
   end
 
   subcommand ["down", "delete"], "Remove the stack." do
@@ -134,6 +139,14 @@ Clamp do
 
   end
 
+  subcommand "wait", "Wait until stack is stable" do
+
+    def execute
+      puts stack.wait
+    end
+
+  end
+
   subcommand "template", "Display stack template." do
 
     def execute

data/lib/stackup/stack.rb

@@ -19,7 +19,7 @@ module Stackup
       end
     end
 
-    attr_reader :name, :cf_client, :watcher
+    attr_reader :name
 
     # Register a handler for reporting of stack events.
     # @param [Proc] event_handler
@@ -62,23 +62,27 @@ module Stackup
     #   if true, disable rollback if stack creation fails
     # @option options [String] :notification_arns
     #   ARNs for the Amazon SNS topics associated with this stack
-    # @option options [String] :on_failure (DO_NOTHING)
+    # @option options [String] :on_failure (ROLLBACK)
     #   if stack creation fails: DO_NOTHING, ROLLBACK, or DELETE
     # @option options [Hash, Array<Hash>] :parameters
     #   stack parameters, either as a Hash, or as an Array of
     #   +Aws::CloudFormation::Types::Parameter+ structures
     # @option options [Array<String>] :resource_types
     #   resource types that you have permissions to work with
-    # @option options [Hash] :template
-    #   stack template, as Ruby data
+    # @option options [Hash] :stack_policy
+    #   stack policy, as Ruby data
     # @option options [String] :stack_policy_body
     #   stack policy, as JSON
     # @option options [String] :stack_policy_url
     #   location of stack policy
+    # @option options [Hash] :stack_policy_during_update
+    #   temporary stack policy, as Ruby data
     # @option options [String] :stack_policy_during_update_body
     #   temporary stack policy, as JSON
     # @option options [String] :stack_policy_during_update_url
     #   location of temporary stack policy
+    # @option options [Hash] :template
+    #   stack template, as Ruby data
     # @option options [String] :template_body
     #   stack template, as JSON
     # @option options [String] :template_url
@@ -98,6 +102,12 @@ module Stackup
       if (parameters = options[:parameters])
         options[:parameters] = normalise_parameters(parameters)
       end
+      if (policy_data = options.delete(:stack_policy))
+        options[:stack_policy_body] = MultiJson.dump(policy_data)
+      end
+      if (policy_data = options.delete(:stack_policy_during_update))
+        options[:stack_policy_during_update_body] = MultiJson.dump(policy_data)
+      end
       options[:capabilities] ||= ["CAPABILITY_IAM"]
       delete if ALMOST_DEAD_STATUSES.include?(status)
       update(options)
@@ -150,6 +160,16 @@ module Stackup
       nil
     end
 
+    # Wait until stack reaches a stable state
+    #
+    # @return [String] status, once stable
+    #
+    def wait
+      modify_stack do
+        # nothing
+      end
+    end
+
     # Get the current template.
     #
     # @return [Hash] current stack template, as Ruby data
@@ -210,6 +230,17 @@ module Stackup
 
     private
 
+    attr_reader :cf_client
+
+    def cf
+      Aws::CloudFormation::Resource.new(:client => cf_client)
+    end
+
+    def cf_stack
+      id_or_name = @stack_id || name
+      cf.stack(id_or_name)
+    end
+
     def create(options)
       options[:stack_name] = name
       options.delete(:stack_policy_during_update_body)
@@ -239,15 +270,6 @@ module Stackup
       @logger ||= Logger.new($stdout).tap { |l| l.level = Logger::INFO }
     end
 
-    def cf
-      Aws::CloudFormation::Resource.new(:client => cf_client)
-    end
-
-    def cf_stack
-      id_or_name = @stack_id || name
-      cf.stack(id_or_name)
-    end
-
     def event_handler
       @event_handler ||= lambda do |e|
         fields = [e.logical_resource_id, e.resource_status, e.resource_status_reason]

data/stackup.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 Gem::Specification.new do |spec|
 
   spec.name          = "stackup"
-  spec.version       = "0.3.0"
+  spec.version       = "0.4.0"
   spec.authors       = ["Mike Williams", "Arvind Kunday"]
   spec.email         = ["mike.williams@rea-group.com", "arvind.kunday@rea-group.com"]
   spec.summary       = "Manage CloudFormation stacks"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stackup
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Mike Williams
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-09 00:00:00.000000000 Z
+date: 2015-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -112,6 +112,7 @@ files:
 - lib/stackup/stack.rb
 - lib/stackup/stack_watcher.rb
 - pkg/stackup-0.2.0.gem
+- pkg/stackup-0.3.0.gem
 - spec/spec_helper.rb
 - spec/stackup/stack_spec.rb
 - spec/stackup/stack_watcher_spec.rb