awssh 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fd2f1b3cf3b3eb5719170a5049b1164e417dc29
-  data.tar.gz: a28e7d706464b1278bf00cc1f81e889f5c3371ad
+  metadata.gz: 7813fbd643c47e30330aa13e8df8c830694833a2
+  data.tar.gz: fa612f8c10bfc39b2b111ff8c89e702594c61071
 SHA512:
-  metadata.gz: 248175e0a1006d5e1434fce9dcf8261c0b939126f11b11e07ea1323ca15fbe83bead4b1059651b6a771f7e162e36a53a7da7db5ea7311b33f4b3fc1816e388b5
-  data.tar.gz: 1b7a8a62366d290db7249103227dc92e6ceb56ed95248cf2c7ed911c1af933c36bf6e453ac553fbb1718d19555a95932bba200592ea3b39557034f429be7d133
+  metadata.gz: bc4a46a8e7e69672c8165af90b92ea1c5f9b7dcfc3c76bbeac97737318ca60424dc27fd1a4ee12011bae3b63aaa8e394d1411e4453ce5fb45893638a6bc8cd80
+  data.tar.gz: 77f3cd627766fe012459567f412ee9f6030ecb01501cd1ded42fa1c121435b92a80b5fc088522609040beb4062c45305b690bc1f2160bcc5a422d21fba466b35

data/lib/awssh/command.rb

@@ -6,6 +6,7 @@ module Awssh
           config: '~/.awssh',
           multi: false,
           test: false,
+          list: false,
       }
       @config = {
           multi: 'csshX',
@@ -14,7 +15,9 @@ module Awssh
           user: nil,
           key: 'AWS ACCESS KEY ID',
           secret: 'AWS SECRET ACCESS KEY',
-          domain: 'example.com'
+          domain: 'example.com',
+          cache: '~/.awssh.cache',
+          expires: 1.day
       }.stringify_keys
 
       @config_file = File.expand_path(@options[:config])
@@ -58,6 +61,14 @@ module Awssh
         opts.on('-u', '--user', 'override user setting') do |u|
           @config['user'] = u
         end
+        opts.on('-l', '--list', 'just list servers') do |l|
+          @options[:list] = true
+        end
+        opts.on('-U', '--update', 'just update the cache') do |u|
+          @options[:update] = true
+          get_servers
+          exit 0
+        end
       end.parse!(argv)
 
       @search = argv
@@ -70,22 +81,22 @@ module Awssh
     end
 
     def connect
-      @servers = get_servers
+      @servers = find_servers
 
-      puts "found: #{@servers.count}" if @options[:verbose]
-      @servers.each do |s|
-        puts "- #{s}"
-      end if @options[:verbose]
-
-      if @servers.count == 0
-        puts "no servers found"
-        exit 1
+      if @options[:verbose] || @options[:list]
+        print_list
       end
+      return if @options[:list]
 
       if @servers.count > 1 && !@options[:multi]
+        print_list
         puts "more than one server found, and multi is false"
         puts "set the -m flag to connect to more than one matched server"
-        puts "servers: #{@servers.join(',')}" unless @options[:verbose]
+        exit 1
+      end
+
+      if @servers.count == 0
+        puts "no servers found"
         exit 1
       end
 
@@ -97,31 +108,62 @@ module Awssh
 
     private
 
-    def get_servers
-      @fog = Fog::Compute.new(provider: 'AWS', aws_access_key_id: @config['key'], aws_secret_access_key: @config['secret'], region: @config["region"])
-      list = @fog.servers.all
+    def print_list
+      puts "found: #{@servers.count}"
+      @servers.each do |s|
+        puts "- #{s}"
+      end
+    end
+
+    def find_servers
+      servers = []
+      get_servers.each do |n|
+        fail = false
+        @search.each do |v|
+          if v =~ /^\^/
+            fail = true if n =~ /#{v.gsub(/^\^/, '')}/
+          else
+            fail = true unless n =~ /#{v}/
+          end
+        end
+        next if fail
+        servers << n
+      end
+      servers
+    end
 
+    def get_servers
+      list = get_cache do
+        server_names
+      end
       puts "total servers: #{list.count}" if @options[:verbose]
+      list.sort
+    end
 
-      servers = []
-      list.each do |s|
-        n = s.tags['Name']
-        if n
-          fail = false
-          @search.each do |v|
-            if v =~ /^\^/
-              fail = true if n =~ /#{v.gsub(/^\^/, '')}/
-            else
-              fail = true unless n =~ /#{v}/
+    def get_cache
+      if @config['cache']
+        file = File.expand_path(@config['cache'])
+        if File.exists?(file)
+          unless @options[:update]
+            if Time.now - File.mtime(file) < @config['expires']
+              return YAML.load_file(file)
             end
           end
-          next if fail
-          servers << n
-        else
-          puts "server #{s.id} does not have a name"
         end
+        puts "updating cache ..."
+        list = yield
+        File.open(file, "w+") { |f| f.write list.to_yaml }
+        return list
       end
-      servers.sort
+      list = yield
+      return list
+    end
+
+    def server_names
+      puts "requesting servers ..."
+      @fog = Fog::Compute.new(provider: 'AWS', aws_access_key_id: @config['key'], aws_secret_access_key: @config['secret'], region: @config["region"])
+      list = @fog.servers.all
+      list.inject([]) { |a, e| a << e.tags['Name'] }
     end
 
     def get_command(servers)

data/lib/awssh/version.rb

@@ -2,7 +2,7 @@ module Awssh
   module Version
     MAJOR = 0
     MINOR = 1
-    TINY  = 5
+    TINY  = 6
     TAG   = nil
     LIST  = [MAJOR, MINOR, TINY, TAG].compact
     STRING = LIST.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awssh
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Shawn Catanzarite