rbtext 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7c05f36445abd449bd35a7f0f70638c19d65ec812b8a821863dbaff69e7a116
-  data.tar.gz: 8853c53c113ffababc63fbb4225c0a4c75f2ee1ff584072181913dca0ba367b4
+  metadata.gz: 5489b31d5f02438507b2bbae6be1d17e716150dda242fc6acb853a2eb3fe339b
+  data.tar.gz: 507406a97defe69dddd52e93a4eaf6d19af6f8b42e980c7f27b2772700f064f4
 SHA512:
-  metadata.gz: 63b5da77e130a4dfc3fc7c8f6758ca10c31884986aab735c1d746a75b8ca0bc6849e05191d34934df0bc4c401dc855b414158a84c93371e258a2652e27ccf084
-  data.tar.gz: 2799434338c2448084e19eda4ad4a46dc7a1933877691d2915a57d78c8b01face8bc0955e3df219024760c7017102cc731a06111d1c595a3cc6e025f55a3ee4b
+  metadata.gz: 147fc6619b47a74f9b67c9ef5bf94cbd90dc5de51d15ddb455eb62de6c80263b93a668400d8884dfe42cc14008ea690737d8532f780a7a6b8aaad390a5d0137d
+  data.tar.gz: 21d5e1b5218407351c1b773a49d5f236c0816b557407f1222a1e14682fddb6538f898351480551d5651d5c9340ffc067b10ed2669c7d77a0c821346999155444

data/bin/ftext

@@ -1,6 +1,8 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 require_relative '../lib/rbtext.rb'
 
+params = (ARGV[1..ARGV.length-1]).to_a
+
 if $stdin.tty? && ARGV[0]
   txt = ARGV[0].to_s
 elsif $stdin.tty?
@@ -18,13 +20,15 @@ else
     end
 
     (0..lines.length-1).each do |l|
-      txt << "#{"_.f:reset._" if ARGV[1] != "--noreset"}_.#{args[l]}._"+lines[l]
+      txt << "#{"_.f:reset._" if !params.include?("--noreset")}_.#{args[l]}._"+lines[l].gsub("_", "\0004")
     end
 
     txt = txt.join
   else
-    txt = ARGF.readlines.join
+    txt = ARGF.readlines.join.gsub("_", "\0004")
   end
 end
 
-print R::Ft.new(txt)
+out = R::Ft.new(txt).to_s.gsub("\0004", "_")
+print out.dump.sub("\"", "").reverse.sub("\"", "").reverse if params.include?("--dump")
+print out if !params.include?("--dump")

data/lib/rbtext/colors.rb

@@ -1,13 +1,6 @@
 module RBText
   module Colors
-    @@methods = [
-      :fg_color_codes,
-      :bg_color_codes,
-      :color,
-      :num_color
-    ]
-
-    def fg_color_codes
+    def self.fg_color_codes
       {
         black: "30",
         red: "31",
@@ -29,7 +22,7 @@ module RBText
       }
     end
 
-    def bg_color_codes
+    def self.bg_color_codes
       bg_color_codes = {}
 
       for c in self.fg_color_codes.keys do
@@ -39,7 +32,7 @@ module RBText
       return bg_color_codes
     end
 
-    def color(color, type: :fg, mode: :str)
+    def self.color(color, type: :fg, mode: :str)
       return "\033[39m\033[49m" if type == :all && color == :reset
 
       if type == :fg
@@ -54,21 +47,11 @@ module RBText
       print "\033[#{color_code}m" if mode == :set
     end
 
-    def num_color(num, type: :fg, mode: :str)
+    def self.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
-
-    @@methods.each do |method|
-      module_function method
-    end
-  end
-
-  module C
-    include RBText::Colors
-
-    @@methods.each do |method|
-      module_function method
-    end
   end
 end
+
+RBText::C = RBText::Colors

data/lib/rbtext/cursor.rb

@@ -1,32 +1,22 @@
 module RBText
   module Cursor
-    @@methods = [
-      :up,
-      :down,
-      :left,
-      :right,
-      :beginning_of_line,
-      :go_to_pos,
-      :pos
-    ]
-
-    def up(num=1)
+    def self.up(num=1)
       print "\033[#{num.to_i}A"
     end
 
-    def down(num=1)
+    def self.down(num=1)
       print "\033[#{num.to_i}B"
     end
 
-    def left(num=1)
+    def self.left(num=1)
       print "\033[#{num.to_i}D"
     end
 
-    def right(num=1)
+    def self.right(num=1)
       print "\033[#{num.to_i}C"
     end
 
-    def go_to_pos(x, y=nil)
+    def self.go_to_pos(x, y=nil)
       if x.class == Array && !y
         y = x[1]
         x = x[0]
@@ -36,7 +26,7 @@ module RBText
       print "\033[#{y};#{x}f"
     end
 
-    def pos
+    def self.pos
       res = ''
       $stdin.raw do |stdin|
         $stdout << "\e[6n"
@@ -49,19 +39,18 @@ module RBText
       return [Integer(m[:column]), Integer(m[:row])]
     end
 
-    def beginning_of_line
+    def self.beginning_of_line
       print "\r"
     end
 
-    @@methods.each do |method|
-      module_function method
+    def self.show
+      print "\033[?25h"
     end
-  end
 
-  module Cr
-    include RBText::Cursor
-    @@methods.each do |method|
-      module_function method
+    def self.hide
+      print "\033[?25l"
     end
   end
 end
+
+RBText::Cr = RBText::Cursor

data/lib/rbtext/formatting.rb

@@ -1,16 +1,6 @@
 module RBText
   module Formatting
-    @@methods = [
-    :reset,
-    :bold,
-    :faint,
-    :italic, 
-    :underline, 
-    :blinking, 
-    :strikethrough
-    ]
-
-    def reset(f_opt = nil, mode: :str)
+    def self.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"
@@ -22,52 +12,42 @@ module RBText
       print r if mode == :set
     end
 
-    def bold(mode: :str)
+    def self.bold(mode: :str)
       r="\033[1m"
       return r if mode == :str
       print r if mode == :set
     end
 
-    def faint(mode: :str)
+    def self.faint(mode: :str)
       r="\033[2m"
       return r if mode == :str
       print r if mode == :set
     end
 
-    def italic(mode: :str)
+    def self.italic(mode: :str)
       r="\033[3m"
       return r if mode == :str
       print r if mode == :set
     end
 
-    def underline(mode: :str)
+    def self.underline(mode: :str)
       r="\033[4m"
       return r if mode == :str
       print r if mode == :set
     end
 
-    def blinking(mode: :str)
+    def self.blinking(mode: :str)
       r="\033[5m"
       return r if mode == :str
       print r if mode == :set
     end
 
-    def strikethrough(mode: :str)
+    def self.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
-    @@methods.each do |method|
-      module_function method
-    end
   end
 end
+
+RBText::F = RBText::Formatting

data/lib/rbtext/ftext.rb

@@ -77,6 +77,14 @@ module RBText
     def [](num)
       self.to_s[num]
     end
+
+    def *(n)
+      self.to_s*n
+    end
+
+    def include?(i)
+      self.to_s.include?(i)
+    end
   end
 
   class Ft < RBText::Ftext

data/lib/rbtext/screen.rb

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

data/lib/rbtext/string_methods.rb

@@ -0,0 +1,36 @@
+require 'rbtext/colors'
+require 'rbtext/formatting'
+
+class String
+  def color(color, type: :fg)
+    RBText::Colors.color(color, type: type) + self + RBText::Colors.color(:reset, type: type)
+  end
+
+  def num_color(color, type: :fg)
+    RBText::Colors.num_color(color, type: type) + self + RBText::Colors.color(:reset, type: type)
+  end
+
+  def bold
+    RBText::Formatting.bold + self + RBText::Formatting.reset
+  end
+
+  def faint
+    RBText::Formatting.faint + self + RBText::Formatting.reset
+  end
+
+  def italic
+    RBText::Formatting.italic + self + RBText::Formatting.reset
+  end
+
+  def underline
+    RBText::Formatting.underline + self + RBText::Formatting.reset
+  end
+
+  def blinking
+    RBText::Formatting.blinking + self + RBText::Formatting.reset
+  end
+
+  def strikethrough
+    RBText::Formatting.strikethrough + self + RBText::Formatting.reset
+  end
+end

data/lib/rbtext.rb

@@ -7,15 +7,13 @@ require "io/console"
 
 module RBText
   @ver_1 = 0
-  @ver_2 = 2
+  @ver_2 = 3
   @ver_3 = 1
   @ver_4 = ""
 
-  def version
+  def self.version
     "#{@ver_1}.#{@ver_2}.#{@ver_3}#{".#{@ver_4}" if @ver_4.length > 1}"
   end
-
-  module_function :version
 end
 
 module R

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rbtext
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors:
 - Matthias Lee
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-30 00:00:00.000000000 Z
+date: 2022-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: io
+  name: io-console
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.5.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.5.6
 description: A gem for printing formatted text
 email: matthias@matthiasclee.com
 executables:
@@ -38,6 +38,7 @@ files:
 - lib/rbtext/formatting.rb
 - lib/rbtext/ftext.rb
 - lib/rbtext/screen.rb
+- lib/rbtext/string_methods.rb
 homepage: https://github.com/Matthiasclee/RBText
 licenses:
 - AGPL-3.0