simple_deploy 0.7.3 → 0.7.4

data/CHANGELOG.md

@@ -1,4 +1,6 @@
-## head:
+## v0.7.4:
+
+* Updated the update command so it can now take a new template
 
 ## v0.7.3 (05/17/2013):
 

data/lib/simple_deploy/aws/cloud_formation.rb

@@ -18,7 +18,7 @@ module SimpleDeploy
                  'TemplateBody' => args[:template] }.merge parameters
         @connect.create_stack(args[:name], data)
         @logger.info "Cloud Formation stack creation completed."
-      rescue Exception => e  
+      rescue Exception => e
         Error.new(:exception => e).process
       end
 
@@ -28,32 +28,32 @@ module SimpleDeploy
                  'TemplateBody' => args[:template] }.merge parameters
         @connect.update_stack(args[:name], data)
         @logger.info "Cloud Formation stack update completed."
-      rescue Exception => e  
+      rescue Exception => e
         Error.new(:exception => e).process
       end
 
       def destroy(name)
         @connect.delete_stack name
         @logger.info "Cloud Formation stack destroy completed."
-      rescue Exception => e  
+      rescue Exception => e
         Error.new(:exception => e).process
       end
 
       def describe_stack(name)
         @connect.describe_stacks('StackName' => name).body['Stacks']
-      rescue Exception => e  
+      rescue Exception => e
         Error.new(:exception => e).process
       end
 
       def stack_resources(name)
         @connect.describe_stack_resources('StackName' => name).body['StackResources']
-      rescue Exception => e  
+      rescue Exception => e
         Error.new(:exception => e).process
       end
 
       def stack_events(name, limit)
         @connect.describe_stack_events(name).body['StackEvents'] [0..limit-1]
-      rescue Exception => e  
+      rescue Exception => e
         Error.new(:exception => e).process
       end
 
@@ -67,7 +67,7 @@ module SimpleDeploy
 
       def template(name)
         @connect.get_template(name).body['TemplateBody']
-      rescue Exception => e  
+      rescue Exception => e
         Error.new(:exception => e).process
       end
 

data/lib/simple_deploy/cli/update.rb

@@ -25,6 +25,7 @@ EOS
                                                                   :default => 'info'
           opt :name, "Stack name(s) of stack to deploy", :type => :string,
                                                          :multi => true
+          opt :template, "Path to a new template file", :type => :string
         end
 
         valid_options? :provided => @opts,
@@ -39,8 +40,14 @@ EOS
           stack = Stack.new :name        => name,
                             :environment => @opts[:environment]
 
+          if @opts[:template]
+            template_body = IO.read @opts[:template]
+          end
+
           rescue_exceptions_and_exit do
-            stack.update :force => @opts[:force], :attributes => attributes
+            stack.update :force => @opts[:force],
+                         :template_body => template_body,
+                         :attributes => attributes
           end
         end
       end

data/lib/simple_deploy/stack/stack_updater.rb

@@ -11,12 +11,12 @@ module SimpleDeploy
       @template_body = args[:template_body]
     end
 
-    def update_stack_if_parameters_changed(attributes)
-      if parameter_updated?(attributes)
-        @logger.debug "Updated parameters found."
+    def update_stack(attributes)
+      if parameter_updated?(attributes) || @template_body
+        @logger.debug 'Updated parameters or new template found.'
         update
       else
-        @logger.debug "No Cloud Formation parameters require updating."
+        @logger.debug 'No parameters require updating and no new template found.'
         false
       end
     end
@@ -26,9 +26,9 @@ module SimpleDeploy
     def update
       if status.wait_for_stable
         @logger.info "Updating Cloud Formation stack #{@name}."
-        cloud_formation.update :name => @name,
+        cloud_formation.update :name       => @name,
                                :parameters => read_parameters_from_entry_attributes,
-                               :template => @template_body
+                               :template   => @template_body
       else
         raise "#{@name} did not reach a stable state."
       end

data/lib/simple_deploy/stack.rb

@@ -30,7 +30,7 @@ module SimpleDeploy
 
       @entry.set_attributes attributes
       stack_creator.create
-      
+
       @entry.save
     end
 
@@ -47,10 +47,10 @@ module SimpleDeploy
       if deployment.clear_for_deployment?
         @logger.info "Updating #{@name}."
         attributes = stack_attribute_formatter.updated_attributes args[:attributes]
-        @template_body = template
+        @template_body = args[:template_body] || template
 
         @entry.set_attributes attributes
-        stack_updater.update_stack_if_parameters_changed attributes
+        stack_updater.update_stack attributes
         @logger.info "Update complete for #{@name}."
 
         @entry.save
