simple_deploy 0.5.5 → 0.5.6

data/CHANGELOG

@@ -1,3 +1,10 @@
+## v0.5.6
+
+* Corrected the instances command so it returns all instances
+* Updated the clone command so it can take a new template for the new stack
+* Added region to the message notifications
+* Fixed deployments so they don't try to deploy if the attributes fail to update
+
 ## v0.5.5
 
 * Added backoff functionality to updates so they work better with the force option

data/lib/simple_deploy/cli/clone.rb

@@ -20,6 +20,7 @@ EOS
           opt :new_name, "Stack name for the new stack", :type => :string
           opt :attributes, "= separated attribute and it's value", :type  => :string,
                                                                    :multi => true
+          opt :template, "Path to a new template file", :type => :string
         end
 
         CLI::Shared.valid_options? :provided => @opts,
@@ -31,8 +32,12 @@ EOS
         cloned_attributes = filter_attributes source_stack.attributes
         new_attributes = merge_attributes cloned_attributes, override_attributes
 
-        template_file = Tempfile.new("#{@opts[:new_name]}_template.json").path
-        File::open(template_file, 'w') { |f| f.write source_stack.template.to_json }
+        if @opts[:template]
+          template_file = @opts[:template]
+        else
+          template_file = Tempfile.new("#{@opts[:new_name]}_template.json").path
+          File::open(template_file, 'w') { |f| f.write source_stack.template.to_json }
+        end
 
         new_stack.create :attributes => new_attributes,
                          :template   => template_file

data/lib/simple_deploy/cli/deploy.rb

@@ -65,14 +65,17 @@ EOS
                             :logger      => logger,
                             :internal    => opts[:internal]
 
-          stack.update :force => opts[:force], :attributes => new_attributes if new_attributes.any?
-
-          notifier.send_deployment_start_message unless opts[:quiet]
-          if stack.deploy opts[:force]
-            notifier.send_deployment_complete_message unless opts[:quiet]
-          else
-            logger.error "Deployment to #{name} did not complete succesfully."
-            exit 1
+          proceed = true
+          proceed = stack.update :force => opts[:force], :attributes => new_attributes if new_attributes.any?
+
+          if proceed
+            notifier.send_deployment_start_message unless opts[:quiet]
+            if stack.deploy opts[:force]
+              notifier.send_deployment_complete_message unless opts[:quiet]
+            else
+              logger.error "Deployment to #{name} did not complete succesfully."
+              exit 1
+            end
           end
 
         end

data/lib/simple_deploy/notifier.rb

@@ -11,12 +11,12 @@ module SimpleDeploy
     end
 
     def send_deployment_start_message
-      message = "Deployment to #{@stack_name} started."
+      message = "Deployment to #{@stack_name} in #{@config.region @environment} started."
       send message
     end
 
     def send_deployment_complete_message
-      message = "Deployment to #{@stack_name} complete."
+      message = "Deployment to #{@stack_name} in #{@config.region @environment} complete."
       attributes = stack.attributes
 
       if attributes['app_github_url']

data/lib/simple_deploy/stack.rb

@@ -35,6 +35,10 @@ module SimpleDeploy
         attributes = stack_attribute_formater.updated_attributes args[:attributes]
         stack.update :attributes => attributes
         @logger.info "Update complete for #{@name}."
+        true
+      else
+        @logger.info "Not clear to update."
+        false
       end
     end
 
@@ -72,14 +76,14 @@ module SimpleDeploy
 
     def instances
       stack.instances.map do |instance| 
-        info = instance['instancesSet'].first
-
-        if info['vpcId'] || @use_internal_ips
-          info['privateIpAddress']
-        else
-          info['ipAddress']
+        instance['instancesSet'].map do |info|
+          if info['vpcId'] || @use_internal_ips
+            info['privateIpAddress']
+          else
+            info['ipAddress']
+          end
         end
-      end
+      end.flatten
     end
 
     def status

data/lib/simple_deploy/version.rb

@@ -1,3 +1,3 @@
 module SimpleDeploy
-  VERSION = "0.5.5"
+  VERSION = "0.5.6"
 end

data/simple_deploy.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec"
 
   s.add_runtime_dependency "capistrano"
-  s.add_runtime_dependency "stackster", '= 0.3.0'
+  s.add_runtime_dependency "stackster", '= 0.3.1'
   s.add_runtime_dependency "tinder"
   s.add_runtime_dependency "trollop"
 end

data/spec/cli/clone_spec.rb

@@ -136,6 +136,27 @@ describe SimpleDeploy::CLI::Clone do
 
         subject.clone
       end
