raykit 0.0.385 → 0.0.388

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2628195892071cf9a584959d32d814ef059acaa7697b0a115c1ac67edd15f1a8
-  data.tar.gz: d7e2b2dc2b8162d7003bfea9ec831d4b33240f851ba793adf905402ce4c7e48f
+  metadata.gz: 3b11546d1b5398f5248ef90d704add21b831f91ef7a79d38212086262aa3b9cc
+  data.tar.gz: 453b28fa4e041b94d05abd069ffdc3f4fa254ed476f2249f60a3865c8b1dac01
 SHA512:
-  metadata.gz: b67eb6e9644e13778947a60730652034b23d6e66a4c165dff803da838da33de395e8c99b2def8d652dc41a085b750ea7c0539e5036e73fa15aedfdfbfd42b64d
-  data.tar.gz: 4a6645a6870477ff37958778beaeecefa05c29f5393612476ea8b6e2e1bb589d8b4d47e1ca1659e07b570a944632e17fa900f6e260d4c07edcd3ecf0c09a6b0e
+  metadata.gz: a823d9b9b52e8fe70789b847521cf5ec368e58f555edf4843798bff487d8d5e4455062f0a083a097612ceb3cc4e2bdf6803417b266b0f4c51ae14bd7af27de80
+  data.tar.gz: 80beabddb4f3bba256d48db6f9f3358163a63ea36f3198f7e7f438e717865b8f4266587fa5f8ef67db02b31503d0eacdaba793fce5ae983d8273cbe4f521794b

data/README.md

@@ -4,3 +4,5 @@ ruby gem supporting rake ci/cd tasks
 
 ## raykit console application
 
+# TODO
+- consider using https://github.com/tj/terminal-table to display name value pairs

data/lib/raykit/command.rb

@@ -63,6 +63,7 @@ module Raykit
         @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 = 1
@@ -76,6 +77,12 @@ module Raykit
             rescue IO::WaitReadable
             rescue EOFError
               @exitstatus = thread.value.exitstatus
+              until stdout.eof?
+                @output << stdout.read_nonblock(BUFFER_SIZE)
+              end
+              until stderr.eof?
+                @error << stderr.read_nonblock(BUFFER_SIZE)
+              end
               break
             end
           end
@@ -92,6 +99,8 @@ module Raykit
             @exitstatus = thread.value.exitstatus
           end
         end
+
+        # =================================================
       end
       @elapsed = timer.elapsed
       if @logging_enabled
@@ -187,7 +196,7 @@ module Raykit
       symbol = Rainbow(error.encode("utf-8")).red if @exitstatus != 0
       cmd = "#{Rainbow(SECRETS.hide(@command)).yellow}"
       if show_directory
-        puts "#{symbol} #{cmd} " + Rainbow("#{elapsed_str}").cyan #(#{@directory},#{elapsed_str})"
+        puts "#{symbol} #{cmd} " + Rainbow("#{elapsed_str}").cyan
         puts Rainbow("  #{@directory}").cyan
       else
         puts "#{symbol} #{Rainbow(SECRETS.hide(@command)).yellow} (#{elapsed_str})"
@@ -202,6 +211,7 @@ module Raykit
     end
 
     def details
+      puts "  exit_code: " + @exitstatus.to_s
       if @output.length > 0
         @output.lines.each do |line|
           puts "  " + line
@@ -214,6 +224,16 @@ module Raykit
       end
     end
 
+    def to_markdown
+      checkmark = "\u2713"
+      error = "\u0058"
+      symbol = checkmark.encode("utf-8")
+      symbol = error.encode("utf-8") if @exitstatus != 0
+      cmd = "#{SECRETS.hide(@command)}"
+      md = "#{symbol} #{SECRETS.hide(@command)} (#{elapsed_str})"
+      md
+    end
+
     def save
       filename = "#{Environment.get_dev_dir("log")}/Commands/#{SecureRandom.uuid}"
       log_dir = File.dirname(filename)

data/lib/raykit/git/repository.rb

@@ -134,6 +134,20 @@ module Raykit
           run(cmd)
         end
       end
+
+      def self.make(url, commit_id, command)
+        repo = Raykit::Git::Repository.new(url)
+        make_dir = roam.get_dev_dir("make") + "/" + commit_id
+        FileUtils.mkdir_p(roam.get_dev_dir("make")) if !Dir.exists?(roam.get_dev_dir("make"))
+        run("git clone #{url} #{make_dir}") if (!Dir.exists?(make_dir))
+        cmd = 0
+        Dir.chdir(make_dir) do
+          run("git checkout #{commit_id}")
+          cmd = run(command)
+        end
+        FileUtils.rm_rf(make_dir) if (cmd.exitstatus == 0)
+        cmd
+      end
     end
   end
 end

data/lib/raykit/log.rb

@@ -42,10 +42,12 @@ module Raykit
 
     def self.start_task(task_name)
       puts Rainbow(": #{task_name}").blue.bright
+      MARKDOWN.puts(": #{task_name}")
     end
 
     def self.show_value(name, value)
       puts "  " + Rainbow(name).cyan + " " + Rainbow("#{value}").white.bold
+      MARKDOWN.puts("#{name} #{value}")
     end
   end
 end

data/lib/raykit/markdown.rb

@@ -0,0 +1,23 @@
+module Raykit
+  class Markdown
+    attr_accessor :text
+
+    def initialize()
+      @text = ""
+    end
+
+    def puts(line)
+      @text = @text + "\n" + line
+    end
+
+    def to_s()
+      @text
+    end
+
+    def save_as(filename)
+      File.write("rake.md", @text)
+    end
+  end
+end
+
+MARKDOWN = Raykit::Markdown.new

data/lib/raykit/project.rb

@@ -14,6 +14,8 @@ module Raykit
     @repository
     @git_directory
     @timeout
+    @values
+    @commands
 
     # @log
     # @commit_message_filename
@@ -53,6 +55,8 @@ module Raykit
         end
       end
       @repository = Raykit::Git::Repository.new(@remote)
+      @values = Hash::new()
+      @commands = Array::new()
     end
 
     def get_dev_dir(subdir)
@@ -75,6 +79,10 @@ module Raykit
       @git_directory.branch
     end
 
+    def values
+      @values
+    end
+
     # latest local commit
     def latest_commit
       return "" if detached?
@@ -211,9 +219,28 @@ module Raykit
       self
     end
 
+    def to_markdown()
+      md = "# #{@name}"
+      md += get_markdown_nvp("Name", "Value", " ")
+      md += get_markdown_nvp("-", "-", "-")
+      md += get_markdown_nvp("Version", "#{@version}", " ")
+      md += get_markdown_nvp("Machine", "#{Raykit::Environment::machine}", " ")
+      md += get_markdown_nvp("User", "#{Raykit::Environment::user}", " ")
+      @values.each do |key, value|
+        md += get_markdown_nvp(key, value, " ")
+      end
+      @commands.each do |cmd|
+        md = md + "\n" + cmd.to_markdown
+      end
+      md
+    end
+
+    def get_markdown_nvp(key, value, pad_char)
+      "\n| " + key.to_s.ljust(36, pad_char) + "| " + value.to_s.ljust(36, pad_char)
+    end
+
     def summary
       info if @verbose
-
       puts "[#{elapsed}] #{Rainbow(@name).yellow.bright} #{Rainbow(version).yellow.bright}"
     end
 
@@ -294,13 +321,13 @@ module Raykit
         if !cmd.exitstatus.nil? && cmd.exitstatus.zero?
         else
           # display error details
-          puts cmd.output
-          $stderr.puts cmd.error
+          cmd.details
           if quit_on_failure
             abort
           end
         end
         cmd.save
+        @commands << cmd
         cmd
       end
     end

data/lib/raykit.rb

@@ -10,6 +10,7 @@ lib_dir = File.dirname(__FILE__)
 Dir.glob("#{lib_dir}/raykit/**/*.rb").sort.each { |file| require file }
 
 PROJECT = Raykit::Project.new
+
 SECRETS = Raykit::Secrets.new
 
 REPOSITORIES = Raykit::Git::Repositories.new("#{Raykit::Environment.get_dev_dir("log")}/Raykit.Git.Repositories.json")
@@ -38,6 +39,7 @@ if defined?(RAYKIT_GLOBALS)
 
   def show_value(name, value)
     Raykit::Log.show_value(name, value)
+    PROJECT.values[name] = value
   end
 
   def copy_files(src_dir, target_dir, glob)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: raykit
 version: !ruby/object:Gem::Version
-  version: 0.0.385
+  version: 0.0.388
 platform: ruby
 authors:
 - Lou Parslow
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-08 00:00:00.000000000 Z
+date: 2022-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,6 +107,7 @@ files:
 - lib/raykit/log.rb
 - lib/raykit/logevent.rb
 - lib/raykit/logging.rb
+- lib/raykit/markdown.rb
 - lib/raykit/msbuild.rb
 - lib/raykit/nugetpackage.rb
 - lib/raykit/nunit.rb