hotdog 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5f4c5c3e2ce98b90bfd87374b07db36fc8b077f
-  data.tar.gz: be06e73ed9e26efe4e4613ab16f4192b3eae65c6
+  metadata.gz: be590bcf10423710cc9b86db34d0aaec800d9eaf
+  data.tar.gz: fb1eaa5dd9f40e4ff4889f378e1093a647e0cb90
 SHA512:
-  metadata.gz: f0c733531b4b53e213528585429afd2c70ab20088e0740ae61bbca70e7a0306613fa1b6257a816980b180148ef8850e14d0ee9c6cace0b38395c05ddf84e5f5b
-  data.tar.gz: 1c3bdbc7e80deed263273903924bd0c03ad187b02aa87cb9c17b860ef421c7e367466379e428afdb95fc6eff9d39e3481a406c0e8bbe55d96b79ebb9935701f6
+  metadata.gz: 75e2e9648fb2229292f79d70c4609ea7340637891b2a5c5db3cc637cf9e9a420f27dd2c940996cfd4ae2c22b638c2fbedf628a526e55efad474068e7ad34b5ff
+  data.tar.gz: 055408cd88e6f4bc745dd6ed56008107bad40a3bc7db6e8bab7698c0b2278a3b6ebb52b19546871ae05c1f2169fc8f6b72ccd5357d89cd37c6383e463b760322

data/lib/hotdog/commands/ssh.rb

@@ -13,7 +13,9 @@ module Hotdog
           index: nil,
           options: [],
           user: nil,
+          port: nil,
           identity_file: nil,
+          forward_agent: false,
         }
 
         optparse.on("-n", "--index INDEX", "Use this index of host if multiple servers are found", Integer) do |index|
@@ -25,12 +27,19 @@ module Hotdog
         optparse.on("-i SSH_IDENTITY_FILE", "SSH identity file path") do |path|
           ssh_option[:identity_file] = path
         end
+        optparse.on("-A", "Enable agent forwarding", TrueClass) do |b|
+          ssh_option[:forward_agent] = b
+        end
+        optparse.on("-p PORT", "Port of the remote host", Integer) do |port|
+          ssh_option[:port] = port
+        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
+        search_args = []
+        optparse.order!(args) {|search_arg| search_args.push(search_arg) }
+        expression = search_args.join(" ").strip
         if expression.empty?
           exit(1)
         end
@@ -47,7 +56,7 @@ module Hotdog
         if result.length == 1
           host = result[0]
         elsif result.empty?
-          STDERR.puts("no match found: #{args.join(" ")}")
+          STDERR.puts("no match found: #{search_args.join(" ")}")
           exit(1)
         else
           if ssh_option[:index] && result.length > ssh_option[:index]
@@ -76,13 +85,20 @@ module Hotdog
         if path = ssh_option[:identity_file]
           cmdline << "-i" << Shellwords.escape(path)
         end
+        if port = ssh_option[:port]
+          cmdline << "-p" << port.to_s
+        end
+        if ssh_option[:forward_agent]
+          cmdline << "-A"
+        end
         if user = ssh_option[:user]
-          cmdline << (Shellwords.escape(user) + "@" + address)
+          cmdline << (user + "@" + address)
         else
           cmdline << address
         end
+        cmdline.concat(args)
 
-        exec cmdline.join(" ")
+        exec *cmdline
         exit(127)
       end
     end

data/lib/hotdog/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotdog
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Yamashita Yuu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-03 00:00:00.000000000 Z
+date: 2015-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler