raykit 0.0.319 → 0.0.323

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e800e87fe08181c989bb8babbce06be9fcae9f2eb8d1a9fe118bc6a47ff62999
-  data.tar.gz: 41c106098a55e6499087cf420f23227eb1a4f601bae921571524f11dd45026ba
+  metadata.gz: efd74944a1f30ac6317bef794cc964e37e484cef50814f0702b61b7b17c1d4d2
+  data.tar.gz: 5eb12a1cafeb1dd6812d5747ea90046face2dfefffdc4c6008ec7d4593d26a4a
 SHA512:
-  metadata.gz: 7def4aa9bb5c9fa527b86707438876f79aa2ff6ea21e9b15fb4e47ce5856bb070aee634a63d4b0194da3a6fb4ed9b31d7d3dfb34b16a72057d201026df356359
-  data.tar.gz: 134460e58978f156f9e4e1b1a0ef41743b361b852c6206a3905659fb560ba5a317c93867cd48922229770dd450ded9f918413269eaa9e27abdc3295cdcf9d577
+  metadata.gz: 4848c9952dcc2853067c1e7ef54b275f1c08c4dd18dac99c5e692750bc2ce28d526bd7e74da7910e27577ae1251f2ba20fe0f6510c51a7ab5ea140a58722a8b0
+  data.tar.gz: 8390ef4a06b1c5c48217dda4e729647750757e03c15e3a0a4ebc5c90c9dfae214f9422aedc329f5346b39903ad27986dec94f6c0311877b7645f0d0ddc52fffa

data/lib/raykit/command.rb

@@ -1,13 +1,12 @@
-# frozen_string_literal: true
-
-require 'open3'
-require 'timeout'
-require 'json'
-require 'yaml'
-require 'logger'
-require 'securerandom'
+require "open3"
+require "timeout"
+require "json"
+require "yaml"
+require "logger"
+require "securerandom"
 
 BUFFER_SIZE = 1024 unless defined?(BUFFER_SIZE)
+
 module Raykit
   # Functionality to support executing and logging system commands
   class Command
@@ -25,39 +24,51 @@ module Raykit
     def init_defaults
       @timeout = 0
       @directory = Dir.pwd
-      @output = ''
-      @error = ''
+      @output = +""
+      @error = +""
       @exitstatus = 0
       @user = Environment.user
       @machine = Environment.machine
       @logging_enabled = true
     end
 
-    def initialize(command, timeout = 0, success_log_level = Logger::DEBUG, logging_enabled = true)
+    def initialize(command)
+    #def initialize(command, timeout = 0, success_log_level = Logger::DEBUG, logging_enabled = true)
+      timeout = 0
+      success_log_level = nil
+      logging_enabled = false
       @@commands = []
       init_defaults
       @success_log_level = success_log_level
       @logging_enabled = logging_enabled
       @command = command
       @timeout = timeout
-      run if @command.length.positive?
+      #t = Time.now
+      @elapsed = 0
+      #run if @command.length.positive?
+      self
+    end
+
+    def set_timeout(timeout)
+      @timeout = timeout
       self
     end
 
     def run
       # puts '---running---'
       @start_time = Time.now
+      @elapsed = 0
       timer = Timer.new
       if @timeout.zero?
         @output, @error, process_status = Open3.capture3(@command)
         @exitstatus = process_status.exitstatus
       else
+        puts "@timeout is #{@timeout}"
         Open3.popen3(@command, chdir: @directory) do |_stdin, stdout, stderr, thread|
-          tick = 2
+          tick = 1
           pid = thread.pid
           start = Time.now
-          elapsed = Time.now - start
-          while ((elapsed) < @timeout) && thread.alive?
+          while ((Time.now - start) < @timeout) && thread.alive?
             Kernel.select([stdout, stderr], nil, nil, tick)
             begin
               @output << stdout.read_nonblock(BUFFER_SIZE)
@@ -67,16 +78,16 @@ module Raykit
               @exitstatus = thread.value.exitstatus
               break
             end
-            elapsed = Time.now - start
           end
+          sleep 1
           if thread.alive?
             if Gem.win_platform?
               `taskkill /f /pid #{pid}`
             else
-              Process.kill('TERM', pid)
+              Process.kill("TERM", pid)
             end
             @exitstatus = 5
-            @error = 'timed out'
+            @error = +"timed out"
           else
             @exitstatus = thread.value.exitstatus
           end
@@ -91,68 +102,70 @@ module Raykit
           # puts '---logging---'
           unless @success_log_level.nil?
             e = to_log_event
-            e['Level'] = 'Verbose' if @success_log_level == 'Verbose'
-            e['Level'] = 'Debug' if @success_log_level == Logger::DEBUG
-            e['Level'] = 'Information' if @success_log_level == Logger::INFO
-            e['Level'] = 'Warning' if @elapsed > 60 * 2
+            e["Level"] = "Verbose" if @success_log_level == "Verbose"
+            e["Level"] = "Debug" if @success_log_level == Logger::DEBUG
+            e["Level"] = "Information" if @success_log_level == Logger::INFO
+            e["Level"] = "Warning" if @elapsed > 60 * 2
             e.to_seq
           end
         end
       end
+      self
     end
 
+    
     def to_log_event
       secrets = Secrets.new
       msg = secrets.hide(@command)
-      level = 'Verbose'
-      level = 'Warning' if @exitstatus != 0
+      level = "Verbose"
+      level = "Warning" if @exitstatus != 0
       output = @output
       error = @error
       output = @output[-1000..-1] if @output.length > 1200
       error = @error[-1000..-1] if @error.length > 1200
       Raykit::LogEvent.new(level, msg, {
-                             'SourceContext' => 'Raykit::Command',
-                             'Category' => 'Command',
-                             'Timeout' => @timeout,
-                             'Directory' => @directory,
-                             'Output' => output,
-                             'Error' => error,
-                             'ExitStatus' => @exitstatus,
-                             'Elapsed' => elapsed_str,
-                             'ElapsedSeconds' => @elapsed
-                           })
+        "SourceContext" => "Raykit::Command",
+        "Category" => "Command",
+        "Timeout" => @timeout,
+        "Directory" => @directory,
+        "Output" => output,
+        "Error" => error,
+        "ExitStatus" => @exitstatus,
+        "Elapsed" => elapsed_str,
+        "ElapsedSeconds" => @elapsed,
+      })
     end
 
     def log
       # --- Rolling File JSON -----
-      log = Logger.new("#{Raykit::Environment.log_dir}/Raykit.Commands.txt", 'daily')
+      log = Logger.new("#{Raykit::Environment.log_dir}/Raykit.Commands.txt", "daily")
       log.formatter = proc do |_severity, _datetime, _progname, msg|
         "#{msg}\n"
       end
       secrets = Secrets.new
       msg = secrets.hide(@command) # "?"# self.summary(false)
-      level = 'Verbose'
-      level = 'Warning' if @exitstatus != 0
+      level = "Verbose"
+      level = "Warning" if @exitstatus != 0
       event = Raykit::LogEvent.new(level, msg, {
-                                     'Timeout' => @timeout,
-                                     'Directory' => @directory,
-                                     'Output' => @output,
-                                     'Error' => @error,
-                                     'ExitStatus' => @exitstatus,
-                                     'Elapsed' => elapsed_str
-                                   })
+        "Timeout" => @timeout,
+        "Directory" => @directory,
+        "Output" => @output,
+        "Error" => @error,
+        "ExitStatus" => @exitstatus,
+        "Elapsed" => elapsed_str,
+      })
       log.info event.to_json
       # ---------------------------
       begin
         json = JSON.generate(to_hash)
-        log_filename = "#{Environment.get_dev_dir('log')}/Raykit.Command/#{SecureRandom.uuid}.json"
+        log_filename = "#{Environment.get_dev_dir("log")}/Raykit.Command/#{SecureRandom.uuid}.json"
         log_dir = File.dirname(log_filename)
         FileUtils.mkdir_p(log_dir) unless Dir.exist?(log_dir)
-        File.open(log_filename, 'w') { |f| f.write(json) }
-        if @exitstatus.zero?
-          LOG.log('Raykit.Command', Logger::Severity::INFO, json)
+        File.open(log_filename, "w") { |f| f.write(json) }
+        if !@exitstatus.nil? && @exitstatus.zero?
+          LOG.log("Raykit.Command", Logger::Severity::INFO, json)
         else
-          LOG.log('Raykit.Command', Logger::Severity::ERROR, json)
+          LOG.log("Raykit.Command", Logger::Severity::ERROR, json)
         end
       rescue JSON::GeneratorError => e
         puts to_hash.to_s
@@ -164,36 +177,46 @@ module Raykit
     def elapsed_str
       if elapsed < 1.0
       end
-      "#{format('%.0f', elapsed)}s"
+      "#{format("%.0f", elapsed)}s"
     end
 
-    def summary(show_directory = false)
+    def summary(show_directory = true)
       checkmark = "\u2713"
       # warning="\u26A0"
       error = "\u0058"
-      symbol = Rainbow(checkmark.encode('utf-8')).green
-      symbol = Rainbow(error.encode('utf-8')).red if @exitstatus != 0
+      symbol = Rainbow(checkmark.encode("utf-8")).green
+      symbol = Rainbow(error.encode("utf-8")).red if @exitstatus != 0
       if show_directory
-        puts "#{symbol}  #{elapsed_str.rjust(4)} #{Rainbow(SECRETS.hide(@command)).yellow} (#{@directory})"
+        puts "#{symbol} #{Rainbow(SECRETS.hide(@command)).yellow} (#{@directory},#{elapsed_str})"
       else
-        puts "#{symbol}  #{elapsed_str.rjust(4)} #{Rainbow(SECRETS.hide(@command)).yellow}" # + " (#{@directory})"
+        puts "#{symbol} #{Rainbow(SECRETS.hide(@command)).yellow} (#{elapsed_str})"
       end
-      # puts symbol + "  " + elapsed_str.rjust(4) + " " + Rainbow(SECRETS.hide(@command)).yellow# + " (#{@directory})"
+      self
     end
 
     def details
+      if @output.length > 0
+        @output.lines.each do |line|
+          puts '  ' + line
+        end
+      end
+      if @error.length > 0
+        @error.lines.each do |line|
+          puts '  ' + line
+        end
+      end
       # summary
-      puts @output
-      puts @error
-      puts
+      #puts @output
+      #puts @error
+      #puts
     end
 
     def save
-      filename = "#{Environment.get_dev_dir('log')}/Commands/#{SecureRandom.uuid}"
+      filename = "#{Environment.get_dev_dir("log")}/Commands/#{SecureRandom.uuid}"
       log_dir = File.dirname(filename)
       FileUtils.mkdir_p(log_dir) unless Dir.exist?(log_dir)
 
-      File.open(filename, 'w') do |f|
+      File.open(filename, "w") do |f|
         f.write(JSON.pretty_generate(to_hash))
       end
       self
@@ -206,30 +229,30 @@ module Raykit
       hash[:timeout] = @timeout
       hash[:start_time] = @start_time
       hash[:elapsed] = @elapsed
-      hash[:output] = @output.force_encoding('ISO-8859-1').encode('UTF-8')
-      hash[:error] = @error.force_encoding('ISO-8859-1').encode('UTF-8')
+      hash[:output] = @output.force_encoding("ISO-8859-1").encode("UTF-8")
+      hash[:error] = @error.force_encoding("ISO-8859-1").encode("UTF-8")
       hash[:exitstatus] = @exitstatus
       hash[:user] = @user
       hash[:machine] = @machine
-      hash[:context] = 'Raykit.Command'
+      hash[:context] = "Raykit.Command"
       hash
     end
 
     def from_hash(hash)
-      @command = hash['command']
-      @directory = hash['directory']
-      @timeout = hash['timeout']
-      @start_time = hash['start_time']
-      @elapsed = hash['elapsed']
-      @output = hash['output']
-      @error = hash['error']
-      @exitstatus = hash['exitstatus']
-      @user = hash['user'] if hash.include?('user')
-      @machine = hash['machine'] if hash.include?('machine')
+      @command = hash["command"]
+      @directory = hash["directory"]
+      @timeout = hash["timeout"]
+      @start_time = hash["start_time"]
+      @elapsed = hash["elapsed"]
+      @output = hash["output"]
+      @error = hash["error"]
+      @exitstatus = hash["exitstatus"]
+      @user = hash["user"] if hash.include?("user")
+      @machine = hash["machine"] if hash.include?("machine")
     end
 
     def self.parse(json)
