hotdog 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a8a2587c731d0636d060338297376ef857135d4
-  data.tar.gz: 4ec81a26bfa37aa4a2352a3879526d86aa023a60
+  metadata.gz: c5f4c5c3e2ce98b90bfd87374b07db36fc8b077f
+  data.tar.gz: be06e73ed9e26efe4e4613ab16f4192b3eae65c6
 SHA512:
-  metadata.gz: c718fa212bd63300938cbfb78b624b24b4df25da7ee351f586f51e4b357d1fc2bf5ff8f7b2144b4d531804e61bb13c5cd4f20dc179b38b6bc5933bc296ba8975
-  data.tar.gz: 6cfaa906fc298e47913400612584eba9d94877ad7addc9f52ac5768229864ece0699387cff42d0022207e043fcb78a86e309d7001785c913c42fa6dd5a6f3fb3
+  metadata.gz: f0c733531b4b53e213528585429afd2c70ab20088e0740ae61bbca70e7a0306613fa1b6257a816980b180148ef8850e14d0ee9c6cace0b38395c05ddf84e5f5b
+  data.tar.gz: 1c3bdbc7e80deed263273903924bd0c03ad187b02aa87cb9c17b860ef421c7e367466379e428afdb95fc6eff9d39e3481a406c0e8bbe55d96b79ebb9935701f6

data/README.md

@@ -86,6 +86,12 @@ $ hotdog search availability-zone:us-east-1b and 'name:web-*'
 i-03cb56ed
 ```
 
+Login to the matching host using ssh.
+
+```sh
+$ hotdog ssh availability-zone:us-east-1b and 'name:web-*' -t public_ipv4 -u username
+```
+
 
 ## Expression
 

data/lib/hotdog/commands/search.rb

@@ -20,6 +20,18 @@ module Hotdog
           exit(1)
         end
 
+        result = evaluate(node, self).sort
+        if 0 < result.length
+          result, fields = get_hosts_with_search_tags(result, node)
+          STDOUT.print(format(result, fields: fields))
+          logger.info("found %d host(s)." % result.length)
+        else
+          STDERR.puts("no match found: #{args.join(" ")}")
+          exit(1)
+        end
+      end
+
+      def get_hosts_with_search_tags(result, node)
         drilldown = ->(n){
           case
           when n[:left] && n[:right] then drilldown.(n[:left]) + drilldown.(n[:right])
@@ -30,15 +42,7 @@ module Hotdog
         }
         identifiers = drilldown.call(node).map(&:to_s)
 
-        result = evaluate(node, self).sort
-        if 0 < result.length
-          result, fields = get_hosts(result, @options[:display_search_tags] ? identifiers : [])
-          STDOUT.print(format(result, fields: fields))
-          logger.info("found %d host(s)." % result.length)
-        else
-          STDERR.puts("no match found: #{args.join(" ")}")
-          exit(1)
-        end
+        get_hosts(result, @options[:display_search_tags] ? identifiers : [])
       end
 
       def parse(expression)

data/lib/hotdog/commands/ssh.rb

@@ -0,0 +1,90 @@
+#!/usr/bin/env ruby
+
+require "json"
+require "parslet"
+require "hotdog/commands/search"
+require "shellwords"
+
+module Hotdog
+  module Commands
+    class Ssh < Search
+      def run(args=[])
+        ssh_option = {
+          index: nil,
+          options: [],
+          user: nil,
+          identity_file: nil,
+        }
+
+        optparse.on("-n", "--index INDEX", "Use this index of host if multiple servers are found", Integer) do |index|
+          ssh_option[:index] = index
+        end
+        optparse.on("-o SSH_OPTION", "Passes this string to ssh command through shell. This option may be given multiple times") do |option|
+          ssh_option[:options] += [option]
+        end
+        optparse.on("-i SSH_IDENTITY_FILE", "SSH identity file path") do |path|
+          ssh_option[:identity_file] = path
+        end
+        optparse.on("-u SSH_USER", "SSH login user name") do |user|
+          ssh_option[:user] = user
+        end
+
+        args = optparse.parse(args)
+        expression = args.join(" ").strip
+        if expression.empty?
+          exit(1)
+        end
+
+        begin
+          node = parse(expression)
+        rescue Parslet::ParseFailed => error
+          STDERR.puts("syntax error: " + error.cause.ascii_tree)
+          exit(1)
+        end
+
+        result = evaluate(node, self).sort
+
+        if result.length == 1
+          host = result[0]
+        elsif result.empty?
+          STDERR.puts("no match found: #{args.join(" ")}")
+          exit(1)
+        else
+          if ssh_option[:index] && result.length > ssh_option[:index]
+            host = result[ssh_option[:index]]
+          else
+            result, fields = get_hosts_with_search_tags(result, node)
+
+            # add "index" field
+            result = result.each_with_index.map {|host,i| [i] + host }
+            fields = ["index"] + fields
+
+            STDERR.print(format(result, fields: fields))
+            logger.info("found %d host(s)." % result.length)
+            exit(1)
+          end
+        end
+
+        result, fields = get_hosts([host])
+        address = result.flatten.first
+
+        # build ssh command
+        cmdline = ["ssh"]
+        ssh_option[:options].each do |option|
+          cmdline << "-o" << option
+        end
+        if path = ssh_option[:identity_file]
+          cmdline << "-i" << Shellwords.escape(path)
+        end
+        if user = ssh_option[:user]
+          cmdline << (Shellwords.escape(user) + "@" + address)
+        else
+          cmdline << address
+        end
+
+        exec cmdline.join(" ")
+        exit(127)
+      end
+    end
+  end
+end

data/lib/hotdog/version.rb

@@ -1,3 +1,3 @@
 module Hotdog
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotdog
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Yamashita Yuu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-23 00:00:00.000000000 Z
+date: 2015-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -102,6 +102,7 @@ files:
 - lib/hotdog/commands/hosts.rb
 - lib/hotdog/commands/ls.rb
 - lib/hotdog/commands/search.rb
+- lib/hotdog/commands/ssh.rb
 - lib/hotdog/commands/tags.rb
 - lib/hotdog/commands/up.rb
 - lib/hotdog/formatters.rb