+
+      it 'should create the new stack using a new template' do
+        @options[:template] = 'brand_new_template.json'
+
+        SimpleDeploy::CLI::Shared.should_receive(:valid_options?).
+                                 with(:provided => @options,
+                                      :required => [:environment, :source_name, :new_name])
+        Trollop.stub(:options).and_return(@options)
+
+        @new_stack.should_receive(:create) do |options|
+          options[:attributes].should == [{ 'AmiId' => 'ami-7b6a4e3e' },
+                                          { 'AppEnv' => 'pod-2-cd-1' },
+                                          { 'MaximumAppInstances' => 1 },
+                                          { 'MinimumAppInstances' => 1 },
+                                          { 'chef_repo_bucket_prefix' => 'updated-intu-lc' },
+                                          { 'chef_repo_domain' => 'updated_community_chef_repo' }]
+          options[:template].should match /brand_new_template.json/
+        end
+
+        subject.clone
+      end
     end
   end
 end

data/spec/cli/deploy_spec.rb

@@ -110,7 +110,75 @@ describe SimpleDeploy::CLI::Deploy do
                                :internal    => false).
                           and_return(@stack)
 
-      @stack.should_receive(:update).with(hash_including(:force => true, :attributes => [{'foo' => 'bah'}]))
+      @stack.should_receive(:update).with(hash_including(:force => true, :attributes => [{'foo' => 'bah'}])).and_return(true)
+      @stack.should_receive(:deploy).with(true).and_return(true)
+      @notifier.should_receive(:send_deployment_start_message)
+      @notifier.should_receive(:send_deployment_complete_message)
+
+      subject.deploy
+    end
+
+    it "should skip the deploy if the attributes update is not successful" do
+      options = { :environment => 'my_env',
+                  :log_level   => 'debug',
+                  :name        => ['my_stack'],
+                  :force       => true,
+                  :internal    => false,
+                  :attributes  => ['foo=bah'] }
+
+      SimpleDeploy::CLI::Shared.should_receive(:valid_options?).
+                                with(:provided => options,
+                                     :required => [:environment, :name])
+      Trollop.stub(:options).and_return(options)
+
+      SimpleDeploy::Notifier.should_receive(:new).
+                          with(:stack_name  => 'my_stack',
+                               :environment => 'my_env',
+                               :logger      => @logger).
+                          and_return(@notifier)
+
+      SimpleDeploy::Stack.should_receive(:new).
+                          with(:environment => 'my_env',
+                               :logger      => @logger,
+                               :name        => 'my_stack',
+                               :internal    => false).
+                          and_return(@stack)
+
+      @stack.should_receive(:update).with(hash_including(:force => true, :attributes => [{'foo' => 'bah'}])).and_return(false)
+      @stack.should_not_receive(:deploy)
+      @notifier.should_not_receive(:send_deployment_start_message)
+      @notifier.should_not_receive(:send_deployment_complete_message)
+
+      subject.deploy
+    end
+
+    it "should do the deploy if there are no attributes to update" do
+      options = { :environment => 'my_env',
+                  :log_level   => 'debug',
+                  :name        => ['my_stack'],
+                  :force       => true,
+                  :internal    => false,
+                  :attributes  => [] }
+
+      SimpleDeploy::CLI::Shared.should_receive(:valid_options?).
+                                with(:provided => options,
+                                     :required => [:environment, :name])
+      Trollop.stub(:options).and_return(options)
+
+      SimpleDeploy::Notifier.should_receive(:new).
+                          with(:stack_name  => 'my_stack',
+                               :environment => 'my_env',
+                               :logger      => @logger).
+                          and_return(@notifier)
+
+      SimpleDeploy::Stack.should_receive(:new).
+                          with(:environment => 'my_env',
+                               :logger      => @logger,
+                               :name        => 'my_stack',
+                               :internal    => false).
+                          and_return(@stack)
+
+      @stack.should_not_receive(:update)
       @stack.should_receive(:deploy).with(true).and_return(true)
       @notifier.should_receive(:send_deployment_start_message)
       @notifier.should_receive(:send_deployment_complete_message)

data/spec/notifier_spec.rb

@@ -23,8 +23,10 @@ describe SimpleDeploy do
     it "should support a basic start message" do
       campfire_mock = mock 'campfire mock'
 
+      @config_mock.should_receive(:region).with('test').and_return('us-west-1')
+
       SimpleDeploy::Notifier::Campfire.should_receive(:new).and_return campfire_mock
-      campfire_mock.should_receive(:send).with "Deployment to stack_name started."
+      campfire_mock.should_receive(:send).with "Deployment to stack_name in us-west-1 started."
       
       @notifier.send_deployment_start_message
     end
