ro_thor 4.5.2 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afa23e7e7a73fa1081b16b19dd6c23885ccae2aa758fa15e62c9f06327858d9c
-  data.tar.gz: 18d917709a6d26063a6f6342d80a0e80d8aa7ea56b2c47a2fa539e1dcedfe169
+  metadata.gz: 40a5e6127722a684605524581c7e89944b58e56f1dd70b6a17ddea65bc2ef18e
+  data.tar.gz: b59e1dafcef1f636262269db13c6a4075c3d3aff5433f59d7754dd6dcb9a8f42
 SHA512:
-  metadata.gz: 9dddca51dc229b9c27636801594a33bd5046c2134f9a384e2a7b38368ce1ab61148dcba6d243b24be6306835d450b99e485498185bd3c7da4adc895dc81bef68
-  data.tar.gz: c9746ad4784046cfc78dbd336499bf33004e7b823756ba4cf335fb0eb988371113ccbb624219a806f9e4bd98d21af171507df1ab5c01e536f3342f3a880cb5b4
+  metadata.gz: c0e7640798240171dc4b27eb498606691985848b82b5fdc18bf1a34f886a2382503ed6eec44c4fe36c351517e7f919790ad4584a9245a9a72bd91125d52a21f8
+  data.tar.gz: 1284f79d0f46079b6ed0b1833b59449f022c4e8a0a39a7cd3c558db7100f23b4de93e7ab6ffbbfac9213efe02095ba3d9e94c2526480e20ed0b889962b896720

data/lib/ro_thor.rb

@@ -1,5 +1,6 @@
 require 'pathname'
 $LOAD_PATH.unshift(Pathname.new(__FILE__).parent.to_s)
+require 'shellwords'
 require 'thor'
 require 'open3'
 require 'ro_thor/base'
@@ -54,7 +55,7 @@ class RoThor < Thor
     end
   end
 
-  def open_url(url, user_data_dir=nil, *args, &blk)
+  def open_url(url, user_data_dir = nil, *args, &blk)
     user_data_dir ||= "#{ENV['HOME']}/.config/google-chrome"
     sys %Q(google-chrome --user-data-dir=#{user_data_dir.strip} "#{url}")
   end
@@ -63,6 +64,10 @@ class RoThor < Thor
     RoFile.basename(Dir.pwd)
   end
 
+  def sh_esc(str)
+    Shellwords.escape(str)
+  end
+
   def cur_pj_name2(*args, &blk)
     cur_pj_name.gsub(%r{^ro_}, "")
   end
@@ -76,7 +81,6 @@ class RoThor < Thor
   end
 
 
-
   def down_d(*args, &blk)
     RoFile.join("/media/roroco/disk750/Downloads", *args, &blk)
   end
@@ -147,6 +151,5 @@ class RoThor < Thor
       sh "xdotool windowactivate #{wins.first.strip}"
     end
   end
-
 end
 

data/lib/ro_thor/http.rb

@@ -16,6 +16,11 @@ class RoThor
       end
     end
 
+    def head(url, *args, &blk)
+      out "head #{url}"
+      h.head(url, *args, &blk)
+    end
+
     def get(url, *args, &blk)
       out "get #{url}"
       h.get(url, *args, &blk)

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
@@ -12,24 +13,22 @@ class RoThor
 
     attr_accessor :user_at_host, :se
 
-    def initialize(user_at_host, &blk)
+    def initialize(user_at_host)
       @user_at_host = user_at_host
       m = user_at_host.match(%r{(.*)@(.*)})
       @se = ::Net::SSH.start(m[2], m[1])
     end
 
-    def down(from, to, *args, &blk)
+    def down(from, to)
       RoFile.msp(to)
       sys "scp #{user_at_host}:#{from} #{to}"
     end
 
-    def up(from, to, *args, &blk)
+    def up(from, to)
       sys "scp #{from} #{user_at_host}:#{to}"
     end
 
-    def sh(*args, &blk)
-      args_clone, opts = args.ro_opts
-
+    def sh(*args, **opts)
       cmd = args.join(" ")
       msg = opts[:status] || cmd
 
@@ -43,8 +42,8 @@ class RoThor
       stderr_lines = []
 
       ch = se.open_channel do |ch|
-        ch.exec("bash -ci '#{cmd}'") do |ch, success|
-          unless success
+        ch.exec(cmd) do |ch, success|
+          if !success
             raise ::RoErr::RmtErr, "could not exe cmd: #{command.inspect}"
           end
 
@@ -60,7 +59,7 @@ class RoThor
               unless data.match(%r{cannot set terminal process group \((-)?\d+\): Inappropriate ioctl for device})\
                  or data.match(%r{no job control in this shell})
                 # or data.match(%Q(Cookie#domain returns dot-less domain name now. Use Cookie#dot_domain if you need "." at the beginning.))
-                if data.len > 100
+                if data.length > 100
                   err_msg = "\nerr_msg:\n#{data}"
                 else
                   err_msg = "err_msg:#{data}"
@@ -76,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
@@ -97,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.2
+  version: 4.6.0
 platform: ruby
 authors:
 - ''
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-19 00:00:00.000000000 Z
+date: 2020-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -66,6 +66,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 4.2.0
+- !ruby/object:Gem::Dependency
+  name: term-ansicolor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.7.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.7.1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -126,10 +140,10 @@ signing_key:
 specification_version: 4
 summary: ''
 test_files:
+- spec/spec_helper.rb
 - spec/lib/ro_cmd/thor/dp_spec.rb
+- spec/lib/core_ext/array_spec.rb
 - spec/lib/ro_thor/ssh_spec.rb
 - spec/lib/ro_thor/ro_err_spec.rb
-- spec/lib/core_ext/array_spec.rb
 - spec/rails_helper.rb
-- spec/spec_helper.rb
 - spec/mysql/my.cnf