stackster 0.3.2 → 0.4.0

data/.rvmrc

@@ -1 +1 @@
-rvm use ruby-1.9.3-p194@stackster --create
+rvm use ruby-1.9.3-p327@stackster --create

data/CHANGELOG

@@ -1,3 +1,9 @@
+## v0.4.0
+
+* Raise stackster exception as opposed to exit on CF errors
+* Creating base exceptions class
+* Updating rvm to ruby 1.9.3-p327
+
 ## v0.3.2
 
 * Removed the logger gem dependency

data/lib/stackster.rb

@@ -1,5 +1,6 @@
 require "stackster/aws"
 require "stackster/entry"
+require "stackster/exceptions"
 require "stackster/stack"
 require "stackster/instance"
 require "stackster/logger"

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

@@ -17,9 +17,12 @@ module Stackster
             case msg
             when 'No updates are to be performed.'
               @logger.info msg
+            when /^Stack:(.*) does not exist$/
+              @logger.error msg
+              raise Stackster::Exceptions::UnknownStack.new msg
             else
               @logger.error msg
-              exit 1
+              raise Stackster::Exceptions::CloudFormationError.new msg
             end
           end
         end

data/lib/stackster/exceptions.rb

@@ -0,0 +1,17 @@
+module Stackster
+  module Exceptions
+    class Base < RuntimeError
+      attr_accessor :message
+
+      def initialize(message="")
+        @message = message
+      end
+    end
+
+    class CloudFormationError < Base
+    end
+
+    class UnknownStack < Base
+    end
+  end
+end

data/lib/stackster/version.rb

@@ -1,3 +1,3 @@
 module Stackster
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

data/spec/aws/cloud_formation/error_spec.rb

@@ -13,6 +13,10 @@ describe Stackster do
     @exception_stub2 = stub 'Excon::Response'
     @exception_stub2.stub(:response).and_return(@exception_stub2)
     @exception_stub2.stub(:body).and_return('<opt><Error><Message>Oops.</Message></Error></opt>')
+
+    @exception_stub3 = stub 'Excon::Response'
+    @exception_stub3.stub(:response).and_return(@exception_stub3)
+    @exception_stub3.stub(:body).and_return('<opt><Error><Message>Stack:test does not exist</Message></Error></opt>')
   end
 
   describe 'process' do
@@ -23,17 +27,31 @@ describe Stackster do
       error.process
     end
 
-    it 'should process general messages' do
+    it 'should re-raise unkonwn errors as Stackster::CloudFormationError' do
       @logger_mock.should_receive(:error).with('Oops.')
 
       error = Stackster::AWS::CloudFormation::Error.new :exception => @exception_stub2, :config => @config_stub
 
+      lambda { error.process }.should raise_error Stackster::Exceptions::CloudFormationError
+    end
+
+    it 'should re-raise unkonwn errors as Stackster::CloudFormationError and set mesg' do
+      @logger_mock.should_receive(:error).with('Oops.')
+
+      error = Stackster::AWS::CloudFormation::Error.new :exception => @exception_stub2, :config => @config_stub
       begin
         error.process
-        fail 'should have exited'
-      rescue SystemExit => e
-        e.status.should == 1
+      rescue Stackster::Exceptions::CloudFormationError => e
+        e.message.should == "Oops."
       end
     end
+
+    it 'should reaise stck unkown messages as Stackster::UnknownStack' do
+      @logger_mock.should_receive(:error).with('Stack:test does not exist')
+
+      error = Stackster::AWS::CloudFormation::Error.new :exception => @exception_stub3, :config => @config_stub
+      lambda { error.process }.should raise_error Stackster::Exceptions::UnknownStack
+    end
+
   end
 end

data/spec/aws/cloud_formation_spec.rb

@@ -37,16 +37,19 @@ describe Stackster do
       @cf.create(@args)
     end
 
-    it "should trap exceptions" do
+    it "should trap and re-raise exceptions as Stackster::Exceptions::CloudFormationError" do
       @cf_mock.should_receive(:create_stack).with('my_stack',
                                                   { 'Capabilities' => ['CAPABILITY_IAM'],
                                                     'TemplateBody' => 'my_template',
                                                     'Parameters' => { 'parameter1' => 'my_param' }
                                                   }).and_raise(@exception)
