hotdog 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd779ac66dbd9c74001c9be43cfc2fa0e9cf8a5b
-  data.tar.gz: 3e7b187c2adcf00368c470abda57c194354631a0
+  metadata.gz: 52dcd14a86fb66237bcb18755f02fde4109a2c22
+  data.tar.gz: dcca4b54617bfb3dac88bff53db1605f26535984
 SHA512:
-  metadata.gz: fe1134ef72ab05bd66e1a97fdf059c64e815203cdeff0b536202a52043c583b62b787f990eb6d1133a20256732a434648a607d479524f9720323439f80b9700e
-  data.tar.gz: e8510f2f2b0dfa42828392e1f34b1e65fb83feb334030d282c9c1c76199d797de3b8e69df42a94cc08d784e24d3b1f224ce2c6b6813e1d0a3c7d52eae402109a
+  metadata.gz: 2b5a34f103669cdca02a4233d1af3cff3c57b827a8b6b97b87bd9c54bb8fd71e411800540655597825cc3ba23e5753c49e0f0bc465f1354ddf047fa7b1e86c23
+  data.tar.gz: 4b1d29a2ce4ddc458dc3a6d6a63d7ceff460bb24139e7083a282edaef3a7d3f08cf36fcd989fb4cc93c8723f9d381a588d60267f0861ed5f1d551689cef7cce3

data/lib/hotdog/commands/scp.rb

@@ -0,0 +1,41 @@
+#!/usr/bin/env ruby
+
+require "json"
+require "shellwords"
+require "hotdog/commands/ssh"
+
+module Hotdog
+  module Commands
+    class Scp < SingularSshAlike
+      private
+      def build_command_string(host, command=nil, options={})
+        # replace "@:" by actual hostname
+        cmdline = ["scp"] + build_command_options(options) + Shellwords.split(command).map { |token| token.gsub(/@(?=:)/, host) }
+        Shellwords.join(cmdline)
+      end
+
+      def build_command_options(options={})
+        arguments = []
+        if options[:forward_agent]
+          # nop
+        end
+        if options[:identity_file]
+          arguments << "-i" << options[:identity_file]
+        end
+        if options[:user]
+          arguments << "-o" << "User=#{options[:user]}"
+        end
+        if options[:options]
+          arguments += options[:options].flat_map { |option| ["-o", option] }
+        end
+        if options[:port]
+          arguments << "-P" << options[:port]
+        end
+        if options[:verbose]
+          arguments << "-v"
+        end
+        arguments
+      end
+    end
+  end
+end

data/lib/hotdog/commands/sftp.rb

@@ -0,0 +1,43 @@
+#!/usr/bin/env ruby
+
+require "json"
+require "shellwords"
+require "hotdog/commands/ssh"
+
+module Hotdog
+  module Commands
+    class Sftp < SingularSshAlike
+      private
+      def build_command_string(host, command=nil, options={})
+        cmdline = ["sftp"] + build_command_options(options) + [host]
+        if command
+          logger.warn("ignore remote command: #{command}")
+        end
+        Shellwords.join(cmdline)
+      end
+
+      def build_command_options(options={})
+        arguments = []
+        if options[:forward_agent]
+          # nop
+        end
+        if options[:identity_file]
+          arguments << "-i" << options[:identity_file]
+        end
+        if options[:user]
+          arguments << "-o" << "User=#{options[:user]}"
+        end
+        if options[:options]
+          arguments += options[:options].flat_map { |option| ["-o", option] }
+        end
+        if options[:port]
+          arguments << "-P" << options[:port]
+        end
+        if options[:verbose]
+          arguments << "-v"
+        end
+        arguments
+      end
+    end
+  end
+end

data/lib/hotdog/commands/ssh.rb

@@ -186,16 +186,10 @@ module Hotdog
       end
     end
 
-    class Ssh < SshAlike
+    class SingularSshAlike < SshAlike
       def define_options(optparse, options={})
         super
         options[:index] = nil
-        optparse.on("-D BIND_ADDRESS", "Specifies a local \"dynamic\" application-level port forwarding") do |bind_address|
-          options[:dynamic_port_forward] = bind_address
-        end
-        optparse.on("-L BIND_ADDRESS", "Specifies that the given port on the local (client) host is to be forwarded to the given host and port on the remote side") do |bind_address|
-          options[:port_forward] = bind_address
-        end
         optparse.on("-n", "--index INDEX", "Use this index of host if multiple servers are found", Integer) do |index|
           options[:index] = index
         end
@@ -216,7 +210,7 @@ module Hotdog
         if hosts.length != 1
           result = hosts.each_with_index.map { |host, i| [i, host] }
           STDERR.print(format(result, fields: ["index", "host"]))
-          logger.error("found %d hosts." % result.length)
+          logger.error("found %d candidates." % result.length)
           exit(1)
         end
       end
@@ -227,7 +221,20 @@ module Hotdog
         exec(cmdline)
         exit(127)
       end
+    end
+
+    class Ssh < SingularSshAlike
+      def define_options(optparse, options={})
+        super
+        optparse.on("-D BIND_ADDRESS", "Specifies a local \"dynamic\" application-level port forwarding") do |bind_address|
+          options[:dynamic_port_forward] = bind_address
+        end
+        optparse.on("-L BIND_ADDRESS", "Specifies that the given port on the local (client) host is to be forwarded to the given host and port on the remote side") do |bind_address|
+          options[:port_forward] = bind_address
+        end
+      end
 
+      private
       def build_command_options(options={})
         arguments = super
         if options[:dynamic_port_forward]

data/lib/hotdog/version.rb

@@ -1,3 +1,3 @@
 module Hotdog
-  VERSION = "0.10.0"
+  VERSION = "0.11.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotdog
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Yamashita Yuu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-21 00:00:00.000000000 Z
+date: 2016-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -175,7 +175,9 @@ files:
 - lib/hotdog/commands/hosts.rb
 - lib/hotdog/commands/ls.rb
 - lib/hotdog/commands/pssh.rb
+- lib/hotdog/commands/scp.rb
 - lib/hotdog/commands/search.rb
+- lib/hotdog/commands/sftp.rb
 - lib/hotdog/commands/ssh.rb
 - lib/hotdog/commands/tags.rb
 - lib/hotdog/commands/up.rb