ro_thor 4.5.6 → 4.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b67dc9bd9932eeb51d0f0831054f1dd0ac75b363680a83be38b261fbdfa69e9
-  data.tar.gz: 2ae3bb147c2da61d5ec4b9703d0ba5f2d4b565756b643797b8e7332885418bba
+  metadata.gz: 4f2c130067f45ad0815676db4152f971063e03487b82ef35d6824a7146a04425
+  data.tar.gz: d939307abbefe9260132cb92d160568e0a0ebfd594d9c7d211d8a6d6c2a7136f
 SHA512:
-  metadata.gz: 98b778674d80cb95f87c1f477491a34789bead212e9ed5c1e16ec4f899e9a1fd1b6ca91358198bcd367503fe300a25e30afc4b76e583d215b1f1fec6ca3031bf
-  data.tar.gz: '078d536d5861d011906eef2f69083145ea441d738c207a855dfccc4c80a565f98bf9c9935fffddcc29d4331d6e33c363b279c66204d42051a2950c59e19d0f30'
+  metadata.gz: cf49e3f59b18ae2cff4cda9093c4b49f63ec69f9febcc98b1b138c88c25758093b7494ec2d7cbd0b8e4ef647b1d3311a10b88645043a06fa3deff181f4ec25cd
+  data.tar.gz: 020ef1946c6d6b40cdbb26aa497bbd1f2c99409f7b76b83713c5ea1253050de1655b2ac56257eb52f5515d4f040aac838221bf3eb2976c528ca6f37667dde707

data/lib/ro_thor/ssh.rb

@@ -4,6 +4,7 @@ require 'net/ssh'
 require_relative 'helper'
 require_relative 'sh'
 require_relative 'ro_file'
+require 'term/ansicolor'
 
 class RoThor
   class SSH
@@ -42,7 +43,7 @@ class RoThor
 
       ch = se.open_channel do |ch|
         ch.exec(cmd) do |ch, success|
-          unless success
+          if !success
             raise ::RoErr::RmtErr, "could not exe cmd: #{command.inspect}"
           end
 
@@ -74,12 +75,14 @@ class RoThor
       ch.wait
       ch.close
 
+      stdout = out_a.join('')
+
       stderr_lines = stderr_lines.hits
       stderr_lines.delete_if do |l|
         l.match(%r{^/.*warning\:.*$})
       end
 
-      unless stderr_lines.empty?
+      if !stderr_lines.empty?
         if stderr_lines.any? do |l|
           l.match(%r{\tfrom})
         end
@@ -95,19 +98,21 @@ class RoThor
             end
           end
 
-          e = RoErr::RmtErr.new(uncol(err_msg_arr.join), backtrace: bt.map(&:strip).hits)
+          e = RoErr::RmtErr.new(stdout + uncol(err_msg_arr.join))
+          e.set_backtrace(bt.map(&:strip).hits)
         else
-          e = RoErr::RmtErr.new(uncol(stderr_lines.join("\n")), backtrace: clr)
+          e = RoErr::RmtErr.new(stdout + uncol(stderr_lines.join("\n")))
+          e.set_backtrace(clr)
         end
 
-        if ::RoCell::Rmt.ignore_err
-          out_ins.warn e
-        else
-          raise e
-        end
+        # if ::RoCell::Rmt.ignore_err
+        #   out_ins.warn e
+        # else
+        raise e
+        # end
       end
 
-      out_a.join('')
+      stdout
     end
 
     def uncol(*args, &blk)

data/spec/lib/ro_thor/ssh_spec.rb

@@ -2,8 +2,24 @@ require 'rails_helper'
 require 'ro_thor/ssh'
 
 describe 'RoThor::Rmt.new' do
-  it :sh do
-    s = RoThor::SSH.new('root@me')
-    s.sh('ls;ls')
+  describe "sh" do
+    it "1" do
+      s = RoThor::SSH.new('root@techprpr')
+      s.sh('ls;ls')
+    end
+
+    it "capture err" do
+      s = RoThor::SSH.new("root@techprpr")
+      begin
+        # raise "err"
+        s.sh("lrekljeklwjl")
+      rescue Exception => e
+        puts "e:#{e} ---- #{File.basename __FILE__}:#{__LINE__}"
+      end
+    end
+  end
+
+  it "sh with regex" do
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ro_thor
 version: !ruby/object:Gem::Version
-  version: 4.5.6
+  version: 4.5.7
 platform: ruby
 authors:
 - ''
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-01 00:00:00.000000000 Z
+date: 2019-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor