rbtext 0.0.7 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c7aca79a52e20d6e7d51024f1029cc8ed92a2e870f796026463005acfa28d37
-  data.tar.gz: 8ed901117befbb3899c7a5f1ef9b64c03bec6e0cbe43da498295b6e7e3e4576e
+  metadata.gz: d7c05f36445abd449bd35a7f0f70638c19d65ec812b8a821863dbaff69e7a116
+  data.tar.gz: 8853c53c113ffababc63fbb4225c0a4c75f2ee1ff584072181913dca0ba367b4
 SHA512:
-  metadata.gz: 3de37ec9edf252ac34d556b57a52dd5a83fdf8ab43c6099369fc73d30fb43cae5a95084eda353e8789e87064689e204b7dcc9eaed9214744851ffbcf1a988b75
-  data.tar.gz: 9255ebee6de279081a194c964096c6c5eaf1e35c3101d1304a2e2cefc0cf5ab4763c87feb8c0385f95703ee916598c4efa6dfb03f750906fc381e37ebbfe0960
+  metadata.gz: 63b5da77e130a4dfc3fc7c8f6758ca10c31884986aab735c1d746a75b8ca0bc6849e05191d34934df0bc4c401dc855b414158a84c93371e258a2652e27ccf084
+  data.tar.gz: 2799434338c2448084e19eda4ad4a46dc7a1933877691d2915a57d78c8b01face8bc0955e3df219024760c7017102cc731a06111d1c595a3cc6e025f55a3ee4b

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",
@@ -32,25 +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)
-      return "\033[#{type == :fg ? "38" : "48"};5;#{num}m"
+    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, :num_color
+    @@methods.each do |method|
+      module_function method
+    end
   end
 
   module C
     include RBText::Colors
-    module_function :fg_color_codes, :bg_color_codes, :color, :num_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,44 +1,73 @@
 module RBText
   module Formatting
-    def reset(f_opt = nil)
+    @@methods = [
+    :reset,
+    :bold,
+    :faint,
+    :italic, 
+    :underline, 
+    :blinking, 
+    :strikethrough
+    ]
+
+    def reset(f_opt = nil, mode: :str)
       if f_opt
-        "\033[#{
+        r="\033[#{
           f_opt =~ /^\033\[(1|2)m$/ ? "\033[22m" : "\033[2#{f_opt.gsub(/[^0-9]/, "")}m"
         }"
       else
-        "\033[0m"
+        r="\033[0m"
       end
+      return r if mode == :str
+      print r if mode == :set
     end
 
-    def bold
-      "\033[1m"
+    def bold(mode: :str)
+      r="\033[1m"
+      return r if mode == :str
+      print r if mode == :set
     end
 
-    def faint
-      "\033[2m"
+    def faint(mode: :str)
+      r="\033[2m"
+      return r if mode == :str
+      print r if mode == :set
     end
 
-    def italic
-      "\033[3m"
+    def italic(mode: :str)
+      r="\033[3m"
+      return r if mode == :str
+      print r if mode == :set
     end
 
-    def underline
-      "\033[4m"
+    def underline(mode: :str)
+      r="\033[4m"
+      return r if mode == :str
+      print r if mode == :set
     end
 
-    def blinking
-      "\033[5m"
+    def blinking(mode: :str)
+      r="\033[5m"
+      return r if mode == :str
+      print r if mode == :set
     end
 
-    def strikethrough
-      "\033[9m"
+    def strikethrough(mode: :str)
+      r="\033[9m"
+      return r if mode == :str
+      print r if mode == :set
     end
 
-      module_function :reset, :bold, :faint, :italic, :underline, :blinking, :strikethrough
+    module_function 
+    @@methods.each do |method|
+      module_function method
+    end
   end
 
   module F
     include RBText::Formatting
-    module_function :reset, :bold, :faint, :italic, :underline, :blinking, :strikethrough
+    @@methods.each do |method|
+      module_function method
+    end
   end
 end

data/lib/rbtext/ftext.rb

@@ -4,7 +4,7 @@ module RBText
       @original_text = str
       @text = ""
       
-      str = str.split("_")
+      str = str.gsub("_.", "\0001").gsub("._", "\0002").gsub("_", "\0000").gsub("\0001", "_.").gsub("\0002", "._").split("_").map{|x|x.gsub("\0000", "_")}
 
       for x in str do
         if x[0] == "." && x[x.length-1] == "." && x.split(":").length == 2
@@ -69,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,11 +3,12 @@ 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 = 7
+  @ver_2 = 2
+  @ver_3 = 1
   @ver_4 = ""
 
   def version

metadata

@@ -1,21 +1,37 @@
 --- !ruby/object:Gem::Specification
 name: rbtext
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.2.1
 platform: ruby
 authors:
 - Matthias Lee
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-20 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