ex_aequo_base 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 875a596526632b322c4bec51e6c1cc44601fb35d6e3212eee2279156491fd3d3
-  data.tar.gz: b2587bd9aa314519a1bf5661acfacdead4d36ec837d342a5a5f615f08e7d7899
+  metadata.gz: 2f42430967e4c2f9e06b956df55783e74a92a1e820d226b580517f21f50c00e2
+  data.tar.gz: fb27b96a0dcabf3730527c162013114a465c00ac4a369595c25ac17fc9d032ad
 SHA512:
-  metadata.gz: f35274645d41f0ed31f8a302c74dd4abfc927f602e5f4e4e22229371245a3e54a1e14df8cc16f4b4b640496f17c1ae22620d416955c06d2efb228372c0e8fed3
-  data.tar.gz: a62de5273b819ad9f3637e32cb73aa9edc8592c2a31b6dcebc8975beaa107c4a1721ed7bfd4d00e97aa6c2a9226eb1a383f1b8adebc265bf89156f3ea103c8e9
+  metadata.gz: 84104dce64e79d0fe8945d1aeaac2f63bbb14329933eb4e9f84aefbfae68f2b842c9c0de5c82dca1c1c1cfddc3d2060dd532f7d03001efeffe5d3625b15b8a23
+  data.tar.gz: ce17b03ae58f71e3b0d9c2c45d9c7e55a32b1ad7788f1c31163f4fd263879c340a1a6558495026060caf950dcf0a394eb43ccef3b1112f1164165e8b3a241343

data/lib/ex_aequo/base/all.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require_relative 'colorize'
+require_relative 'kernel'
 require_relative 'open_struct'
 # require_relative 'match_data'
 Colorize = ExAequo::Base::Colorize

data/lib/ex_aequo/base/colorize/color_definitions.rb

@@ -480,30 +480,30 @@ ANSI_COLORS = {
 }
 
 module ExAequo
-  module Colorizer
-    module ColorDefinitions extend self
+  module Base
+    module Colorize
+      module ColorDefinitions extend self
 
-      def get(color, no_color)
-        color = find_color(color)
-        if color
-          return '' if no_color
-          color
+        def get(color, no_color)
+          color = find_color(color)
+          if color
+            return '' if no_color
+            color
+          end
         end
-      end
 
-      private
-      def find_color(color)
-        case ANSI_COLORS.fetch(color.to_sym, nil)
-        in [r, g, b] 
-          # not yet implemented
-          nil
-        in [:color, col]
-          # not yet implemented
-          nil
-        in nil
-          nil
-        in value
-          "\e[#{value}m"
+        private
+        def find_color(color)
+          case ANSI_COLORS.fetch(color.to_sym, nil)
+          in [r, g, b] 
+            "\e[38;2;#{r};#{g};#{b}m"
+          in [:color, col]
+            "\e[35;5;#{col}m"
+          in nil
+            nil
+          in value
+            "\e[#{value}m"
+          end
         end
       end
     end

data/lib/ex_aequo/base/colorize/colorizer.rb

@@ -0,0 +1,154 @@
+# frozen_string_literal: true
+
+module ExAequo
+  module Base
+    module Colorize
+
+      module Colorizer extend self
+
+        def colored(*chunks)
+          no_color = ENV.fetch('NO_COLOR', false)
+          chunks
+            .flatten
+            .map { colorize_chunk it, no_color }
+            .join
+        end
+
+        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, 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 |
+              case colorize(line, reset:)
+              in {ok: true, result:}
+                device.puts result
+              in {ok: false, error:}
+                $stderr.puts("ERROR in line #{idx.succ} ** #{error} **")
+              end
+            end
+        end
+
+        def pcolored(*chunks, device: $stderr)
+          device.puts(colored(*chunks))
+        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 colorize_chunk(chunk, no_color)
+          case chunk
+          in Symbol
+            get_color!(chunk, no_color)
+          else
+            chunk.to_s
+          end
+        end
+
+        def get_color!(color, no_color)
+          case ColorDefinitions.get(color, no_color)
+          in nil
+            raise "Bad color definition #{color.inspect}"
+          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
+  end
+end
+# SPDX-License-Identifier: AGPL-3.0-or-later

data/lib/ex_aequo/base/colorize.rb

@@ -1,13 +1,14 @@
 # frozen_string_literal: true
 
