simple_deploy 0.7.8 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f50c33ab5fad70dd5d5938374d342831e08a31c5
-  data.tar.gz: 5eb200ab3c1249b4e003be67b4d0b31c61f551f1
+  metadata.gz: 832792b12e68e17d1db4be736d39c9336e98bd99
+  data.tar.gz: 910b11938e36f43f7a6ced19dfd7a561ceee0d8a
 SHA512:
-  metadata.gz: 4d9ef0c4bd2d97750f3ae7e84bfe68c292a9ef53e0a5b38d238aaec69e63309f6437d8b1cdf3b2c225c18c175e0b19b2c6260ed46f5aee0950410691365552a8
-  data.tar.gz: b518e05faba332143bb56f7baa11582492f4b3e0722dd5aada78bf2bad11e6f612696b7aba2b89ba8704d5d7b2018647de76a7ee2c7c4aa17098f19a7c89eed6
+  metadata.gz: 13bf1dd9a2954146bdbe181b5b064a7fcf028786fbe2e8be79f3cf1397bca87e7e7cd84ab4319846d03a5ef4835bdc8080346dd13dd124159fc8d2fdba5811a2
+  data.tar.gz: 4716579fc9991b71496aac673f36dab70f082361e30220ca1d654c39da945f9a71abdb17c9b934d4912ce16d8cf0151cd6b7f78da8f9481f88819475b106e46d

data/CHANGELOG.md

@@ -1,4 +1,6 @@
-## HEAD:
+## v0.8.0 (12/13/13):
+
+* Added flag to specify external ips
 
 ## v0.7.8 (12/11/13):
 

data/lib/simple_deploy/cli/deploy.rb

@@ -30,10 +30,11 @@ 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:
+Using Internal / External 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 defaults to using the public IP when ssh'ng to stacks in classic, or the private IP when in a VPC.
+
+The internal or external flag forces simple_deploy to use the given IP address.
 
 simple_deploy deploy -n STACK_NAME -n STACK_NAME -e ENVIRONMENT -i
 
@@ -48,6 +49,7 @@ EOS
           opt :name, "Stack name(s) of stack to deploy", :type => :string,
                                                          :multi => true
           opt :quiet, "Quiet, do not send notifications"
+          opt :external, "Use external IP for ssh commands"
           opt :internal, "Use internal IP for ssh commands"
         end
 
@@ -65,6 +67,7 @@ EOS
 
          stack = Stack.new :name        => name,
                            :environment => @opts[:environment],
+                           :external    => @opts[:external],
                            :internal    => @opts[:internal]
 
           proceed = true

data/lib/simple_deploy/cli/execute.rb

@@ -15,12 +15,13 @@ Execute command on given stack(s).
 
 simple_deploy execute -n STACK_NAME -n STACK_NAME -e ENVIRONMENT -c "COMMAND"
 
-Using Internal IP for SSH:
+Using Internal / External 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 defaults to using the public IP when ssh'ng to stacks in classic, or the private IP when in a VPC.
 
-simple_deploy deploy -n STACK_NAME -n STACK_NAME -e ENVIRONMENT -i
+The internal or external flag forces simple_deploy to use the given IP address.
+
+simple_deploy execute -n STACK_NAME -n STACK_NAME -e ENVIRONMENT -i
 
 EOS
           opt :help, "Display Help"
@@ -28,6 +29,7 @@ EOS
                                                                    :multi => true
           opt :command, "Command to execute.", :type => :string
           opt :environment, "Set the target environment", :type => :string
+          opt :external, "Use external IP for ssh commands"
           opt :internal, "Use internal IP for ssh commands"
           opt :log_level, "Log level:  debug, info, warn, error", :type    => :string,
                                                                   :default => 'info'
@@ -48,6 +50,7 @@ EOS
 
           stack = Stack.new :name        => name,
                             :environment => @opts[:environment],
+                            :external    => @opts[:external],
                             :internal    => @opts[:internal]
 
           begin

data/lib/simple_deploy/cli/instances.rb

@@ -15,11 +15,20 @@ List instances for stack.
 
 simple_deploy instances -n STACK_NAME -e ENVIRONMENT
 
+Using Internal / External IPs
+
+simple_deploy defaults to using the public IP when return the IP for stacks in classic, or the private IP when in a VPC.
+
+The internal or external flag forces simple_deploy to use the given IP address.
+
+simple_deploy instances -n STACK_NAME -n STACK_NAME -e ENVIRONMENT -i
+
 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"
+          opt :external, "Return external IP for instances."
+          opt :internal, "Return internal IP for instances."
         end
 
         valid_options? :provided => @opts,
@@ -30,6 +39,7 @@ EOS
 
         stack = Stack.new :name        => @opts[:name],
                           :environment => @opts[:environment],
+                          :external    => @opts[:external],
                           :internal    => @opts[:internal]
 
         exit 1 unless stack.exists?

data/lib/simple_deploy/stack.rb

@@ -21,6 +21,7 @@ module SimpleDeploy
       @logger = SimpleDeploy.logger
 
       @use_internal_ips = !!args[:internal]
+      @use_external_ips = !!args[:external]
       @entry = Entry.new :name => @name
     end
 
@@ -120,13 +121,9 @@ module SimpleDeploy
     end
 
     def instances
-      stack_reader.instances.map do |instance| 
+      stack_reader.instances.map do |instance|
         instance['instancesSet'].map do |info|
