multish 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d76d493821db956c0ff89f1b06f65b9017130620400fbb58468c9c90f3417019
-  data.tar.gz: 89234f44a40082755499b5a7b0279cff4e147ed43bde517f457a651653d2b56b
+  metadata.gz: d26fbeace3df038252b8a4b39319c07593ddede65c892542aa3bdbee2f3a8c8e
+  data.tar.gz: 9457c3ef496f10d3f23fad25f85c5d46a297bf5ed554676431b14ba8fee3a771
 SHA512:
-  metadata.gz: 215dc7043862bc9c4185730f74855cb74448b4d5627f674595ff2978c944c56f4bfc5f284f058123aec0a5f14325672479b42df494d10079dca3fcf3ebebc37a
-  data.tar.gz: '04969adf2a71b600d3cdf0d61d0d260c851fd6a49a12111d261cb2da2bb2b99dc793efea3966a2c2eecd23dbffb91ce53041bf82633d655d665171c96e1951d6'
+  metadata.gz: dda0a8d05902b289522d4e5a563554529018870c6120ab5706e1094e7d4a6fdfdabdd709f7de61b67fc58a5c04d96d8848607456426fdd6fa9f4a6e4e99737f3
+  data.tar.gz: cd86199b25f754b2762e7ae7be758128e2cd8929abdb553036b825ef15d35235cef012c47f5d0f6ca41db8127b2028b97a16403d53bfa3b7a813bc3afd9181c5

data/lib/multish.rb

@@ -4,6 +4,8 @@ require 'curses'
 require 'open3'
 require 'colorize'
 
+BRIGHT_WHITE = 15
+
 class MultishItem
   attr_reader :command
 
@@ -80,10 +82,94 @@ class MultishItem
 
   def print(text)
     @output << text
-    @window.addstr(text)
+    color_print(@window, text)
     @window.refresh
   end
 
+  def color_print(window, input)
+    parse_commands(input) do |op, arg|
+      case op
+      when :string
+        window.addstr(arg)
+      when :reset
+        window.attroff(Curses.color_pair(10) | Curses::A_BOLD)
+      when :bold
+        window.attron(Curses::A_BOLD)
+      when :color
+        Curses.init_pair(10, arg, BRIGHT_WHITE)
+        window.attron(Curses.color_pair(10))
+      when :error
+        raise "ERROR: #{arg}"
+      end
+    end
+  end
+
+  def parse_commands(string)
+    parse_string(string) do |op, arg|
+      case op
+      when :string
+        yield [:string, arg]
+      when :escape
+        if arg == '[m'
+          yield [:reset]
+        elsif arg[/^\[(\d+;)+(\d+)m$/]
+          args = ($1 + $2).split(';')
+          args.each do |subarg|
+            subarg = subarg.to_i
+            case subarg
+            when 1
+              yield [:bold]
+            when 30..37
+              color = Curses::COLOR_BLACK + subarg - 30
+              yield [:color, color]
+            end
+          end
+        end
+      when :error
+        yield [:error, arg]
+      end
+    end
+  end
+
+  def parse_string(string)
+    len = string.length
+    i = 0
+    chars = ''
+    while i < len
+      char = string[i]
+      if char == "\e"
+        yield [:string, chars] if !chars.empty? && block_given?
+        chars = ''
+        escape = ''
+        i += 1
+        if string[i] == '['
+          escape << string[i]
+          i += 1
+        else
+          return yield [:error, string]
+        end
+        while string[i] =~ /[\x30-\x3f]/
+          escape << string[i]
+          i += 1
+        end
+        while string[i] =~ /[\x20–\x2f]/
+          escape << string[i]
+          i += 1
+        end
+        if string[i] =~ /[\x40-\x7e]/
+          escape << string[i]
+        else
+          return yield [:error, string]
+        end
+        yield [:escape, escape] if block_given?
+      else
+        chars << char
+      end
+      i += 1
+    end
+    yield [:string, chars] if !chars.empty? && block_given?
+  end
+
   def finished?
     return false unless @wait_thr
 
@@ -117,6 +203,7 @@ class Multish
     Curses.init_pair(2, Curses::COLOR_WHITE, Curses::COLOR_GREEN)
     Curses.init_pair(3, Curses::COLOR_WHITE, Curses::COLOR_RED)
     Curses.init_pair(4, Curses::COLOR_WHITE, Curses::COLOR_BLACK)
+    Curses.init_color(BRIGHT_WHITE, 1000, 1000, 1000)
     Curses.use_default_colors
     Curses.cbreak
     @commands.each(&:create_window!)
@@ -134,14 +221,17 @@ class Multish
         @commands.each(&:update_title!)
         break if @commands.all?(&:finished?)
       end
+    rescue StandardError => e
+      Curses.close_screen
+      warn 'INTERNAL ERROR'.red
+      warn e.message
+      warn e.backtrace
     ensure
       Curses.curs_set(1)
       Curses.close_screen
       if errored?
         warn 'At least one of the commands exited with error.'
-        @commands.select(&:errored?).each do |command|
-          command.print_output!
-        end
+        @commands.select(&:errored?).each(&:print_output!)
         exit 1
       else
         exit 0

data/lib/multish/version.rb

@@ -1,3 +1,3 @@
 class Multish
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.3.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multish
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Tomasz Dąbrowski