ex_aequo 0.2.6 → 0.3.1

data/lib/ex_aequo/colorizer.rb

@@ -0,0 +1,130 @@
+# frozen_string_literal: true
+
+require_relative './colorize/color_definitions'
+
+module ExAequo
+  module Colorizer extend self
+
+    def colorize(line, reset: false)
+      line = line.chomp
+      no_color = ENV.fetch('NO_COLOR', false)
+      case parse(line.grapheme_clusters, no_color)
+      in {ok: true, result:} 
+        {ok: true, result: join_result(result, no_color:, reset:)}
+      in error
+        error
+      end
+    end
+
+    def colorize_file(file, reset: false)
+      file = File.open(file, 'r') if String === file
+
+      at_exit do
+        file.close rescue nil
+      end
+      colorize_lines( file.readlines(chomp: true) )
+    end
+
+    def colorize_lines(lines, reset: false)
+      lines = lines.split(%r{\n\r?}) if String === lines
+      lines
+        .each_with_index do | line, idx |
+          case colorize(line, reset:)
+          in {ok: true, result:}
+            puts result
+          in {ok: false, error:}
+            $stderr.puts("ERROR in line #{idx.succ} ** #{error} **")
+          end
+        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)
+      case ColorDefinitions.get(color, no_color)
+      in nil
+        {ok: false, error: "undefined color #{color}"}
+      in color
+        {ok: true, color:}
+      end
+    end
+
+    def get_color!(color, no_color)
+      case ColorDefinitions.get(color, no_color)
+      in nil
+        raise "This should not have happened"
+      in color
+        color
+      end
+    end
+
+    def join_result(result, no_color:, reset:)
+      app(result, reset ? get_color!(:reset, no_color) : '')
+        .join
+    end
+
+    def parse(line, no_color, result = [])
+      # p(line:, result:)
+      case line
+      in [] 
+        {ok: true, 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)
+      in [char, *rest] 
+        parse(rest, no_color, app(result, char))
+      end
+    end
+
+    def parse_color(line, no_color, result, color=[])
+      # p(line:line, result:, color:)
+      case line
+      in []
+        {ok: false, error: "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)
+      in [char, *rest]
+        parse_color(rest, no_color, result, app(color, char))
+      end
+    end
+
+    def parse_continue_after_color(rest, no_color, result, color)
+      case check_color_definition(rest, no_color, color)
+      in {ok: true, color:}
+        parse(rest, no_color, app(result, color))
+      in error
+        error
+      end
+    end
+
+    def parse_next_color(rest, no_color, result, color)
+      case check_color_definition(rest, no_color, color)
+      in {ok: true, color:}
+        parse_color(rest, no_color, app(result, color))
+      in error
+        error
+      end
+    end
+
+    def reset(no_color)
+      get_color!(:reset, no_color)
+    end
+  end
+end
+# SPDX-License-Identifier: AGPL-3.0-or-later

data/lib/ex_aequo/kernel/enumerable.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Enumerable
+  def find_value(&block)
+    each do |ele|
+      case block.(ele)
+      in nil
+        nil
+      in false
+        false
+      in value
+        return value
+      end
+    end
+    nil
+  end
+end
+# SPDX-License-Identifier: AGPL-3.0-or-later

data/lib/ex_aequo/kernel/fn.rb

@@ -5,5 +5,8 @@ module Fn
   def prefix_string(with)
     ->(subject) { "#{with}#{subject}" }
   end
+  def split_string(by=/\s+/)
+    ->(subject) {subject.split(by)}
+  end
 end
 # SPDX-License-Identifier: Apache-2.0

data/lib/ex_aequo/kernel/match_data.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+class MatchData
+  def deconstruct(*) = to_a
+end
+# SPDX-License-Identifier: AGPL-3.0-or-later

data/lib/ex_aequo/my_struct/class_methods.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'ostruct'
 class MyStruct < OpenStruct
   module ClassMethods
     def from_reduce(keys, acc, &reducer)

data/lib/ex_aequo/ui/prompts.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'io/console'
+require_relative '../colorize'
+module ExAequo
+  module Ui
+    module Prompts extend self
+      extend Colorize
+
+      def prompt_ch(text: nil, chars:)
+        loop do
+          $stdout.print(text || _mk_text(chars))
+          $stdout.flush
+          case _member($stdin.getch, chars)
+          in {ok: true, ch:}
+            return ch
+          in {ok: false, ch:}
+            $stdout.puts(colorize("<red>ERROR$: Illegal char entered -> #{ch.inspect}"))
+          end
+        end
+      end
+
+      private
+      def _keys_or_members(chars)
+        case chars
+        when Hash
+          chars.keys
+        else
+          chars.to_a
+        end
+          .join(', ')
+      end
+
+      def _member(ch, chars)
+        if chars.member?(ch)
+          {ok: true, ch: ch}
+        else
+          {ok: false, ch: ch}
+        end
+      end
+
+      def _mk_text(chars)
+        "Please enter one of the following chars #{_keys_or_members(chars)} > "
+      end
+    end
+  end
+end
+# SPDX-License-Identifier: AGPL-3.0-or-later

data/lib/ex_aequo/ui.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require_relative 'ui/prompts'
+module ExAequo
+  module Ui
+    extend Forwardable
+    def_delegators Prompts, :prompt_ch
+  end
+end
+# SPDX-License-Identifier: AGPL-3.0-or-later

data/lib/ex_aequo/version.rb

@@ -2,7 +2,7 @@
 
 module ExAequo
   module Version
-    VERSION = '0.2.6'
+    VERSION = '0.3.1'
   end
 end
 # SPDX-License-Identifier: Apache-2.0

data/lib/ex_aequo.rb

@@ -2,7 +2,7 @@
 
 module ExAequo
 end
+require 'ostruct'
 require_relative 'ex_aequo/args_parser'
-require_relative 'ex_aequo/color'
 require_relative 'ex_aequo/version'
 # SPDX-License-Identifier: Apache-2.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ex_aequo
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.1
 platform: ruby
 authors:
 - Robert Dober
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-07 00:00:00.000000000 Z
+date: 2024-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: forwarder3
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'Some tools
 
   '
@@ -37,21 +51,19 @@ files:
 - lib/ex_aequo.rb
 - lib/ex_aequo/args.rb
 - lib/ex_aequo/args_parser.rb
-- lib/ex_aequo/color.rb
-- lib/ex_aequo/color/ansi.rb
-- lib/ex_aequo/color/ansi256.rb
-- lib/ex_aequo/color/colorizer.rb
-- lib/ex_aequo/color/modifiers.rb
-- lib/ex_aequo/color/rgb.rb
-- lib/ex_aequo/color/text.rb
-- lib/ex_aequo/color/web.rb
-- lib/ex_aequo/colors.rb
+- lib/ex_aequo/colorize.rb
+- lib/ex_aequo/colorize/color_definitions.rb
+- lib/ex_aequo/colorizer.rb
 - lib/ex_aequo/kernel.rb
 - lib/ex_aequo/kernel/access.rb
+- lib/ex_aequo/kernel/enumerable.rb
 - lib/ex_aequo/kernel/fn.rb
+- lib/ex_aequo/kernel/match_data.rb
 - lib/ex_aequo/my_struct.rb
 - lib/ex_aequo/my_struct/class_methods.rb
 - lib/ex_aequo/tools/text_scanner.rb
+- lib/ex_aequo/ui.rb
+- lib/ex_aequo/ui/prompts.rb
 - lib/ex_aequo/version.rb
 homepage: https://gitlab.com/robert_dober/rb_ex_aequo
 licenses:
@@ -65,14 +77,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Some tools

data/lib/ex_aequo/color/ansi.rb

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'modifiers'
-module ExAequo
-  module Color
-    module Ansi
-      extend self
-      include ExAequo::Color::Modifiers
-
-      AnsiColorEscape = {
-        black:     30,
-        red:       31,
-        green:     32,
-        yellow:    33,
-        blue:      34,
-        magenta:   35,
-        cyan:      36,
-        white:     37
-      }.freeze
-
-      def ansi(name, bold: false, dim: false, italic: false, underline: false)
-        case AnsiColorEscape.fetch(name.to_s.downcase.to_sym, nil)
-        in nil
-          raise IllegalColor, "#{name} is not one of the 8 legal basic ansi color names: #{_legal_ansi_color_names}"
-        in value
-          "\e[#{value}#{postfix_modifiers(bold:, dim:, italic:, underline:)}m"
-        end
-      end
-
-      private
-
-      def _legal_ansi_color_names
-        AnsiColorEscape.keys.inspect
-      end
-    end
-  end
-end
-# SPDX-License-Identifier: Apache-2.0

data/lib/ex_aequo/color/ansi256.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'modifiers'
-module ExAequo
-  module Color
-    module Ansi256
-      extend self
-      include ExAequo::Color::Modifiers
-
-      def ansi256(color, bold: false, dim: false, italic: false, underline: false)
-        case color
-        in 0..255
-          "\e[38;5;#{color}#{postfix_modifiers(bold:, dim:, italic:, underline:)}m"
-        else
-          raise IllegalColor, "#{color.inspect} is not a color number between 0 and 255"
-        end
-      end
-    end
-  end
-end
-# SPDX-License-Identifier: Apache-2.0

data/lib/ex_aequo/color/colorizer.rb

@@ -1,76 +0,0 @@
-# frozen_string_literal: true
-
-module ExAequo
-  module Color
-    module Colorizer
-      extend self
-
-      ColorMethodKeywords = {
-        ansi: nil,
-        ansi256: nil,
-        rgb: nil,
-        web: nil
-      }.freeze
-
-      StyleKeywords = {
-        bold: nil,
-        dim: nil,
-        italic: nil,
-        underline: nil
-      }.freeze
-
-      ColorizeKeywords = ColorMethodKeywords.merge(StyleKeywords).merge(reset: true)
-
-      def colorize(text, **kwds)
-        kwds =  ColorizeKeywords.merge(kwds)
-        _check_args!(kwds)
-
-        [
-          _color_code(**kwds),
-          text,
-          _maybe_reset(kwds[:reset])
-        ].join
-      end
-
-      private
-
-      def _check_args!(kwds)
-        spurious = kwds.keys - ColorizeKeywords.keys
-        raise ArgumentError, "illegal keywords #{spurious}, allowed: #{ColorizeKeywords.keys}" unless spurious.empty?
-
-        _check_rgb_args!(kwds)
-      end
-
-      def _check_rgb_args!(kwds)
-        unless kwds.values_at(*ColorMethodKeywords.keys).compact.size == 1
-          raise ArgumentError, 'need to specify exactly one of the following keyword arguments: :ansi, :ansi256, :rgb, :web'
-        end
-
-        if kwds[:rgb] && Access.any_key?(kwds, :bold, :dim)
-          raise(
-            ArgumentError,
-            'specifying bold and/or dim with rgb does not make sense'
-          )
-        end
-      end
-
-      def _color_code(**kwds)
-        kwds => {ansi:, ansi256:, rgb:, web:, italic:, underline:}
-        if rgb
-          ExAequo::Color.rgb(*Array(rgb), italic:, underline:)
-        elsif web
-          ExAequo::Color.rgb(*ExAequo::Color::Web.to_rgb(web), italic:, underline:)
-        elsif ansi
-          ExAequo::Color.ansi(ansi, **kwds.slice(*StyleKeywords.keys))
-        else
-          ExAequo::Color.ansi256(ansi256, **kwds.slice(*StyleKeywords.keys))
-        end
-      end
-
-      def _maybe_reset(reset)
-        reset ? ExAequo::Color.reset : nil
-      end
-    end
-  end
-end
-# SPDX-License-Identifier: Apache-2.0

data/lib/ex_aequo/color/modifiers.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module ExAequo
-  module Color
-    module Modifiers extend self
-      ModifierValues = {
-        bold: 1,
-        dim: 2,
-        italic: 3,
-        underline: 4
-      }.freeze
-
-      def postfix_modifiers(bold: nil, dim: nil, italic: nil, underline: nil)
-        [
-          bold ? :bold : nil,
-          dim ? :dim : nil,
-          italic ? :italic : nil,
-          underline ? :underline : nil
-        ].compact
-          .map(&Access.hash_by_key(ModifierValues))
-          .map(&Fn.prefix_string(';'))
-          .join
-      end
-    end
-  end
-end
-# SPDX-License-Identifier: Apache-2.0

data/lib/ex_aequo/color/rgb.rb

@@ -1,63 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'modifiers'
-module ExAequo
-  module Color
-    module Rgb
-      extend self
-
-      def rgb(red, green = nil, blue = nil, **kwds)
-        if green && blue
-          _rgb(red, green, blue, **kwds)
-        else
-          raise ArgumentError, 'takes 1 or 3 parameters, given two' if green
-
-          _rgb(*_hex_to_triple(red), **kwds)
-        end
-      end
-
-      private
-
-      def _check_rgb(red, green, blue)
-        if _check_rgb_byte(red) && _check_rgb_byte(green) && _check_rgb_byte(blue)
-          :ok
-        else
-          "#{[red, green, blue]} is not a legal rgb specification, need three bytes (0..255)"
-        end
-      end
-
-      def _check_rgb_byte(byte)
-        case byte
-        in 0..255
-          true
-        else
-          false
-        end
-      end
-
-      LeadingHashRgx = %r{\A#}
-      def _hex_to_triple(hex)
-        chex = hex.sub(LeadingHashRgx, '')
-        case chex.grapheme_clusters.each_slice(2).map(&:join).map { Integer(_1, 16) }
-        in r, g, b
-          [r, g, b]
-        else
-          raise IllegalColor, "#{hex} is not a legal rgb hex string"
-        end
-      rescue ArgumentError
-        raise IllegalColor, "#{hex} is not a legal rgb hex string"
-      end
-
-      def _rgb(red, green, blue, italic: false, underline: false)
-        case _check_rgb(red, green, blue)
-        in :ok
-          modifier = ExAequo::Color::Modifiers.postfix_modifiers(italic:, underline:)
-          "\e[38;2;#{red};#{green};#{blue}#{modifier}m"
-        in message
-          raise IllegalColor, message
-        end
-      end
-    end
-  end
-end
-# SPDX-License-Identifier: Apache-2.0

data/lib/ex_aequo/color/text.rb

@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../color'
-module ExAequo
-  module Color
-
-    module Text extend self
-      Specials = {
-        bold: ExAequo::Color::Ansi.ansi(:white, bold: true),
-        eol: "\n",
-        reset: ExAequo::Color.reset
-      }
-
-      def put_col(*segments, to: $stdout)
-        to.puts(colorized_text(segments))
-      end
-
-      def colorized_text(*segments)
-        if ENV['NO_COLOR']
-          segments.flatten.filter { String === _1 }.join
-        else
-          segments.flatten.map(&_color_or_text).join
-        end
-      end
-
-      private
-
-
-      def _color_or_text
-        -> color_or_text do
-          case color_or_text
-          when Symbol
-            _colorize(color_or_text)
-          else
-            color_or_text
-          end
-        end
-      end
-
-      def _colorize(color)
-        case ExAequo::Color::Ansi::AnsiColorEscape[color]
-        when nil
-          Specials.fetch(color) { raise ArgumentError, "#{color} not yet implemented" }
-        else
-          ExAequo::Color::Ansi.ansi(color)
-        end
-      end
-    end
-  end
-end
-# SPDX-License-Identifier: Apache-2.0