-      cmd = Command.new('')
+      cmd = Command.new("")
       cmd.from_hash(JSON.parse(json))
       cmd
     end
@@ -242,8 +265,8 @@ module Raykit
 
     def self.get_script_commands(hash)
       commands = []
-      if hash.key?('script')
-        hash['script'].each do |cmd|
+      if hash.key?("script")
+        hash["script"].each do |cmd|
           commands << cmd
         end
       end

data/lib/raykit/console.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'optparse'
-require 'slop'
-require_relative('./logging')
+require "optparse"
+require "slop"
+require_relative("./logging")
 
 module Raykit
   # The implementation for the raykit console application
@@ -11,10 +11,10 @@ module Raykit
 
     def initialize
       @opts = Slop.parse do |o|
-        o.string '-t', '--task', 'rake task', default: 'default'
-        o.bool '-v', '--verbose', 'print detailed output', default: false
-        o.bool '-q', '--quiet', 'minimal output', default: false
-        o.bool '-s', '--stop', 'stop on error', default: true
+        o.string "-t", "--task", "rake task", default: "default"
+        o.bool "-v", "--verbose", "print detailed output", default: false
+        o.bool "-q", "--quiet", "minimal output", default: false
+        o.bool "-s", "--stop", "stop on error", default: true
       end
 
       if opts.verbose?
@@ -24,28 +24,28 @@ module Raykit
     end
 
     def run
-      verb = 'usage'
+      verb = "usage"
       verb = @opts.arguments[0] if @opts.arguments.length.positive?
       case verb
-      when 'usage'
+      when "usage"
         usage
-      when 'add'
+      when "add"
         add
-      when 'remove'
+      when "remove"
         remove
-      when 'show'
+      when "show"
         show
-      when 'work'
+      when "work"
         work
-      when 'import'
+      when "import"
         import
-      when 'clean'
+      when "clean"
         clean
-      when 'sync_version'
+      when "sync_version"
         sync_version
-      when 'copy'
+      when "copy"
         copy
-      when 'pull'
+      when "pull"
         pull
       else
         puts "unrecognized command #{verb}"
@@ -54,33 +54,33 @@ module Raykit
     end
 
     def verb_descriptions
-      { 'add' => 'add a git url',
-        'remove' => 'remove one or more git urls',
-        'show' => 'show git urls matching a specific pattern',
-        'work' => 'clone and rake a git repository',
-        'import' => 'import git urls matching a specific pattern',
-        'clean' => 'clean one or more working directories',
-        'pull' => 'preform git pull on one or more working directories',
-        'sync_version' => 'synchronize the version number between two files',
-        'copy' => 'copy a file' }
+      { "add" => "add a git url",
+        "remove" => "remove one or more git urls",
+        "show" => "show git urls matching a specific pattern",
+        "work" => "clone and rake a git repository",
+        "import" => "import git urls matching a specific pattern",
+        "clean" => "clean one or more working directories",
+        "pull" => "preform git pull on one or more working directories",
+        "sync_version" => "synchronize the version number between two files",
+        "copy" => "copy a file" }
     end
 
     def verb_usage
-      { 'add' => 'add GIT_URL',
-        'remove' => 'remove URL_PATTERN',
-        'show' => 'show URL_PATTERN',
-        'work' => 'work URL_PATTERN [--task RAKE_TASK]',
-        'import' => 'import URL_PATTERN',
-        'clean' => 'clean URL_PATTERN',
-        'pull' => 'pull URL_PATTERN',
-        'sync_version' => 'sync_version SOURCE_FILENAME DESTINATION_FILENAME',
-        'copy' => 'copy SOURCE DESTINATION' }
+      { "add" => "add GIT_URL",
+        "remove" => "remove URL_PATTERN",
+        "show" => "show URL_PATTERN",
+        "work" => "work URL_PATTERN [--task RAKE_TASK]",
+        "import" => "import URL_PATTERN",
+        "clean" => "clean URL_PATTERN",
+        "pull" => "pull URL_PATTERN",
+        "sync_version" => "sync_version SOURCE_FILENAME DESTINATION_FILENAME",
+        "copy" => "copy SOURCE DESTINATION" }
     end
 
     def usage
