awssh 0.1.10 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb9932336f3891ec3d4942cae574d6f1c9bd11f7
-  data.tar.gz: 064bb17a62d25ad544b1130d9295b8f7958fb505
+  metadata.gz: 717e709f2882548951c708971b9c520865b43a90
+  data.tar.gz: dc34e939651504f2d726f4c6286ec7ce8e745300
 SHA512:
-  metadata.gz: feda51cf7c4f3aa96180dd03593fdda9cdd4f40b93fdf02cc513ae39436b7ce4447251f137c62dc368fe469caac586951dfac1022f004fdb2e370c8afaa6d3b9
-  data.tar.gz: 15ed1d0660d675f394cf6e25f94b29e0650c455ee7fbc13d194c906fa99b9c4d1a283c7a214b735d4572078785641c4557651e96b5a53b4885c08ad737f850b2
+  metadata.gz: 61ea4118362d29f203c5840042202222fb39de880040b2237b4d3cd38708a7e9933c28c9874858892697b1adc7b99d7fae720b27e5074c48d1b20c95a1d8aeba
+  data.tar.gz: ccff97b8024852e0b3636443529bb9136a5b8b8701c709134dfe1fe527d4bd1ff9bc8a41b3f0446dea830d50cf92b8ffe290bf4cc9abb78387ba618f0bd67da3

data/awssh.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'fog', '~> 1.23.0'
-  spec.add_dependency 'dotenv', '~> 0.11.1'
+  spec.add_dependency 'fog', '~> 1.30.0'
+  spec.add_dependency 'dotenv', '~> 2.0.1'
   spec.add_dependency 'activesupport'
 
   spec.add_development_dependency "bundler", "~> 1.6"

data/bin/awssh

@@ -5,4 +5,4 @@ require 'optparse'
 require 'active_support/all'
 require 'awssh'
 
-Awssh::Command.new(ARGV).connect
+Awssh::Command.new(ARGV).run

data/lib/awssh/cache.rb

@@ -0,0 +1,72 @@
+require 'ostruct'
+
+module Awssh
+  class Cache
+    class << self
+      def load(file)
+        @instance = new(file)
+      end
+
+      def instance
+        raise 'cache not loaded?' unless @instance.data
+        @instance
+      end
+    end
+
+    attr_reader :data
+
+    def initialize(file, expires)
+      if file
+        @file = File.expand_path(file)
+      else
+        @disabled = true
+        @file = nil
+      end
+      @expires = expires
+      @data = load
+    end
+
+    def write(key, value)
+      time = Time.now.to_i
+      data = {time: time, value: value}
+      @data[key] = data
+      save
+    end
+
+    def read(key)
+      @data[key][:value]
+    end
+
+    def fetch(key, force)
+      if force || @disabled
+        diff = Time.now.to_i
+      else
+        time = @data[key] ? @data[key][:time] : 0
+        diff = Time.now.to_i - time
+      end
+      if diff > @expires
+        value = yield
+        write(key, value)
+        return value
+      else
+        read(key)
+      end
+    end
+
+    private
+
+    def load
+      return {} if @disabled
+      unless File.exists?(@file)
+        @data = {}
+        save
+      end
+      YAML.load_file(@file)
+    end
+
+    def save
+      return if @disabled
+      File.open(@file, "w+") {|f| f.write(@data.to_yaml)}
+    end
+  end
+end

data/lib/awssh/cloud.rb

@@ -0,0 +1,34 @@
+module Awssh
+  class Cloud
+    class << self
+      def connect(key, secret, region)
+        @instance = new(key, secret, region)
+      end
+      def instance
+        raise "not connected?" unless @instance
+        @instance
+      end
+    end
+
+    def initialize(key, secret, region)
+      @key = key
+      @secret = secret
+      @region = region
+      @fog = Fog::Compute.new(provider: 'AWS', aws_access_key_id: @key, aws_secret_access_key: @secret, region: @region)
+    end
+
+    def servers
+      puts "requesting servers..."
+      list = @fog.servers.all({'instance-state-name' => 'running'})
+      list.inject([]) do |a, e|
+        a << {
+          id: e.id,
+          name: e.tags['Name'],
+          tags: e.tags.inject({}) {|h, e| (k,v) = e; h[k.downcase] = v.downcase; h},
+          private: e.private_ip_address,
+          public: e.public_ip_address,
+        }
+      end
+    end
+  end
+end

data/lib/awssh/command.rb

@@ -1,3 +1,4 @@
+require 'pp'
 module Awssh
   class Command
     def initialize(argv)
@@ -11,17 +12,15 @@ module Awssh
       @config = {
           multi: 'csshX',
           single: 'ssh',
-          region: 'us-east-1',
           user: nil,
-          key: 'AWS ACCESS KEY ID',
-          secret: 'AWS SECRET ACCESS KEY',
-          domain: 'example.com',
+          use_names: false,
           cache: '~/.awssh.cache',
           expires: 1.day
       }.stringify_keys
 
       @config_file = File.expand_path(@options[:config])
