stackster 0.2.7 → 0.2.8

data/CHANGELOG

@@ -1,3 +1,9 @@
+## v0.2.8
+
+* Added stack status class
+* Update waits for in progress stacks to complete
+* Added -l switch to set log level
+
 ## v0.2.7
 
 * Changed some debug levels

data/lib/stackster/aws/simpledb.rb

@@ -6,9 +6,9 @@ module Stackster
 
       def initialize(args)
         c = args[:config]
-        @connect = Fog::AWS::SimpleDB.new :aws_access_key_id => c.access_key,
+        @connect = Fog::AWS::SimpleDB.new :aws_access_key_id     => c.access_key,
                                           :aws_secret_access_key => c.secret_key,
-                                          :region => c.region
+                                          :region                => c.region
       end
 
       def domains

data/lib/stackster/cli.rb

@@ -22,6 +22,8 @@ EOS
         opt :help, "Display Help"
         opt :attributes, "= seperated attribute and it's value", :type  => :string,
                                                                   :multi => true
+        opt :log_level, "Log level:  debug, info, warn, error", :type    => :string,
+                                                                :default => 'info'
         opt :name, "Stack name to manage", :type => :string
         opt :template, "Path to the template file", :type => :string
       end
@@ -31,24 +33,21 @@ EOS
       case @cmd
       when 'create', 'destroy', 'delete', 'list', 'update', 'show'
         @s = Stack.new :name => @opts[:name],
-                       :config => nil
+                       :logger => StacksterLogger.new(:log_level => @opts[:log_level])
       end
 
       case @cmd
       when 'create'
         @s.create :attributes => attributes,
                   :template => @opts[:template]
-        puts "#{@opts[:name]} created."
       when 'update'
         @s.update :attributes => attributes
-        puts "#{@opts[:name]} updated."
       when 'destroy', 'delete'
         @s.destroy
-        puts "#{@opts[:name]} destroyed."
       when 'show'
         puts @s.display.to_yaml
       when 'list'
-        puts StackLister.new.all
+        puts StackLister.new.all.sort
       else
         puts "Unkown command '#{@cmd}'"
       end

data/lib/stackster/entry.rb

@@ -24,11 +24,17 @@ module Stackster
     end
 
     def save
-      attributes.merge!('Name' => name)
-      attributes.each_pair do |k,v|
-        @logger.debug "Setting attribute #{k}=#{v}"
+      set_name_attribute
+
+      attributes.each_pair do |key,value|
+        @logger.debug "Setting attribute #{key}=#{value}"
       end
-      sdb_connect.put_attributes('stacks', name, attributes, { :replace => attributes.keys })
+
+      sdb_connect.put_attributes('stacks', 
+                                  name, 
+                                  attributes, 
+                                 :replace => attributes.keys )
+
       @logger.debug "Save to SimpleDB successful."
     end
 
@@ -39,9 +45,13 @@ module Stackster
 
     private
 
+    def set_name_attribute
+      attributes.merge!('Name' => name)
+    end
+
     def get_attributes
       u = {}
-      attrs = sdb_connect.select("select * from stacks where itemName() = '#{name}'")
+      attrs = sdb_connect.select "select * from stacks where itemName() = '#{name}'"
       if attrs[name]
         attrs[name].each_pair { |k, v| u[k] = v.first }
       end

data/lib/stackster/logger.rb

@@ -1,29 +1,32 @@
 module Stackster
   class StacksterLogger
 
-    def initialize(args = {})
-      @logger = args[:logger] ||= Logger.new(STDOUT)
+    require 'forwardable'
 
-      unless args[:logger]
-        @logger.datetime_format = "%Y-%m-%d %H:%M:%S"
-        @logger.formatter = proc do |severity, datetime, progname, msg|
-            "#{datetime}: #{msg}\n"
-        end
-      end
+    extend Forwardable
 
-      @logger
-    end
+    def_delegators :@logger, :debug, :error, :info, :warn
 
-    def debug(msg)
-      @logger.debug msg
+    def initialize(args = {})
+      @log_level = args[:log_level] ||= 'info'
+      @logger    = args[:logger] ||= new_logger(args)
     end
 
-    def info(msg)
-      @logger.info msg
+    private
+
+    def new_logger(args)
+      Logger.new(STDOUT).tap do |l|
+        l.datetime_format = '%Y-%m-%dT%H:%M:%S%z'
+        l.formatter = proc do |severity, datetime, progname, msg|
+          "#{datetime} #{severity} : #{msg}\n"
+        end
+        l.level = logger_level
+      end
     end
 
-    def error(msg)
-      @logger.error msg
+    def logger_level
+      Logger.const_get @log_level.upcase
     end
+
   end
 end

data/lib/stackster/stack/stack_updater.rb

@@ -17,17 +17,21 @@ module Stackster
         update
       else
         @logger.debug "No Cloud Formation parameters require updating."
-        return false
+        false
       end
     end
 
     private
 
     def update
-      @logger.info "Updating Cloud Formation stack #{@name}."
-      cloud_formation.update :name => @name,
-                             :parameters => read_parameters_from_entry_attributes,
-                             :template => @template_body
+      if status.wait_for_stable
+        @logger.info "Updating Cloud Formation stack #{@name}."
+        cloud_formation.update :name => @name,
+                               :parameters => read_parameters_from_entry_attributes,
+                               :template => @template_body
+      else
+        raise "#{@name} did not reach a stable state."
+      end
     end
 
     def parameter_updated?(attributes)
@@ -56,5 +60,10 @@ module Stackster
       @cloud_formation ||= AWS::CloudFormation.new :config => @config
     end
 
+    def status
+      @status ||= Status.new :name => @name,
+                             :config => @config
+    end
+
   end
 end

data/lib/stackster/stack/status.rb

@@ -0,0 +1,55 @@
+module Stackster
+  class Status
+
+    def initialize(args)
+      @name = args[:name]
+      @config = args[:config]
+      @logger = @config.logger
+    end
+
+    def complete?
+      /_COMPLETE$/ === current
+    end
+
+    def failed?
+      /_FAILED$/ === current
+    end
+
+    def cleanup_in_progress?
+      /_CLEANUP_IN_PROGRESS$/ === current
+    end
+
+    def in_progress?
+      /_IN_PROGRESS$/ === current && !cleanup_in_progress?
+    end
+
+    def create_failed?
+     'CREATE_FAILED' == current
+    end
+
+    def stable?
+      (complete? || failed?) && (! create_failed?)
+    end
+
+    def wait_for_stable(count=25)
+      1.upto(count).each do |c|
+        break if stable?
+        @logger.info ("#{@name} not stable (#{current}).  Sleeping #{c * c} second(s).")
+        Kernel.sleep (c * c)
+      end
+      stable?
+    end
+
+    private
+
+    def current
+      stack_reader.status
+    end
+
+    def stack_reader
+      @stack_reader ||= StackReader.new :name   => @name,
+                                        :config => @config
+    end
+
+  end
+end

data/lib/stackster/stack.rb

@@ -4,6 +4,7 @@ require 'stackster/stack/stack_destroyer'
 require 'stackster/stack/stack_reader'
 require 'stackster/stack/stack_formater'
 require 'stackster/stack/stack_lister'
+require 'stackster/stack/status'
 
 module Stackster
   class Stack
@@ -112,5 +113,10 @@ module Stackster
                                             :config => @config
     end
 
+    def status
+      @status ||= Status.new :name => @name,
+                             :config => @config
+    end
+
   end
 end

data/lib/stackster/version.rb

@@ -1,3 +1,3 @@
 module Stackster
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

data/spec/logger_spec.rb

@@ -13,6 +13,9 @@ describe Stackster do
     logger_mock = mock 'logger'
     Logger.should_receive(:new).with(STDOUT).and_return logger_mock
     logger_mock.should_receive(:info).with 'a message'
+    logger_mock.should_receive(:datetime_format=).with '%Y-%m-%dT%H:%M:%S%z'
+    logger_mock.should_receive(:formatter=)
+    logger_mock.should_receive(:level=).with 1
     logger = Stackster::StacksterLogger.new
     logger.info 'a message'
   end

data/spec/stack/stack_updater_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+
 require 'json'
 
 describe Stackster do
@@ -18,11 +18,12 @@ describe Stackster do
                       }'
   end
 
-  it "should update the stack when parameters change" do
+  it "should update the stack when parameters change and stack is stable" do
     attributes = { "param1" => "value1", "param3" => "value3" }
     config_mock = mock 'config mock'
     logger_mock = mock 'logger mock'
     entry_mock = mock 'entry mock'
+    status_mock = mock 'status mock'
     cloud_formation_mock = mock 'cloud formation mock'
     Stackster::AWS::CloudFormation.should_receive(:new).
                                    with(:config => config_mock).
@@ -36,6 +37,11 @@ describe Stackster do
     config_mock.should_receive(:logger).and_return(logger_mock)
     logger_mock.should_receive(:debug).exactly(1).times
     logger_mock.should_receive(:info).exactly(1).times
+    Stackster::Status.should_receive(:new).
+                      with(:name   => 'test-stack',
+                           :config => config_mock).
+                      and_return status_mock
+    status_mock.should_receive(:wait_for_stable).and_return true
     stack_updater = Stackster::StackUpdater.new :name          => 'test-stack',
                                                 :template_body => @template_body,
                                                 :entry         => entry_mock,
@@ -45,6 +51,31 @@ describe Stackster do
                   should == true
   end
 
+  it "should raise an error when parameters change and stack is not stable" do
+    attributes = { "param1" => "value1", "param3" => "value3" }
+    config_mock = mock 'config mock'
+    logger_mock = mock 'logger mock'
+    entry_mock = mock 'entry mock'
+    status_mock = mock 'status mock'
+    cloud_formation_mock = mock 'cloud formation mock'
+    Stackster::AWS::CloudFormation.should_receive(:new).
+                                   exactly(0).times
+    config_mock.should_receive(:logger).and_return(logger_mock)
+    logger_mock.should_receive(:debug).exactly(1).times
+    Stackster::Status.should_receive(:new).
+                      with(:name   => 'test-stack',
+                           :config => config_mock).
+                      and_return status_mock
+    status_mock.should_receive(:wait_for_stable).and_return false
+    stack_updater = Stackster::StackUpdater.new :name          => 'test-stack',
+                                                :template_body => @template_body,
+                                                :entry         => entry_mock,
+                                                :config        => config_mock
+
+    lambda {stack_updater.update_stack_if_parameters_changed( [ { 'param1' => 'new-value' } ] ) }.
+                  should raise_error
+  end
+
   it "should not update the stack when parameters don't change" do
     attributes = { "param3" => "value3" }
     config_mock = mock 'config mock'

data/spec/stack/status_spec.rb