@@ -65,10 +65,9 @@ module SimpleDeploy
       if args[:caller].kind_of? Stack::Deployment::Status
         @logger.info "Updating #{@name}."
         attributes = stack_attribute_formatter.updated_attributes args[:attributes]
-        @template_body = template
 
         @entry.set_attributes attributes
-        stack_updater.update_stack_if_parameters_changed attributes
+        stack_updater.update_stack attributes
         @logger.info "Update complete for #{@name}."
 
         @entry.save

data/lib/simple_deploy/version.rb

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

data/spec/cli/clone_spec.rb

@@ -170,7 +170,7 @@ describe SimpleDeploy::CLI::Clone do
 
         subject.should_receive(:valid_options?).
                 with(:provided => @options,
-                      :required => [:environment, :source_name, :new_name])
+                     :required => [:environment, :source_name, :new_name])
         Trollop.stub(:options).and_return(@options)
 
         @new_stack_mock.should_receive(:create) do |options|

data/spec/cli/update_spec.rb

@@ -10,20 +10,22 @@ describe SimpleDeploy::CLI::Update do
   describe 'update' do
     before do
       @stack_mock1.stub(:attributes).and_return({})
+      @template_body = "{ \"fake_json\" : \"goodness\"}"
+
+      @options = { :environment => 'my_env',
+                   :log_level   => 'debug',
+                   :name        => ['my_stack1'],
+                   :force       => true,
+                   :attributes  => ['chef_repo_bucket_prefix=intu-lc'] }
+
     end
 
     it "should pass force true" do
-      options = { :environment => 'my_env',
-                  :log_level   => 'debug',
-                  :name        => ['my_stack1'],
-                  :force       => true,
-                  :attributes  => ['chef_repo_bucket_prefix=intu-lc'] }
-
       subject.should_receive(:valid_options?).
-              with(:provided => options,
+              with(:provided => @options,
                    :required => [:environment, :name])
 
-      Trollop.stub(:options).and_return(options)
+      Trollop.stub(:options).and_return(@options)
 
       @stack_mock1.should_receive(:update).with(hash_including(:force => true))
 
@@ -31,21 +33,32 @@ describe SimpleDeploy::CLI::Update do
     end
 
     it "should pass force false" do
-      options = { :environment => 'my_env',
-                  :log_level   => 'debug',
-                  :name        => ['my_stack1'],
-                  :force       => false,
-                  :attributes  => ['chef_repo_bucket_prefix=intu-lc'] }
+      @options[:force] = false
 
       subject.should_receive(:valid_options?).
-              with(:provided => options,
+              with(:provided => @options,
                    :required => [:environment, :name])
 
-      Trollop.stub(:options).and_return(options)
+      Trollop.stub(:options).and_return(@options)
 
       @stack_mock1.should_receive(:update).with(hash_including(:force => false))
 
       subject.update
     end
+
+    it "should update the template if a new template is provided" do
+      @options[:template] = 'brand_new_template.json'
+
+      subject.should_receive(:valid_options?).
+        with(:provided => @options,
+             :required => [:environment, :name])
+
+      Trollop.stub(:options).and_return(@options)
+
+      IO.should_receive(:read).with('brand_new_template.json').and_return(@template_body)
+
+      @stack_mock1.should_receive(:update).with(hash_including(:template_body => @template_body))
+      subject.update
+    end
   end
 end

data/spec/stack/stack_updater_spec.rb

@@ -18,6 +18,23 @@ describe SimpleDeploy::StackUpdater do
                             }
                         }
                       }'
+
+    @new_template_body = '{ "Parameters": 
+                            { 
+                              "param1" : 
+                                {
+                                  "Description" : "param-1"
+                                },
+                              "param2" : 
+                                {
+                                  "Description" : "param-2"
+                                },
+                              "param3" : 
+                                {
+                                  "Description" : "param-3"
+                                }
+                            }
+                          }'
   end
 
   it "should update the stack when parameters change and stack is stable" do
@@ -41,39 +58,50 @@ describe SimpleDeploy::StackUpdater do
                                                    :template_body => @template_body,
                                                    :entry         => entry_mock
 
-    stack_updater.update_stack_if_parameters_changed( [ { 'param1' => 'new-value' } ] ).
+    stack_updater.update_stack( [ { 'param1' => 'new-value' } ] ).
                   should == true
   end
 
-  it "should raise an error when parameters change and stack is not stable" do
+  it "should update the stack when only the template body changes and stack is stable" do
     attributes = { "param1" => "value1", "param3" => "value3" }
     entry_mock = mock 'entry mock'
     status_mock = mock 'status mock'
     cloud_formation_mock = mock 'cloud formation mock'
     SimpleDeploy::AWS::CloudFormation.should_receive(:new).
