rbtext 0.0.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a729d44ed2a3ab04b78d02b0d0226f3630ed47d789c8534f4f84244eb658395
-  data.tar.gz: 68e66d49346a58ed12ff5fa7bd7c44c9b6ce5a21f647f08be7b46d72acd06e2e
+  metadata.gz: c0e5451aa3736ffcedad724b7bac7ab81d041b0fdd6689dda38fc3f700bb7429
+  data.tar.gz: 4795dd7dde116fa9ae34f5da44d55238ac18e829b56de491f652c55a327c5623
 SHA512:
-  metadata.gz: 418da7b0d089e55f49fd9de6695899e4aec6f19c86860410d6fe4cc900c94c74658253eaec9f6fa9f13814060415cceaade928a9feae04467d881a01d4625ed4
-  data.tar.gz: db96c6606483f074eaf77990d64e18017b1e5e0f5867cd90f470ae07bb28aada188843ea19999000b310ecf569f41e4fce76919d9640b13fbfb4b869b03d7d90
+  metadata.gz: 6ea9d2ea58d11bef5ce07ca67c364e22411be909b56c1637f643a77691b48e5bb5f4f0609670859e1f07f0b86bd9b4a298b7f7cd11f333e51f245f3480c2a37f
+  data.tar.gz: 7ea1e21507a58eeee386e0c30dd0af7c4473b0d4a45716455aa33cd8209f0a6bab0d246341ab1dcc1047e219303f57579f3f2629f2963fbd98926ef7d3aa40e8

data/bin/ftext

@@ -0,0 +1,30 @@
+#!/usr/bin/ruby
+require_relative '../lib/rbtext.rb'
+
+if $stdin.tty? && ARGV[0]
+  txt = ARGV[0].to_s
+elsif $stdin.tty?
+  return
+else
+  if ARGV[0]
+    txt = []
+
+    args = ARGV[0].split(',')
+    lines = STDIN.each_line.to_a
+
+    if args.length < lines.length
+      x = lines.length/args.length
+      args = args * (x+1)
+    end
+
+    (0..lines.length-1).each do |l|
+      txt << "#{"_.f:reset._" if ARGV[1] != "--noreset"}_.#{args[l]}._"+lines[l]
+    end
+
+    txt = txt.join
+  else
+    txt = ARGF.readlines.join
+  end
+end
+
+print R::Ft.new(txt)

data/lib/rbtext/colors.rb

@@ -1,5 +1,12 @@
 module RBText
   module Colors
+    @@methods = [
+      :fg_color_codes,
+      :bg_color_codes,
+      :color,
+      :num_color
+    ]
+
     def fg_color_codes
       {
         black: "30",
@@ -17,7 +24,8 @@ module RBText
         light_blue: "94",
         light_magenta: "95",
         light_cyan: "96",
-        white: "97"
+        white: "97",
+        reset: "39"
       }
     end
 
@@ -31,21 +39,36 @@ module RBText
       return bg_color_codes
     end
 
-    def color(color, type: :fg)
+    def color(color, type: :fg, mode: :str)
+      return "\033[39m\033[49m" if type == :all && color == :reset
+
       if type == :fg
         color_code = self.fg_color_codes[color.to_sym]
       elsif type == :bg
         color_code = self.bg_color_codes[color.to_sym]
+      else
+        return nil
       end
 
-      return "\033[#{color_code}m"
+      return "\033[#{color_code}m" if mode == :str
+      print "\033[#{color_code}m" if mode == :set
+    end
+
+    def num_color(num, type: :fg, mode: :str)
+      return "\033[#{type == :fg ? "38" : "48"};5;#{num}m" if mode == :str
+      print "\033[#{type == :fg ? "38" : "48"};5;#{num}m" if mode == :set
     end
 
-    module_function :fg_color_codes, :bg_color_codes, :color
+    @@methods.each do |method|
+      module_function method
+    end
   end
 
   module C
     include RBText::Colors
-    module_function :fg_color_codes, :bg_color_codes, :color
+
+    @@methods.each do |method|
+      module_function method
+    end
   end
 end

data/lib/rbtext/cursor.rb

@@ -1,5 +1,15 @@
 module RBText
   module Cursor
+    @@methods = [
+      :up,
+      :down,
+      :left,
+      :right,
+      :beginning_of_line,
+      :go_to_pos,
+      :pos
+    ]
+
     def up(num=1)
       print "\033[#{num.to_i}A"
     end
@@ -16,20 +26,42 @@ module RBText
       print "\033[#{num.to_i}C"
     end
 
-    def go_to_pos(x, y)
+    def go_to_pos(x, y=nil)
+      if x.class == Array && !y
+        y = x[1]
+        x = x[0]
+      end
+
       print "\033[#{y};#{x}H"
       print "\033[#{y};#{x}f"
     end
 
+    def pos
+      res = ''
+      $stdin.raw do |stdin|
+        $stdout << "\e[6n"
+        $stdout.flush
+        while (c = stdin.getc) != 'R'
+          res << c if c
+        end
+      end
+      m = res.match /(?<row>\d+);(?<column>\d+)/
+      return [Integer(m[:column]), Integer(m[:row])]
+    end
+
     def beginning_of_line
       print "\r"
     end
 
-    module_function :up, :down, :left, :right, :beginning_of_line, :go_to_pos
+    @@methods.each do |method|
+      module_function method
+    end
   end
 
   module Cr
     include RBText::Cursor
-    module_function :up, :down, :left, :right, :beginning_of_line, :go_to_pos
+    @@methods.each do |method|
+      module_function method
+    end
   end
 end

data/lib/rbtext/formatting.rb

@@ -1,30 +1,73 @@
 module RBText
   module Formatting
-    def reset
-      "\033[0m"
+    @@methods = [
+    :reset,
+    :bold,
+    :faint,
+    :italic, 
+    :underline, 
+    :blinking, 
+    :strikethrough
+    ]
+
+    def reset(f_opt = nil, mode: :str)
+      if f_opt
+        r="\033[#{
+          f_opt =~ /^\033\[(1|2)m$/ ? "\033[22m" : "\033[2#{f_opt.gsub(/[^0-9]/, "")}m"
+        }"
+      else
+        r="\033[0m"
+      end
+      return r if mode == :str
+      print r if mode == :set
+    end
+
+    def bold(mode: :str)
+      r="\033[1m"
+      return r if mode == :str
+      print r if mode == :set
     end
 
-    def bold
-      "\033[1m"
+    def faint(mode: :str)
+      r="\033[2m"
+      return r if mode == :str
+      print r if mode == :set
     end
 
-    def faint
-      "\033[2m"
+    def italic(mode: :str)
+      r="\033[3m"
+      return r if mode == :str
+      print r if mode == :set
     end
 
-    def italic
-      "\033[3m"
+    def underline(mode: :str)
+      r="\033[4m"
+      return r if mode == :str
+      print r if mode == :set
     end
 
-    def underline
-      "\033[4m"
+    def blinking(mode: :str)
+      r="\033[5m"
+      return r if mode == :str
+      print r if mode == :set
     end
 
-    module_function :reset, :bold, :faint, :italic, :underline
+    def strikethrough(mode: :str)
+      r="\033[9m"
+      return r if mode == :str
+      print r if mode == :set
+    end
+
+    module_function 
+    @@methods.each do |method|
+      module_function method
+    end
   end
 
   module F
     include RBText::Formatting
-    module_function :reset, :bold, :faint, :italic, :underline
+    @@methods.each do |method|
+      module_function method
+    end
   end
 end

data/lib/rbtext/ftext.rb

@@ -15,6 +15,10 @@ module RBText
             @text << RBText::Colors.color(x[1].to_sym)
           elsif x[0] == "cb"
             @text << RBText::Colors.color(x[1].to_sym, type: :bg)
+          elsif x[0] == "cfn" || x[0] == "cn"
+            @text << RBText::Colors.num_color(x[1])
+          elsif x[0] == "cbn"
+            @text << RBText::Colors.num_color(x[1], type: :bg)
           elsif x[0] == "f"
             if x[1] == "reset"
               @text << RBText::Formatting.reset
@@ -26,6 +30,24 @@ module RBText
               @text << RBText::Formatting.italic
             elsif x[1] == "underline"
               @text << RBText::Formatting.underline
+            elsif x[1] == "strikethrough"
+              @text << RBText::Formatting.strikethrough
+            elsif x[1] == "blinking"
+              @text << RBText::Formatting.blinking
+            end
+          elsif x[0] == "rf"
+            if x[1] == "bold"
+              @text << RBText::Formatting.reset(R::F.bold)
+            elsif x[1] == "faint"
+              @text << RBText::Formatting.reset(R::F.faint)
+            elsif x[1] == "italic"
+              @text << RBText::Formatting.reset(R::F.italic)
+            elsif x[1] == "underline"
+              @text << RBText::Formatting.reset(R::F.underline)
+            elsif x[1] == "strikethrough"
+              @text << RBText::Formatting.reset(R::F.strikethrough)
+            elsif x[1] == "blinking"
+              @text << RBText::Formatting.reset(R::F.blinking)
             end
           end
         else
@@ -47,6 +69,14 @@ module RBText
     def original_text
       @original_text
     end
+
+    def +(str)
+      self.to_s + str
+    end
+
+    def [](num)
+      self.to_s[num]
+    end
   end
 
   class Ft < RBText::Ftext

data/lib/rbtext/screen.rb

@@ -1,5 +1,13 @@
 module RBText
   module Screen
+    @@methods = [
+      :clear,
+      :clear_line,
+      :size,
+      :height,
+      :width
+    ]
+
     def clear
       print "\033[2J"
     end
@@ -8,11 +16,27 @@ module RBText
       print "\033[2K"
     end
 
-    module_function :clear, :clear_line
+    def size
+      IO.console.winsize
+    end
+
+    def height
+      self.size[0]
+    end
+
+    def width
+      self.size[1]
+    end
+
+    @@methods.each do |method|
+      module_function method
+    end
   end
 
   module S
     include RBText::Screen
-    module_function :clear, :clear_line
+    @@methods.each do |method|
+      module_function method
+    end
   end
 end

data/lib/rbtext.rb

@@ -3,14 +3,16 @@ require_relative "rbtext/colors.rb"
 require_relative "rbtext/formatting.rb"
 require_relative "rbtext/ftext.rb"
 require_relative "rbtext/screen.rb"
+require "io/console"
 
 module RBText
   @ver_1 = 0
-  @ver_2 = 0
-  @ver_3 = 6
+  @ver_2 = 2
+  @ver_3 = 0
+  @ver_4 = ""
 
   def version
-    "#{@ver_1}.#{@ver_2}.#{@ver_3}"  
+    "#{@ver_1}.#{@ver_2}.#{@ver_3}#{".#{@ver_4}" if @ver_4.length > 1}"
   end
 
   module_function :version

metadata

@@ -1,21 +1,37 @@
 --- !ruby/object:Gem::Specification
 name: rbtext
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Matthias Lee
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-19 00:00:00.000000000 Z
-dependencies: []
+date: 2022-03-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: io
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 description: A gem for printing formatted text
 email: matthias@matthiasclee.com
-executables: []
+executables:
+- ftext
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/ftext
 - lib/rbtext.rb
 - lib/rbtext/colors.rb
 - lib/rbtext/cursor.rb