aws_ssh 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14171af4055f9cec7390e3b1b0a63e3554fc173f
-  data.tar.gz: 1da138031a9c079484ae282bf35046c4e18b048a
+  metadata.gz: a29fb3972592fe9a5515f6b0980977736c7b150e
+  data.tar.gz: 13272a3858270e3a3daeabac3c7c2b82846d544f
 SHA512:
-  metadata.gz: 83dd28ff9fcae85abd860ac20f89fb21e0c2f0a0fda3b0579c3d3ecb90cfd0f052afb8135ae84e5c431dcc25a38287f156f8ac68afb21990124f0a36d59125f7
-  data.tar.gz: ecb116933c9dafbdb88898aeaaaace8b4cb5becfed2ce7af45c36e9a3ebc139483e95e1dff3a1b6b9ea63427ea3a219eb176aa977075a14133ca3b5a351d9293
+  metadata.gz: e942774c61463151f57ee62eb45d4c4414047b4b5caeb797792ac9845d9cdf5a2dddf356ac79277213d33f853d1d4ac87bbc83e0c45ea0d54c85e1be8b357ea7
+  data.tar.gz: c724c62b75f28e1557fcef2ceaebc7b615f448afbca89e57607d90cf7e425f738ace9e4467ec66c0d41d11ce48883dcecc7bb7cd91da7ad623d378add763f309

data/lib/aws_ssh/cache.rb

@@ -0,0 +1,4 @@
+module AWS_SSH
+  #24 hours
+  CACHE_TIME = (60*60)*24
+end

data/lib/aws_ssh/ec2.rb

@@ -55,7 +55,7 @@ module AWS_SSH
       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 }
+      @ssh_key_suffixes.each{|k| if key_file.nil? && 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,

data/lib/aws_ssh/runner.rb

@@ -1,11 +1,13 @@
 require "aws_ssh/files"
+require "aws_ssh/cache"
 module AWS_SSH
   class Run
     def generate
-      config = AWS_SSH::HOSTS_FILE
+      config = ENV['HOME']+"/.ssh/"+AWS_SSH::HOSTS_FILE
       # 4 hour cache
-      if (File.exists?(config) && File.mtime(config) < (Time.now - (60*60*4) )) || ! File.exists?(config)
+      if (File.exists?(config) && File.mtime(config) < (Time.now - (AWS_SSH::CACHE_TIME) )) || ! File.exists?(config)
         self.force
+        self.write
       end
     end
 

data/lib/aws_ssh/version.rb

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

data/lib/aws_ssh.rb

@@ -9,6 +9,6 @@ module AWS_SSH
   require "aws_ssh/ec2"
   require "aws_ssh/setup"
   require "aws_ssh/teardown"
+  require "aws_ssh/cache"
   require "aws_ssh/runner"
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws_ssh
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Charles Marshall
@@ -85,6 +85,7 @@ files:
 - bin/aws_ssh_setup
 - bin/aws_ssh_teardown
 - lib/aws_ssh.rb
+- lib/aws_ssh/cache.rb
 - lib/aws_ssh/cmds.rb
 - lib/aws_ssh/ec2.rb
 - lib/aws_ssh/exceptions.rb