capify-ec2 1.5.0.pre2 → 1.5.0.pre3

data/Changelog.md

@@ -1,3 +1,13 @@
+## 1.5.0.pre3 (Aug 6, 2013)
+
+Features:
+
+  - Capify-EC2 will now use the 'ssh_options[:keys]' setting in your 'deploy.rb' when connecting to an instance using the 'ec2:ssh' command.
+
+Bugfixes:
+
+  - Fixed an exception when using the 'ec2:ssh' and 'ec2:status' commands with stages.
+
 ## 1.5.0.pre2 (Jul 23, 2013)
 
 Bugfixes:

data/lib/capify-ec2.rb

@@ -100,7 +100,7 @@ class CapifyEc2
     # Project and Stages info..
     info_label_width = [@ec2_config[:aws_project_tag], @ec2_config[:aws_stages_tag]].map(&:length).max
     puts "#{@ec2_config[:aws_project_tag].rjust( info_label_width ).bold}: #{@ec2_config[:project_tags].join(', ')}." if @ec2_config[:project_tags].any?
-    puts "#{@ec2_config[:aws_stages_tag].rjust( info_label_width ).bold}: #{@ec2_config[:stage]}." unless @ec2_config[:stage].empty?
+    puts "#{@ec2_config[:aws_stages_tag].rjust( info_label_width ).bold}: #{@ec2_config[:stage]}." unless @ec2_config[:stage].to_s.empty?
     
     # Title row.
     status_output = []
@@ -140,7 +140,7 @@ class CapifyEc2
 
   def desired_instances(region = nil)
     instances = @ec2_config[:project_tags].empty? ? @instances : project_instances
-    @ec2_config[:stage].empty? ? instances : get_instances_by_stage(instances)
+    @ec2_config[:stage].to_s.empty? ? instances : get_instances_by_stage(instances)
   end
 
   def get_instances_by_role(role)

data/lib/capify-ec2/capistrano.rb

@@ -39,13 +39,20 @@ Capistrano::Configuration.instance(:must_exist).load do
     desc "Allows ssh to instance by id. cap ssh <INSTANCE NAME>"
     task :ssh do
       server = variables[:logger].instance_variable_get("@options")[:actions][1]
+      if "ec2:ssh" == server then
+        server = variables[:logger].instance_variable_get("@options")[:actions][2]
+      end
       
       if server
         instance = numeric?(server) ? capify_ec2.desired_instances[server.to_i] : capify_ec2.get_instance_by_name(server)
 
         if instance and instance.contact_point then
           port = ssh_options[:port] || 22 
-          command = "ssh -p #{port} #{user}@#{instance.contact_point}"
+          key = ""
+          if !ssh_options[:keys].to_s.empty?
+            key = "-i #{ssh_options[:keys]}"
+          end
+          command = "ssh -p #{port} #{key} #{user}@#{instance.contact_point}"
           puts "Running `#{command}`"
           exec(command)
         else

data/lib/capify-ec2/version.rb

@@ -1,6 +1,6 @@
 module Capify
   module Ec2
-    VERSION = "1.5.0.pre2"
+    VERSION = "1.5.0.pre3"
   end
 end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: capify-ec2
 version: !ruby/object:Gem::Version 
-  hash: -151014382
+  hash: -2435621208
   prerelease: 6
   segments: 
   - 1
   - 5
   - 0
   - pre
-  - 2
-  version: 1.5.0.pre2
+  - 3
+  version: 1.5.0.pre3
 platform: ruby
 authors: 
 - Noah Cantor
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-07-23 00:00:00 Z
+date: 2013-08-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fog