simple_deploy 0.5.3 → 0.5.4

data/CHANGELOG

@@ -1,3 +1,8 @@
+## v0.5.4
+
+* Added support for internal networking to the deploy and instances commands
+* Added backoff functionality to deployments so they work better with the force option
+
 ## v0.5.3
 
 * Added a clone command that clones a stack

data/lib/simple_deploy/backoff.rb

@@ -0,0 +1,9 @@
+module SimpleDeploy
+  class Backoff
+    def self.exp_periods(num_periods = 3)
+      (1..num_periods).each do |n|
+        yield (1.0/2.0 * (2.0**n - 1.0)).ceil
+      end
+    end
+  end
+end

data/lib/simple_deploy/cli/deploy.rb

@@ -27,6 +27,13 @@ export SIMPLE_DEPLOY_SSH_USER=fred
 export SIMPLE_DEPLOY_SSH_KEY=$HOME/.ssh/id_dsa
 simple_deploy deploy -n STACK_NAME -n STACK_NAME -e ENVIRONMENT
 
+Using Internal IP for SSH:
+
+Simple deploy defaults to using the public IP when ssh'ng to stacks. This option instructs it
+to use the private IP, which is needed when ssh'ng from one stack to another.
+
+simple_deploy deploy -n STACK_NAME -n STACK_NAME -e ENVIRONMENT -i
+
 EOS
           opt :help, "Display Help"
           opt :attributes, "= seperated attribute and it's value", :type  => :string,
@@ -38,6 +45,7 @@ EOS
           opt :name, "Stack name(s) of stack to deploy", :type => :string,
                                                          :multi => true
           opt :quiet, "Quiet, do not send notifications"
+          opt :internal, "Use internal IP for ssh commands"
         end
 
         CLI::Shared.valid_options? :provided => opts,
@@ -54,7 +62,8 @@ EOS
 
           stack = Stack.new :environment => opts[:environment],
                             :name        => name,
-                            :logger      => logger
+                            :logger      => logger,
+                            :internal    => opts[:internal]
 
           stack.update :force => opts[:force], :attributes => new_attributes if new_attributes.any?
 

data/lib/simple_deploy/cli/instances.rb

@@ -16,6 +16,7 @@ EOS
           opt :help, "Display Help"
           opt :environment, "Set the target environment", :type => :string
           opt :name, "Stack name to manage", :type => :string
+          opt :internal, "Use internal IP for ssh commands"
         end
 
         CLI::Shared.valid_options? :provided => opts,
@@ -28,7 +29,8 @@ EOS
         stack = Stack.new :environment => opts[:environment],
                           :name        => opts[:name],
                           :config      => config,
-                          :logger      => logger
+                          :logger      => logger,
+                          :internal    => opts[:internal]
 
         instances = stack.instances
         if instances.nil? || instances.empty?

data/lib/simple_deploy/stack/deployment.rb

@@ -38,6 +38,11 @@ module SimpleDeploy
       def execute(force = false)
         if !clear_for_deployment? && force
           clear_deployment_lock true
+
+          Backoff.exp_periods do |p|
+            sleep p
+            break if clear_for_deployment?
+          end
         end
 
         if clear_for_deployment?

data/lib/simple_deploy/stack.rb

@@ -10,6 +10,8 @@ module SimpleDeploy
       @name = args[:name]
       @config = Config.new :logger => args[:logger]
       @logger = @config.logger
+
+      @use_internal_ips = !!args[:internal]
     end
 
     def create(args)
@@ -66,7 +68,12 @@ module SimpleDeploy
     def instances
       stack.instances.map do |instance| 
         info = instance['instancesSet'].first
-        info['vpcId'] ? info['privateIpAddress'] : info['ipAddress']
+
+        if info['vpcId'] || @use_internal_ips
+          info['privateIpAddress']
+        else
+          info['ipAddress']
+        end
       end
     end
 

data/lib/simple_deploy/version.rb

@@ -1,3 +1,3 @@
 module SimpleDeploy
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

data/lib/simple_deploy.rb

@@ -4,3 +4,4 @@ require 'simple_deploy/stack'
 require 'simple_deploy/notifier'
 require 'simple_deploy/logger'
 require 'simple_deploy/version'
+require 'simple_deploy/backoff'

data/spec/backoff_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe SimpleDeploy::Backoff do
+  describe 'exp_periods' do
+    it 'should yield each period' do
+      expected_periods = [1, 2, 4]
+
+      i = 0
+      SimpleDeploy::Backoff.exp_periods do |p|
+        expected_periods[i].should == p
+        i += 1
+      end
+    end
+
+    it 'should generate and yield a specified number of periods' do
+      expected_periods = [1, 2]
+
+      i = 0
+      SimpleDeploy::Backoff.exp_periods(2) do |p|
+        expected_periods[i].should == p
+        i += 1
+      end
+    end
+  end
+end

data/spec/cli/deploy_spec.rb

@@ -19,6 +19,7 @@ describe SimpleDeploy::CLI::Deploy do
                   :log_level   => 'debug',
                   :name        => ['my_stack'],
                   :force       => true,
+                  :internal    => false,
                   :attributes  => [] }
 
       SimpleDeploy::CLI::Shared.should_receive(:valid_options?).
