ex_aequo_base 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46f5ec37896f313f3ee4edfc8bd1621f3ef01111fbb4ed80e55e5e0d3c95fb34
-  data.tar.gz: 0653da343a7cfff30b9667dde6836dce10f9241361bfa3d77a2fb5ba60a1cb72
+  metadata.gz: 24a260aad0b858a285db2f96eccff1885c3755e12eed40c61a01d4100ecc40ed
+  data.tar.gz: 961b6557e5002df0ee9993399de00f4705ecf55561b048e8ef9c5927c924030b
 SHA512:
-  metadata.gz: cad017a7d02b4823e436df3035ec128e9ebca3ed4d914a06ec046f464cee07ecdd36c1c3d9b736323c42ebf73bd1756936844c9ef3adf17e518998d42260b13c
-  data.tar.gz: d19f2261d4ea8bef04d182ac411651e6353c9f2ff3ef886aa97bc67d3a092d33643ea7cb5e3afc7d902a45fd43b6dd7399bb55c7262c9044bc4b3f430ab055b8
+  metadata.gz: 7ba6c445f2dd6bfa21b20fd7e4bc5b83ce57ebc1b72c62049aad348f30ea36f32dc8e016bddf9cef180b29541ef900837124fb91a10b7e8364bb742e06dee4a1
+  data.tar.gz: d34123cb7cdf68a20195a4d95a408d30922ec129ab463d894360fecf76574f354bcb8f96c8c909882a09de50168a84696a164db7b8244f5e4d5b97c4899399f3

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

@@ -25,22 +25,22 @@ module ExAequo
           end
         end
 
-        def colorize_file(file, reset: false)
+        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) )
+          colorize_lines( file.readlines(chomp: true), device:, reset: )
         end
 
-        def colorize_lines(lines, reset: false)
+        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:}
-                puts result
+                device.puts result
               in {ok: false, error:}
                 $stderr.puts("ERROR in line #{idx.succ} ** #{error} **")
               end

data/lib/ex_aequo/base/kernel.rb

@@ -3,14 +3,13 @@
 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
+  def require_subdir(*files, descend:, &blk)
+    raise ArgumentError, "must not provide positional file parameter #{files} and a block" if !files.empty? && blk
+    raise ArgumentError, "must provide file or block" unless !files.empty? || blk
+    if files.empty?
       req_subdir_blk(descend:, &blk)
+    else
+      req_subdir_file(File.join(files), descend:)
     end
   end
 
@@ -46,8 +45,8 @@ module ExAequo::Base::KernelHelper extend self
 end
 
 module Kernel
-  def require_subdir(file=nil, descend: false, &blk)
-    ExAequo::Base::KernelHelper.require_subdir(file, descend:, &blk)
+  def require_subdir(*files, descend: false, &blk)
+    ExAequo::Base::KernelHelper.require_subdir(*files, descend:, &blk)
   end
 end
 # SPDX-License-Identifier: AGPL-3.0-or-later

data/lib/ex_aequo/base/open_struct.rb

@@ -4,7 +4,13 @@ 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 self.to_proc
+    -> hashy do
+      new hashy
+    end
+  end
 
   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.3'
+    VERSION = '0.1.5'
   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.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Robert Dober
@@ -68,6 +68,7 @@ files:
 - 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: