pipetext 0.2.5 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 685bbe79ca57a8040a92176e5b746d293331435a27b62cbf62b98d0be128b232
-  data.tar.gz: de13755f037a063cd397f2070c4d065a9c473cae149e9dafad6db52bc7fc221c
+  metadata.gz: aa217b6ffbf3d726efa7e28c5f8e190d05f8f09da02995a4a2d575c372674bf4
+  data.tar.gz: a272e83e9336d39b158e0cc00467afb5f89d061cba70ce2ee6616ec2bafcd38d
 SHA512:
-  metadata.gz: c3e2e2937254a31aaf4a976ecd7812b910f4fa3ce5cb95bb9c6357664e0fecd7cde693056e841b970336cbd954021c31dcde13bfb893377f300cd19fa5de74a7
-  data.tar.gz: 32ce0d5766f3b40219e5c5941618a4336aa2911b0157ae02aae68297b151252d2fecc8c997e27fb53ad65ac6da3b66d3ccd955e600ef3b9f838c138855e9f9e2
+  metadata.gz: ef2b34b99b343908b04aedadcbb7c2c7c943c6430b414097c0f9cbdecffb483b1168f73b375c961f166660626db2dc838aa9fec94b69c5378cb08cd7ac224d67
+  data.tar.gz: 9e2dc194f697ba535339ed951534ce7c07eb426ef2ecf42597eefee63f0ee9a8cff3378af057742ab171a1af237a0b4379da07831abf6c4adc222681a9d35dbb

data/bin/pipetext

@@ -77,6 +77,7 @@ if(ARGV[0] == nil && STDIN.tty? == true)
   puts "PipeText capabilities:"
   puts
   pipe.paint(pipetext_example)
+  puts
   puts "Command Syntax: #{File.basename(__FILE__)} <filename> | <pipetext>"
   puts "Example usages:"
   puts

data/lib/pipetext/pipetext.rb

@@ -168,21 +168,44 @@ module PipeText
 
   # This is not entirely accurate because of emojis, which we assume are 2 characters
   def printable_length(string)
+    if(string == "")
+      return 0
+    end
     length = 0
     escape = false
+    wide = false
+    wide_count = 0
     string.chars.each do |character|
-      if(character.ord == 27)
+      if(character[0].ord == 27)
         escape = true
-      elsif(character.ord >= 32)
-        if(escape == true && character.ord == 109)
+      elsif(character[0].ord == 226 && wide == false)
+        wide = true
+      elsif(character[0].ord == 240 && wide == false)
+        wide = true
+      elsif(character[0].ord >= 32)
+        if(escape == true && character[0].ord == 109)
           escape = false
-        elsif(character.ord > 9600) # ~ Emoji / Unicode - double wide characters start
+        elsif(character[0].ord > 9600) # ~ Emoji / Unicode - double wide characters start
           length += 2
-        elsif(escape == false)
+        elsif(escape == false && wide == false)
           length += 1
+        elsif(wide == true)
+          wide_count += 1
+        end
+        if(wide == true && wide_count >= 2)
+          if(character[0].ord == 147)
+            length += 1
+          else
+            length += 1
+            wide = false
+            wide_count = 0
+          end
         end
       end
     end
+    if(wide == true && wide_count > 0)
+      length += 1
+    end
     return length
   end
 
@@ -206,20 +229,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'] =~ /=/ && attributes['variable'][0] != '#')	# 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)
@@ -399,7 +422,7 @@ module PipeText
   end
 
   def emit_variable(new_text, attributes)
-    if(attributes['variable'][0] == '#')	# We are manipulating attributes['num']
+    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'],
@@ -453,10 +476,10 @@ module PipeText
     match_length = 0
     value_length = 0
     $substitute_emoji_names.each do |key, value|
-      if(attributes['emoji'] == key)			# Use the most precise match first
+      if(attributes['emoji'] == key)                    # Use the most precise match first
         emoji = value
         break
-      elsif(attributes['emoji'].length <= key.length)	# Otherwise use shortest match
+      elsif(attributes['emoji'].length <= key.length)   # Otherwise use shortest match
         match = abbreviated_match(attributes['emoji'], key)
         if(match == 0 && key =~ /-/)
           match = abbreviated_match(attributes['emoji'], key.sub(/-/, ' '))
@@ -469,7 +492,7 @@ module PipeText
         end
       end
     end
-    if(emoji == String.new)		# No match, put copy input
+    if(emoji == String.new)             # No match, put copy input
       new_text << "|[" + attributes['emoji'] + "]"
     else
       emoji.split(/\|U/).each do |e|

data/lib/pipetext/version.rb

@@ -4,6 +4,5 @@ module PipeText
 
   public
 
-  VERSION = "0.2.5"
+  VERSION = "0.2.7"
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pipetext
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.7
 platform: ruby
 authors:
 - Minaswan Nakamoto
@@ -16,7 +16,7 @@ description: "== Easily add colors, boxes, repetitions and emojis to your termin
   print(string)\n      write('|Y' + string + '|n')\n    end\n  end\n  \n  printer
   = YellowPrinter.new\n  printer.print('This is yellow')\n  \n  The gem includes a
   command line interface too:\n  \n  > pipetext\n\n  > pipetext '|Ccyan|n'\n\n  Easily
-  set your bash prompt colors using pipetext:\n\n  > PS1=$(pipetext '|g\\u|n@|g\\h|n:|g\\w|n$
+  set your bash prompt colors using pipetext:\n\n  > PS1=$(pipetext '|$|g\\u|n@|g\\h|n:|g\\w|n$
   ')\n\n  Works with files:\n\n  > pipetext <filename>\n\n  Works with pipes too:\n\n
   \ > echo '|RRed test |u1f49c|n' | pipetext\n\n---\n  | pipe  ||  & ampersand    &&
   \ Toggle (&) background color mode  |&\n  smoke   |s  white          |W  black text