@@ -35,7 +36,8 @@ describe SimpleDeploy::CLI::Deploy do
       SimpleDeploy::Stack.should_receive(:new).
                           with(:environment => 'my_env',
                                :logger      => @logger,
-                               :name        => 'my_stack').
+                               :name        => 'my_stack',
+                               :internal    => false).
                           and_return(@stack)
 
       @stack.should_receive(:deploy).with(true).and_return(true)
@@ -50,6 +52,7 @@ describe SimpleDeploy::CLI::Deploy do
                   :log_level   => 'debug',
                   :name        => ['my_stack'],
                   :force       => true,
+                  :internal    => false,
                   :attributes  => [] }
 
       SimpleDeploy::CLI::Shared.should_receive(:valid_options?).
@@ -66,7 +69,8 @@ describe SimpleDeploy::CLI::Deploy do
       SimpleDeploy::Stack.should_receive(:new).
                           with(:environment => 'my_env',
                                :logger      => @logger,
-                               :name        => 'my_stack').
+                               :name        => 'my_stack',
+                               :internal    => false).
                           and_return(@stack)
 
       @stack.should_receive(:deploy).with(true).and_return(false)
@@ -83,6 +87,7 @@ describe SimpleDeploy::CLI::Deploy do
                   :log_level   => 'debug',
                   :name        => ['my_stack'],
                   :force       => true,
+                  :internal    => false,
                   :attributes  => ['foo=bah'] }
 
       SimpleDeploy::CLI::Shared.should_receive(:valid_options?).
@@ -99,7 +104,8 @@ describe SimpleDeploy::CLI::Deploy do
       SimpleDeploy::Stack.should_receive(:new).
                           with(:environment => 'my_env',
                                :logger      => @logger,
-                               :name        => 'my_stack').
+                               :name        => 'my_stack',
+                               :internal    => false).
                           and_return(@stack)
 
       @stack.should_receive(:update).with(hash_including(:force => true, :attributes => [{'foo' => 'bah'}]))

data/spec/stack/deployment_spec.rb

@@ -103,7 +103,7 @@ describe SimpleDeploy do
       status_mock = mock 'status mock'
       SimpleDeploy::Stack::Deployment::Status.should_receive(:new).
                                               and_return status_mock
-      status_mock.should_receive(:clear_for_deployment?).and_return false, true
+      status_mock.should_receive(:clear_for_deployment?).and_return false, true, true
       status_mock.should_receive(:clear_deployment_lock).with(true)
       status_mock.should_receive(:set_deployment_in_progress)
       @deployment_mock.should_receive(:simpledeploy)

data/spec/stack_spec.rb

@@ -12,6 +12,7 @@ describe SimpleDeploy do
     @config_stub.stub(:artifact_cloud_formation_url).and_return('CookBooksURL')
 
     SimpleDeploy::Config.should_receive(:new).
+                         at_least(:once).
                          with(:logger => 'my-logger').
                          and_return @config_stub
     @stack = SimpleDeploy::Stack.new :environment => 'test-env',
@@ -157,4 +158,49 @@ describe SimpleDeploy do
       @stack.destroy.should be_true
     end
   end
+
+  describe 'instances' do
+    before do
+      @instances = [{ 'instancesSet' => [{ 'ipAddress' => '50.40.30.20', 'privateIpAddress' => '10.1.2.3' }] }]
+      @environment_config_mock.stub(:[])
+    end
+
+    it 'should use the private IP when vpc' do
+      stack = SimpleDeploy::Stack.new :environment => 'test-env',
+                                       :name        => 'test-stack',
+                                       :logger      => 'my-logger',
+                                       :config      => @config_stub,
+                                       :internal    => false
+      stack.stub(:stack) { @stack_mock }
+
+      @instances.first['instancesSet'].first['vpcId'] = 'my-vpc'
+      @stack_mock.stub(:instances).and_return(@instances)
+
+      stack.send(:instances).should == ['10.1.2.3']
+    end
+
+    it 'should use the private IP when internal' do
+      stack = SimpleDeploy::Stack.new :environment => 'test-env',
+                                       :name        => 'test-stack',
+                                       :logger      => 'my-logger',
+                                       :config      => @config_stub,
+                                       :internal    => true
+      stack.stub(:stack) { @stack_mock }
+      @stack_mock.stub(:instances).and_return(@instances)
+
+      stack.send(:instances).should == ['10.1.2.3']
+    end
+
+    it 'should use the public IP when not vpc and not internal' do
+      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.send(:instances).should == ['50.40.30.20']
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_deploy
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-11 00:00:00.000000000 Z
+date: 2012-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -109,6 +109,7 @@ files:
 - bin/simple_deploy
 - lib/simple_deploy.rb
 - lib/simple_deploy/artifact.rb
+- lib/simple_deploy/backoff.rb
 - lib/simple_deploy/cli.rb
 - lib/simple_deploy/cli/attributes.rb
 - lib/simple_deploy/cli/clone.rb
@@ -139,6 +140,7 @@ files:
 - script/ci_setup
 - simple_deploy.gemspec
 - spec/artifact_spec.rb
+- spec/backoff_spec.rb
 - spec/cli/attributes_spec.rb
 - spec/cli/clone_spec.rb
 - spec/cli/deploy_spec.rb
@@ -181,6 +183,7 @@ specification_version: 3
 summary: I help with deployments
 test_files:
 - spec/artifact_spec.rb
+- spec/backoff_spec.rb
 - spec/cli/attributes_spec.rb
 - spec/cli/clone_spec.rb
 - spec/cli/deploy_spec.rb