aws_ssh 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 309d8060f416544bfc2f694b9e52e9a1d0959c88
-  data.tar.gz: f10639efda3bfb3d036886b865559320471dba4d
+  metadata.gz: 14171af4055f9cec7390e3b1b0a63e3554fc173f
+  data.tar.gz: 1da138031a9c079484ae282bf35046c4e18b048a
 SHA512:
-  metadata.gz: 08db6a7f98e7e501c61c84dddf558c3614f46866d0d1a634750a85811d8b3f57abaef5cef29a062f7be69cb4b1674b248e9836e68709578ab73b92feffbf756c
-  data.tar.gz: 44c0e9cb3d52f917c6d548c96650ec837352067ddc96cb244b3ee68d23d578f628285fa4a6bbae313ce3a49d6fc34627fc633da8bd542701c20ce4f5b96ff4c9
+  metadata.gz: 83dd28ff9fcae85abd860ac20f89fb21e0c2f0a0fda3b0579c3d3ecb90cfd0f052afb8135ae84e5c431dcc25a38287f156f8ac68afb21990124f0a36d59125f7
+  data.tar.gz: ecb116933c9dafbdb88898aeaaaace8b4cb5becfed2ce7af45c36e9a3ebc139483e95e1dff3a1b6b9ea63427ea3a219eb176aa977075a14133ca3b5a351d9293

data/README.md

@@ -28,9 +28,11 @@ You can also have as many services and environments as you like, they just have
 
 ## Install ##
 
+gem install aws_ssh && aws_ssh_setup
 
 ### Uninstall ###
 
+aws_ssh_teardown && gem uninstall aws_ssh
 
 ## Usage ##
 

data/lib/aws_ssh/ec2.rb

@@ -12,7 +12,7 @@ module AWS_SSH
     # aws api object
     attr_accessor :api
     # suffix of the key to use
-    attr_accessor :ssh_key_suffix
+    attr_accessor :ssh_key_suffixes
     # auto generated ssh config_file
     attr_accessor :ssh_config_file
     # value used as seperater in the tags
@@ -36,7 +36,7 @@ module AWS_SSH
       @LogLevel = "quiet"
 
       @seperator = "."
-      @ssh_key_suffix = "pem"
+      @ssh_key_suffixes = [".pem", ""]
       @api = AWS::EC2.new(access_key_id: ENV['AWS_ACCESS_KEY_ID'], secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'], region: ENV['AWS_REGION'])
     end
 
@@ -53,6 +53,9 @@ module AWS_SSH
 
     def instance_data(instance)
       tags = instance.tags.to_h
+      key_file = nil
+      base = ENV['HOME']+"/.ssh/"+instance.key_name
+      @ssh_key_suffixes.each{|k| if File.exists?(base+k) then key_file = base+k end }
       return {
         :name => if tags["Name"].nil? then nil else tags["Name"].to_s.strip end,
         :user => if tags["user"].nil? then @User else tags["user"].to_s.strip end,
@@ -60,7 +63,7 @@ module AWS_SSH
         :services => if tags["service"].nil? then nil else tags["service"].split(@seperator) end,
         :ip => instance.private_ip_address,
         :key => instance.key_name,
-        :key_file => ENV['HOME']+"/.ssh/"+instance.key_name+"."+@ssh_key_suffix
+        :key_file => key_file
       }
     end
 
@@ -82,7 +85,7 @@ module AWS_SSH
       hosts = {}
       self.instances.select!{|i| i.status.to_s == "running"}.each do |i|
         info = self.instance_data(i)
-        if File.exists?(info[:key_file])
+        if !info[:key_file].nil?
           self.instance_names(info).each{ |h| hosts[h] = info}
         end
       end
@@ -100,7 +103,7 @@ module AWS_SSH
         config += "Host #{name}\n"
         config += "  HostName #{host[:ip].to_s}\n"
         config += "  User #{host[:user].to_s}\n"
-        config += "  IdentityFile ~/.ssh/#{host[:key].to_s}.#{@ssh_key_suffix}\n"
+        config += "  IdentityFile #{host[:key_file]}\n"
         config += "  StrictHostKeyChecking #{@StrictHostKeyChecking}\n"
         config += "  UserKnownHostsFile #{@UserKnownHostsFile}\n"
         config += "  LogLevel #{@LogLevel}\n"

data/lib/aws_ssh/version.rb

@@ -1,3 +1,3 @@
 module AWS_SSH
-  VERSION="0.1.0"
+  VERSION="0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws_ssh
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Charles Marshall