rbtext 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbf603b0b26d45f84043ab323355140ffce5efc13d9696617678035bb0980b1b
-  data.tar.gz: c7200c930672811a1db5882134bd899124a0906b350dfbcffa9d5558bedbd15a
+  metadata.gz: ac75a94bd454a8663a2de94b33bbe9c10e3a5e86d269ef77d16c9fbb221c1dc5
+  data.tar.gz: 787ef54498a6812bba42840993ce4113b7087ef356ce59dd5dd33097bb8650b3
 SHA512:
-  metadata.gz: 340e6172cf38c0a5c01602be6a47d78798a992c4027e959ac39159408bbb604333a3e9d61b763d37f759595e696fba1253b0a4e56d98a478fa36e6b932c88e44
-  data.tar.gz: 80ddbba3f5be56835aaf4fa71f9b3cc96745a2abe9caac32bafb4a89728c9d069ed4649a2a45103e2c2e5c3498a8c99868a1da10a93cf7c10379a530bc08090c
+  metadata.gz: 86d72ea937822a41fd2d7987c6af738ea4bfb20d271cb5a91bd632c493e136e0527e35eac6186b03096ee7db4863a071196e2fb2c342eeb23b9fb4a8117c9ea5
+  data.tar.gz: 3b42b6eedca4db02f8ef8c6ab2498b4ab75049942c9900bb263a9acf4ff84322ee1fe7af02c2f3e129204e0ecb44840dd3066e193947f3265d45f327f50bc089

data/lib/rbtext/colors.rb

@@ -17,7 +17,8 @@ module RBText
         light_blue: "94",
         light_magenta: "95",
         light_cyan: "96",
-        white: "97"
+        white: "97",
+        reset: "39"
       }
     end
 
@@ -32,20 +33,28 @@ module RBText
     end
 
     def color(color, type: :fg)
+      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"
     end
 
-    module_function :fg_color_codes, :bg_color_codes, :color
+    def num_color(num, type: :fg)
+      return "\033[#{type == :fg ? "38" : "48"};5;#{num}m"
+    end
+
+    module_function :fg_color_codes, :bg_color_codes, :color, :num_color
   end
 
   module C
     include RBText::Colors
-    module_function :fg_color_codes, :bg_color_codes, :color
+    module_function :fg_color_codes, :bg_color_codes, :color, :num_color
   end
 end

data/lib/rbtext/cursor.rb

@@ -16,15 +16,20 @@ module RBText
       print "\033[#{num.to_i}C"
     end
 
+    def go_to_pos(x, y)
+      print "\033[#{y};#{x}H"
+      print "\033[#{y};#{x}f"
+    end
+
     def beginning_of_line
       print "\r"
     end
 
-    module_function :up, :down, :left, :right, :beginning_of_line
+    module_function :up, :down, :left, :right, :beginning_of_line, :go_to_pos
   end
 
   module Cr
     include RBText::Cursor
-    module_function :up, :down, :left, :right, :beginning_of_line
+    module_function :up, :down, :left, :right, :beginning_of_line, :go_to_pos
   end
 end

data/lib/rbtext/formatting.rb

@@ -1,7 +1,13 @@
 module RBText
   module Formatting
-    def reset
-      "\033[0m"
+    def reset(f_opt = nil)
+      if f_opt
+        "\033[#{
+          f_opt =~ /^\033\[(1|2)m$/ ? "\033[22m" : "\033[2#{f_opt.gsub(/[^0-9]/, "")}m"
+        }"
+      else
+        "\033[0m"
+      end
     end
 
     def bold
@@ -20,11 +26,19 @@ module RBText
       "\033[4m"
     end
 
-    module_function :reset, :bold, :faint, :italic, :underline
+    def blinking
+      "\033[5m"
+    end
+
+    def strikethrough
+      "\033[9m"
+    end
+
+      module_function :reset, :bold, :faint, :italic, :underline, :blinking, :strikethrough
   end
 
   module F
     include RBText::Formatting
-    module_function :reset, :bold, :faint, :italic, :underline
+    module_function :reset, :bold, :faint, :italic, :underline, :blinking, :strikethrough
   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

@@ -0,0 +1,30 @@
+module RBText
+  module Screen
+    def clear
+      print "\033[2J"
+    end
+
+    def clear_line
+      print "\033[2K"
+    end
+
+    def size
+      IO.console.winsize
+    end
+
+    def height
+      self.size[0]
+    end
+
+    def width
+      self.size[1]
+    end
+
+    module_function :clear, :clear_line, :size, :height, :width
+  end
+
+  module S
+    include RBText::Screen
+    module_function :clear, :clear_line, :size, :height, :width
+  end
+end

data/lib/rbtext.rb

@@ -2,14 +2,17 @@ require_relative "rbtext/cursor.rb"
 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 = 5
+  @ver_2 = 1
+  @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,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rbtext
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Matthias Lee
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-19 00:00:00.000000000 Z
-dependencies: []
+date: 2022-03-23 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: []
@@ -21,6 +35,7 @@ files:
 - lib/rbtext/cursor.rb
 - lib/rbtext/formatting.rb
 - lib/rbtext/ftext.rb
+- lib/rbtext/screen.rb
 homepage: https://github.com/Matthiasclee/RBText
 licenses:
 - AGPL-3.0