stackster 0.2.2 → 0.2.3

data/lib/stackster/aws/cloud_formation/error.rb

@@ -0,0 +1,30 @@
+require 'xmlsimple'
+
+module Stackster
+  class AWS
+    class CloudFormation
+      class Error
+
+        def initialize(args)
+          @exception = args[:exception]
+          @config    = args[:config]
+          @logger    = @config.logger
+        end
+
+        def process
+          message = XmlSimple.xml_in(@exception.response.body)
+          message['Error'].first['Message'].each do |msg|
+            case msg
+            when 'No updates are to be performed.'
+              @logger.info msg
+            else
+              @logger.error msg
+              exit 1
+            end
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/stackster/aws/cloud_formation.rb

@@ -5,28 +5,47 @@ module Stackster
     class CloudFormation
 
       def initialize(args)
-        c = args[:config]
-        @connect = Fog::AWS::CloudFormation.new :aws_access_key_id => c.access_key,
-                                                :aws_secret_access_key => c.secret_key,
-                                                :region => c.region
+        @config = args[:config]
+        @logger = @config.logger
+        @connect = Fog::AWS::CloudFormation.new :aws_access_key_id     => @config.access_key,
+                                                :aws_secret_access_key => @config.secret_key,
+                                                :region                => @config.region
       end
 
       def create(args)
         parameters = { 'Parameters' => args[:parameters] }
         data = { 'Capabilities' => ['CAPABILITY_IAM'],
                  'TemplateBody' => args[:template] }.merge parameters
-        @connect.create_stack(args[:name], data)
+        begin
+          @connect.create_stack(args[:name], data)
+        rescue Exception => e  
+          Error.new(:config    => @config,
+                    :exception => e).process
+        end
+        @logger.info "Cloud Formation stack creation completed."
       end
 
       def update(args)
         parameters = { 'Parameters' => args[:parameters] }
         data = { 'Capabilities' => ['CAPABILITY_IAM'],
                  'TemplateBody' => args[:template] }.merge parameters
-        @connect.update_stack(args[:name], data)
+        begin
+          @connect.update_stack(args[:name], data)
+        rescue Exception => e  
+          Error.new(:config    => @config,
+                    :exception => e).process
+        end
+        @logger.info "Cloud Formation stack update completed."
       end
 
       def destroy(name)
-        @connect.delete_stack name
+        begin
+          @connect.delete_stack name
+        rescue Exception => e  
+          Error.new(:config    => @config,
+                    :exception => e).process
+        end
+        @logger.info "Cloud Formation stack destroy completed."
       end
 
       def describe_stack(name)

data/lib/stackster/aws.rb

@@ -1,3 +1,4 @@
 require "stackster/aws/cloud_formation"
+require "stackster/aws/cloud_formation/error"
 require "stackster/aws/ec2"
 require "stackster/aws/simpledb"

data/lib/stackster/cli.rb

@@ -4,6 +4,7 @@ module Stackster
   module CLI
     def self.start
       @opts = Trollop::options do
+        version Stackster::VERSION
         banner <<-EOS
 
 I build and manage AWS Cloud Formation Stacks

data/lib/stackster/entry.rb

@@ -7,6 +7,7 @@ module Stackster
     def initialize(args)
       @domain = 'stacks'
       @config = args[:config]
+      @logger = @config.logger
       self.name = region_specific_name args[:name]
       create_domain
       get_attributes
@@ -25,12 +26,15 @@ module Stackster
     def save
       attributes.merge!('Name' => name)
       attributes.each_pair do |k,v|
-        sdb_connect.put_attributes('stacks', name, { k => v }, { :replace => k })
+        @logger.debug "Setting attribute #{k}=#{v}"
       end
+      sdb_connect.put_attributes('stacks', name, attributes, { :replace => attributes.keys })
+      @logger.info "Save to SimpleDB successful."
     end
 
     def delete_attributes
       sdb_connect.delete('stacks', name)
+      @logger.info "Delete from SimpleDB successful."
     end
 
     private

data/lib/stackster/logger.rb

@@ -14,8 +14,16 @@ module Stackster
       @logger
     end
 
+    def debug(msg)
+      @logger.debug msg
+    end
+
     def info(msg)
       @logger.info msg
     end
+
+    def error(msg)
+      @logger.error msg
+    end
   end
 end

data/lib/stackster/stack/stack_creater.rb

@@ -5,12 +5,14 @@ module Stackster
 
     def initialize(args)
       @config = args[:config]
+      @logger = @config.logger
       @entry = args[:entry]
       @name = args[:name]
       @template = read_template_from_file args[:template_file]
     end
 
     def create
+      @logger.info "Creating Cloud Formation stack #{@name}."
       cloud_formation.create :name => @name,
                              :parameters => read_parameters_from_entry,
                              :template => @template

data/lib/stackster/stack/stack_formater.rb

@@ -11,7 +11,7 @@ module Stackster
         'attributes'      => stack_reader.attributes,
         'status'          => stack_reader.status,
         'outputs'         => stack_reader.outputs,
-        'events'          => stack_reader.events,
+        'events'          => stack_reader.events(3),
         'resources'       => stack_reader.resources,
       }
     end

data/lib/stackster/stack/stack_updater.rb

@@ -5,18 +5,26 @@ module Stackster
 
     def initialize(args)
       @config = args[:config]
+      @logger = @config.logger
       @entry = args[:entry]
       @name = args[:name]
       @template_body = args[:template_body]
     end
 
     def update_stack_if_parameters_changed(attributes)
-      parameter_updated?(attributes) ? update : false
+      if parameter_updated?(attributes)
+        @logger.info "Updated parameters found."
+        update
+      else
+        @logger.info "No Cloud Formation parameters require updating."
+        return 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

data/lib/stackster/version.rb

