simple_deploy 0.7.5 → 0.7.6.beta.1

data/.gitignore

@@ -6,3 +6,4 @@ coverage
 .ruby-version
 .rvmrc
 *.swp
+.idea/*

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## HEAD:
+
+* Fixed issue 176 where multiple deploys did not exit if first deploy failed
+* Fixed find_xml_file error when a blank exception is thrown from cloudformation.
+
 ## v0.7.5 (07/02/13):
 
 * Fixed bug with forced deployment in 0.7.4

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

@@ -11,21 +11,33 @@ module SimpleDeploy
         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
-            when /^Stack:(.*) does not exist$/
-              @logger.error msg
-              raise Exceptions::UnknownStack.new msg
+          @logger.debug "Object type = #{@exception.class}"
+          if @exception.respond_to?(:response)
+            unless @exception.response.body.empty?
+              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
+                when /Template requires parameter(.*)/
+                  @logger.info msg
+                when /^Stack:(.*) does not exist$/
+                  @logger.error msg
+                  raise Exceptions::UnknownStack.new msg
+                else
+                  @logger.error msg
+                  raise Exceptions::CloudFormationError.new msg
+                end
+              end
             else
-              @logger.error msg
-              raise Exceptions::CloudFormationError.new msg
+              @logger.error "CloudFormation returned blank xml EXCEPTION => #{@exception.response.body}" 
+              raise Exceptions::CloudFormationError.new "Cloudformation returned blank xml"
             end
+          else
+            @logger.error "Unknown exception from cloudformation #{@exception.inspect}"
+            raise Exceptions::CloudFormationError.new "Unknown exception from cloudformation"
           end
         end
-
       end
     end
   end

data/lib/simple_deploy/stack/deployment.rb

@@ -28,8 +28,11 @@ module SimpleDeploy
           status.set_deployment_in_progress
 
           @logger.info 'Starting deployment.'
-          executer.execute :sudo    => true,
-                          :command => deploy_command
+          return_val = executer.execute :sudo    => true,
+                                        :command => deploy_command
+
+          return false unless return_val
+
           @logger.info 'Deployment complete.'
 
           status.unset_deployment_in_progress

data/lib/simple_deploy/stack.rb

@@ -91,6 +91,11 @@ module SimpleDeploy
     end
 
     def destroy
+      unless exists?
+        @logger.error "#{@name} does not exist"
+        return false
+      end
+
       if attributes['protection'] != 'on'
         stack_destroyer.destroy
         @entry.delete_attributes

data/lib/simple_deploy/version.rb

@@ -1,3 +1,3 @@
 module SimpleDeploy
-  VERSION = "0.7.5"
+  VERSION = "0.7.6.beta.1"
 end

data/spec/aws/cloud_formation/error_spec.rb

@@ -14,10 +14,13 @@ describe SimpleDeploy::AWS::CloudFormation::Error 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>')
+
+    @exception_stub4 = stub 'Excon::Response'
+    @exception_stub4.stub(:response).and_return(@exception_stub4)
+    @exception_stub4.stub(:body).and_return('')
   end
 
   describe 'process' do
@@ -26,6 +29,11 @@ describe SimpleDeploy::AWS::CloudFormation::Error do
       expect { error.process }.to_not raise_error SimpleDeploy::Exceptions::CloudFormationError
     end
 
+    it 'should raise an error if the exception is blank' do
+      error = SimpleDeploy::AWS::CloudFormation::Error.new :exception => @exception_stub4
+      expect { error.process }.to raise_error SimpleDeploy::Exceptions::CloudFormationError
+    end
+
     it 'should re-raise unkonwn errors as SimpleDeploy::CloudFormationError' do
       error = SimpleDeploy::AWS::CloudFormation::Error.new :exception => @exception_stub2
 

data/spec/stack/deployment_spec.rb

@@ -110,7 +110,7 @@ describe SimpleDeploy::Stack::Deployment do
         before do
           @attributes['app_encrypted'] = 'true'
           @execute_mock.should_receive(:execute).
-                        with( {:sudo=>true, :command=>"env CHEF_REPO_URL=s3://cookbooks_bp-test-us-west-1/cookbooks_d/cookbooks.tar.gz APP_URL=s3://app_bp-test-us-west-1/app_d/app.tar.gz.gpg PRIMARY_HOST=10.1.2.3 /tmp/script"} )
+                        with( {:sudo=>true, :command=>"env CHEF_REPO_URL=s3://cookbooks_bp-test-us-west-1/cookbooks_d/cookbooks.tar.gz APP_URL=s3://app_bp-test-us-west-1/app_d/app.tar.gz.gpg PRIMARY_HOST=10.1.2.3 /tmp/script"} ).and_return(true)
         end
 
         it "should deploy if the stack is clear to deploy" do
@@ -137,7 +137,7 @@ describe SimpleDeploy::Stack::Deployment do
       context "when unencrypted" do
         before do
           @execute_mock.should_receive(:execute).
-                        with( {:sudo=>true, :command=>"env CHEF_REPO_URL=s3://cookbooks_bp-test-us-west-1/cookbooks_d/cookbooks.tar.gz APP_URL=s3://app_bp-test-us-west-1/app_d/app.tar.gz PRIMARY_HOST=10.1.2.3 /tmp/script"} )
+                        with( {:sudo=>true, :command=>"env CHEF_REPO_URL=s3://cookbooks_bp-test-us-west-1/cookbooks_d/cookbooks.tar.gz APP_URL=s3://app_bp-test-us-west-1/app_d/app.tar.gz PRIMARY_HOST=10.1.2.3 /tmp/script"} ).and_return(true)
         end
 
         it "should deploy if the stack is clear to deploy" do

data/spec/stack_spec.rb

@@ -143,6 +143,7 @@ describe SimpleDeploy::Stack do
     end
 
     it "should destroy if the stack is not protected" do
+      @stack.stub(:exists?).and_return(true)
       @entry_mock.should_receive(:delete_attributes)
 
       SimpleDeploy::StackReader.should_receive(:new).
@@ -158,6 +159,7 @@ describe SimpleDeploy::Stack do
     end
 
     it "should not destroy if the stack is protected" do
+      @stack.stub(:exists?).and_return(true)
       @entry_mock.should_receive(:delete_attributes).never
 
       SimpleDeploy::StackReader.should_receive(:new).
@@ -170,6 +172,7 @@ describe SimpleDeploy::Stack do
     end
 
     it "should destroy if protection is undefined" do
+      @stack.stub(:exists?).and_return(true)
       @entry_mock.should_receive(:delete_attributes)
 
       SimpleDeploy::StackReader.should_receive(:new).
@@ -183,6 +186,13 @@ describe SimpleDeploy::Stack do
 
       @stack.destroy.should be_true
     end
+
+    it "should not destroy if stack does not exist" do
+      @stack.stub(:exists?).and_return(false)
+      @entry_mock.should_receive(:delete_attributes).never
+      @stack_destroyer_mock.should_receive(:destroy).never
+      @stack.destroy.should_not be_true
+    end
   end
 
   describe 'instances' do

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: simple_deploy
 version: !ruby/object:Gem::Version
-  version: 0.7.5
-  prerelease: 
+  version: 0.7.6.beta.1
+  prerelease: 6
 platform: ruby
 authors:
 - Brett Weaver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2013-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70113953516080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *70113953516080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70113953514780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70113953514780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70113953529640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: 2.13.0
   type: :development
   prerelease: false
-  version_requirements: *70113953529640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70113953528660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: 0.7.1
   type: :development
   prerelease: false
-  version_requirements: *70113953528660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70113953528020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,21 +85,31 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *70113953528020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70113953527100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 2.13.5
   type: :runtime
   prerelease: false
-  version_requirements: *70113953527100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.13.5
 - !ruby/object:Gem::Dependency
   name: esbit
-  requirement: &70113953525280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,40 +117,60 @@ dependencies:
         version: 0.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *70113953525280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70113953523220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70113953523220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70113953537360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *70113953537360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: xml-simple
-  requirement: &70113953531880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70113953531880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.2
 description: Opinionated gem for Managing AWS Cloud Formation stacks and deploying
   updates to Instances.
 email:
@@ -246,21 +296,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3918312770132842025
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -3918312770132842025
+      version: 1.3.1
 requirements: []
 rubyforge_project: simple_deploy
-rubygems_version: 1.8.16
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Opinionated gem for AWS resource management.