ansiterm 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c7ee1afd97de8627d4106e6d2506c6afeeed80bd
-  data.tar.gz: 902a4d04c8b376286e9da45bc03219e46e6f33c8
+SHA256:
+  metadata.gz: d38217a9590237a3e098e5cf097fc03bc055dbab158c7eaab8b730a9c51e28d8
+  data.tar.gz: fa2661f67e062ad9e8a12f930bb80e93aff47d41641da140ec8bc51a293b98ba
 SHA512:
-  metadata.gz: 4f0aedde0e2ec57c2ea17cb53c8749d1c144bb78d9f230e98ce215ff7e9daab83e1cf8998a1c2283f53c3ce5f7ea31bf39e5d606e76b600ea859bb518a268ede
-  data.tar.gz: c790e5974e11c75df1216c8966119cf346878b4de6c7accce636729af3b2206e9b9eef028379dcf9b6e003921d0361312834b32f02942774c69b10f275b556ba
+  metadata.gz: 84474fe763a85f88560157e7bf70d047e1bbf1efb72407b64b6f4cd9cac57be295f99d9720c5a28d7531873c8ac192c1c3ab63b37fa6d44d877729f96442d1bc
+  data.tar.gz: 809ec57358492a2b71a9ae095907248b1ff2e681f679ab3139d5cd7bede8198cb42408ece26e109859f3a0862702a37be9bb75de0b04ca1d9227abc1644a450d

data/lib/ansiterm/attr.rb

@@ -1,6 +1,8 @@
 
 module AnsiTerm
 
+  # # Attr #
+  #
   # Attr represents the attributes of a given character.
   # It is intended to follow the "Flyweight" GOF pattern
   # in that any object representing a given combination
@@ -20,7 +22,7 @@ module AnsiTerm
     ITALICS     = 2
     UNDERLINE   = 4
     CROSSED_OUT = 8
-    
+
     attr_reader :fgcol, :bgcol, :flags
 
     def initialize(fgcol: nil, bgcol: nil, flags: 0)
@@ -31,11 +33,18 @@ module AnsiTerm
     end
 
     def merge(attrs)
+      if attrs.kind_of?(self.class)
+        old = attrs
+        attrs = {}
+        attrs[:bgcol] = old.bgcol if old.bgcol
+        attrs[:fgcol] = old.fgcol if old.fgcol
+        attrs[:flags] = old.flags if old.flags
+      end
       self.class.new({bgcol: @bgcol, fgcol: @fgcol, flags: @flags}.merge(attrs))
     end
-    
+
     def add_flag(flags); merge({flags: @flags | flags}); end
-    def clear_flag(flags); merge({flags: @flags & ~BOLD}); end
+    def clear_flag(flags); merge({flags: @flags & ~flags}); end
 
     def reset;        self.class.new; end
     def normal;       clear_flag(BOLD); end
@@ -55,23 +64,23 @@ module AnsiTerm
 
     def transition_to(other)
       t = []
-      t << [other.fgcol] if other.fgcol != self.fgcol
-      t << [other.bgcol] if other.bgcol != self.bgcol
-      
+      t << [other.fgcol] if other.fgcol && other.fgcol != self.fgcol
+      t << [other.bgcol] if other.bgcol && other.bgcol != self.bgcol
+
       if other.bold? != self.bold?
         t << [other.bold? ? 1 : 22]
       end
-      
+
       if other.underline? != self.underline?
         t << [other.underline? ? 4 : 24]
       end
-      
+
       if other.crossed_out? != self.crossed_out?
         t << [other.crossed_out? ? 9 : 29]
       end
 
       return "\e[0m" if other.normal? && !self.normal? && t.length != 1
-      
+
       if t.empty?
         ""
       else

data/lib/ansiterm/string.rb

@@ -1,4 +1,5 @@
-
+ 
+# This is a test
 module AnsiTerm
 
   class String
@@ -6,6 +7,10 @@ module AnsiTerm
       parse(str)
     end
 
+    def to_plain_str
+      @str.dup
+    end
+    
     def to_str
       out = ""
       a = Attr.new
@@ -40,6 +45,25 @@ module AnsiTerm
       @str, @attrs = str,Array(attrs)
     end
 
+    def set_attr(range, attr)
+      min = range.first - 1
+      fattr = @attrs[min]
+      attr = fattr.merge(attr) if fattr
+      r = Array(@attrs[range]).count # Inefficient, but saves dealing with negative offsets etc. "manually"
+      last = nil
+      @attrs[range] = @attrs[range].map do |a| 
+        a == last ? a : last = attr.merge(a)
+      end
+    end
+
+    def[]= range, str
+      s = @str
+      a = @attrs
+      parse(str)
+      @str   = s[0..(range.min-1)].to_s + @str   + s[(range.max)..-1].to_s
+      @attrs = a[0..(range.min-1)].to_a + @attrs + a[(range.max)..-1].to_a
+    end
+    
     def[] i
       str = @str[i]
       if str
@@ -51,6 +75,10 @@ module AnsiTerm
       end
     end
 
+    def attr_at(index)
+      @attrs[index]
+    end
+
     def << str
       parse(self.to_str + "\e[0m" + str.to_str)
     end
@@ -64,7 +92,8 @@ module AnsiTerm
         if par == "5"
           col = [col,5,params.shift].join(";")
         elsif par == "2"
-          col = [col,5,params.shift,params.shift, params.shift].join(";")
+          col = ([col,2] << params.slice!(0..2)).join(";")
+#          ,params.shift,params.shift, params.shift].join(";")
         end
       end
       a.merge(attr_name => col)
@@ -81,16 +110,22 @@ module AnsiTerm
       while i < max
         c = str[i]
         if c == "\e" && str[i+1] == "[" # CSI
-          params = ""
+          params = []
           i += 2
+          par = ""
           while i < max && str[i].ord < 0x40
-            params << str[i]
+            if str[i] == ";"
+              params << par
+              par = ""
+            else
+              par << str[i]
+            end
             i+=1
           end
+          params << par if !par.empty?
           final = str[i]
 
           if final == "m"
-            params = params.split(";")
             while par = params.shift
               par = par.to_i
               case par
@@ -105,12 +140,13 @@ module AnsiTerm
               when 22
                 a = a.normal
               when 24
+                old = a
                 a = a.clear_flag(Attr::UNDERLINE)
               when 29
                 a = a.clear_flag(Attr::CROSSED_OUT)
-              when 30..39
+              when 30..39, 90..98
                 a = parse_color(par, params, a, :fgcol)
-              when 40..49
+              when 40..49, 100..107
                 a = parse_color(par, params, a, :bgcol)
               else
                 @str << "[unknown escape: #{par}]"

data/lib/ansiterm/version.rb

@@ -1,3 +1,3 @@
 module AnsiTerm
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ansiterm
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Vidar Hokstad
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-30 00:00:00.000000000 Z
+date: 2018-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: ANSI/VT102 terminal output with windowing