+
       Stackster::AWS::CloudFormation::Error.should_receive(:new).
-        with(:config => @config_stub, :exception => @exception).and_return(@error_stub)
+        with(:config => @config_stub, :exception => @exception).
+        and_raise Stackster::Exceptions::CloudFormationError.new('failed')
 
-      @cf.create(@args).should == 'Processed Error'
+      lambda { @cf.create @args }.
+        should raise_error Stackster::Exceptions::CloudFormationError
     end
   end
 
@@ -61,16 +64,18 @@ describe Stackster do
       @cf.update(@args)
     end
 
-    it "should trap exceptions" do
+    it "should trap and re-raise exceptions as Stackster::Exceptions::CloudFormationError" do
       @cf_mock.should_receive(:update_stack).with('my_stack',
                                                   { 'Capabilities' => ['CAPABILITY_IAM'],
                                                     'TemplateBody' => 'my_template',
                                                     'Parameters' => { 'parameter1' => 'my_param' }
                                                   }).and_raise(@exception)
       Stackster::AWS::CloudFormation::Error.should_receive(:new).
-        with(:config => @config_stub, :exception => @exception).and_return(@error_stub)
+        with(:config => @config_stub, :exception => @exception).
+        and_raise Stackster::Exceptions::CloudFormationError.new('failed')
 
-      @cf.update(@args).should == 'Processed Error'
+      lambda { @cf.update(@args) }.
+        should raise_error Stackster::Exceptions::CloudFormationError
     end
   end
 
@@ -82,12 +87,16 @@ describe Stackster do
       @cf.destroy('my_stack')
     end
 
-    it "should trap exceptions" do
-      @cf_mock.should_receive(:delete_stack).with('my_stack').and_raise(@exception)
+    it "should trap and re-raise exceptions as Stackster::Exceptions::CloudFormationError" do
+      @cf_mock.should_receive(:delete_stack).
+               with('my_stack').
+               and_raise @exception
       Stackster::AWS::CloudFormation::Error.should_receive(:new).
-        with(:config => @config_stub, :exception => @exception).and_return(@error_stub)
+        with(:config => @config_stub, :exception => @exception).
+        and_raise Stackster::Exceptions::CloudFormationError.new('failed')
 
-      @cf.destroy('my_stack').should == 'Processed Error'
+      lambda { @cf.destroy('my_stack') }.
+        should raise_error Stackster::Exceptions::CloudFormationError
     end
   end
 
@@ -99,12 +108,16 @@ describe Stackster do
       @cf.describe_stack('my_stack').should == [{'StackStatus' => 'green', 'Outputs' => [{'key' => 'value'}]}]
     end
 
-    it "should trap exceptions" do
-      @cf_mock.should_receive(:describe_stacks).with('StackName' => 'my_stack').and_raise(@exception)
+    it "should trap and re-raise exceptions as Stackster::Exceptions::CloudFormationError" do
+      @cf_mock.should_receive(:describe_stacks).
+               with('StackName' => 'my_stack').
+               and_raise @exception
       Stackster::AWS::CloudFormation::Error.should_receive(:new).
-        with(:config => @config_stub, :exception => @exception).and_return(@error_stub)
+        with(:config => @config_stub, :exception => @exception).
+        and_raise Stackster::Exceptions::CloudFormationError.new('failed')
 
-      @cf.describe_stack('my_stack').should == 'Processed Error'
+      lambda { @cf.describe_stack('my_stack') }.
+        should raise_error Stackster::Exceptions::CloudFormationError
     end
   end
 
@@ -115,12 +128,16 @@ describe Stackster do
       @cf.stack_resources('my_stack').should == [{'StackName' => 'my_stack'}]
     end
 