@@ -36,6 +38,7 @@ describe SimpleDeploy do
       @config_mock.should_receive(:environment).
                    with('test').
                    and_return environment_mock
+      @config_mock.should_receive(:region).with('test').and_return('us-west-1')
       Stackster::Stack.should_receive(:new).
                        with(:environment => 'test',
                             :name        => 'stack_name',
@@ -50,7 +53,7 @@ describe SimpleDeploy do
       SimpleDeploy::Notifier::Campfire.should_receive(:new).
                                        and_return campfire_mock
       campfire_mock.should_receive(:send).
-                    with "Deployment to stack_name complete. App: http://github.com/user/app/commit/appsha Chef: http://github.com/user/chef_repo/commit/chefsha"
+                    with "Deployment to stack_name in us-west-1 complete. App: http://github.com/user/app/commit/appsha Chef: http://github.com/user/chef_repo/commit/chefsha"
       @notifier.send_deployment_complete_message
     end
 

data/spec/stack_spec.rb

@@ -80,7 +80,7 @@ describe SimpleDeploy do
                                             and_return @stack_mock
       @stack_mock.should_receive(:update).with :attributes => @expected_attributes
 
-      @stack.update :attributes => [{ 'chef_repo' => 'test123' }]
+      @stack.update(:attributes => [{ 'chef_repo' => 'test123' }]).should be_true
     end
 
     it "should not update when the deployment is locked and force is not set" do
@@ -90,7 +90,7 @@ describe SimpleDeploy do
       SimpleDeploy::StackAttributeFormater.should_not_receive(:new)
       Stackster::Stack.should_not_receive(:new)
 
-      @stack.update :attributes => { 'arg1' => 'val' }
+      @stack.update(:attributes => { 'arg1' => 'val' }).should_not be_true
     end
 
     it "should update when the deployment is locked and force is set true" do
@@ -106,7 +106,7 @@ describe SimpleDeploy do
                                             and_return @stack_mock
       @stack_mock.should_receive(:update).with :attributes => @expected_attributes
 
-      @stack.update :force => true, :attributes => [{ 'chef_repo' => 'test123' }]
+      @stack.update(:force => true, :attributes => [{ 'chef_repo' => 'test123' }]).should be_true
     end
 
     it "should not update when the deployment is locked and force is set false" do
@@ -116,7 +116,7 @@ describe SimpleDeploy do
       SimpleDeploy::StackAttributeFormater.should_not_receive(:new)
       Stackster::Stack.should_not_receive(:new)
 
-      @stack.update :force => false, :attributes => { 'arg1' => 'val' }
+      @stack.update(:force => false, :attributes => { 'arg1' => 'val' }).should_not be_true
     end
   end
 
@@ -176,7 +176,7 @@ describe SimpleDeploy do
       @instances.first['instancesSet'].first['vpcId'] = 'my-vpc'
       @stack_mock.stub(:instances).and_return(@instances)
 
-      stack.send(:instances).should == ['10.1.2.3']
+      stack.instances.should == ['10.1.2.3']
     end
 
     it 'should use the private IP when internal' do
@@ -188,7 +188,7 @@ describe SimpleDeploy do
       stack.stub(:stack) { @stack_mock }
       @stack_mock.stub(:instances).and_return(@instances)
 
-      stack.send(:instances).should == ['10.1.2.3']
+      stack.instances.should == ['10.1.2.3']
     end
 
     it 'should use the public IP when not vpc and not internal' do
@@ -200,7 +200,23 @@ describe SimpleDeploy do
       stack.stub(:stack) { @stack_mock }
       @stack_mock.stub(:instances).and_return(@instances)
 
-      stack.send(:instances).should == ['50.40.30.20']
+      stack.instances.should == ['50.40.30.20']
+    end
+
+    it 'should handle instanceSets with multiple intances' do
+      @instances = [{ 'instancesSet' => [
+        { 'ipAddress' => '50.40.30.20', 'privateIpAddress' => '10.1.2.3' },
+        { 'ipAddress' => '50.40.30.21', 'privateIpAddress' => '10.1.2.4' }] }]
+
+      stack = SimpleDeploy::Stack.new :environment => 'test-env',
+                                       :name        => 'test-stack',
+                                       :logger      => 'my-logger',
+                                       :config      => @config_stub,
+                                       :internal    => false
+      stack.stub(:stack) { @stack_mock }
+      @stack_mock.stub(:instances).and_return(@instances)
+
+      stack.instances.should == ['50.40.30.20', '50.40.30.21']
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_deploy
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-19 00:00:00.000000000 Z
+date: 2012-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: tinder
   requirement: !ruby/object:Gem::Requirement