hocho 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc1d89aba4bdb301b19444dc5d87cbe529b75cd7fd2a5862af8a0e0eee0f06c9
-  data.tar.gz: a1e4308126d79cb3b4365c0dda2737ff2c57ca1f9a71ff74ba86948a0d4e4ab7
+  metadata.gz: 2f5398ffdb759cbfa7f06c5d388d5fa4b5455e81229f7546a302f9a97d9aeb8d
+  data.tar.gz: d07ddf5a3b23e81ba9b9d2eda67a909c3a4e84bd2a60a69bffcd682cad7db1e2
 SHA512:
-  metadata.gz: e9a5930caf9ce31ba052af069126bb6230b275ab007c00a0edbaf08a8d30fc0b4135aeae57899ebc8428a068a0f7221dd4249f1fa6af240830fb98b045aaeef5
-  data.tar.gz: 89d2ac75f09f14d2e569a7a229cfa61a625dbda5e1da6d035d54ac240d9cb78fd6272a85cc686166004404994a98384b1e6466d86ee349ab4d28270ad33c5e45
+  metadata.gz: 7e41c1eaa65f335385d5dead37cd1784500576f4ad3dfbb39e316771d28517b909097fafa687799e80067d2568a83ada90baa1db2e9030c3bcc6ddaca30020da
+  data.tar.gz: fdb35fd1103394c48602a766db80bcc90bec1777fb6d62dc562aebf0be2dfe6f73e3af6618679547d91ab92a07626a0e8c1616033e28f32e7017f5aa72deb31f

data/lib/hocho/drivers/ssh_base.rb

@@ -109,30 +109,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.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hocho
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - sorah (Shota Fukumori)
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-25 00:00:00.000000000 Z
+date: 2020-10-23 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
@@ -169,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Server provisioning tool with itamae
 test_files: []