-          if info['vpcId'] || @use_internal_ips
-            info['privateIpAddress']
-          else
-            info['ipAddress']
-          end
+          determine_ip_address(info)
         end
       end.flatten.compact
     end
@@ -210,6 +207,18 @@ module SimpleDeploy
                                             :ssh_key     => ssh_key
     end
 
+    def determine_ip_address(info)
+      if info['vpcId']
+        address = @use_external_ips ? info['ipAddress'] : info['privateIpAddress']
+        unless address
+          @logger.warn "Instance '#{info['instanceId']}' does not have an external address, skipping."
+        end
+        address
+      else
+        @use_internal_ips ? info['privateIpAddress'] : info['ipAddress']
+      end
+    end
+
     def ssh_key
       ENV['SIMPLE_DEPLOY_SSH_KEY'] ||= "#{ENV['HOME']}/.ssh/id_rsa"
     end

data/lib/simple_deploy/version.rb

@@ -1,3 +1,3 @@
 module SimpleDeploy
-  VERSION = "0.7.8"
+  VERSION = "0.8.0"
 end

data/spec/cli/deploy_spec.rb

@@ -46,6 +46,7 @@ describe SimpleDeploy::CLI::Deploy do
                   :log_level   => 'debug',
                   :name        => ['my_stack'],
                   :force       => true,
+                  :external    => false,
                   :internal    => false,
                   :attributes  => [] }
 
@@ -75,6 +76,7 @@ describe SimpleDeploy::CLI::Deploy do
                   :log_level   => 'debug',
                   :name        => ['my_stack'],
                   :force       => true,
+                  :external    => false,
                   :internal    => false,
                   :attributes  => ['foo=bah'] }
 
@@ -102,6 +104,7 @@ describe SimpleDeploy::CLI::Deploy do
                   :log_level   => 'debug',
                   :name        => ['my_stack'],
                   :force       => true,
+                  :external    => false,
                   :internal    => false,
                   :attributes  => ['foo=bah'] }
 
@@ -131,6 +134,7 @@ describe SimpleDeploy::CLI::Deploy do
                   :log_level   => 'debug',
                   :name        => ['my_stack'],
                   :force       => true,
+                  :external    => false,
                   :internal    => false,
                   :attributes  => [] }
 

data/spec/stack_spec.rb

@@ -201,11 +201,15 @@ describe SimpleDeploy::Stack do
 
       @instances = [
         { 'instancesSet' => [{ 'ipAddress' => '50.40.30.20',
-                               'privateIpAddress' => '10.1.2.3' }] }
+                               'privateIpAddress' => '10.1.2.3' }]}
+      ]
+      @private_instances = [
+        { 'instancesSet' => [{ 'ipAddress' => nil,
+                               'privateIpAddress' => '10.3.2.1' }]}
       ]
     end
 
-    it 'should use the private IP when vpc' do
+    it 'should use the private IP when vpc and not internal or external' do
       @instances.first['instancesSet'].first['vpcId'] = 'my-vpc'
 
       SimpleDeploy::StackReader.should_receive(:new).
@@ -216,6 +220,15 @@ describe SimpleDeploy::Stack do
       @stack.instances.should == ['10.1.2.3']
     end
 
+    it 'should use the public IP when not vpc and not internal or external' do
+      SimpleDeploy::StackReader.should_receive(:new).
+                                 with(:name   => 'test-stack').
+                                 and_return @stack_reader_mock
+      @stack_reader_mock.should_receive(:instances).and_return(@instances)
+
+      @stack.instances.should == ['50.40.30.20']
+    end
+
     it 'should use the private IP when internal' do
       stack = SimpleDeploy::Stack.new :name        => 'test-stack',
                                       :environment => 'test-env',
@@ -229,13 +242,32 @@ describe SimpleDeploy::Stack do
       stack.instances.should == ['10.1.2.3']
     end
 
-    it 'should use the public IP when not vpc and not internal' do
+    it 'should use the public IP when external' do
+      @instances.first['instancesSet'].first['vpcId'] = 'my-vpc'
+      stack = SimpleDeploy::Stack.new :name        => 'test-stack',
+                                      :environment => 'test-env',
+                                      :external    => true
+
       SimpleDeploy::StackReader.should_receive(:new).
                                  with(:name   => 'test-stack').
                                  and_return @stack_reader_mock
       @stack_reader_mock.should_receive(:instances).and_return(@instances)
 
-      @stack.instances.should == ['50.40.30.20']
+      stack.instances.should == ['50.40.30.20']
+    end
+
+    it 'should not include the instance when external and no public IP' do
+      @instances.first['instancesSet'].first['vpcId'] = 'my-vpc'
+      stack = SimpleDeploy::Stack.new :name        => 'test-stack',
+                                      :environment => 'test-env',
+                                      :external    => true
+
+      SimpleDeploy::StackReader.should_receive(:new).
+                                 with(:name   => 'test-stack').
+                                 and_return @stack_reader_mock
+      @stack_reader_mock.should_receive(:instances).and_return(@private_instances)
+
+      stack.instances.should == []
     end
 
     it 'should handle instanceSets with multiple intances' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_deploy
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.8.0
 platform: ruby
 authors:
 - Brett Weaver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-11 00:00:00.000000000 Z
+date: 2013-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs