ro_thor 4.5.6 → 4.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b67dc9bd9932eeb51d0f0831054f1dd0ac75b363680a83be38b261fbdfa69e9
-  data.tar.gz: 2ae3bb147c2da61d5ec4b9703d0ba5f2d4b565756b643797b8e7332885418bba
+  metadata.gz: cbeb5aef6502717a385722f30e59461061ac1d95d436ccf65c688310d7e244ed
+  data.tar.gz: 65414774e137c2b63f8e9c2784fe8f5820b6b0187b54fcd9d7b2dca45743eb4d
 SHA512:
-  metadata.gz: 98b778674d80cb95f87c1f477491a34789bead212e9ed5c1e16ec4f899e9a1fd1b6ca91358198bcd367503fe300a25e30afc4b76e583d215b1f1fec6ca3031bf
-  data.tar.gz: '078d536d5861d011906eef2f69083145ea441d738c207a855dfccc4c80a565f98bf9c9935fffddcc29d4331d6e33c363b279c66204d42051a2950c59e19d0f30'
+  metadata.gz: 83e55c0ded31663342d322067dd74311b61a9d7e21d7950af71970e61ee4641e93ea05f3791b5bb5d94c245a1f7437a44ff23d0dc9a14c1edaa98225d487985d
+  data.tar.gz: 0764d49c5abf5e442ebe7be280dd116609d525d861c6c1bd61e61fb549386b97afe0d5627a238c445e55b93b60d17b75ae562e7ce13e53cfde36b1b4b810be95

data/lib/ro_thor.rb

@@ -1,11 +1,13 @@
 require 'pathname'
 $LOAD_PATH.unshift(Pathname.new(__FILE__).parent.to_s)
+require 'shellwords'
 require 'thor'
 require 'open3'
 require 'ro_thor/base'
 require 'ro_thor/sh'
 require 'ro_thor/ro_file'
 require 'ro_thor/array'
+require 'ro_thor/string'
 require 'ro_thor/helper'
 require 'ro_thor/ro_err'
 require 'ro_thor/http'
@@ -38,6 +40,14 @@ class RoThor < Thor
       desc(str, "")
     end
 
+    def st(*args)
+      start(*args)
+    end
+
+    def start(*args)
+      super(args)
+    end
+
     def create_command(*args, &blk)
       if @usage.nil?
         return
@@ -45,16 +55,12 @@ class RoThor < Thor
       super
     end
 
-    def st(*args, &blk)
-      start(args)
-    end
-
     def lamb(*args, &blk)
       lambda(*args, &blk)
     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 +69,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 +86,6 @@ class RoThor < Thor
   end
 
 
-
   def down_d(*args, &blk)
     RoFile.join("/media/roroco/disk750/Downloads", *args, &blk)
   end
@@ -136,17 +145,16 @@ class RoThor < Thor
 
   def toggle_win(win_name)
     wins = begin
-      shsu("xdotool search --onlyvisible #{win_name}").split("\n")
-    rescue RoThor::Sh::Err => e
-      out(e)
-      out(e.backtrace.join("\n"))
-      sleep(0.5)
-      retry
-    end
+             shsu("xdotool search --onlyvisible #{win_name}").split("\n")
+           rescue RoThor::Sh::Err => e
+             out(e)
+             out(e.backtrace.join("\n"))
+             sleep(0.5)
+             retry
+           end
     if wins.size > 0
       sh "xdotool windowactivate #{wins.first.strip}"
     end
   end
-
 end
 

data/lib/ro_thor/array.rb

@@ -1,6 +1,7 @@
 require_relative 'base'
 class Array
   unless method_defined? :ro_opts
+    # @return [] return args_without_options, options
     def ro_opts(*args, &blk)
       a = []
       opts = {}

data/lib/ro_thor/helper.rb

@@ -1,4 +1,5 @@
 require_relative 'base'
+require_relative 'string'
 
 class RoThor
   module Helper
@@ -11,8 +12,8 @@ class RoThor
       shsu("xclip -sel clip -o")
     end
 
-    def to_md5(s, *args, &blk)
-      Digest::MD5.hexdigest(s)
+    def to_md5(str)
+      str.md5
     end
 
     def in_pj(pj_name, *args, &blk)

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/ro_file.rb

@@ -42,7 +42,9 @@ class RoThor
 
       def msp(f, *args, &blk)
         p = parent(f)
-        FileUtils.mkpath(p)
+        if !test(?d, p)
+          FileUtils.mkpath(p)
+        end
       end
 
       def msd(p, *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
@@ -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/lib/ro_thor/string.rb

@@ -0,0 +1,7 @@
+class String
+  if !method_defined? :md5
+    def md5
+      Digest::MD5.hexdigest(self)
+    end
+  end
+end

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

data/spec/lib/ro_thor_spec.rb

@@ -0,0 +1,15 @@
+require 'rails_helper'
+
+class C < RoThor
+  usg :todo
+
+  def todo(*args)
+
+  end
+end
+
+describe 'RoThor' do
+  it "1" do
+    C.start(*['todo', 'arg1', "arg2"])
+  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.6.5
 platform: ruby
 authors:
 - ''
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-01 00:00:00.000000000 Z
+date: 2020-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -110,10 +110,12 @@ files:
 - lib/ro_thor/ro_file.rb
 - lib/ro_thor/sh.rb
 - lib/ro_thor/ssh.rb
+- lib/ro_thor/string.rb
 - spec/lib/core_ext/array_spec.rb
 - spec/lib/ro_cmd/thor/dp_spec.rb
 - spec/lib/ro_thor/ro_err_spec.rb
 - spec/lib/ro_thor/ssh_spec.rb
+- spec/lib/ro_thor_spec.rb
 - spec/mysql/my.cnf
 - spec/rails_helper.rb
 - spec/spec_helper.rb
@@ -140,10 +142,11 @@ signing_key:
 specification_version: 4
 summary: ''
 test_files:
-- spec/spec_helper.rb
+- spec/lib/ro_thor_spec.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