-      @config.merge!(YAML.load_file(@config_file)||{}) if File.exists?(@config_file)
+      Awssh::Config.load(@config_file)
+      @config = Awssh::Config.data
 
       OptionParser.new do |opts|
         opts.banner = "Usage: awssh [options] [search terms]"
@@ -35,14 +34,22 @@ module Awssh
         opts.separator '    name !~ /term/'
         opts.separator ''
         opts.separator 'Options:'
+        opts.on('-c', "--config", "override config file (default: ~/.awssh)") do |c|
+          @options[:config] = c
+        end
         opts.on('-V', '--version', 'print version') do |v|
           puts "awssh version: #{Awssh::Version::STRING}"
           exit 0
         end
         opts.on('-i', '--init', 'initialize config') do |i|
-          path = File.expand_path("~/.awssh")
-          File.open(path, "w+") { |f| f.write @config.to_yaml }
-          puts "created config file: #{path}"
+          path = File.expand_path(@options[:config])
+          puts "creating config file: #{path}"
+          if File.exists?(path)
+            backup = "#{path}.#{Time.now.to_i}"
+            puts "moving previous config to #{backup}"
+            FileUtils.mv(path, backup)
+          end
+          File.open(path, "w+") { |f| f.write Awssh::Config::DEFAULT }
           exit 0
         end
         opts.separator ''
@@ -59,134 +66,104 @@ module Awssh
         opts.separator ''
         opts.on('-U', '--update', 'just update the cache') do |u|
           @options[:update] = true
-          get_servers
-          exit 0
         end
         opts.on('--no-cache', 'disable cache for this run') do |u|
-          @config['cache'] = false
+          @config.cache = false
         end
         opts.separator ''
         opts.on('-m', '--[no-]multi', 'connect to multiple servers') do |m|
           @options[:multi] = m
         end
-        opts.on('-c', "--config", "override config file (default: ~/.awssh)") do |c|
-          @options[:config] = c
-        end
         opts.on('-u', '--user USER', 'override user setting') do |u|
-          @config['user'] = u
+          @config.user = u
         end
       end.parse!(argv)
 
+      @cloud = Awssh::Cloud.connect(@config.key, @config.secret, @config.region)
+      @cache = Awssh::Cache.new(@config.cache, @config.expires||1.day)
       @search = argv
 
+      if @options[:update]
+        cache(:servers, true) { @cloud.servers }
+        exit 0
+      end
+
       if @options[:verbose]
-        p @search
-        p @options
-        p @config
+        puts "options: #{@options.inspect}"
+        puts "config: #{@config.inspect}"
       end
     end
 
-    def connect
-      @servers = find_servers
-
-      if @options[:verbose] || @options[:list]
-        print_list
-      end
-      return if @options[:list]
+    def run
+      @servers = cache(:servers) { @cloud.servers }
+      search = Awssh::Search.new(@servers, @search)
+      list = search.filter
+      hosts = hosts(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"
+      if hosts.count == 0
+        puts "no servers found."
         exit 1
       end
 
-      if @servers.count == 0
-        puts "no servers found"
+      multi_not_multi = (hosts.count > 1 && !@options[:multi])
+
+      if @options[:list] || @options[:verbose] || multi_not_multi
+        puts_hosts(hosts)
+      end
+      puts "#{hosts.count} servers found" if @options[:verbose]
+      exit 0 if @options[:list]
+      if multi_not_multi
+        puts "more than one server found and multi is false"
+        puts "use the -m flag to connect to multiple servers"
         exit 1
       end
 
-      @command = get_command(@servers)
-
-      puts "running: #{@command}"
-      exec @command unless @options[:test]
-    end
-
-    private
-
-    def print_list
-      puts "found: #{@servers.count}"
-      @servers.each do |s|
-        puts "- #{s}"
-      end
+      connect(hosts)
     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
+    def connect(hosts)
+      cmd = command(hosts)
+      if @options[:test] || @options[:verbose]
+        puts cmd
       end
-      servers
+      exec(cmd) unless @options[:test]
     end
 
-    def get_servers
-      list = get_cache do
-        server_names
+    def command(hosts)
+      if @options[:multi]
+        command = "#{@config.multi} #{hosts.map { |e| host(e) }.join(' ')}"
+      else
+        command = "#{@config.single} #{host(servers.first)}"
       end
-      puts "total servers: #{list.count}" if @options[:verbose]
-      list.sort
+      command
     end
 
-    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
-        end
-        puts "updating cache ..."
-        list = yield
-        File.open(file, "w+") { |f| f.write list.to_yaml }
-        return list
-      end
-      list = yield
-      return list
+    def cache(key, force=!@config.cache, &block)
+      @cache.fetch(key, force, &block)
     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({'instance-state-name' => 'running'})
-      list.inject([]) { |a, e| a << e.tags['Name'] || e.id }
+    def hosts(list)
+      list.map do |l|
+        (id,_) = l.split('||')
+        @servers.to_a.detect {|e| e[:id] == id}
+      end.compact.sort_by {|e| e[:name]}
     end
 
-    def get_command(servers)
-      if @options[:multi]
-        command = "#{@config["multi"]} #{servers.map { |e| server_url(e) }.join(' ')}"
+    def host(host)
+      out = []
+      out << "#{@config.user}@" if @config.user
+      if @config.use_names
+        out << [host[:name], @config.domain].compact.join('.')
       else
-        command = "#{@config["single"]} #{server_url(servers.first)}"
+        out << host[:private]
       end
-      command
+      out.join('')
     end
 
-    def server_url(server)
-      out = []
-      out << "#{@config["user"]}@" if @config["user"]
-      out << server
-      out << ".#{@config["domain"]}" if @config["domain"]
-      out.join('')
+    def puts_hosts(hosts)
+      hosts.each do |host|
+        puts "%10s   %-15s   %s" % [host[:id], host[:private], host[:name]]
+      end
     end
   end
 end

data/lib/awssh/config.rb

@@ -0,0 +1,42 @@
+require 'ostruct'
+
+module Awssh
+  class Config
+    class << self
+      def load(file)
+        @instance = new(file)
+      end
+
+      def data
+        raise 'config not loaded?' unless @instance.data
+        @instance.data
+      end
+    end
+
+    attr_reader :data
+
+    def initialize(file)
+      @file = file
+      raise "config file does not exist: #{file}" unless File.exist?(file)
+      @data = OpenStruct.new(YAML.load_file(file))
+    end
+
+    DEFAULT = <<-EOF
+---
+region: us-east-1               # AWS Region
+key: AWS_ACCESS_KEY_ID          # AWS access key id
+secret: AWS_SECRET_ACCESS_KEY   # AWS secret access key
+multi: csshX                    # command to use when connecting to multiple servers
+single: ssh                     # command to use when connecting to single server
+#user: username                 # set user for connection to all servers
+                                # this can be overridden on the command line
+domain: example.com             # if 'use_names' is set, this will be appended
+                                # to names, leave blank if name is fully-qualified
+use_names: false                # if true, rather than connecting to IP's,
+                                # connection strings will be created using Name
+                                # tag and domain
+cache: ~/.awssh.cache           # the cache file, set to false to disable caching
+expires: 86400                  # cache expiration time in seconds
+    EOF
+  end
+end

data/lib/awssh/search.rb

@@ -0,0 +1,49 @@
+module Awssh
+  class Search
+    def initialize(servers, terms)
+      @db = db(servers)
+      @terms = convert(terms)
+    end
+
+    def filter
+      list = @db
+      @terms.each do |key, value, opts|
+        regex = key == 'name' ? /\sname:[^\s]*#{value}[^\s]*/ : /\s#{key}:#{value}/
+        puts "regex: #{regex}"
+        if opts[:inverse]
+          found = list.grep(regex)
+          list = list - found
+        else
+          list = list.grep(regex)
+        end
+      end
+      list
+    end
+
+    def convert(terms)
+      terms.inject([]) do |a, e|
+        opts = {}
+        term = e.downcase
+        if term =~ /\:/
+          (key, value) = term.split(':')
+        else
+          key = 'name'
+          value = term
+          if term =~ /^\^/
+            value = term.gsub(/^\^/, '')
+            key = "^#{k}"
+          end
+        end
+        if key =~ /^\^/
+          opts[:inverse] = true
+          key.gsub!(/^\^/)
+        end
+        a << [key, value, opts]
+      end
+    end
+
+    def db(servers)
+      servers.inject([]) { |a, s| a << "#{s[:id]}|| #{s[:tags].inject([]) { |a, e| a << e.join(':') }.join(' ')}" }
+    end
+  end
+end

data/lib/awssh/version.rb

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

data/lib/awssh.rb

@@ -1,2 +1,10 @@
-require "awssh/version"
-require "awssh/command"
+require 'awssh/version'
+require 'awssh/config'
+require 'awssh/cloud'
+require 'awssh/cache'
+require 'awssh/search'
+require 'awssh/command'
+
+module Awssh
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awssh
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.2.0
 platform: ruby
 authors:
 - Shawn Catanzarite
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-22 00:00:00.000000000 Z
+date: 2015-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.23.0
+        version: 1.30.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.23.0
+        version: 1.30.0
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -96,7 +96,11 @@ files:
 - awssh.gemspec
 - bin/awssh
 - lib/awssh.rb
+- lib/awssh/cache.rb
+- lib/awssh/cloud.rb
 - lib/awssh/command.rb
+- lib/awssh/config.rb
+- lib/awssh/search.rb
 - lib/awssh/version.rb
 homepage: ''
 licenses:
@@ -118,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: aws ssh wrapper