pipetext 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0ae63046e780049e0d20b63aab5604e11dcb8c0a3906e12c4db118bd317e5fd
-  data.tar.gz: 39edba4cb4b0b899c5692f57ee71e371254f3f2b199ee5a1207872cb89eb7ef3
+  metadata.gz: c79619e754a795072b47b34cf152a56f01308c347e8b7ceb9a74d2fac3a9d407
+  data.tar.gz: 27f7cd8b4cad98f95bd888c56b1bf9793c5c083276f947be6f69c37619e2fcfa
 SHA512:
-  metadata.gz: 84eae6ce6e8581f67281d46e34da26c427ebae034b6bfd3bfcc56f059569ad3366fdc74dd05db1cacd0ee9345fd4e28394d4be8923e3629421c2d8c2937eb507
-  data.tar.gz: cd59a5cca225c9819947601ad39449c7fc4d70576027f09721287ad215798a965a09847f329eda0f246fd89ce5fed8bacbfccc908bb96ce5812b33cb14097ed2
+  metadata.gz: cd2794bef8842d24f2a9d558adc654fd2b66de4fd242d7edcebb6731441ebdccfac57d1187d61f56b93b47b4f490a6777cea0ee8c1de7405e3373f254bc4faee
+  data.tar.gz: 96eb07179f6936b55f480f3860e11e4a190457b7159835666f14d2bdc53f24d65c4de393fa82c9242959281b1a3429bb30e02981b0a58ded387bff5a6815d103

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)
+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
@@ -81,9 +84,10 @@ if(ARGV[0] == nil && STDIN.tty? == true)
   puts "pipetext '|]50Insert spaces until end (50)|W|{centered}|n|;Add After'"
   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("version |c#{PipeText::VERSION}|n")
+  pipe.paint("version |c#{PipeText::VERSION}|n\n")
 else
   if(STDIN.tty? == false)
     pipe.paint(STDIN.read)

data/lib/pipetext/pipetext.rb

@@ -44,6 +44,9 @@ module PipeText
       '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)
@@ -115,13 +118,11 @@ module PipeText
 
   def write(text, box_mode=true, ampersand_mode=false)
     fastpipetext(text, box_mode, ampersand_mode)
-    puts
   end
 
   # Defaults to using & for background colors
   def paint(text, box_mode=true, ampersand_mode=true)
     fastpipetext(text, box_mode, ampersand_mode)
-    puts
   end
 
   def ignored_character(character, ignored_characters)
@@ -202,20 +203,20 @@ 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['variable_capture'] == true && attributes['escape'] == false)
-      if(attributes['variable'] =~ /=/)		# Update
+      if(attributes['variable'] =~ /=/ && attributes['variable'][0] != '#')	# Update
         update_variable(attributes)
-      else					# Display
+      else									# Display
         emit_variable(new_text, attributes)
       end
     elsif(attributes['variable_capture'] == true)
@@ -337,8 +338,37 @@ 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(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
@@ -346,7 +376,30 @@ module PipeText
   end
 
   def emit_variable(new_text, attributes)
-    if(attributes['variables'][attributes['variable']])
+    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

data/lib/pipetext/version.rb

@@ -4,6 +4,6 @@ module PipeText
 
   public
 
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pipetext
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Minaswan Nakamoto
@@ -36,9 +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  Capture variable
-  \ |(variable name=data)       Display variable |(variable name)\n\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