hocho 0.3.6 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc1d89aba4bdb301b19444dc5d87cbe529b75cd7fd2a5862af8a0e0eee0f06c9
-  data.tar.gz: a1e4308126d79cb3b4365c0dda2737ff2c57ca1f9a71ff74ba86948a0d4e4ab7
+  metadata.gz: 624f4576bac01ab09d957ba4252d50364c64a3129a09a25ec09773be27f7d1c8
+  data.tar.gz: 2c217ddcb5f628117d587e6d0d6f4db55dc5f87b951d59aee276acf4dec3872d
 SHA512:
-  metadata.gz: e9a5930caf9ce31ba052af069126bb6230b275ab007c00a0edbaf08a8d30fc0b4135aeae57899ebc8428a068a0f7221dd4249f1fa6af240830fb98b045aaeef5
-  data.tar.gz: 89d2ac75f09f14d2e569a7a229cfa61a625dbda5e1da6d035d54ac240d9cb78fd6272a85cc686166004404994a98384b1e6466d86ee349ab4d28270ad33c5e45
+  metadata.gz: '0315529a8835d22611d7e8d64763d21e497022958756c13d8d61bc915dc48f751b0672cf569fa535d76b882d5d20041f6787d72caecd37c54d608380a7887309'
+  data.tar.gz: ba8d6825082b32a63d03d8196d2180e99c43597c4e93cd63b4dd701f4bf172fbd2ddca810b448bf67659133cff70175abe4728c843c6ab6c0272db377c239b42

data/lib/hocho/command.rb

@@ -36,7 +36,7 @@ module Hocho
     desc "show NAME", ""
     method_option :format, enum: %w(yaml json), default: 'yaml'
     def show(name)
-      host = inventory.filter(name: name).first
+      host = inventory.filter({name: name}).first
       if host
         case options[:format]
         when 'yaml'

data/lib/hocho/drivers/ssh_base.rb

@@ -22,14 +22,15 @@ module Hocho
         ssh_cmd = ['ssh', *host.openssh_config.flat_map { |l| ['-o', "\"#{l}\""] }].join(' ')
         shm_exclude = shm_prefix.map{ |_| "--exclude=#{_}" }
         compress = host.compress? ? ['-z'] : []
-        rsync_cmd = [*%w(rsync -a --copy-links --copy-unsafe-links --delete --exclude=.git), *compress, *shm_exclude, '--rsh', ssh_cmd, '.', "#{host.hostname}:#{host_basedir}"]
+        hostname = host.hostname.include?(?:) ? "[#{host.hostname}]" : host.hostname # surround with square bracket for ipv6 address
+        rsync_cmd = [*%w(rsync -a --copy-links --copy-unsafe-links --delete --exclude=.git), *compress, *shm_exclude, '--rsh', ssh_cmd, '.', "#{hostname}:#{host_basedir}"]
 
         puts "=> $ #{rsync_cmd.shelljoin}"
         system(*rsync_cmd, chdir: base_dir) or raise 'failed to rsync'
 
         unless shm_prefix.empty?
           shm_include = shm_prefix.map{ |_| "--include=#{_.sub(%r{/\z},'')}/***" }
-          rsync_cmd = [*%w(rsync -a --copy-links --copy-unsafe-links --delete), *compress, *shm_include, '--exclude=*', '--rsh', ssh_cmd, '.', "#{host.hostname}:#{host_shm_basedir}"]
+          rsync_cmd = [*%w(rsync -a --copy-links --copy-unsafe-links --delete), *compress, *shm_include, '--exclude=*', '--rsh', ssh_cmd, '.', "#{hostname}:#{host_shm_basedir}"]
           puts "=> $ #{rsync_cmd.shelljoin}"
           system(*rsync_cmd, chdir: base_dir) or raise 'failed to rsync'
           shm_prefix.each do |x|
@@ -109,30 +110,36 @@ module Hocho
       end
 
       def set_ssh_output_hook(c)
-        outbuf, errbuf = [], []
-        check = ->(prefix,data,buf) do
-          has_newline = data.include?("\n")
+        check = ->(prefix, data, buf) do
+          data = buf + data unless buf.empty?
+          return if data.empty?
+
           lines = data.lines
-          last = lines.pop
-          if last[-1] == "\n"
-            buf << last
-          end
-          if has_newline
-            (buf+lines).join.each_line do |line|
-              puts "#{prefix} #{line}"
-            end
-            buf.replace([])
+
+          # If data is not NL-terminated, its last line is carried over to next check.call
+          if lines.last.end_with?("\n")
+            buf.clear
+          else
+            buf.replace(lines.pop)
           end
-          if last[-1] != "\n"
-            buf << last
+
+          lines.each do |line|
+            puts "#{prefix}#{line}"
           end
         end
 
+        outbuf, errbuf = +"", +""
+        outpre, errpre = "[#{host.name}] ", "[#{host.name}/ERR] "
+
         c.on_data do |c, data|
-          check.call "[#{host.name}] ", data, outbuf
+          check.call outpre, data, outbuf
         end
         c.on_extended_data do |c, _, data|
-          check.call "[#{host.name}/ERR] ", data, errbuf
+          check.call errpre, data, errbuf
+        end
+        c.on_close do
+          puts "#{outpre}#{outbuf}" unless outbuf.empty?
+          puts "#{errpre}#{errbuf}" unless errbuf.empty?
         end
       end
 

data/lib/hocho/host.rb

@@ -107,7 +107,7 @@ module Hocho
         when :encryption
          [["Ciphers", [*value].join(?,)]]
         when :compression
-         [["Compression", value]]
+         [["Compression", value ? 'yes' : 'no']]
         when :compression_level
          [["CompressionLevel", value]]
         when :timeout

data/lib/hocho/version.rb

@@ -1,3 +1,3 @@
 module Hocho
-  VERSION = "0.3.6"
+  VERSION = "0.3.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hocho
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.8
 platform: ruby
 authors:
 - sorah (Shota Fukumori)
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-25 00:00:00.000000000 Z
+date: 2023-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -108,7 +108,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - her@sorah.jp
 executables:
@@ -153,7 +153,7 @@ homepage: https://github.com/sorah/hocho
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -168,8 +168,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.4.0.dev
+signing_key:
 specification_version: 4
 summary: Server provisioning tool with itamae
 test_files: []