rbtext 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a729d44ed2a3ab04b78d02b0d0226f3630ed47d789c8534f4f84244eb658395
-  data.tar.gz: 68e66d49346a58ed12ff5fa7bd7c44c9b6ce5a21f647f08be7b46d72acd06e2e
+  metadata.gz: 8c7aca79a52e20d6e7d51024f1029cc8ed92a2e870f796026463005acfa28d37
+  data.tar.gz: 8ed901117befbb3899c7a5f1ef9b64c03bec6e0cbe43da498295b6e7e3e4576e
 SHA512:
-  metadata.gz: 418da7b0d089e55f49fd9de6695899e4aec6f19c86860410d6fe4cc900c94c74658253eaec9f6fa9f13814060415cceaade928a9feae04467d881a01d4625ed4
-  data.tar.gz: db96c6606483f074eaf77990d64e18017b1e5e0f5867cd90f470ae07bb28aada188843ea19999000b310ecf569f41e4fce76919d9640b13fbfb4b869b03d7d90
+  metadata.gz: 3de37ec9edf252ac34d556b57a52dd5a83fdf8ab43c6099369fc73d30fb43cae5a95084eda353e8789e87064689e204b7dcc9eaed9214744851ffbcf1a988b75
+  data.tar.gz: 9255ebee6de279081a194c964096c6c5eaf1e35c3101d1304a2e2cefc0cf5ab4763c87feb8c0385f95703ee916598c4efa6dfb03f750906fc381e37ebbfe0960

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
 
@@ -41,11 +42,15 @@ module RBText
       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/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

data/lib/rbtext.rb

@@ -7,10 +7,11 @@ require_relative "rbtext/screen.rb"
 module RBText
   @ver_1 = 0
   @ver_2 = 0
-  @ver_3 = 6
+  @ver_3 = 7
+  @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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbtext
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Matthias Lee
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-19 00:00:00.000000000 Z
+date: 2022-03-20 00:00:00.000000000 Z
 dependencies: []
 description: A gem for printing formatted text
 email: matthias@matthiasclee.com