-      puts 'Usage: raykit VERB [GIT_URL|PATTERN] [OPTIONS]'
+      puts "Usage: raykit VERB [GIT_URL|PATTERN] [OPTIONS]"
       verb_descriptions.each do |k, v|
-        puts "#{k.ljust(15, ' ')} - #{v}"
+        puts "#{k.ljust(15, " ")} - #{v}"
       end
       # puts @opts
       # puts "verbs: " + verbs.to_s
@@ -89,7 +89,7 @@ module Raykit
 
     def add
       if @opts.arguments.length < 2
-        puts 'add requires a url'
+        puts "add requires a url"
         return 1
       end
       url = @opts.arguments[1]
@@ -104,17 +104,16 @@ module Raykit
 
     def remove
       if @opts.arguments.length < 2
-        puts 'remove requires a url or pattern'
+        puts "remove requires a url or pattern"
         return 1
       end
-      pattern = ''
+      pattern = ""
       pattern = @opts.arguments[1] if @opts.arguments.length > 1
       remove_urls = REPOSITORIES.matches(pattern)
       if remove_urls.length.zero?
-        puts 'no matching urls found.'
-
+        puts "no matching urls found."
       else
-        remove_urls.each  do |url|
+        remove_urls.each do |url|
           REPOSITORIES.delete(url)
           puts "url #{url} removed."
         end
@@ -123,7 +122,7 @@ module Raykit
     end
 
     def show
-      pattern = ''
+      pattern = ""
       pattern = @opts.arguments[1] if @opts.arguments.length > 1
       REPOSITORIES.matches(pattern).each do |url|
         puts url
@@ -131,7 +130,7 @@ module Raykit
     end
 
     def work
-      pattern = ''
+      pattern = ""
       pattern = @opts.arguments[1] if @opts.arguments.length > 1
 
       work_repositories = REPOSITORIES.matches(pattern)
@@ -139,18 +138,18 @@ module Raykit
       puts "work: found #{work_repositories.length} matching urls"
       work_repositories.each do |url|
         exitstatus = work_url(url)
-        puts ' ' if @opts.verbose?
+        puts " " if @opts.verbose?
         return exitstatus if @opts[:stop] && exitstatus != 0
       end
       0
     end
 
     def work_url(url)
-      return 0 if url == 'https://gitlab.com/lou-parslow/raykit.git'
+      return 0 if url == "https://gitlab.com/lou-parslow/raykit.git"
 
       puts Rainbow(url).yellow.bright if @opts.verbose?
       repo = Raykit::Git::Repository.new(url)
-      work = Raykit::Git::Directory.new(repo.get_dev_dir('work'))
+      work = Raykit::Git::Directory.new(repo.get_dev_dir("work"))
       unless Dir.exist?(work.directory)
         clone = Command.new("git clone #{url} #{work.directory} --recursive")
         puts clone.summary unless @opts.quiet?
@@ -161,7 +160,7 @@ module Raykit
       end
       if Dir.exist?(work.directory)
         Dir.chdir(work.directory) do
-          if File.exist?('rakefile.rb')
+          if File.exist?("rakefile.rb")
             rake = Raykit::Command.new("rake #{@opts[:task]}")
             rake.summary(true) if !@opts.quiet? || rake.exitstatus != 0
             if rake.exitstatus != 0
@@ -179,17 +178,17 @@ module Raykit
     end
 
     def pull
-      pattern = ''
+      pattern = ""
       pattern = @opts.arguments[1] if @opts.arguments.length > 1
       REPOSITORIES.matches(pattern).each do |url|
         repo = Raykit::Git::Repository.new(url)
-        work = Raykit::Git::Directory.new(repo.get_dev_dir('work'))
-        if Dir.exist?(work.directory) && !work.directory == '.git'
+        work = Raykit::Git::Directory.new(repo.get_dev_dir("work"))
+        if Dir.exist?(work.directory) && !work.directory == ".git"
           Dir.chdir(work.directory) do
             diff = `git diff`.strip
             status = `git status`.strip
-            if diff.length.zero? && status.include?('nothing to commit')
-              cmd = Command.new('git pull')
+            if diff.length.zero? && status.include?("nothing to commit")
+              cmd = Command.new("git pull")
               cmd.summary if @opts.verbose?
 
               if cmd.exitstatus != 0
@@ -210,9 +209,9 @@ module Raykit
     end
 
     def import
-      pattern = ''
+      pattern = ""
       pattern = @opts.arguments[1] if @opts.arguments.length > 1
-      puts 'scanning...'
+      puts "scanning..."
       count = REPOSITORIES.length
       REPOSITORIES.import(pattern)
       new_count = REPOSITORIES.length - count
@@ -220,11 +219,11 @@ module Raykit
     end
 
     def clean
-      pattern = ''
+      pattern = ""
       pattern = @opts.arguments[1] if @opts.arguments.length > 1
       REPOSITORIES.matches(pattern).each do |url|
         repo = Raykit::Git::Repository.new(url)
-        work = Raykit::Git::Directory.new(repo.get_dev_dir('work'))
+        work = Raykit::Git::Directory.new(repo.get_dev_dir("work"))
         next unless Dir.exist?(work.directory)
 
         puts "removing #{work.directory}"
@@ -250,7 +249,7 @@ module Raykit
 
     def copy
       if @opts.arguments.length < 3
-        puts 'source and destination arguments are required for copy'
+        puts "source and destination arguments are required for copy"
         return 1
       end
       source = @opts.arguments[1]
@@ -265,7 +264,7 @@ module Raykit
 
         begin
           puts "remote: #{remote}"
-          cmd = Raykit::Rake.run(remote, 'master')
+          cmd = Raykit::Rake.run(remote, "master")
           elapsed_str = Timer.get_elapsed_str(cmd.elapsed)
           if cmd.exitstatus.zero?
             puts "#{elapsed_str} #{Rainbow(SECRETS.hide(cmd.command)).yellow.bright} (#{cmd.directory})"
@@ -273,11 +272,11 @@ module Raykit
             puts "\r\n#{cmd.command}\r\n"
             puts "\r\n#{cmd.output}\r\n"
             puts "\r\n#{cmd.error}\r\n"
-            puts ''
+            puts ""
             puts "#{Rainbow(elapsed_str).red.bright} #{Rainbow(cmd.command).white}"
           end
         rescue StandardError
-          puts 'rescued...'
+          puts "rescued..."
         end
       end
     end

data/lib/raykit/dir.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'tmpdir'
-require_relative './environment'
+require "tmpdir"
+require_relative "./environment"
 
 class Dir
   def self.get_text(dir, relative_name)
@@ -9,13 +9,13 @@ class Dir
   end
 
   def self.set_text(dir, relative_name, text)
-    File.open("#{dir}/#{relative_name}", 'w') { |f| f.write text }
+    File.open("#{dir}/#{relative_name}", "w") { |f| f.write text }
   end
 
   def self.get_git_directories(dir)
     git_dirs = []
     Dir.chdir(dir) do
-      Dir.glob('**/.git/index') do |f|
+      Dir.glob("**/.git/index") do |f|
         git_dir = File.dirname(File.dirname(f))
         git_dirs << git_dir
       end
@@ -37,8 +37,8 @@ class Dir
   end
 
   def self.get_data_dir
-    unless ENV['DATA_DIR'].nil?
-      data_dir = ENV['DATA_DIR']
+    unless ENV["DATA_DIR"].nil?
+      data_dir = ENV["DATA_DIR"]
       return data_dir if Dir.exist?(data_dir)
     end
     home_dir = Raykit::Environment.home_dir

data/lib/raykit/dotnet.rb

@@ -93,7 +93,7 @@ module Raykit
 
     def self.get_package_names(filename)
       package_names = []
-      if File.exist?(filename) && filename.include?('.csproj')
+      if File.exist?(filename) && filename.include?(".csproj")
         regex = /<PackageReference Include="([\w.-]+)"/
         text = IO.read(filename)
         text.scan(regex).each do |m|