dry-stack 0.1.55 → 0.1.56

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31af448879164bcafc2849deddb1a57ac32c879d8802c778a011ba63a042aac8
-  data.tar.gz: ea33f69f427432a01a44eee65bbfe47252abbc3ead5c41f81efe4dbd66119b45
+  metadata.gz: f703dca5d6c72d78f7634b294ba41b739f19b5ee87c0177301ce0d8fc98e7148
+  data.tar.gz: 7f70554b5b5b421926ce36dc75e1fec8086d98a2df2f51c9b8763441ad869057
 SHA512:
-  metadata.gz: f1ceae1fc14e54826ca71d95499e994114f02729aa3701e899a720fd6266167458e9b99626103a9a9bee23a0d8c69633ae8a49741225f9c9a65678b325c1cc0e
-  data.tar.gz: 8e01abf90ecd9706ec7eba012adfe55eb73e5682563c1b5e6e55ac3d5bd7d65a3a52a6fd2b9b2c36d5ca52389d2f5fdab4d1e5aa84c70e93dd6cf0c2b293c885
+  metadata.gz: f8f8588139024f0a15c9ac97b103a545a5d0d997d7e6af7b4db07f9574bc242c25c9a2f4a3ff8caf0c6a4b01a4d7e70910a7eb59f6a561edc735ed9297850fd6
+  data.tar.gz: 37e9151d6f369f35eda3286c418758292c515526106c3c3e04b27c5e391ebc5908482675a0b9a80fe20db7bd6968f5e4e5566bf2b27b1304357f218924def989

data/bin/rparallel

@@ -10,6 +10,15 @@ Task = Struct.new(:number, :command, :started_at, :ended_at, :exit_code, keyword
 end
 
 class RParallel
+  COLORS = {
+    bold: "\e[1m",
+    dim: "\e[2m",
+    green: "\e[32m",
+    red: "\e[31m",
+    cyan: "\e[36m",
+    reset: "\e[0m"
+  }.freeze
+
   def self.run(argv, stdin: $stdin, stdout: $stdout, stderr: $stderr)
     return usage(stdout) if argv == ["--help"] || argv == ["-h"]
 
@@ -21,20 +30,22 @@ class RParallel
     commands = stdin.each_line.map(&:strip).reject(&:empty?)
     tasks = commands.each_with_index.map { |command, index| Task.new(number: index + 1, command:) }
 
-    tasks.map { |task| Thread.new { run_task(task, stdout, stderr) } }.each(&:join)
+    color = color_enabled?
+    output_mutex = Mutex.new
+    tasks.map { |task| Thread.new { run_task(task, stdout, stderr, output_mutex, color) } }.each(&:join)
     print_report(tasks, stdout)
 
     tasks.all? { _1.exit_code.zero? } ? 0 : 1
   end
 
-  def self.run_task(task, stdout, stderr)
+  def self.run_task(task, stdout, stderr, output_mutex, color)
     task.started_at = monotonic_time
 
     Open3.popen3("sh", "-c", task.command) do |child_stdin, child_stdout, child_stderr, wait_thread|
       child_stdin.close
       readers = [
-        Thread.new { IO.copy_stream(child_stdout, stdout) },
-        Thread.new { IO.copy_stream(child_stderr, stderr) }
+        Thread.new { stream_output(child_stdout, stdout, task.number, output_mutex) },
+        Thread.new { stream_output(child_stderr, stderr, task.number, output_mutex, color: :red, enabled: color) }
       ]
       readers.each(&:join)
       task.exit_code = wait_thread.value.exitstatus || 1
@@ -46,26 +57,61 @@ class RParallel
     task.ended_at = monotonic_time
   end
 
+  def self.stream_output(source, target, job_number, output_mutex, color: nil, enabled: false)
+    source.each_line do |line|
+      output = "[Job #{job_number}] #{line.chomp}"
+      output_mutex.synchronize { target.puts color ? colorize(output, color, enabled) : output }
+    end
+  end
+
   def self.print_report(tasks, stdout)
     rows = tasks.map do |task|
       [task.number.to_s, task.status, task.exit_code.to_s, format("%.3fs", task.duration), task.command]
     end
-    widths = column_widths([["#", "status", "exit", "duration", "command"], *rows])
+    header = ["#", "status", "exit", "duration", "command"]
+    widths = column_widths([header, *rows])
+    color = color_enabled?
 
     stdout.puts
-    stdout.puts "rparallel report"
-    stdout.puts format_row(["#", "status", "exit", "duration", "command"], widths)
-    rows.each { stdout.puts format_row(_1, widths) }
+    stdout.puts colorize("rparallel report", :bold, color)
+    stdout.puts colorize(border(widths), :dim, color)
+    stdout.puts format_row(header, widths, color:, header: true)
+    stdout.puts colorize(border(widths), :dim, color)
+    rows.each { stdout.puts format_row(_1, widths, color:) }
+    stdout.puts colorize(border(widths), :dim, color)
   end
 
   def self.column_widths(rows)
     rows.transpose.map { _1.map(&:length).max }
   end
 
-  def self.format_row(row, widths)
-    row.each_with_index.map do |value, index|
-      index == row.length - 1 ? value : value.ljust(widths[index])
-    end.join("  ")
+  def self.format_row(row, widths, color:, header: false)
+    cells = row.each_with_index.map do |value, index|
+      padded = value.ljust(widths[index])
+      header ? colorize(padded, :cyan, color) : colorize_report_cell(padded, row, index, color)
+    end
+
+    "| #{cells.join(' | ')} |"
+  end
+
+  def self.border(widths)
+    "+-#{widths.map { '-' * _1 }.join('-+-')}-+"
+  end
+
+  def self.colorize_report_cell(value, row, index, color)
+    return colorize(value, row[1] == "ok" ? :green : :red, color) if [1, 2].include?(index)
+
+    value
+  end
+
+  def self.colorize(value, color_name, enabled)
+    return value unless enabled
+
+    "#{COLORS.fetch(color_name)}#{value}#{COLORS.fetch(:reset)}"
+  end
+
+  def self.color_enabled?
+    ENV["NO_COLOR"].nil? && ENV["RPARALLEL_NO_COLOR"].nil?
   end
 
   def self.usage(stdout)
@@ -77,7 +123,8 @@ class RParallel
 
   def self.monotonic_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
 
-  private_class_method :run_task, :print_report, :column_widths, :format_row, :usage, :monotonic_time
+  private_class_method :run_task, :stream_output, :print_report, :column_widths, :format_row, :border,
+                       :colorize_report_cell, :colorize, :color_enabled?, :usage, :monotonic_time
 end
 
 exit RParallel.run(ARGV)

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.1.55'
+    VERSION = '0.1.56'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-stack
 version: !ruby/object:Gem::Version
-  version: 0.1.55
+  version: 0.1.56
 platform: ruby
 authors:
 - Artyom B