-require_relative 'colorizer'
+require_relative 'kernel'
+require_subdir __FILE__
 require 'forwardable'
 module ExAequo
   module Base
     module Colorize extend self
       extend Forwardable
 
-      def_delegators Colorizer, :colorize, :colorize_file, :colorize_lines
+      def_delegators Colorizer, :colored, :colorize, :colorize_file, :colorize_lines, :pcolored
 
     end
   end

data/lib/ex_aequo/base/constants.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module ExAequo
+  module Base
+    RbExtensionRgx = %r{ \. rb \z }x
+  end
+end
+# SPDX-License-Identifier: AGPL-3.0-or-later

data/lib/ex_aequo/base/kernel.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require_relative 'constants'
+module ExAequo::Base::KernelHelper extend self
+
+  def require_subdir(file, descend:, &blk)
+
+    raise ArgumentError, "must not provide positional file parameter #{file.inspect} and a block" if file && blk
+    raise ArgumentError, "must provide file or block" unless file || blk
+    if file
+      req_subdir_file(file, descend:)
+    else
+      req_subdir_blk(descend:, &blk)
+    end
+  end
+
+  private
+
+  def check_file(file)
+    return file if File.directory?(file)
+
+    file = file.sub(ExAequo::Base::RbExtensionRgx, '')
+    return file if File.directory?(file)
+
+    raise ArgumentError, "#{file} is not a directory nor does a subdirectory named after this ruby file ('.rb' removed) exist"
+  end
+
+  def req_subdir_blk(descend:, &blk)
+    subdir = blk.()
+    blk.source_location => src, _
+    if subdir
+      dir = File.dirname(src)
+      req_subdir_file(File.join(dir, subdir), descend:, exclude: src)
+    else
+      req_subdir_file(src, descend:, exclude: src)
+    end
+  end
+
+  def req_subdir_file(file, descend:, exclude: nil)
+    dir = check_file(file)
+    wc = descend ? '/**/*.rb' : '/*.rb'
+    Dir.glob(File.join(dir, wc)).each do |f|
+      require f.sub(ExAequo::Base::RbExtensionRgx, '') unless f == exclude
+    end
+  end
+end
+
+module Kernel
+  def require_subdir(file=nil, descend: false, &blk)
+    ExAequo::Base::KernelHelper.require_subdir(file, descend:, &blk)
+  end
+end
+# SPDX-License-Identifier: AGPL-3.0-or-later

data/lib/ex_aequo/base/open_struct.rb

@@ -4,7 +4,7 @@ require 'ostruct'
 require 'forwarder'
 class OpenStruct
   extend Forwarder
-  forward_all :deconstruct_keys, :empty?, :fetch, to: :to_h
+  forward_all :deconstruct_keys, :empty?, :fetch, :has_key?, to: :to_h
 
   def update(hashy)
     hashy.to_h.each do |k, v|

data/lib/ex_aequo/base/string/colorize.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require_relative '../colorize/colorizer'
+class String
+  def colored(color, reset: true)
+    colors = [color, self, (reset ? :reset : nil)].compact
+    Colorize::Colorizer.colored(*colors)
+  end
+
+  def pcolored(color, device: $stdout) = Colorize::Colorizer.pcolored(color, self, device:)
+end
+# SPDX-License-Identifier: AGPL-3.0-or-later

data/lib/ex_aequo/base/version.rb

@@ -2,7 +2,7 @@
 
 module ExAequo
   module Base
-    VERSION = '0.1.2'
+    VERSION = '0.1.4'
   end
 end
 # SPDX-License-Identifier: AGPL-3.0-or-later

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ex_aequo_base
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Robert Dober
@@ -63,9 +63,12 @@ files:
 - lib/ex_aequo/base/all.rb
 - lib/ex_aequo/base/colorize.rb
 - lib/ex_aequo/base/colorize/color_definitions.rb
-- lib/ex_aequo/base/colorizer.rb
+- lib/ex_aequo/base/colorize/colorizer.rb
+- lib/ex_aequo/base/constants.rb
+- lib/ex_aequo/base/kernel.rb
 - lib/ex_aequo/base/match_data.rb
 - lib/ex_aequo/base/open_struct.rb
+- lib/ex_aequo/base/string/colorize.rb
 - lib/ex_aequo/base/version.rb
 homepage: https://codeberg.org/lab419/rb_ex_aequo_base
 licenses:

data/lib/ex_aequo/base/colorizer.rb

@@ -1,130 +0,0 @@
-# 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