ansiterm 0.2.0 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0df537615fddd8fe2fed0443af028139d1444979
-  data.tar.gz: c5c72311de8e4022f7d8f951038f782ef8eadf57
+SHA256:
+  metadata.gz: 594990b07d22ef5777b36348387c47a3061c4772f5e830a2240294c77574b3ea
+  data.tar.gz: 772aa91059ffa9d4e59bd06b33fd607726befacd0ecfafa61db3a5df862897a9
 SHA512:
-  metadata.gz: e61b1784d2b29c07bca256043698320180542b7b1a44a3a3af5680e8eaa6c4ebf15bbf1a84cc620772b193e7321733a24d030df990684943b177b69e1fb09f82
-  data.tar.gz: 6e1a7d0b76d5f7f11f85761fabddf6372294681d3f744fa4522d76fc30cab08bd27ce3426d3e01f780b1825135a4e876b1b3dd58e7bce31f67d7c97500b8420e
+  metadata.gz: d3e0fba3540ea67e4126c9ccc6918b778d7fffd971f407c3d4045148dda5b5edf2ef00761ec2465eea55e1e930da15e8a111e62a214753cbfd8a2c6d77fd753b
+  data.tar.gz: 59a9fa226a211ce692a446c7e895631bc19c30e729d3597a7f5f6f97e1de267ac16e4593fe363f460d4a37e3c02bbfb01112772d1cd7489e05cc6ae0406d471c

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
@@ -10,7 +12,7 @@ module AnsiTerm
   # whether to e.g. encode a string as spans with one Attr,
   # or characters with one Attr per character.
   #
-  # Use Attr#transition(other_attr) to retrieve an ANSI
+  # Use `Attr#transition(other_attr)` to retrieve an ANSI
   # sequence that represents the changes from self to
   # other_attr.
   #
@@ -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)
@@ -30,12 +32,27 @@ module AnsiTerm
       freeze
     end
 
+    def ==(other)
+      return false if !other.kind_of?(self.class)
+      return fgcol == other.fgcol &&
+             bgcol == other.bgcol &&
+             flags == other.flags
+    end
+
     def merge(attrs)
+      return self if self == 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 +72,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 != self.fgcol && other.fgcol
+      t << [other.bgcol] if other.bgcol != self.fgcol && other.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
@@ -80,4 +97,7 @@ module AnsiTerm
     end
   end
 
+  def self.attr(*args)
+    Attr.new(*args)
+  end
 end

data/lib/ansiterm/string.rb

@@ -1,11 +1,20 @@
-
+# coding: utf-8
 module AnsiTerm
 
   class String
-    def initialize(str="")
-      parse(str)
+    def initialize(str=nil)
+      if str
+        parse(str)
+      else
+        @str = ""
+        @attrs = []
+      end
     end
-    
+
+    def to_plain_str
+      @str.dup
+    end
+
     def to_str
       out = ""
       a = Attr.new
@@ -20,6 +29,10 @@ module AnsiTerm
       out
     end
 
+    def to_s
+      to_str
+    end
+
     def encoding
       @str.encoding
     end
@@ -28,10 +41,57 @@ module AnsiTerm
       @str.length
     end
 
+    def index str, off = 0
+      @str.index(str,off)
+    end
+
     def set(str,attrs)
       @str, @attrs = str,Array(attrs)
     end
 
+    def raw
+      return @str, Array(@attrs)
+    end
+
+    def set_attr(range, attr)
+      min   = [range.first - 1,0].max
+      fattr = @attrs[min]
+      attr  = fattr.merge(attr)
+      r = Array(@attrs[range]).count # Inefficient, but saves dealing with negative offsets etc. "manually"
+      last = nil
+      @attrs[range] = @attrs[range].map do |a|
+        n = a.merge(attr)
+        last == n ? last : n
+      end
+      rm = range.last
+      if a = @attrs[rm]
+        @attrs[rm] = Attr.new(bgcol:40).merge(fattr).merge(a)
+      end
+    end
+
+    def merge_attr_below(range, attr)
+      min = [0,range.first - 1].max
+      fattr = @attrs[min]
+      r = Array(@attrs[range]).count # Inefficient, but saves dealing with negative offsets etc. "manually"
+      last = nil
+      @attrs[range] = @attrs[range].map do |a|
+        if a.bgcol == 49
+          a.merge(attr)
+        else
+          attr.merge(a)
+        end
+      end
+      #fattr #@attrs[min+r].merge(fattr)
+    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
@@ -43,7 +103,27 @@ module AnsiTerm
       end
     end
 
+    def char_at(index)
+      @str[index]
+    end
     
+    def attr_at(index)
+      @attrs[index]
+    end
+
+    def << str
+      return self if str.nil?
+      if !str.kind_of?(self.class)
+        parse(self.to_str + "\e[0m" + str.to_str)
+        return self
+      end
+
+      s,a = str.raw
+      @str.concat(s)
+      @attrs.concat(a)
+      self
+    end
+
     private
 
     def parse_color(par, params, a, attr_name)
@@ -53,7 +133,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)
@@ -70,16 +151,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
@@ -94,12 +181,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}]"
@@ -115,4 +203,8 @@ module AnsiTerm
       self
     end
   end
+
+  def self.str(*args)
+    AnsiTerm::String.new(*args)
+  end
 end

data/lib/ansiterm/version.rb

@@ -1,3 +1,3 @@
 module AnsiTerm
-  VERSION = "0.2.0"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ansiterm
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.3
 platform: ruby
 authors:
 - Vidar Hokstad
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-31 00:00:00.000000000 Z
+date: 2021-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,8 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: ANSI/VT102 terminal output with windowing