pipetext 0.1.6 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ca1788110ca471e3592a78b3f91285af91338551836a6b39addf9f6a4b4049c
-  data.tar.gz: db0162ba573ac6498c0356d0f91264998f460aa1b903a79a1d9edccdfd1ce923
+  metadata.gz: 0f7f0d849921eef214577fe5b3418bcda0815b9158de41079c5ded31beb06e39
+  data.tar.gz: 31623762e3303061e8753b07a4a44b5efbd1eda8748fb411871ca643b54dbe6f
 SHA512:
-  metadata.gz: b197769b04cb90d36106524f18d7e8459ad0dd96358a6a7bbc350c3c4572fcd204ff25834f67c730b0676a4e4f3b55462a120367a9e23d5e93e93fd3a8754aba
-  data.tar.gz: 27a1232cfb0ad1be0d5d6b641ee633e44846200a1ba69c42f28f997c5cf6b0769923171aee4bb764f9aab6f0a58be973fcb8b3a6d403e06431d053fbcc8eef05
+  metadata.gz: 500918c7d15469238f5c1f3424570a759cabd9a80dbbd8c2faec1b781ce44cbabcb1ea0c4cfdf19a6914b2f80d3d5e88136f7f0f68ec1fe1ab26eee1adb1afc0
+  data.tar.gz: 41a068587aed07e5c3fc360497c8296640509951e12d6d513e3cf8c89a88c43c9ea5f1517a3a373ec12eb0a470de32901b2b79575aa46c30ad0802e73807af7f

data/bin/pipetext

@@ -38,9 +38,12 @@ Add spaces to line end             ||;         Set line end    ||]#
 Set current x,y cursor position    ||[x,y]     Terminal bell   ||[bell]
 Move cursor up 1 line              ||^         Hide cursor     ||h
 Move cursor down 1 line            ||v         Unhide cursor   ||H
-Move cursor forward 1 character    ||>         Sleep timer in seconds ||[#s]
+Move cursor forward 1 character    ||>         Sleep timer in seconds      ||[#s]
 Move cursor back 1 character       ||<         Sleep timer in milliseconds ||[#ms]
-
+Capture variable  ||(variable name=data)       Display variable        ||(variable name)
+Add to variable   ||(variable name+=data)      Subtract from variable  ||(variable name-=data)
+Multiple variable ||(variable name*=data)      Divide variable         ||(variable name/=data)
+Copy variable to current number    ||(#variable name)
 
 Emojis:  https://unicode.org/emoji/charts/full-emoji-list.html
          ||[Abbreviated CLDR Short Name]     |[smiling face with heart-eyes] ||[smiling face with heart-eyes] or
@@ -69,22 +72,22 @@ Longer repetition patterns using the character ~
 |3~     &r|----|O> ALL YOUR |kBASE|n |3\~ARE|3\~ BELONG TO US. <|----|O&n|\n~|n'
 
 if(ARGV[0] == nil && STDIN.tty? == true)
-  puts "#{File.basename(__FILE__)} <filename> | <pipetext>"
+  puts "PipeText capabilities:"
   puts
-  puts "Example usage:"
+  pipe.paint(pipetext_example)
+  puts "Command Syntax: #{File.basename(__FILE__)} <filename> | <pipetext>"
+  puts "Example usages:"
   puts
   puts "pipetext '|RBright red|n, |cCyan|n, |g&rGreen and Red|n,&n Normal |R|u1f49c |g|U2714|n'"
-  puts
   puts "pipetext '|50-'"
-  puts
   puts "pipetext '|-|50-'"
-  puts
   puts "pipetext '|]50Insert spaces until end (50)|W|{centered}|n|;Add After'"
-  puts
+  puts "pipetext 'Capture a variable named gear line|(gear line=|r|[gear]|n|-|60-|O|r|[gear]|n)|\\n" +
+       "|(gear line)|\\n|(gear line)|\\n|(gear line)|\\n||(gear line) = |(gear line)'"
+  puts "pipetext '|(test=15)Print 10 stars: |(#test-=5)* and 20 hashes: |(#test+=5)#'"
   puts "pipetext '|10~     &r|----|O> ALL YOUR |kBASE|n |3\\~ARE|3\\~ BELONG TO US. <|----|O&n|\\n~|n'"
   puts
-  pipe.paint(pipetext_example)
-  pipe.paint("PipeText Version |c#{PipeText::VERSION}|n")
+  pipe.paint("version |c#{PipeText::VERSION}|n")
 else
   if(STDIN.tty? == false)
     pipe.paint(STDIN.read)

data/lib/pipetext/pipetext.rb

@@ -6,41 +6,47 @@ module PipeText
 
   def pipetext_init(box_mode=true, ampersand_mode=false)
     attributes = {
-      'pipe'            => false,          # Pipe already been found?
-      'repeat_pattern'  => false,          # Used by |<#>~repeat pattern~
-      'pattern'         => String.new,     # Used by |<#>~repeat pattern~ to capture
-      'pattern_escape'  => false,          # Has an escape \ already been found in front of this character?
-      'ampersand'       => false,          # Has an ampersand already been found in front of this character?
-      'ampersand_mode'  => ampersand_mode, # Do we even process ampersands for background colors?
-      'blink'           => false,          # Is blink turned on?
-      'bold'            => false,
-      'crossed_out'     => false,
-      'faint'           => false,
-      'found'           => false,          # At the end -- did we find a match?
-      'italic'          => false,
-      'inverse'         => false,
-      'underline'       => false,
-      'box'             => -1,             # Default to |O (no boxes)
-      'box_mode'        => box_mode,
-      'num'             => 0,              # Number of times to repeat pattern
-      'end_capture'     => false,          # Used to capture the end column number
-      'end'             => 0,              # Number which current denotes the end of the column
-      'position'        => 0,              # Number which current position in the column
-      'center_capture'  => false,          # Used to capture text for centering
-      'center'          => String.new,     # Text to be centered
-      'emoji_capture'   => false,          # Used to capture emoji description or bell/move to position
-      'emoji'           => String.new,     # Used to capture emoji description or bell/move to position
-      'unicode_capture' => 0,              # Used to capture Unicode using 6 character UTF-16 hex format
-      'unicode'         => String.new,
-      'palette_capture' => 0,              # Used to capture 8-bit color using 2 character hex format
-      'p'               => String.new,     # |p00 to |pFF
-      'color_capture'   => 0,              # Used to capture RGB color using #RRGGBB format
-      'r'               => String.new,
-      'g'               => String.new,
-      'b'               => String.new,
-      'fg'              => String.new,     # Needed to restore after background change
-      'bg'              => String.new      # Needed to restore after foreground change
+      'pipe'             => false,          # Pipe already been found?
+      'repeat_pattern'   => false,          # Used by |<#>~repeat pattern~
+      'pattern'          => String.new,     # Used by |<#>~repeat pattern~ to capture
+      'escape'           => false,          # Has an escape \ already been found in front of this character?
+      'ampersand'        => false,          # Has an ampersand already been found in front of this character?
+      'ampersand_mode'   => ampersand_mode, # Do we even process ampersands for background colors?
+      'blink'            => false,          # Is blink turned on?
+      'bold'             => false,
+      'crossed_out'      => false,
+      'faint'            => false,
+      'found'            => false,          # At the end -- did we find a match?
+      'italic'           => false,
+      'inverse'          => false,
+      'underline'        => false,
+      'box'              => -1,             # Default to |O (no boxes)
+      'box_mode'         => box_mode,
+      'num'              => 0,              # Number of times to repeat pattern
+      'end_capture'      => false,          # Used to capture the end column number
+      'end'              => 0,              # Number which current denotes the end of the column
+      'position'         => 0,              # Number which current position in the column
+      'center_capture'   => false,          # Used to capture text for centering
+      'center'           => String.new,     # Text to be centered
+      'variable_capture' => false,          # Used to capture a variable for update or to display
+      'variable'         => String.new,     # Variable captured
+      'variables'        => Hash.new,       # Stores all captured variables
+      'emoji_capture'    => false,          # Used to capture emoji description or bell/move to position
+      'emoji'            => String.new,     # Used to capture emoji description or bell/move to position
+      'unicode_capture'  => 0,              # Used to capture Unicode using 6 character UTF-16 hex format
+      'unicode'          => String.new,
+      'palette_capture'  => 0,              # Used to capture 8-bit color using 2 character hex format
+      'p'                => String.new,     # |p00 to |pFF
+      'color_capture'    => 0,              # Used to capture RGB color using #RRGGBB format
+      'r'                => String.new,
+      'g'                => String.new,
+      'b'                => String.new,
+      'fg'               => String.new,     # Needed to restore after background change
+      'bg'               => String.new      # Needed to restore after foreground change
     }
+    attributes['variables']['height'] = `tput lines`.chomp
+    attributes['variables']['width'] = `tput cols`.chomp
+    return attributes
   end
 
   def pipe(text, attributes)
@@ -64,6 +70,8 @@ module PipeText
       new_text << "|[" + attributes['emoji']
     elsif(attributes['center_capture'] == true)
       new_text << "|{" + attributes['center']
+    elsif(attributes['variable_capture'] == true)
+      new_text << "|(" + attributes['variable']
     end
     return new_text
   end
@@ -98,6 +106,8 @@ module PipeText
       new_text << "|[" + attributes['emoji']
     elsif(attributes['center_capture'] == true)
       new_text << "|{" + attributes['center']
+    elsif(attributes['variable_capture'] == true)
+      new_text << "|(" + attributes['variable']
     end
     print(new_text)
   end
@@ -195,32 +205,45 @@ module PipeText
       attributes['end_capture'] = false
     end
     if(attributes['end_capture'] == true && character =~ /[0-9]/)
-      if(character == '0')                      # |10+
+      if(character == '0')				# |10+
         if(attributes['num'] > 0)
           attributes['num'] *= 10
         end
-      elsif(character >= '1' && character <= '9')  # |1+ through |9+
+      elsif(character >= '1' && character <= '9')	# |1+ through |9+
         if(attributes['num'] > 0)
           attributes['num'] *= 10
         end
         attributes['num'] += character.to_i
       end
-    elsif(character == '|' && attributes['repeat_pattern'] == false)
-      process_pipe(character, new_text, attributes)
-    elsif(character == '~' && attributes['pipe'] == true &&
-        attributes['num'] > 0 && attributes['pattern_escape'] == false)
-      process_repeat_pattern(character, new_text, attributes)
-    elsif(attributes['repeat_pattern'] == true)
-      capture_character_pattern(character, attributes)
-    elsif(attributes['color_capture'] > 0 && character =~ /[0-9,A-F,a-f]/)
-      capture_color(character, new_text, attributes)
-    elsif(attributes['palette_capture'] > 0 && character =~ /[0-9,A-F,a-f]/)
-      capture_palette_color(character, new_text, attributes)
+    elsif(character == ')' && attributes['variable_capture'] == true && attributes['escape'] == false)
+      if(attributes['variable'] =~ /=/ && attributes['variable'][0] != '#')	# Update
+        update_variable(attributes)
+      else									# Display
+        emit_variable(new_text, attributes)
+      end
+    elsif(attributes['variable_capture'] == true)
+      if(character == '\\')
+        attributes['escape'] = true
+      else
+        if(attributes['escape'] == true)
+          attributes['variable'] << "\\#{character}"
+          attributes['escape'] = false
+        else
+          attributes['variable'] << character
+        end
+      end
     elsif(attributes['center_capture'] == true)
-      if(character == '}')
-        emit_center(new_text, attributes)
+      if(character == '\\')
+        attributes['escape'] = true
       else
-        attributes['center'] << character
+        if(attributes['escape'] == true)
+          attributes['center'] << "\\#{character}"
+          attributes['escape'] = false
+        elsif(character == '}')
+          emit_center(new_text, attributes)
+        else
+          attributes['center'] << character
+        end
       end
     elsif(attributes['emoji_capture'] == true)
       if(character == ']')
@@ -246,13 +269,24 @@ module PipeText
       else
         attributes['emoji'] << character
       end
+    elsif(character == '|' && attributes['repeat_pattern'] == false)
+      process_pipe(character, new_text, attributes)
+    elsif(character == '~' && attributes['pipe'] == true &&
+        attributes['num'] > 0 && attributes['escape'] == false)
+      process_repeat_pattern(character, new_text, attributes)
+    elsif(attributes['repeat_pattern'] == true)
+      capture_character_pattern(character, attributes)
+    elsif(attributes['color_capture'] > 0 && character =~ /[0-9,A-F,a-f]/)
+      capture_color(character, new_text, attributes)
+    elsif(attributes['palette_capture'] > 0 && character =~ /[0-9,A-F,a-f]/)
+      capture_palette_color(character, new_text, attributes)
     elsif(attributes['unicode_capture'] == 1 && character == '+') # Skip
       return
     elsif(attributes['unicode_capture'] > 0 && character =~ /[0-9,A-F,a-f]/)
       capture_unicode(character, new_text, attributes)
     elsif(attributes['pipe'] == true &&
         attributes['repeat_pattern'] == false &&
-        attributes['pattern_escape'] == true)
+        attributes['escape'] == true)
       process_escaped_character(character, new_text, attributes)
     elsif(character == '&' && attributes['ampersand_mode'] == true &&
         attributes['pipe'] == false)
@@ -306,8 +340,82 @@ module PipeText
     attributes['unicode'] = String.new
   end
 
+  def number?(text)
+    text.chars.each do |character|
+      if(character !~ /[0-9 ]/)
+        return false
+      end
+    end
+    return true
+  end
+
+  def update_variable(attributes)
+    if(attributes['variable'] =~ /(.*)\-=(.*)/)
+      if(!number?($2) || !number?(attributes['variables'][$1]))
+        attributes['variables'][$1].slice!($2)
+      elsif(attributes['variable'] =~ /(.*) \-= ?(.*)/ || attributes['variable'] =~ /(.*)\-= ?(.*)/)
+        value = attributes['variables'][$1].to_i - $2.to_i
+        attributes['variables'][$1] = value.to_s
+      end
+    elsif(attributes['variable'] =~ /(.*)\+=(.*)/)
+      if(!number?($2) || !number?(attributes['variables'][$1]))
+        attributes['variables'][$1] += $2
+      elsif(attributes['variable'] =~ /(.*) \+= ?(.*)/ || attributes['variable'] =~ /(.*)\+= ?(.*)/)
+        value = attributes['variables'][$1].to_i + $2.to_i
+        attributes['variables'][$1] = value.to_s
+      end
+    elsif(attributes['variable'] =~ /(.*) \*= ?(.*)/ || attributes['variable'] =~ /(.*)\*= ?(.*)/)
+      value = attributes['variables'][$1].to_i * $2.to_i
+      attributes['variables'][$1] = value.to_s
+    elsif(attributes['variable'] =~ /(.*) \/= ?(.*)/ || attributes['variable'] =~ /(.*)\/= ?(.*)/)
+      value = attributes['variables'][$1].to_i / $2.to_i
+      attributes['variables'][$1] = value.to_s
+    elsif(attributes['variable'] =~ /(.*) = ?(.*)/ || attributes['variable'] =~ /(.*)= ?(.*)/)
+      attributes['variables'][$1] = $2
+    end
+    attributes['variable_capture'] = false
+    attributes['variable'] = String.new
+  end
+
+  def emit_variable(new_text, attributes)
+    if(attributes['variable'][0] == '#')	# We are manipulating attributes['num']
+      if(attributes['variable'][1..-1] =~ /(.*) \-= ?(.*)/ ||
+          attributes['variable'][1..-1] =~ /(.*)\-= ?(.*)/)
+        attributes['num'] = pipetext(escape_fix(attributes['variables'][$1]), attributes['box_mode'],
+            attributes['ampersand_mode']).to_i - $2.to_i
+      elsif(attributes['variable'][1..-1] =~ /(.*) \+= ?(.*)/ ||
+          attributes['variable'][1..-1] =~ /(.*)\+= ?(.*)/)
+        attributes['num'] = pipetext(escape_fix(attributes['variables'][$1]), attributes['box_mode'],
+            attributes['ampersand_mode']).to_i + $2.to_i
+      elsif(attributes['variable'][1..-1] =~ /(.*) \*= ?(.*)/ ||
+          attributes['variable'][1..-1] =~ /(.*)\*= ?(.*)/)
+        attributes['num'] = pipetext(escape_fix(attributes['variables'][$1]), attributes['box_mode'],
+            attributes['ampersand_mode']).to_i * $2.to_i
+      elsif(attributes['variable'][1..-1] =~ /(.*) \/= ?(.*)/ ||
+          attributes['variable'][1..-1] =~ /(.*)\/= ?(.*)/)
+        attributes['num'] = pipetext(escape_fix(attributes['variables'][$1]), attributes['box_mode'],
+            attributes['ampersand_mode']).to_i / $2.to_i
+      else
+        attributes['num'] = pipetext(escape_fix(attributes['variables'][attributes['variable'][1..-1]]),
+            attributes['box_mode'], attributes['ampersand_mode']).to_i
+      end
+      attributes['pipe'] = true
+      attributes['found'] = false
+    elsif(attributes['variables'][attributes['variable']])
+      new_text << pipetext(escape_fix(attributes['variables'][attributes['variable']]),
+          attributes['box_mode'], attributes['ampersand_mode'])
+    else
+      new_text << "|(" + attributes['variable'] + ")"
+    end
+    attributes['variable_capture'] = false
+    attributes['variable'] = String.new
+  end
+
   def emit_center(new_text, attributes)
     spaces = attributes['end'] - attributes['position'] - printable_length(attributes['center'])
+    if(printable_length(attributes['center']) % 2)
+      spaces += 1
+    end
     if(spaces > 0)
       spaces /= 2
       spaces.times do
@@ -370,7 +478,7 @@ module PipeText
       end
       attributes['num'] = 0
       attributes['pipe'] = false
-      attributes['pattern_escape'] = false
+      attributes['escape'] = false
       attributes['repeat_pattern'] = false
       attributes['pattern'] = String.new
     else                                # ~ after number in |5~Repeat 5 times~
@@ -380,7 +488,8 @@ module PipeText
 
   def escape_fix(text) # Done this way for old Ruby versions
     text = text.gsub(/\\a/, "\a").gsub(/\\b/, "\b").gsub(/\\e/, "\e").gsub(/\\f/, "\f")
-    text.gsub(/\\n/, "\n").gsub(/\\r/, "\r").gsub(/\\t/, "\t").gsub(/\\v/, "\v").gsub(/\\~/, '~')
+    text = text.gsub(/\\n/, "\n").gsub(/\\r/, "\r").gsub(/\\t/, "\t").gsub(/\\v/, "\v")
+    text = text.gsub(/\\~/, '~').gsub(/\\\(/, '(').gsub(/\\\)/, ')')
   end
 
   def process_escaped_character(character, new_text, attributes)
@@ -393,7 +502,7 @@ module PipeText
     end
     attributes['num'] = 0
     attributes['pipe'] = false
-    attributes['pattern_escape'] = false
+    attributes['escape'] = false
     attributes['pattern'] = String.new
     attributes['repeat_pattern'] = false
   end
@@ -417,11 +526,11 @@ module PipeText
 
   def capture_character_pattern(character, attributes)
     if(character == '\\')
-      attributes['pattern_escape'] = true
+      attributes['escape'] = true
     else
-      if(attributes['pattern_escape'] == true)
+      if(attributes['escape'] == true)
         attributes['pattern'] << "\\#{character}"
-        attributes['pattern_escape'] = false
+        attributes['escape'] = false
       else
         attributes['pattern'] << character
       end
@@ -701,17 +810,19 @@ module PipeText
         spaces.times do
           new_text << " "
         end
-      when ']'                                  # |]0-9 - end column number
+      when ']'                                  # |]0-9* - end column number
         attributes['end_capture'] = true
       when '['                                  # |[emoji]
         attributes['emoji_capture'] = true
+      when '('                                  # |(variable) or |(variable=Some value)
+        attributes['variable_capture'] = true
       when '\\'                                 # |\       - Escape mode
-        attributes['pattern_escape'] = true
+        attributes['escape'] = true
       else                                      # We didn't find the next character
         attributes['found'] = false
       end
     elsif(character == '\\')
-      attributes['pattern_escape'] = true
+      attributes['escape'] = true
     else                                        # We didn't find the next character
       attributes['found'] = false
     end
@@ -748,7 +859,7 @@ module PipeText
         end
         attributes['pipe'] = false
       end
-    elsif(attributes['pattern_escape'] == false)
+    elsif(attributes['escape'] == false)
       attributes['pipe'] = false
     end
   end

data/lib/pipetext/version.rb

@@ -4,6 +4,6 @@ module PipeText
 
   public
 
-  VERSION = "0.1.5"
+  VERSION = "0.2.1"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pipetext
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.1
 platform: ruby
 authors:
 - Minaswan Nakamoto
@@ -36,8 +36,12 @@ description: "== Easily add colors, boxes, repetitions and emojis to your termin
   \        Set line end   |]#\n  Set current x,y cursor position    |[x,y]     Terminal
   bell  |[bell]\n  Move cursor up 1 line              |^         Hide cursor    |h\n
   \ Move cursor down 1 line            |v         Unhide cursor  |H\n  Move cursor
-  forward 1 character    |>         Sleep timer in seconds |[#s]\n  Move cursor back
-  1 character       |<         Sleep timer in milliseconds |[#ms]\n---\n  Emojis:
+  forward 1 character    |>         Sleep timer in seconds      |[#s]\n  Move cursor
+  back 1 character       |<         Sleep timer in milliseconds |[#ms]\n  Capture
+  variable  |(variable name=data)       Display variable        |(variable name)\n
+  \ Add to variable   |(variable name+=data)      Subtract from variable  |(variable
+  name-=data)\n  Multiple variable |(variable name*=data)      Divide variable         |(variable
+  name/=data)\n  Copy variable to current number    |(#variable name)\n\n---\n  Emojis:
   \ https://unicode.org/emoji/charts/full-emoji-list.html\n         |[Abbreviated
   CLDR Short Name]     \U0001F60D |[smiling face with heart-eyes] or\n      ⚙  |[gear]
   \  \U0001F4A4 |[zzz]   \U0001F468 |[man]    \U0001F60D |[sm f w he e]\n      ✔  |U2714