-    it "should trap exceptions" do
-      @cf_mock.should_receive(:describe_stack_resources).with('StackName' => 'my_stack').and_raise(@exception)
+    it "should trap and re-raise exceptions as Stackster::Exceptions::CloudFormationError" do
+      @cf_mock.should_receive(:describe_stack_resources).
+               with('StackName' => 'my_stack').
+               and_raise @exception
       Stackster::AWS::CloudFormation::Error.should_receive(:new).
-        with(:config => @config_stub, :exception => @exception).and_return(@error_stub)
+        with(:config => @config_stub, :exception => @exception).
+        and_raise Stackster::Exceptions::CloudFormationError.new('failed')
 
-      @cf.stack_resources('my_stack').should == 'Processed Error'
+      lambda { @cf.stack_resources('my_stack') }.
+        should raise_error Stackster::Exceptions::CloudFormationError
     end
   end
 
@@ -131,12 +148,17 @@ describe Stackster do
       @cf.stack_events('my_stack', 2).should == ['event1', 'event2']
     end
 
-    it "should trap exceptions" do
-      @cf_mock.should_receive(:describe_stack_events).with('my_stack').and_raise(@exception)
+    it "should trap and re-raise exceptions as Stackster::Exceptions::CloudFormationError" do
+      @cf_mock.should_receive(:describe_stack_events).
+               with('my_stack').
+               and_raise @exception
+
       Stackster::AWS::CloudFormation::Error.should_receive(:new).
-        with(:config => @config_stub, :exception => @exception).and_return(@error_stub)
+        with(:config => @config_stub, :exception => @exception).
+        and_raise Stackster::Exceptions::CloudFormationError.new('failed')
 
-      @cf.stack_events('my_stack', 2).should == 'Processed Error'
+      lambda { @cf.stack_events('my_stack', 2) }.
+        should raise_error Stackster::Exceptions::CloudFormationError
     end
   end
 
@@ -163,12 +185,16 @@ describe Stackster do
       @cf.template('my_stack').should == '{EIP: "string"}'
     end
 
-    it "should trap exceptions" do
-      @cf_mock.should_receive(:get_template).with('my_stack').and_raise(@exception)
+    it "should trap and re-raise exceptions as Stackster::Exceptions::CloudFormationError" do
+      @cf_mock.should_receive(:get_template).
+               with('my_stack').
+               and_raise @exception
       Stackster::AWS::CloudFormation::Error.should_receive(:new).
-        with(:config => @config_stub, :exception => @exception).and_return(@error_stub)
+        with(:config => @config_stub, :exception => @exception).
+        and_raise Stackster::Exceptions::CloudFormationError.new('failed')
 
-      @cf.template('my_stack').should == 'Processed Error'
+      lambda { @cf.template('my_stack') }.
+        should raise_error Stackster::Exceptions::CloudFormationError
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stackster
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000 Z
+date: 2012-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70363866364540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70363866364540
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70363866362780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,15 +32,10 @@ dependencies:
         version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.11.0
+  version_requirements: *70363866362780
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70363866361660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -53,15 +43,10 @@ dependencies:
         version: 0.6.4
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.4
+  version_requirements: *70363866361660
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70363866360020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -69,60 +54,40 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.3
+  version_requirements: *70363866360020
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70363866374520 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.0
+  version_requirements: *70363866374520
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70363866373260 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '2.0'
+  version_requirements: *70363866373260
 - !ruby/object:Gem::Dependency
   name: xml-simple
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70363866371480 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.2
+  version_requirements: *70363866371480
 description: Thats what I do
 email:
 - brett@weav.net
@@ -150,6 +115,7 @@ files:
 - lib/stackster/config.rb
 - lib/stackster/entry.rb
 - lib/stackster/entry/entry_lister.rb
+- lib/stackster/exceptions.rb
 - lib/stackster/instance.rb
 - lib/stackster/instance/instance_reader.rb
 - lib/stackster/logger.rb
@@ -195,7 +161,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3770927478865725038
+      hash: 3449585736490155171
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -204,10 +170,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3770927478865725038
+      hash: 3449585736490155171
 requirements: []
 rubyforge_project: stackster
-rubygems_version: 1.8.24
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: I make deployments easier