awsam 0.0.1 → 0.0.2

data/README.md

@@ -119,7 +119,8 @@ will be marked with an asterisk.
 ### Import a key pair
 
 Add a key to the default account, or the specified account. Defaults
-chosen from current environment if set.
+chosen from current environment if set. IMPORTANT: `my-key-name` must
+match the logical name of the AWS EC2 keypair.
 
     $ aem key add my-key-name /path/to/my-keypair.pem
     Imported key pair my-key-name for account staging [Staging account]

data/bin/ascp

@@ -46,7 +46,8 @@ keyfile = nil
       exit 1
     end
 
-    args[i] = args[i].gsub(instance_id, inst[:dns_name])
+    hostname = Awsam::Ec2::instance_hostname(inst)
+    args[i] = args[i].gsub(instance_id, hostname)
 
     key = acct.find_key(inst[:ssh_key_name])
     keyfile = key.path if key

data/bin/assh

@@ -57,15 +57,17 @@ if inst[:aws_state] != "running"
   exit 1
 end
 
-puts "Logging in as #{user} to #{inst[:dns_name]}"
+hostname = Awsam::Ec2::instance_hostname(inst)
+
+puts "Logging in as #{user} to #{hostname}"
 puts
 
 key = acct.find_key(inst[:ssh_key_name])
 
 if key
-  exec "ssh -i #{key.path} -o IdentitiesOnly=yes #{user}@#{inst[:dns_name]}"
+  exec "ssh -i #{key.path} -o IdentitiesOnly=yes #{user}@#{hostname}"
 else
-  exec "ssh #{user}@#{inst[:dns_name]}"
+  exec "ssh #{user}@#{hostname}"
 end
 
 # Local Variables:

data/lib/awsam/account.rb

@@ -128,6 +128,10 @@ module Awsam
       @params[:secret_key]
     end
 
+    def aws_region
+      @params[:aws_region]
+    end
+
 private
 
     def conf_file(file = nil)

data/lib/awsam/ec2.rb

@@ -1,11 +1,20 @@
 module Awsam
   module Ec2
 
-    LOOKUP_TAGS = ["Name", "aws:autoscaling:groupName"].freeze
+    LOOKUP_TAGS = ["Name", "aws:autoscaling:groupName", "AlsoKnownAs"].freeze
+
+    def self.instance_hostname(inst)
+      hostname = inst[:dns_name]
+      # Are we in a VPC?
+      if inst[:vpc_id]
+        hostname = inst[:private_ip_address]
+      end
+      hostname
+    end
 
     def self.find_instance(acct, instance_id)
       logger = Logger.new(File.open("/dev/null", "w"))
-      ec2 = RightAws::Ec2.new(acct.access_key, acct.secret_key, :logger => logger)
+      ec2 = RightAws::Ec2.new(acct.access_key, acct.secret_key, :logger => logger, :region => acct.aws_region)
       
       unless ec2
         puts "Unable to connect to EC2"

data/lib/awsam/version.rb

@@ -1,3 +1,3 @@
 module Awsam
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awsam
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: right_aws
@@ -119,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4361486896786609133
+      hash: -1303385006306844615
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4361486896786609133
+      hash: -1303385006306844615
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23.2