@@ -0,0 +1,105 @@
+require 'spec_helper'
+
+describe Stackster do
+
+  before do
+    @config_mock = mock 'config mock'
+    @logger_mock = mock 'logger mock'
+    @stack_reader_mock = mock 'stack reader mock'
+    Stackster::StackReader.should_receive(:new).
+                           and_return @stack_reader_mock
+    @config_mock.should_receive(:logger).and_return @logger_mock
+    @status = Stackster::Status.new :name   => 'test-stack',
+                                    :config => @config_mock
+  end
+
+  it "should return true if the stack is in complete state" do
+    @stack_reader_mock.should_receive(:status).
+                      and_return 'UPDATE_COMPLETE'
+    @status.complete?.should == true
+  end
+
+  it "should return false if the stack is not in complete state" do
+    @stack_reader_mock.should_receive(:status).
+                      and_return 'UPDATE_IN_PROGRESS'
+    @status.complete?.should == false
+  end
+
+  it "should return true if the stack is in a failed state" do
+    @stack_reader_mock.should_receive(:status).
+                      and_return 'DELETE_FAILED'
+    @status.failed?.should == true
+  end
+
+  it "should return false if the stack is not in a failed state" do
+    @stack_reader_mock.should_receive(:status).
+                      and_return 'UPDATE_IN_PROGRESS'
+    @status.failed?.should == false
+  end
+
+  it "should return true if the stack is in an in_progress state" do
+    @stack_reader_mock.should_receive(:status).exactly(2).times.
+                      and_return 'UPDATE_IN_PROGRESS'
+    @status.in_progress?.should == true
+  end
+
+  it "should return false if the stack is not in an in_progress state" do
+    @stack_reader_mock.should_receive(:status).exactly(2).times.
+                      and_return 'UPDATE_COMPLETE_CLEANUP_IN_PROGRESS'
+    @status.in_progress?.should == false
+  end
+
+  it "should return true if the stack is cleaning up" do
+    @stack_reader_mock.should_receive(:status).
+                      and_return 'UPDATE_COMPLETE_CLEANUP_IN_PROGRESS'
+    @status.cleanup_in_progress?.should == true
+  end
+
+  it "should return false if the stack is not in a cleaning up state" do
+    @stack_reader_mock.should_receive(:status).
+                      and_return 'UPDATE_IN_PROGRESS'
+    @status.cleanup_in_progress?.should == false
+  end
+
+  it "should return true if the stack is in a complete state" do
+    @stack_reader_mock.should_receive(:status).exactly(2).times.
+                       and_return 'UPDATE_COMPLETE'
+    @status.stable?.should == true
+  end
+
+  it "should return true if the stack is in a failed state" do
+    @stack_reader_mock.should_receive(:status).exactly(3).times.
+                      and_return 'UPDATE_FAILED'
+    @status.stable?.should == true
+  end
+
+  it "should return true if the stack is in an in progress state" do
+    @stack_reader_mock.should_receive(:status).exactly(2).times.
+                      and_return 'IN_PROGRESS'
+    @status.stable?.should == false
+  end
+
+  it "should return false if the stack creation failed" do
+    @stack_reader_mock.should_receive(:status).exactly(3).times.
+                      and_return 'CREATE_FAILED'
+    @status.stable?.should == false
+  end
+
+  it "should return true when the stack is in a stable state" do
+    @stack_reader_mock.should_receive(:status).exactly(4).times.
+                      and_return 'CREATE_COMPLETE'
+    @status.wait_for_stable.should == true
+  end
+
+  it "should sleep 2 times and return false when the stack is in an unstable state" do
+    Kernel.stub!(:sleep)
+    Kernel.should_receive(:sleep).with(1)
+    Kernel.should_receive(:sleep).with(4)
+
+    @stack_reader_mock.should_receive(:status).exactly(11).times.
+                       and_return 'CREATE_FAILED'
+    @logger_mock.should_receive(:info).exactly(2).times
+    @status.wait_for_stable(2).should == false
+  end
+
+end

data/spec/stack_spec.rb

@@ -41,13 +41,15 @@ describe Stackster do
 
       it "should create a new stack" do
         stack_creater_mock = mock 'stack creater'
-        @entry_mock.should_receive(:set_attributes).with({ 'test-attr' => 'test-value' })
+        @entry_mock.should_receive(:set_attributes).
+                    with({ 'test-attr' => 'test-value' })
         @entry_mock.should_receive(:save)
-        Stackster::StackCreater.should_receive(:new).with(:name          => 'test-stack',
-                                                          :entry         => @entry_mock,
-                                                          :template_file => 'template_file',
-                                                          :config        => @config_mock).
-                                          and_return stack_creater_mock
+        Stackster::StackCreater.should_receive(:new).
+                                with(:name          => 'test-stack',
+                                     :entry         => @entry_mock,
+                                     :template_file => 'template_file',
+                                     :config        => @config_mock).
+                                and_return stack_creater_mock
         stack_creater_mock.should_receive(:create)
 
         @stack.create :template   => 'template_file',
@@ -68,15 +70,18 @@ describe Stackster do
         @entry_mock.should_receive(:save)
         stack_reader_mock.should_receive(:template).and_return('template-body-json')
 
-        Stackster::StackReader.should_receive(:new).with(:name   => 'test-stack',
-                                                         :config => @config_mock).
-                                                    and_return stack_reader_mock
-        Stackster::StackUpdater.should_receive(:new).with(:name          => 'test-stack',
-                                                          :entry         => @entry_mock,
-                                                          :template_body => 'template-body-json',
-                                                          :config        => @config_mock).
-                                                     and_return stack_updater_mock
-        stack_updater_mock.should_receive(:update_stack_if_parameters_changed)
+        Stackster::StackReader.should_receive(:new).
+                               with(:name   => 'test-stack',
+                                    :config => @config_mock).
+                               and_return stack_reader_mock
+        Stackster::StackUpdater.should_receive(:new).
+                                with(:name          => 'test-stack',
+                                     :entry         => @entry_mock,
+                                     :template_body => 'template-body-json',
+                                     :config        => @config_mock).
+                                and_return stack_updater_mock
+        stack_updater_mock.should_receive(:update_stack_if_parameters_changed).
+                           and_return true
         @stack.update :attributes => { 'update' => 'test-attrs' }
       end
 
@@ -86,9 +91,10 @@ describe Stackster do
     context "when destroying a stack" do
       it "should destroy a stack" do
         stack_destroyer_mock = mock 'stack destroyer'  
-        Stackster::StackDestroyer.should_receive(:new).with(:name   => 'test-stack',
-                                                            :config => @config_mock).
-                                                       and_return stack_destroyer_mock
+        Stackster::StackDestroyer.should_receive(:new).
+                                  with(:name   => 'test-stack',
+                                       :config => @config_mock).
+                                  and_return stack_destroyer_mock
         stack_destroyer_mock.should_receive(:destroy)
         @entry_mock.should_receive(:delete_attributes)
         @stack.destroy

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stackster
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-19 00:00:00.000000000 Z
+date: 2012-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70336360579600 !ruby/object:Gem::Requirement
+  requirement: &70204471061060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70336360579600
+  version_requirements: *70204471061060
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70336360578840 !ruby/object:Gem::Requirement
+  requirement: &70204471059380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70336360578840
+  version_requirements: *70204471059380
 - !ruby/object:Gem::Dependency
   name: logger
-  requirement: &70336360578160 !ruby/object:Gem::Requirement
+  requirement: &70204471055480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70336360578160
+  version_requirements: *70204471055480
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70336360576700 !ruby/object:Gem::Requirement
+  requirement: &70204471053160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70336360576700
+  version_requirements: *70204471053160
 - !ruby/object:Gem::Dependency
   name: xml-simple
-  requirement: &70336360574960 !ruby/object:Gem::Requirement
+  requirement: &70204471051140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70336360574960
+  version_requirements: *70204471051140
 description: Thats what I do
 email:
 - brett@weav.net
@@ -101,6 +101,7 @@ files:
 - lib/stackster/stack/stack_lister.rb
 - lib/stackster/stack/stack_reader.rb
 - lib/stackster/stack/stack_updater.rb
+- lib/stackster/stack/status.rb
 - lib/stackster/version.rb
 - script/ci_setup
 - spec/aws/cloud_formation/error_spec.rb
@@ -119,6 +120,7 @@ files:
 - spec/stack/stack_lister_spec.rb
 - spec/stack/stack_reader_spec.rb
 - spec/stack/stack_updater_spec.rb
+- spec/stack/status_spec.rb
 - spec/stack_spec.rb
 - stackster.gemspec
 homepage: ''
@@ -135,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -121993254634425492
+      hash: -1998118593165875979
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -144,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -121993254634425492
+      hash: -1998118593165875979
 requirements: []
 rubyforge_project: stackster
 rubygems_version: 1.8.16
@@ -168,4 +170,5 @@ test_files:
 - spec/stack/stack_lister_spec.rb
 - spec/stack/stack_reader_spec.rb
 - spec/stack/stack_updater_spec.rb
+- spec/stack/status_spec.rb
 - spec/stack_spec.rb