@@ -1,3 +1,3 @@
 module Stackster
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/aws/cloud_formation/error_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe Stackster do
+
+  ['error'].each do |t|
+    it "should test #{t}"
+  end
+
+end

data/spec/entry_spec.rb

@@ -61,9 +61,7 @@ describe Stackster do
 
     it "should set the attributes in simple db" do
       @simple_db_mock.should_receive(:put_attributes).
-                      with("stacks", "test-stack-us-west-1", {"key"=>"value"}, {:replace=>"key"})
-      @simple_db_mock.should_receive(:put_attributes).
-                      with("stacks", "test-stack-us-west-1", {"Name"=>"test-stack-us-west-1"}, {:replace=>"Name"})
+                      with("stacks", "test-stack-us-west-1", {"key"=>"value", "Name"=>"test-stack-us-west-1"}, {:replace=>["key", "Name"]})
       @entry.attributes = {"key"=>"value"}
       
       @entry.save

data/spec/stack/stack_creater_spec.rb

@@ -21,6 +21,7 @@ describe Stackster do
 
   it "should map the attributes to a template's parameters and create a stack " do
     config_mock = mock 'config mock'
+    logger_mock = mock 'logger mock'
     entry_mock = mock 'entry mock'
     file_mock = mock 'file mock'
     cloud_formation_mock = mock 'cloud formation mock'
@@ -30,6 +31,8 @@ describe Stackster do
     File.should_receive(:open).with('path_to_file').
                                and_return file_mock
     file_mock.should_receive(:read).and_return @template_json
+    config_mock.should_receive(:logger).and_return(logger_mock)
+    logger_mock.should_receive(:info).exactly(1).times
     entry_mock.should_receive(:attributes).and_return @attributes
     cloud_formation_mock.should_receive(:create).
                          with(:name      => 'test-stack', 

data/spec/stack/stack_updater_spec.rb

@@ -21,6 +21,7 @@ describe Stackster do
   it "should update the stack when parameters change" do
     attributes = { "param1" => "value1", "param3" => "value3" }
     config_mock = mock 'config mock'
+    logger_mock = mock 'logger mock'
     entry_mock = mock 'entry mock'
     cloud_formation_mock = mock 'cloud formation mock'
     Stackster::AWS::CloudFormation.should_receive(:new).
@@ -32,6 +33,8 @@ describe Stackster do
                               :parameters => { 'param1' => 'value1' },
                               :template   => @template_body).
                          and_return true
+    config_mock.should_receive(:logger).and_return(logger_mock)
+    logger_mock.should_receive(:info).exactly(2).times
     stack_updater = Stackster::StackUpdater.new :name          => 'test-stack',
                                                 :template_body => @template_body,
                                                 :entry         => entry_mock,
@@ -44,8 +47,11 @@ describe Stackster do
   it "should not update the stack when parameters don't change" do
     attributes = { "param3" => "value3" }
     config_mock = mock 'config mock'
+    logger_mock = mock 'logger mock'
     entry_mock = mock 'entry mock'
     Stackster::AWS::CloudFormation.should_receive(:new).exactly(0).times
+    config_mock.should_receive(:logger).and_return(logger_mock)
+    logger_mock.should_receive(:info).with("No Cloud Formation parameters require updating.")
     stack_updater = Stackster::StackUpdater.new :name          => 'test-stack',
                                                 :template_body => @template_body,
                                                 :entry         => entry_mock,

data/stackster.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "fog"
   s.add_runtime_dependency 'logger'
   s.add_runtime_dependency "trollop"
+  s.add_runtime_dependency "xml-simple"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stackster
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-09 00:00:00.000000000 Z
+date: 2012-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70133562700240 !ruby/object:Gem::Requirement
+  requirement: &70332607252860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70133562700240
+  version_requirements: *70332607252860
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70133562699820 !ruby/object:Gem::Requirement
+  requirement: &70332607252400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70133562699820
+  version_requirements: *70332607252400
 - !ruby/object:Gem::Dependency
   name: logger
-  requirement: &70133562699400 !ruby/object:Gem::Requirement
+  requirement: &70332607251960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70133562699400
+  version_requirements: *70332607251960
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70133562698600 !ruby/object:Gem::Requirement
+  requirement: &70332607251540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70133562698600
+  version_requirements: *70332607251540
+- !ruby/object:Gem::Dependency
+  name: xml-simple
+  requirement: &70332607251100 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70332607251100
 description: Thats what I do
 email:
 - brett@weav.net
@@ -72,6 +83,7 @@ files:
 - lib/stackster.rb
 - lib/stackster/aws.rb
 - lib/stackster/aws/cloud_formation.rb
+- lib/stackster/aws/cloud_formation/error.rb
 - lib/stackster/aws/ec2.rb
 - lib/stackster/aws/simpledb.rb
 - lib/stackster/cli.rb
@@ -90,6 +102,7 @@ files:
 - lib/stackster/stack/stack_updater.rb
 - lib/stackster/version.rb
 - script/ci_setup
+- spec/aws/cloud_formation/error_spec.rb
 - spec/aws/cloud_formation_spec.rb
 - spec/aws/ec2_spec.rb
 - spec/aws/simpledb_spec.rb
@@ -121,7 +134,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2941852262455620206
+      hash: 4366725332877882823
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -130,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2941852262455620206
+      hash: 4366725332877882823
 requirements: []
 rubyforge_project: stackster
 rubygems_version: 1.8.16
@@ -138,6 +151,7 @@ signing_key:
 specification_version: 3
 summary: I make deployments easier
 test_files:
+- spec/aws/cloud_formation/error_spec.rb
 - spec/aws/cloud_formation_spec.rb
 - spec/aws/ec2_spec.rb
 - spec/aws/simpledb_spec.rb