toolrack 0.4.1 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b1faebd0b9013273d3b9943462bcd01efacde8a688e2fe94743628b3d8c249e
-  data.tar.gz: af51abbaf1376b8cf2fadd1df32b6395609ecc237554803c562a661e365e9eb1
+  metadata.gz: ddf90d364454f44c6fa22c6922b4139ffeec29ae7d8e6522e71c23dcf0e175fc
+  data.tar.gz: '081a85a5f8e7f8afa5082a65c9cf2462884e069728a9b28de0896aace92b9a5d'
 SHA512:
-  metadata.gz: 4374ec558bed30fff9ee2578169fa832f28668dc43ebeaab5ce3f651f97b6bb8870ba4f2cfb3cf6500ad49e7dc3a64ace2904fad23399e509e13a19b1c1306a9
-  data.tar.gz: cd45d0a0f890212298030dc1574fe900ccd13ae6b64bf7d57bce863ec7950e65d34238a6f8dedaabab0fadf04b9bf3e1defa4b2d47912e1285c6dd0756db7c1e
+  metadata.gz: df0f8256b236bb56ca19e77e91b53ae1be1b909d5339f3b315b255e7f416490c7f3fec0d8443ddc7c59131475869bf75b733b29f2f52e867702bf1ee6caee061
+  data.tar.gz: fd1ec6a7429bafec01d07386884af758270aab9df59c10ffd6fb0192294aef814a929c577a0a13816bc06499626c3bb3523487babae9730071069a644af181d4

data/Rakefile

@@ -1,6 +1,8 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
 
+require 'devops_helper'
+
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.libs << "lib"

data/lib/toolrack.rb

@@ -3,6 +3,9 @@ require "toolrack/version"
 require 'tlogger'
 require 'singleton'
 
+require 'fileutils'
+
+require_relative 'toolrack/global'
 require_relative 'toolrack/exception_utils'
 require_relative 'toolrack/condition_utils'
 require_relative 'toolrack/process_utils'
@@ -13,27 +16,9 @@ module Antrapol
     class Error < StandardError; end
     # Your code goes here...
  
-    class Logger
-      include Singleton
-      include Antrapol::ToolRack::ConditionUtils
-
-      attr_reader :glogger
-      def initialize
-        # boolean
-        loggerDebug = ENV['TOOLRACK_DEBUG']
-        logFile = ENV['TOOLRACK_LOGFILE']
-        maxLogNo = ENV['TOOLRACK_MAX_LOGFILE'] || 10
-        logFileSize = ENV['TOOLRACK_MAX_LOGFILE_SIZE'] || 10*1024*1024
-        
-        if not is_empty?(loggerDebug) and loggerDebug
-          @glogger = Tlogger.new(STDOUT)
-        elsif not is_empty?(logFile)
-          @glogger = Tlogger.new(logFile,maxLogNo,logFileSize)
-        else
-          @glogger = Tlogger.new('toolrack.log',maxLogNo,logFileSize)
-        end
-      end
-    end
-  
   end
 end
+
+ToolRack = Antrapol::ToolRack
+
+

data/lib/toolrack/condition_utils.rb

@@ -10,7 +10,11 @@ module Antrapol
         elsif obj.nil?
           true
         elsif obj.respond_to?(:empty?)
-          obj.empty?
+          if obj.respond_to?(:strip)
+            obj.strip.empty?
+          else
+            obj.empty?
+          end
         else
           false
         end
@@ -20,6 +24,10 @@ module Antrapol
         !is_empty?(obj)
       end # not empty
 
+      def is_boolean?(val)
+        !!val == val
+      end
+
     end # ConditionUtils
   end # MyToolRack
 end # Antrapol

data/lib/toolrack/global.rb

@@ -0,0 +1,35 @@
+
+require 'singleton'
+require_relative 'condition_utils'
+
+module Antrapol
+  module ToolRack
+ 
+    class Logger
+      include Singleton
+      include Antrapol::ToolRack::ConditionUtils
+
+      attr_reader :glogger
+      def initialize
+        # boolean
+        loggerDebug = ENV['TOOLRACK_DEBUG']
+        logFile = ENV['TOOLRACK_LOGFILE'] || File.join(Dir.home, 'antrapol_logs','toolrack.log')
+        maxLogNo = ENV['TOOLRACK_MAX_LOGFILE'] || 10
+        logFileSize = ENV['TOOLRACK_MAX_LOGFILE_SIZE'] || 10*1024*1024
+
+        logFileDir = File.dirname(logFile)
+        if not File.exist?(logFileDir)
+          FileUtils.mkdir_p(logFileDir)
+        end
+        
+        if not_empty?(loggerDebug) and (loggerDebug.downcase == 'true')
+          @glogger = Tlogger.new(STDOUT)
+        else
+          @glogger = Tlogger.new(logFile,maxLogNo,logFileSize)
+        end
+      end
+    end
+  
+  end
+end
+

data/lib/toolrack/process_utils.rb

@@ -1,11 +1,21 @@
 
-require 'pty'
+require_relative 'global'
+require_relative 'runtime_utils'
+
+if Antrapol::ToolRack::RuntimeUtils.on_windows?
+  # pty causing "function 'openpty' not found in msvcrt.dll" in some
+  # windows platform. Due to patches?
+  Antrapol::ToolRack::Logger.instance.glogger.debug "On Windows. Not going to load gem 'pty'"
+else
+  require 'pty'
+end
 require 'expect'
 require 'io/console'
 require 'tlogger'
 require 'open3'
 
 
+
 module Antrapol
   module ToolRack
     module ProcessUtils
@@ -13,13 +23,13 @@ module Antrapol
       def exec(cmd, opts = { }, &block)
         type = opts[:exec_type]
         if not type.nil?
-          exec2(type, cmd, opts, &block)
+          instance(type, cmd, opts, &block)
         else
-          exec2(:basic, cmd, opts, &block)
+          instance(:basic, cmd, opts, &block)
         end
       end
 
-      def exec2(type, cmd, opts = { }, &block)
+      def instance(type, cmd, opts = { }, &block)
         case type
         when :basic
           Antrapol::ToolRack::Logger.instance.glogger.debug "Basic execution"
@@ -79,6 +89,11 @@ module Antrapol
         
         Antrapol::ToolRack::Logger.instance.glogger.debug "PTY exec command : #{cmd}"
 
+        # pty seems error running on windows + jruby
+        if Antrapol::ToolRack::RuntimeUtils.on_windows?
+          raise Exception, "You're running on Windows. There have been report that error \"function 'openpty' not found in msvcrt.dll\". Probably due to patches. For now pty_exec() shall be halted"
+        end
+
         logger = opts[:logger] || Tlogger.new(STDOUT)
         expect = opts[:expect] || { }
         bufSize = opts[:intBufSize] || 1024000

data/lib/toolrack/version.rb

@@ -1,6 +1,6 @@
 module Antrapol
   module ToolRack
-    VERSION = "0.4.1"
+    VERSION = "0.6.1"
   end
 end
 

data/process_test/pty_test.rb

@@ -0,0 +1,74 @@
+
+
+
+require 'pty'
+require 'expect'
+
+#m, s = PTY.open
+#r, w = IO.pipe
+#
+#pid = spawn("/usr/bin/openvpn --config /home/chris/.openvpn_cli/sg2-ovpn-tcp.ovpn", in: r, out: s)
+#r.close
+#s.close
+#
+#
+#ret = begin
+#        p m.gets
+#      rescue Errno::EIO
+#        nil
+#      end
+#
+
+
+##PTY.spawn("/usr/bin/sudo /usr/bin/openvpn --config /home/chris/.openvpn_cli/sg2-ovpn-tcp.ovpn") do |read, write, pid|
+#PTY.spawn("/usr/bin/openvpn --config /home/chris/.openvpn_cli/sg2-ovpn-tcp.ovpn") do |read, write, pid|
+#  #read.expect(/\[sudo\] password for chris:/) { |m|
+#  #  p m
+#  #  puts "expect"
+#  #  write.printf("chr1st0pher1120\n")
+#  #}
+#  #read.expect(/Username:/) { |msg| 
+#  #  puts "-- #{msg}"
+#  #  write.printf("purevpn0s2643230\r\n") 
+#  #}
+#
+#  #read.expect(/no echo\)/) { |msg|
+#  #  puts "++ #{msg}"
+#  #  write.printf("\t@ntr@p0l.c0m\r\n")
+#  #}
+#
+#  loop do
+#    read.expect(/\n/) { |l| 
+#      p l
+#      @ln = l 
+#    }
+#    break if @ln.nil?
+#  end
+#end
+
+read, write, pid = PTY.spawn("/usr/bin/openvpn --config /home/chris/.openvpn_cli/sg2-ovpn-tcp.ovpn")
+
+puts "PID : #{pid}"
+
+trap "SIGINT" do
+  read.close
+  write.close
+  begin
+    puts "Killing process"
+    Process.kill("HUP",pid)
+    puts "Kill done. Start waiting"
+    Process.wait(pid)
+    STDERR.puts "Cleanup Done!"
+  rescue PTY::ChildExited
+  end
+end
+
+loop do
+  read.expect(/\n/) do |l|
+    puts l
+    @ln = l
+  end
+  break if @ln.nil?
+end
+
+

data/toolrack.gemspec

@@ -27,4 +27,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "tlogger", "~> 0.21"
+
+  spec.add_development_dependency "devops_helper", "~> 0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toolrack
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.6.1
 platform: ruby
 authors:
 - Chris
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-03 00:00:00.000000000 Z
+date: 2021-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tlogger
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.21'
+- !ruby/object:Gem::Dependency
+  name: devops_helper
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 description: Just collections of utilities
 email:
 - chrisliaw@antrapol.com
@@ -42,6 +56,7 @@ files:
 - lib/toolrack.rb
 - lib/toolrack/condition_utils.rb
 - lib/toolrack/exception_utils.rb
+- lib/toolrack/global.rb
 - lib/toolrack/process_utils.rb
 - lib/toolrack/runtime_utils.rb
 - lib/toolrack/utils.rb
@@ -71,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Collection of simple utilities but I find it increase clarity