ex_aequo_color 0.1.0 → 0.2.0

data/lib/ex_aequo/color/colorizer.rb

@@ -0,0 +1,134 @@
+# frozen_string_literal: true
+
+module ExAequo
+  module Color
+    SyntaxError = Class.new(RuntimeError)
+
+    module Colorizer extend self
+      def colorize(line, reset: false)
+        line = line.chomp
+        no_color = ENV.fetch('NO_COLOR', false)
+        result = parse(line.grapheme_clusters, no_color)
+        case result
+        in {ok: true, result:} 
+          Result.ok(join_result(result, no_color:, reset:))
+        else
+          result
+        end
+      end
+
+      def colorize!(line, reset: false)
+        case colorize(line, reset:)
+        in {ok: true, result:}
+          result
+        in {ok: false, error:}
+          raise SyntaxError, error
+        else
+        end
+      end
+
+      def colorize_file(file, device: $stdout, reset: false)
+        file = File.open(file, 'r') if String === file
+
+        at_exit do
+          file.close rescue nil
+        end
+        colorize_lines(file.readlines(chomp: true), device:, reset:) 
+      end
+
+      def colorize_lines(lines, reset: false, device: $stdout)
+        lines = lines.split(%r{\n\r?}) if String === lines
+        lines
+          .each_with_index do | line, idx |
+            result = colorize(line, reset:).extract { |r|
+              $stderr.puts("ERROR in line #{idx.succ} ** #{r.error} **")
+            }
+            device.puts result
+          end
+      end
+
+      private
+
+      def app(ary, ary_or_elem)
+        case ary_or_elem
+        when Array
+          [*ary, *ary_or_elem]
+        else
+          [*ary, ary_or_elem]
+        end
+      end
+
+      def check_color_definition(rest, no_color,color)
+        colored = ColorDefinitions.get(color, no_color)
+        Result.from_value colored, error: "undefined color #{color}"
+      end
+
+      def get_color!(color, no_color)
+        color_def = ColorDefinitions.get(color, no_color)
+        return color_def if color_def
+
+        raise "Bad color definition #{color.inspect}"
+      end
+
+      def join_result(result, no_color:, reset:)
+        app(result, reset ? get_color!(:reset, no_color) : '')
+          .join
+      end
+
+      def parse(line, no_color, result = [])
+        case line
+        in [] 
+          Result.ok(result)
+        in ['<', '<', *rest]
+          parse(rest, no_color, app(result, '<'))
+        in ['$', '$', *rest]
+          parse(rest, no_color, app(result, '$'))
+        in ['$', *rest]
+          parse(rest, no_color, app(result, reset(no_color)))
+        in ['<', *rest]
+          parse_color(rest, no_color, result)
+        else
+          parse(line.drop(1), no_color, app(result, line.first))
+        end
+      end
+
+      def parse_color(line, no_color, result, color=[])
+        case line
+        in []
+          Result.nok("Incomplete Color Spec #{color.join}")
+        in ['>', *rest]
+          parse_continue_after_color(rest, no_color, result, color.join)
+        in [',', *rest]
+          parse_next_color(rest, no_color, result, color.join)
+        else
+          parse_color(line.drop(1), no_color, result, app(color, line.first))
+        end
+      end
+
+      def parse_continue_after_color(rest, no_color, result, color)
+        checked = check_color_definition(rest, no_color, color)
+        case checked
+        in {ok: true, result: color}
+          parse(rest, no_color, app(result, color))
+        else
+          checked
+        end
+      end
+
+      def parse_next_color(rest, no_color, result, color)
+        color_def = check_color_definition(rest, no_color, color)
+        case color_def
+        in {ok: true, result: color}
+          parse_color(rest, no_color, app(result, color))
+        else
+          color_def
+        end
+      end
+
+      def reset(no_color)
+        get_color!(:reset, no_color)
+      end
+    end
+  end
+end
+# SPDX-License-Identifier: AGPL-3.0-or-later

data/lib/ex_aequo/color/encode.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module ExAequo
+  module Color
+    module Encode extend self
+
+      def color(*chunks, reset: true)
+        _colors(chunks.flatten) => {needs_reset:, colorized:}
+        colorized << _color_code(:reset) if needs_reset && reset
+
+        colorized.join
+      end
+
+      def sgc(value)
+        return '' if _no_color
+
+        ColorDefinitions.sgc(value)
+      end
+
+      private
+      def _colors(chunks) =
+        # need the [""] to get the correct encoding (WTH?)
+        chunks.inject(OpenStruct.new(needs_reset: false, colorized: [""])) do |acc, chunk|
+          _color(acc, chunk)
+        end
+
+      def _color(acc, chunk)
+        case chunk
+        when Symbol
+          acc.colorized << _color_code(chunk)
+          acc.update(needs_reset: chunk != :reset)
+        when String
+          acc.colorized << chunk
+        when 0
+          acc.colorized << _color_code(:reset)
+          acc.update(needs_reset: false)
+        else
+          raise ArgumentError, "need a colorspec by symbol, a string or 0 (short for :reset), but got #{chunk.inspect}"
+        end
+        acc
+      end
+
+      def _color_code(color) =
+        ColorDefinitions.get(color, _no_color).tap do
+          raise BadColorSpecification, "bad color specification: #{color}" unless it
+        end
+
+      def _no_color
+        @___no_color__ ||= ENV['NO_COLOR']
+      end
+
+    end
+  end
+end
+# SPDX-License-Identifier: AGPL-3.0-or-later

data/lib/ex_aequo/color/output.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require_relative 'encode'
+module ExAequo
+  module Color
+    module Output extend self
+
+      def putc(*chunks, reset: false, device: $stdout)
+        output = Encode.color(*chunks, reset:)
+        device.print(output)
+      end
+
+      def putcs(*chunks, reset: true, device: $stdout)
+        output = Encode.color(*chunks, reset:)
+        device.puts(output)
+      end
+
+    end
+  end
+end
+# SPDX-License-Identifier: AGPL-3.0-or-later

data/lib/ex_aequo/color/string.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class String
+  def colored(color, reset: true)
+    Color.color(color, self, reset:)
+  end
+
+  def pcolored(color, reset: true, device: $stdout) = Color.pcolored(color, self, reset:, device:)
+end
+# SPDX-License-Identifier: AGPL-3.0-or-later
+

data/lib/ex_aequo/color/version.rb

@@ -2,7 +2,7 @@
 
 module ExAequo
   module Color
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end
 # SPDX-License-Identifier: AGPL-3.0-or-later

data/lib/ex_aequo/color.rb

@@ -1,41 +1,27 @@
 # frozen_string_literal: true
 
-require_relative 'colorizer'
+require 'ex_aequo/base/result/import'
+
+require_relative 'color/color_definitions'
+require_relative 'color/colorizer'
+require_relative 'color/output'
 require 'forwardable'
+require_relative 'ostruct'
 module ExAequo
   module Color extend self
-    extend Forwardable
-
-    def_delegators Colorizer, :colorize, :colorize_file, :colorize_lines
-
-    def color(*chunks, reset: true)
-      colorized = _colors(chunks.flatten)
-      return colorized unless reset
+    BadColorSpecification = Class.new(RuntimeError)
+    extend Encode
+    extend Output
 
-      colorized + _colors([0])
+    def self.included(into)
+      into.send(:include, Encode)
+      into.send(:include, Output)
     end
 
-    private
-    def _colors(chunks) = chunks.map { _color it }.join
-    
-    def _color(chunk)
-      case chunk
-      when Symbol
-        _get_color(chunk)
-      when String
-        chunk
-      when 0
-        _get_color(:reset)
-      else
-        raise ArgumentError, "need a colorspec by symbol, a string or 0 (short for :reset)"
-      end
-    end
-
-    def _get_color(color) = Colorizer::ColorDefinitions.get(color, _no_color)
+    extend Forwardable
+    def_delegators Colorizer, :colorize, :colorize!, :colorize_file, :colorize_lines
 
-    def _no_color
-      @___no_color__ ||= ENV['NO_COLOR']
-    end
+    def pcolored(*chunks, reset: true, device: $stderr) = device.puts(color(*chunks, reset:))
   end
 end
 # SPDX-License-Identifier: AGPL-3.0-or-later

data/lib/ex_aequo/ostruct.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'ostruct'
+class OpenStruct
+  def deconstruct_keys(*) = to_h
+
+  def update(**opts)
+    opts.each do |k, v|
+      self[k] = v
+    end
+  end
+end
+# SPDX-License-Identifier: AGPL-3.0-or-later

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ex_aequo_color
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Robert Dober
@@ -10,19 +10,19 @@ cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ostruct
+  name: ex_aequo_base
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.3.5
 description: Rainbows in your shell
 email: robert.dober@gmail.com
 executables: []
@@ -31,11 +31,16 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
-- lib/ex_aequo.rb
 - lib/ex_aequo/color.rb
+- lib/ex_aequo/color/all.rb
+- lib/ex_aequo/color/ansi_color_names.rb
+- lib/ex_aequo/color/color_definitions.rb
+- lib/ex_aequo/color/colorizer.rb
+- lib/ex_aequo/color/encode.rb
+- lib/ex_aequo/color/output.rb
+- lib/ex_aequo/color/string.rb
 - lib/ex_aequo/color/version.rb
-- lib/ex_aequo/colorize/color_definitions.rb
-- lib/ex_aequo/colorizer.rb
+- lib/ex_aequo/ostruct.rb
 homepage: https://codeberg.org/lab419/rb_ex_aequo_color.git
 licenses:
 - AGPL-3.0-or-later
@@ -47,14 +52,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.4.1
+      version: 3.4.5
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.8
+rubygems_version: 3.7.1
 specification_version: 4
 summary: Rainbows in your shell
 test_files: []