raykit 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cb2d9f485d024b8377b94fdc26e19b31591434cc9fa7b8950fb1c72eab40b95
-  data.tar.gz: 107f01c5d139b50dd8ecdda997d88e24f77d08a91d4128d211323bb6b2bff80e
+  metadata.gz: f933eede56a78983aa2f51561dbccd13f82843dbdb181cc68f8b1d0d90bd03b4
+  data.tar.gz: db666a66afaa823fe210bd837abd6472932390d507ddac6f0809bb8b938fa18e
 SHA512:
-  metadata.gz: 8bbf1552d25efa9077457472b6c131f5a9781368c3e81202c9cf4f5bf1c0b34bbdf55d2205f437a0f5518095b346d45723c2bd6c0d8e191b32effb01556a5765
-  data.tar.gz: bc7528ff64cc3440819bef1db925737a82fe757daafa2612d8c9c407d5f5e2865810bbb5553105081a89d9112567a3ecb2fd90188cd6efa9e9749bbb07829bba
+  metadata.gz: 81b4a53ed5022c0ed8269d58b78b7416f4a0cf9ceaa2f0c72afd4144b92f023457170458b9f3cbbcdcd5ed235ef10dcfde0a8941f71b6e311267da9ba6b47479
+  data.tar.gz: 113633993c47c3023b622341fdb9c8fb0c658c6655e7a392f29c90feb44a0a8fccd2a63fb0e210afec96ba54f349882ba6e25f249c69ad229be93f006b7098ad

data/lib/raykit.rb

@@ -3,6 +3,7 @@ require_relative './raykit/git.rb'
 require_relative './raykit/dotnet.rb'
 require_relative './raykit/version.rb'
 require_relative './raykit/environment.rb'
+require_relative './raykit/command.rb'
 require 'rainbow'
 require 'rake/clean'
 require 'open3'
@@ -11,20 +12,18 @@ CLEAN.include("**/bin","**/obj")
 
 module Raykit
     def Raykit.run(command) 
-        timer = Timer.new
-        exit,exit,exit = Open3.capture3(command)
-        if(exit == 0)#system(command))
-            puts timer.elapsed_str + " " +  Rainbow(command).yellow.bright
-            return timer.elapsed_str + " " + command
+        cmd = Command.new
+        cmd.command = command
+        cmd.run()#command)
+        elapsed_str = Timer.get_elapsed_str(cmd.elapsed)
+        if(cmd.exitstatus == 0)
+            puts elapsed_str + " " +  Rainbow(cmd.command).yellow.bright
+            return elapsed_str + " " + cmd.command
         else
-            #puts ''
-            puts "\r\n" + command + "\r\n"
-            #puts ''
-            system(command)
+            puts "\r\n" + cmd.command + "\r\n"
+            system(cmd.command)
             puts ''
-            abort Rainbow(timer.elapsed_str).red.bright + " " +  Rainbow(command).white
+            abort Rainbow(elapsed_str).red.bright + " " +  Rainbow(cmd.command).white
         end
-    end
-
-    
+    end 
 end

data/lib/raykit/command.rb

@@ -1,20 +1,102 @@
 require 'open3'
+require 'timeout'
+require 'json'
+require 'logger'
+BUFFER_SIZE=1024 if(!defined?(BUFFER_SIZE))
 
 module Raykit
     class Command
-        attr_accessor :log_level
-        def run(command) 
+
+        @@enable_logging = true
+        def self.enable_logging
+            @@enable_logging
+        end
+        def self.enable_logging=(enable)
+            @@enable_logging = enable
+        end
+        @@logger = nil
+        def self.log(command)
+            if(@@enable_logging)
+                if(@@logger.nil?)
+                    log_dir = "#{Raykit::Environment.log_dir}/Raykit/Command"
+                    if(!Dir.exist?(log_dir))
+                        FileUtils.mkdir_p(log_dir)
+                    end
+                    Dir.chdir(log_dir) do
+                        # start the log over whenever the log exceeds 100 megabytes in size
+                        @@logger = Logger.new('log.txt',0,100*1024*1024)
+                    end
+                end
+                if(command.exitstatus == 0)
+                    @@logger.info JSON.generate(command.to_hash)
+                else
+                    @@logger.error JSON.generate(command.to_hash)
+                end
+            end
+        end
+
+        attr_accessor :directory,:timeout,:start_time,:elapsed
+        attr_accessor :command,:output,:error,:exitstatus
+
+        def initialize()
+            @timeout=0
+            @directory = Dir.pwd
+            @output = ''
+            @error = ''
+            @exitstatus = 0
+        end
+
+        def run() 
+            @start_time = Time.now
             timer = Timer.new
-            exit,exit,exit = Open3.capture3(command)
-            if(exit == 0)#system(command))
-                puts timer.elapsed_str + " " +  Rainbow(command).yellow.bright
-                return timer.elapsed_str + " " + command
+            if(@timeout == 0)
+                @output,@error,process_status = Open3.capture3(@command) 
+                @exitstatus=process_status.exitstatus
             else
-                puts "\r\n" + command + "\r\n"
-                system(command)
-                puts ''
-                abort Rainbow(timer.elapsed_str).red.bright + " " +  Rainbow(command).white
+                Open3.popen3(@command, :chdir=>@directory) { |stdin,stdout,stderr,thread|
+                    tick=2
+                    pid = thread.pid
+                    start = Time.now
+                    elapsed = Time.now-start
+                    while (elapsed) < @timeout and thread.alive?
+                        Kernel.select([stdout,stderr], nil, nil, tick)
+                        begin
+                            @output << stdout.read_nonblock(BUFFER_SIZE)
+                            @error << stderr.read_nonblock(BUFFER_SIZE)
+                        rescue IO::WaitReadable
+                        rescue EOFError
+                            @exitstatus=thread.value.exitstatus
+                            break
+                        end
+                        elapsed = Time.now-start
+                    end
+                    if thread.alive?
+                        if(Gem.win_platform?)
+                            `taskkill /f /pid #{pid}`
+                        else
+                            Process.kill("TERM", pid)
+                        end
+                        @exitstatus=5
+                    else
+                        @exitstatus=thread.value.exitstatus
+                    end
+                  }
             end
+            @elapsed = timer.elapsed
+            Command::log(self)
+        end
+
+        def to_hash()
+            hash = Hash.new
+            hash[:command] = @command
+            hash[:directory] = @directory
+            hash[:timeout] = @timeout
+            hash[:start_time] = @start_time
+            hash[:elapsed] = @elapsed
+            hash[:output] = @output
+            hash[:error] = @error
+            hash[:exitstatus] = @exitstatus
+            hash
         end
     end
 end

data/lib/raykit/environment.rb

@@ -16,6 +16,14 @@ module Raykit
         def self.home_dir
             get_env('HOME').gsub('\\','/')
         end
+
+        def self.log_dir
+            log_dir = "#{Environment::root_dir}/log"
+            if(!Dir.exist?(log_dir))
+                Dir.mkdir(log_dir)
+            end
+            log_dir
+        end
     end
 end
 

data/lib/raykit/timer.rb

@@ -13,6 +13,11 @@ module Raykit
         end
 
         def elapsed_str
+            get_elapsed_str(elapsed)
+            #"[" + "%.0f" % (elapsed) + "s]"
+        end
+
+        def self.get_elapsed_str(elapsed)
             "[" + "%.0f" % (elapsed) + "s]"
         end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: raykit
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
 platform: ruby
 authors:
 - Lou Parslow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-08 00:00:00.000000000 Z
+date: 2019-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler