opsicle 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97dd611664d6cade219eb35829d9cc111636ab1b
-  data.tar.gz: 1ba96878b0d09b05dc2df05222507af9b4cfec48
+  metadata.gz: 4e1ae90db98327bdf981f1d0fc69b7488d091a68
+  data.tar.gz: c591e7f2567cfc9f5eb15e4f83762b29a7b54c08
 SHA512:
-  metadata.gz: beb8719a0691650d14a661a10b2b9cd5c79e63ae4d0f41d302a2ac30ed0b2585b09844914570bef34a1a73ca0515c2e091653da3344b8e78440f3d53c8ddf624
-  data.tar.gz: 3dfa883fabc57e83e0d04d56d6e41edbf52034c2c459c46a0ee97b09101ef7ea1c33f6179db86d927fad58a032977cf220752be93d413635d6ac0c55d6ad2751
+  metadata.gz: bbebdecd44667c6f4533f3466eb2674afd75456d35f07d6c6e4cf80f134ed8866e0bcc81f8405b7ab1446a592addec81b631ad2ea0770ba634a98643e96c4049
+  data.tar.gz: f5f7997debb53669e4ee64010a763448c16ffc282ddbe69daabe0479068370e51bfc56fe401e36b16ff5075a1a0dfc626da9b5d44db5d811cb59937e22490a5b

data/lib/opsicle/commands/ssh.rb

@@ -7,21 +7,18 @@ module Opsicle
     end
 
     def execute(options={})
+
       if instances.length == 1
         choice = 1
       else
         Output.say "Choose an Opsworks instance:"
-        instances.each_index do |x|
-          Output.say "#{x+1}) #{instances[x][:hostname]}"
+        instances.each_with_index do |instance, index|
+          Output.say "#{index+1}) #{instance[:hostname]}"
         end
         choice = Output.ask("? ", Integer) { |q| q.in = 1..instances.length }
       end
 
-      instance_ip = instances[choice-1][:elastic_ip] || instances[choice-1][:public_ip]
-      ssh_command = " \"#{options[:"ssh-cmd"].gsub(/'/){ %q(\') }}\"" if options[:"ssh-cmd"] #escape single quotes
-      ssh_options = "#{options[:"ssh-opts"]} " if options[:"ssh-opts"]
-
-      command = "ssh #{ssh_options}#{ssh_username}@#{instance_ip}#{ssh_command}"
+      command = ssh_command(instances[choice-1], options)
 
       Output.say_verbose "Executing shell command: #{command}"
       system(command)
@@ -33,8 +30,26 @@ module Opsicle
                            .select { |instance| instance[:status].to_s == 'online'}
     end
 
+    def public_ips
+      instances.map{|instance| instance[:elastic_ip] || instance[:public_ip] }.compact
+    end
+
     def ssh_username
       client.api_call(:describe_my_user_profile)[:user_profile][:ssh_username]
     end
+
+    def ssh_command(instance, options={})
+      ssh_command = " \"#{options[:"ssh-cmd"].gsub(/'/){ %q(\') }}\"" if options[:"ssh-cmd"] #escape single quotes
+      ssh_options = options[:"ssh-opts"] ? "#{options[:"ssh-opts"]} " : ""
+      if instance_ip = instance[:elastic_ip] || instance[:public_ip]
+        ssh_string = "#{ssh_username}@#{instance_ip}"
+      else
+        ssh_string = "#{ssh_username}@#{public_ips.sample} ssh #{instance[:private_ip]}"
+        ssh_options.concat('-A -t ')
+      end
+
+      "ssh #{ssh_options}#{ssh_string}#{ssh_command}"
+    end
+
   end
 end

data/lib/opsicle/version.rb

@@ -1,3 +1,3 @@
 module Opsicle
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 end

data/spec/opsicle/commands/ssh_spec.rb

@@ -68,6 +68,14 @@ module Opsicle
         subject.execute({ :"ssh-opts" => '-p 234', :"ssh-cmd" => 'cd /srv/www'})
       end
 
+      it "executes sshs through an instance with a public_ip to get to one with a private_ip" do
+        allow(subject).to receive(:instances) {[
+                            { hostname: "host1", elastic_ip: "123.123.123.123" },
+                            { hostname: "host2", private_ip: "789.789.789.789" }
+                          ]}
+        expect(subject).to receive(:system).with("ssh -A -t mrderpyman2014@123.123.123.123 ssh 789.789.789.789")
+        subject.execute
+      end
     end
 
     context "#client" do
@@ -94,5 +102,37 @@ module Opsicle
       end
     end
 
+    context "#public_ips" do
+      it "selects all EIPs and then public_ip on the stack" do
+        allow(subject).to receive(:instances) {[
+                    { hostname: "host1", elastic_ip: "123.123.123.123", public_ip: "123.345.567.789"},
+                    { hostname: "host2", public_ip: "456.456.456.456" },
+                    { hostname: "host2", private_ip: "789.789.789.789" },
+                  ]}
+        expect(subject.public_ips).to eq(["123.123.123.123","456.456.456.456"])
+      end
+    end
+
+    context "#ssh_command" do
+      before do
+        allow(subject).to receive(:ssh_username) {"mrderpyman2014"}
+        allow(subject).to receive(:instances) {[
+                    { hostname: "host1", elastic_ip: "123.123.123.123" },
+                    { hostname: "host2", private_ip: "789.789.789.789" }
+                  ]}
+      end
+      it "creates the proper ssh_command for an instance with a public/elastic ip" do
+        expect(subject.ssh_command({elastic_ip: "123.123.123.123" })).to eq("ssh mrderpyman2014@123.123.123.123")
+      end
+      it "creates the proper ssh_command for an instance with a private ip" do
+        expect(subject.ssh_command({private_ip: "789.789.789.789" })).to eq("ssh -A -t mrderpyman2014@123.123.123.123 ssh 789.789.789.789")
+      end
+      it "properly adds ssh options to the ssh_command for an isntance with a public ip" do
+        expect(subject.ssh_command({elastic_ip: "123.123.123.123" }, { :"ssh-opts" => "-c"})).to eq("ssh -c mrderpyman2014@123.123.123.123")
+      end
+      it "properly adds ssh options to the ssh_command for an isntance with a private ip" do
+        expect(subject.ssh_command({private_ip: "789.789.789.789"}, { :"ssh-opts" => "-c"} )).to eq("ssh -c -A -t mrderpyman2014@123.123.123.123 ssh 789.789.789.789")
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opsicle
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Andy Fleener
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -249,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: An opsworks specific abstraction on top of the aws sdk