toolrack 0.5.0 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b1c1f58f027b8a0b847c9c196c2f2e74ba75f2df78595cb1024f06560bf8ee6
-  data.tar.gz: bdbb04df325bf9f979de7497051267e6925ffc74c8a91c2e49008f03c1021401
+  metadata.gz: 2b8060cf4deb99cad679a22d0e9d4fd85969e0f332361a3d1bd89c52fda8166f
+  data.tar.gz: 5af17bbfb37aa09f5df3c9c8f02f916357b281a262316a6d3a67a0c0ccc9c613
 SHA512:
-  metadata.gz: 97627d8aba3e40cc3cba8f3fe3e0639f349001f548627267fca52d4ee820b8af027ebb33ae1dfff1b46f719b26d36d5aaaf4d2d7e392a918f59dc2bd4ec9e921
-  data.tar.gz: 932804f41294d61ceaa32eec0bdb20a8e6eb32d9abb746861cf5591ab09b29aba2980ad3b4d0508d8d2881240d91e2a64d28d83a9552cca669f3fd54521a4c90
+  metadata.gz: 7fb7969942992c8163decf1d8a98200b7b719f3c6e5c1eda86ad833047b15e185fe9793ecd2876dca56921f9c80760efa08e75ba99e73e8a4af478d9365834f7
+  data.tar.gz: e081ff9358e5e9dabe48f6b41106cb0308f538c20b08753275b90ed54088b0463fe641cf5613ce23858374e6b36c2430329f2477260dc2f69493f1592dd9ed06

data/lib/toolrack.rb

@@ -5,6 +5,7 @@ require 'singleton'
 
 require 'fileutils'
 
+require_relative 'toolrack/global'
 require_relative 'toolrack/exception_utils'
 require_relative 'toolrack/condition_utils'
 require_relative 'toolrack/process_utils'
@@ -15,30 +16,7 @@ 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'] || 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/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

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
@@ -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.5.0"
+    VERSION = "0.5.3"
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toolrack
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.3
 platform: ruby
 authors:
 - Chris
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-02 00:00:00.000000000 Z
+date: 2021-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tlogger
@@ -56,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
@@ -70,7 +71,7 @@ licenses: []
 metadata:
   homepage_uri: https://github.com/chrisliaw/toolrack
   source_code_uri: https://github.com/chrisliaw/toolrack
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -85,8 +86,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Collection of simple utilities but I find it increase clarity
 test_files: []