-                                      exactly(0).times
+                                      and_return cloud_formation_mock
+    entry_mock.stub(:attributes).and_return attributes
+
+    cloud_formation_mock.should_receive(:update).
+                         with(:name      => 'test-stack', 
+                              :parameters => { 'param1' => 'value1', 'param3' => 'value3' },
+                              :template   => @new_template_body).
+                         and_return true
     SimpleDeploy::Status.should_receive(:new).
-                         with(:name   => 'test-stack').
-                         and_return status_mock
-    status_mock.should_receive(:wait_for_stable).and_return false
+                      with(:name   => 'test-stack').
+                      and_return status_mock
+    status_mock.stub(:wait_for_stable).and_return true
     stack_updater = SimpleDeploy::StackUpdater.new :name          => 'test-stack',
-                                                   :template_body => @template_body,
+                                                   :template_body => @new_template_body,
                                                    :entry         => entry_mock
 
-    lambda {stack_updater.update_stack_if_parameters_changed( [ { 'param1' => 'new-value' } ] ) }.
-                  should raise_error
+    stack_updater.update_stack([]).should == true
   end
 
-  it "should not update the stack when parameters don't change" do
-    attributes = { "param3" => "value3" }
+  it "should raise an error when parameters change and stack is not stable" do
+    attributes = { "param1" => "value1", "param3" => "value3" }
     entry_mock = mock 'entry mock'
-    SimpleDeploy::AWS::CloudFormation.should_receive(:new).exactly(0).times
+    status_mock = mock 'status mock'
+    cloud_formation_mock = mock 'cloud formation mock'
+    SimpleDeploy::AWS::CloudFormation.should_receive(:new).never
+    SimpleDeploy::Status.should_receive(:new).
+                         with(:name   => 'test-stack').
+                         and_return status_mock
+    status_mock.stub(:wait_for_stable).and_return false
     stack_updater = SimpleDeploy::StackUpdater.new :name          => 'test-stack',
                                                    :template_body => @template_body,
                                                    :entry         => entry_mock
 
-    stack_updater.update_stack_if_parameters_changed( [ { 'another-param' => 'new-value' } ] ).
-                  should == false
+    lambda {stack_updater.update_stack( [ { 'param1' => 'new-value' } ] ) }.
+                  should raise_error
   end
-
 end

data/spec/stack_spec.rb

@@ -83,8 +83,7 @@ describe SimpleDeploy::Stack do
                                       :entry         => @entry_mock,
                                       :template_body => 'some_json').
                                  and_return @stack_updater_mock
-      @stack_updater_mock.should_receive(:update_stack_if_parameters_changed).
-                          and_return(true)
+      @stack_updater_mock.stub(:update_stack).and_return(true)
       SimpleDeploy::StackReader.should_receive(:new).
                                  with(:name   => 'test-stack').
                                  and_return @stack_reader_mock
@@ -118,8 +117,7 @@ describe SimpleDeploy::Stack do
                                       :entry         => @entry_mock,
                                       :template_body => 'some_json').
                                  and_return @stack_updater_mock
-      @stack_updater_mock.should_receive(:update_stack_if_parameters_changed).
-                          and_return(true)
+      @stack_updater_mock.stub(:update_stack).and_return(true)
       SimpleDeploy::StackReader.should_receive(:new).
                                  with(:name   => 'test-stack').
                                  and_return @stack_reader_mock

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_deploy
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-17 00:00:00.000000000 Z
+date: 2013-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70199856979460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,15 +21,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.2
+  version_requirements: *70199856979460
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70199856978480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,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: *70199856978480
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70199857004380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -53,15 +43,10 @@ dependencies:
         version: 2.13.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.13.0
+  version_requirements: *70199857004380
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70199857003340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -69,15 +54,10 @@ dependencies:
         version: 0.7.1
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.1
+  version_requirements: *70199857003340
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70199857002440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -85,31 +65,21 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.1
+  version_requirements: *70199857002440
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70199857001780 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 2.13.5
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.13.5
+  version_requirements: *70199857001780
 - !ruby/object:Gem::Dependency
   name: esbit
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70199857000960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -117,60 +87,40 @@ dependencies:
         version: 0.0.4
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.4
+  version_requirements: *70199857000960
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70199857000240 !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: *70199857000240
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70199856999600 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 1.10.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.10.0
+  version_requirements: *70199856999600
 - !ruby/object:Gem::Dependency
   name: xml-simple
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70199856999020 !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: *70199856999020
 description: Opinionated gem for Managing AWS Cloud Formation stacks and deploying
   updates to Instances.
 email:
@@ -296,15 +246,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4463041608859511605
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4463041608859511605
 requirements: []
 rubyforge_project: simple_deploy
-rubygems_version: 1.8.23
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Opinionated gem for AWS resource management.