simple_deploy 0.7.4 → 0.7.5

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.7.5 (07/02/13):
+
+* Fixed bug with forced deployment in 0.7.4
+
 ## v0.7.4:
 
 * Updated the update command so it can now take a new template

data/README.md

@@ -31,3 +31,12 @@ Documentation
 -------------
 
 For more information, please view the [Simple Deploy Wiki](https://github.com/intuit/simple_deploy/wiki).
+
+Contributing
+-------------
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/lib/simple_deploy/stack.rb

@@ -65,6 +65,7 @@ module SimpleDeploy
       if args[:caller].kind_of? Stack::Deployment::Status
         @logger.info "Updating #{@name}."
         attributes = stack_attribute_formatter.updated_attributes args[:attributes]
+        @template_body = args[:template_body] || template
 
         @entry.set_attributes attributes
         stack_updater.update_stack attributes

data/lib/simple_deploy/version.rb

@@ -1,3 +1,3 @@
 module SimpleDeploy
-  VERSION = "0.7.4"
+  VERSION = "0.7.5"
 end

data/spec/stack_spec.rb

@@ -5,7 +5,6 @@ describe SimpleDeploy::Stack do
                                            :secret_key => 'secret',
                                            :region     => 'us-west-1'
   include_context 'double stubbed logger'
-        
 
   before do
     @environment_config_mock = mock 'environment config mock'
@@ -292,6 +291,31 @@ describe SimpleDeploy::Stack do
     end
   end
 
+  describe 'in_progress_update' do
+    before do
+      @stack = SimpleDeploy::Stack.new :environment => 'test-env',
+                                       :name        => 'test-stack',
+                                       :config      => @config_stub,
+                                       :internal    => false
+    end
+
+    it "should update the stack to not be in progress" do
+      status_stub = stub 'status', :kind_of? => SimpleDeploy::Stack::Deployment::Status
+      stack_updater_mock = mock 'stack_updater'
+      @entry_mock.stub :attributes => { 'deployment_in_progress' => 'true' }
+      @stack.stub :template => 'some_json'
+      @entry_mock.should_receive(:set_attributes).with([{ 'deployment_in_progress' => 'false' }])
+      SimpleDeploy::StackUpdater.should_receive(:new).
+                                 with(:name          => 'test-stack',
+                                      :entry         => @entry_mock,
+                                      :template_body => 'some_json').
+                                 and_return stack_updater_mock
+      stack_updater_mock.should_receive(:update_stack).with([{ 'deployment_in_progress' => 'false' }])
+      @entry_mock.should_receive(:save)
+      @stack.in_progress_update(:attributes => [ { 'deployment_in_progress' => 'false' } ], :caller => status_stub).should be_true
+    end
+  end
+
   describe "wait_for_stable" do
     before do
       @status_mock = mock 'status'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_deploy
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2013-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70199856979460 !ruby/object:Gem::Requirement
+  requirement: &70113953516080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *70199856979460
+  version_requirements: *70113953516080
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70199856978480 !ruby/object:Gem::Requirement
+  requirement: &70113953514780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70199856978480
+  version_requirements: *70113953514780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70199857004380 !ruby/object:Gem::Requirement
+  requirement: &70113953529640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.13.0
   type: :development
   prerelease: false
-  version_requirements: *70199857004380
+  version_requirements: *70113953529640
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70199857003340 !ruby/object:Gem::Requirement
+  requirement: &70113953528660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.7.1
   type: :development
   prerelease: false
-  version_requirements: *70199857003340
+  version_requirements: *70113953528660
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70199857002440 !ruby/object:Gem::Requirement
+  requirement: &70113953528020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *70199857002440
+  version_requirements: *70113953528020
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70199857001780 !ruby/object:Gem::Requirement
+  requirement: &70113953527100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -76,10 +76,10 @@ dependencies:
         version: 2.13.5
   type: :runtime
   prerelease: false
-  version_requirements: *70199857001780
+  version_requirements: *70113953527100
 - !ruby/object:Gem::Dependency
   name: esbit
-  requirement: &70199857000960 !ruby/object:Gem::Requirement
+  requirement: &70113953525280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *70199857000960
+  version_requirements: *70113953525280
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70199857000240 !ruby/object:Gem::Requirement
+  requirement: &70113953523220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -98,10 +98,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70199857000240
+  version_requirements: *70113953523220
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70199856999600 !ruby/object:Gem::Requirement
+  requirement: &70113953537360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -109,10 +109,10 @@ dependencies:
         version: 1.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *70199856999600
+  version_requirements: *70113953537360
 - !ruby/object:Gem::Dependency
   name: xml-simple
-  requirement: &70199856999020 !ruby/object:Gem::Requirement
+  requirement: &70113953531880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -120,7 +120,7 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70199856999020
+  version_requirements: *70113953531880
 description: Opinionated gem for Managing AWS Cloud Formation stacks and deploying
   updates to Instances.
 email:
@@ -248,7 +248,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4463041608859511605
+      hash: -3918312770132842025
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -257,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4463041608859511605
+      hash: -3918312770132842025
 requirements: []
 rubyforge_project: simple_deploy
 rubygems_version: 1.8.16