l43_simple_color 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4eb4f71f5445e06dc4dac9a05dd23129551f43a1d576a0610ce04cf9192ec1d
-  data.tar.gz: a9d0a1d7ab3d65180009ffc456e8081aebfd9e33a63436c6b490afa305eece4c
+  metadata.gz: 10eeebfdefb2b76a9368c0e9dff8af58c2a4e2898b53212b0fb1df37541be809
+  data.tar.gz: b98c3bf606f3421855b385dba90dd3ed41aac941c65656053e4c627d18e263bc
 SHA512:
-  metadata.gz: 3c9498643606ebbf94451660ad85b775e58989843006cf53ecfd6d74d285fdb57914df3ea752d88db1af7090488dca9053a659e83bd9b33bcc50f58b8184b502
-  data.tar.gz: da9b9c9ec8148288c02254985549d07848048cb2c2c44f80d260d4d4e33b29e137e1f3b0b9903c7456fc9a25685439b26ccbd812d889d3184100946bb79c1c60
+  metadata.gz: bc0f9f77944abe101cad1851f5c81a4b14ed7aa02719b494ad374714e47cdce11060467a15fe57e9bd63158ac3907697a1c524247db7b9eba59dec349bc2777b
+  data.tar.gz: dda276f2001d5e90932606dda820d8df70f59be2263b6d73139c6acbf08fa612f9b5dbd0b5aedfae50824d1d571b1c113be5b356c0a2a534120fe3e323ce3754

data/bin/simple_color

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
-require_relative "../lib/l43/simple_color"
-require_relative "../lib/l43/simple_color/cli"
+$: << File.expand_path("../lib", __FILE__)
+require "l43/simple_color/cli"
 
 L43::SimpleColor::Cli.run(ARGV)
 

data/lib/l43/simple_color/cli.rb

@@ -1,20 +1,13 @@
 # frozen_string_literal: true
 
-require_relative 'colorize'
+require_relative 'file_colorizer'
 module L43
   module SimpleColor
     module Cli extend self
-      include Colorize
       def run(argv)
-        device = make_device(argv.first)
-        device.map { |line|
-          puts(xcolorize!(line)) 
-        }
-      end
-
-      private
-      def make_device(fn)
-        (fn ? File.open(fn) : $stdin).each(chomp: true) 
+        SimpleColor.xcolorize_file(argv.first).each do  |line, _|
+          puts line
+        end
       end
     end
   end

data/lib/l43/simple_color/colorize.rb

@@ -14,26 +14,18 @@ module L43
       ColorSpecRgx = %r{(?:\s|\A):[__[:alnum:]]+(?:\s|\z)}
       Meta = %r{[:\s]+}
 
-      def colorize(str, reset: true, extended: false)
+      def colorize(str, reset: true, extended: false, raises: false)
         case _colorize(str, extended:)
         in String => encoded
           reset ? encoded + get_chunk(:reset) : encoded
-        in error
-          error
-        end
-      end
-
-      def colorize!(str, reset: true, extended: false)
-        case colorize(str, reset:, extended:)
-        in [:error, msg]
-          raise BadColor, msg
-        in result
-          result
+        in [:error, msg] => error
+          raises ? raise(BadColor, msg) : error
         end
       end
 
+      def colorize!(str, reset: true, extended: false) = colorize(str, raises: true, reset:, extended:)
       def xcolorize(str, reset: true) = colorize(str, reset:, extended: true)
-      def xcolorize!(str, reset: true) = colorize!(str, reset:, extended: true)
+      def xcolorize!(str, reset: true) = colorize(str, reset:, extended: true, raises: true)
 
       private
       def _colorize(str, reset: true, extended: false)

data/lib/l43/simple_color/file_colorizer.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'l43/simple_color/colorize'
+module L43
+  module SimpleColor
+    class FileColorizer
+      include Colorize
+      attr_reader :extended, :fn, :reset, :stream
+
+      def colorize_file(&blk)
+        return stream unless blk
+
+        stream.map(&blk)
+      end
+
+      private
+      def initialize(fn, reset:, extended: false)
+        @extended = extended
+        @fn = fn
+        @reset = reset
+        @stream = (fn ? File.open(fn) : $stdin).each(chomp: true).with_index.lazy.map(&colorize_line)
+      end
+
+      def colorize_line
+        -> line, idx do
+          # puts("LINE: #{line}")
+          case colorize(line, reset:, extended:)
+          in :error, msg
+            raise BadColor, msg + "\n\tin file:#{fn || "<:stdin>"}, line #{line.inspect}:#{idx.succ})"
+          in colored
+            [colored, idx.succ]
+          end
+        end
+      end
+    end
+
+    def colorize_file(fn=nil, reset: true, &blk) =
+      FileColorizer.new(fn, reset:).colorize_file(&blk)
+
+    def xcolorize_file(fn=nil, reset: true, &blk) =
+      FileColorizer.new(fn, reset:, extended: true).colorize_file(&blk)
+  end
+end
+# SPDX-License-Identifier: AGPL-3.0-or-later

data/lib/l43/simple_color/version.rb

@@ -2,7 +2,7 @@
 
 module L43
   module SimpleColor
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end
 # SPDX-License-Identifier: AGPL-3.0-or-later

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: l43_simple_color
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Robert Dober
@@ -40,6 +40,7 @@ files:
 - lib/l43/simple_color/cli.rb
 - lib/l43/simple_color/color_data.rb
 - lib/l43/simple_color/colorize.rb
+- lib/l43/simple_color/file_colorizer.rb
 - lib/l43/simple_color/version.rb
 homepage: https://www.codeberg.org/lab419/l43_simple_color.git
 licenses: