ansiterm 0.3.0 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e87a8b37e0488b859cc89f8ebcc0ed199518d3fc
-  data.tar.gz: 738b1172d4ea87b8e4da9fc40eec476a5b0ba6a4
+SHA256:
+  metadata.gz: 92d53d94db9dcd9ed7d7369d4b7df040c5da231bfb2985399b783716f12c7fa0
+  data.tar.gz: 7a50dcdbadfe4cf828de6b98ac674f36052525e0fc5c390a4d018167ccffb4cb
 SHA512:
-  metadata.gz: e91d53b54b15a24a69944992c4da4882d2c17b549af25dab471c7b19ded12eeef36c986d2fd8f70f078cac64689aff72ec7a1071b0393cb4cad06b380e3a2f24
-  data.tar.gz: d6b17caf80f4e3a46d478a2d31dc3562817b7da6ed541ccec5fc44d44db7462d9fe34900070d0666da28766b98ca8a2237c8898d92d8043654b990c7bbf1c7ea
+  metadata.gz: a0c1b315496296dd0a9c6015c5907a0d08eb6d4c4a17756d8ce22f4929b6ff571e448bf9b83a902949be6b625706e9d796d9c59d742f90fb5b0f7b2ffec3c1a9
+  data.tar.gz: c595e0ca1516a21f033317f997f31981bc6899263ce8407065244d76f8bb41bfe339a5435df048be64a149da36e692bcfc04e695e95cc9664e379a5ed8e7e4e6

data/ansiterm.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.13"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/ansiterm/attr.rb

@@ -1,6 +1,7 @@
-
 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 +11,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,22 +21,45 @@ module AnsiTerm
     ITALICS     = 2
     UNDERLINE   = 4
     CROSSED_OUT = 8
-    
+
     attr_reader :fgcol, :bgcol, :flags
 
-    def initialize(fgcol: nil, bgcol: nil, flags: 0)
+    def initialize(fgcol: nil, bgcol: nil, flags: nil)
       @fgcol = fgcol
       @bgcol = bgcol
-      @flags = flags || 0
+      @flags = flags
       freeze
     end
 
-    def merge(attrs)
-      self.class.new({bgcol: @bgcol, fgcol: @fgcol, flags: @flags}.merge(attrs))
+    def ==(other)
+      return false if !other.kind_of?(self.class)
+      return fgcol == other.fgcol &&
+             bgcol == other.bgcol &&
+             flags == other.flags
     end
-    
-    def add_flag(flags); merge({flags: @flags | flags}); end
-    def clear_flag(flags); merge({flags: @flags & ~BOLD}); end
+
+    def to_h
+      attrs = {}
+      attrs[:bgcol] = @bgcol if @bgcol
+      attrs[:fgcol] = @fgcol if @fgcol
+      attrs[:flags] = @flags if @flags
+      attrs
+    end
+
+    def merge(attrs, ignore: nil)
+      return self if self == attrs
+      if attrs.respond_to?(:to_h)
+        attrs = attrs.to_h
+      end
+      if ignore
+        attrs.delete(ignore)
+      end
+      attrs = to_h.merge(attrs)
+      self.class.new(attrs)
+   end
+
+    def add_flag(flags);   merge({flags: @flags.to_i | flags.to_i}); end
+    def clear_flag(flags); merge({flags: @flags.to_i & ~flags.to_i}); end
 
     def reset;        self.class.new; end
     def normal;       clear_flag(BOLD); end
@@ -43,41 +67,44 @@ module AnsiTerm
     def underline;    add_flag(UNDERLINE); end
     def crossed_out;  add_flag(CROSSED_OUT); end
 
-    def bold?;        (@flags & BOLD) != 0; end
-    def underline?;   (@flags & UNDERLINE) != 0; end
-    def crossed_out?; (@flags & CROSSED_OUT) != 0; end
+    def bold?;        (@flags.to_i & BOLD) != 0; end
+    def underline?;   (@flags.to_i & UNDERLINE) != 0; end
+    def crossed_out?; (@flags.to_i & CROSSED_OUT) != 0; end
 
     def normal?
-      @flags == NORMAL &&
-        @fgcol.nil? &&
-        @bgcol.nil?
+      (@flags == NORMAL || @flags.nil?) &&
+        (@fgcol.nil? || @fgcol == 39) &&
+        (@bgcol.nil? || @bgcol == 49)
     end
 
     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
-        "\e[#{t.join(";")}m"
+        "\e[#{t.flatten.join(";")}m"
       end
     end
   end
 
+  def self.attr(*args)
+    Attr.new(*args)
+  end
 end

data/lib/ansiterm/buffer.rb

@@ -0,0 +1,108 @@
+
+module AnsiTerm
+
+  # # AnsiTerm::Buffer #
+  #
+  # A terminal buffer that will eventually handle ANSI style strings
+  # fully. For now it will handle the sequences AnsiTerm::String handles
+  # but e.g. cursor movement etc. needs to be explicitly handled.
+  #
+  # Extracted out of https://github.com/vidarh/re
+  #
+  # FIXME: Provide method of setting default background color
+  #
+  class Buffer
+    attr_reader :w,:h, :lines
+
+    def initialize(w=80, h=25)
+      @lines = []
+      @x = 0
+      @y = 0
+      @w = w
+      @h = h
+      @cache = []
+    end
+
+    def cls
+      @lines = (1..@h).map { nil } #AnsiTerm::String.new } #AnsiTerm::String.new("\e[37;40;0m"+(" "*@w)) }
+    end
+
+    def reset
+      cls
+      @cache=[]
+    end
+
+    def move_cursor(x,y)
+      @x = x
+      @y = y
+      @x = @w-1 if @x >= @w
+      @y = @y-1 if @y >= @h
+    end
+
+    def resize(w,h)
+      if @w != w || @h != h
+        @w, @h = w,h
+        @cache = []
+      end
+    end
+
+    def scroll
+      while @y >= @h
+        @lines.shift
+        @lines << nil #AnsiTerm::String.new #"" #AnsiTerm::String.new("\e[37;40;0m"+(" "*@w))
+        @y -= 1
+      end
+      true
+    end
+
+    def print *args
+      args.each do |str|
+        @lines[@y] ||= AnsiTerm::String.new("\e[0m")
+        @dirty << @y
+        l = @lines[@y]
+
+        if l.length < @x
+          l << (" "*(@x - l.length))
+        end
+        l[@x..@x+str.length] = str
+        #      l[@x] << str
+        #      if @x + s.length > @w
+        #        l[@x .. @w-1] = s[0 .. @w - @x]
+        #        @x = 0
+        #        @y += 1
+        #        scroll if @y >= @h
+        #      end
+      end
+    end
+
+    def to_s
+      out = ""
+      cachehit=0
+      cachemiss=0
+      @lines.each_with_index do |line,y|
+        line ||= ""
+        line = line[0..(@w-1)]
+        l = line.length
+        #if l > @w
+        #  $editor&.log("WARNING: #{l} > @w #{@w}")
+        #end
+        s = line.to_str
+        if @cache[y] != s
+          out << ANSI.cup(y,0) << s << ANSI.sgr(:reset) << ANSI.el #<< X\n"
+          cachemiss += s.length
+          old = @cache[y]
+          @cache[y] = s
+          #$editor.pry([y,old, s])
+        else
+          cachehit += @cache[y].length
+        end
+        # FIXME: This is only worthwhile if a background colour is set
+        #if l < @w
+        #  out << ANSI.csi("m",0,38,48,2,48,48,64) << "-"*(@w-l)
+        #end
+      end
+      @dirty = Set[]
+      out
+    end
+  end
+end

data/lib/ansiterm/string.rb

@@ -1,9 +1,18 @@
-
+# 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
@@ -20,6 +29,10 @@ module AnsiTerm
       out
     end
 
+    def to_s
+      to_str
+    end
+
     def encoding
       @str.encoding
     end
@@ -36,6 +49,53 @@ module AnsiTerm
       @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 ? a.merge(attr) : attr
+        last == n ? last : n
+      end || []
+      rm = range.last+1
+      if a = @attrs[rm]
+        @attrs[rm] = Attr.new.merge(fattr).merge(a)
+        if !a.bgcol
+          @attrs[rm] = @attrs[rm].merge({bgcol: 49})
+        end
+      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
+          n = attr.merge(a, ignore: :bgcol)
+        else
+         n = attr.merge(a)
+        end
+         last == n ? last : n
+      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
@@ -47,13 +107,27 @@ module AnsiTerm
       end
     end
 
+    def char_at(index)
+      @str[index]
+    end
+
+    def attr_at(index)
+      @attrs[index]
+    end
+
     def << str
-      str = self.class.new(str)
-      @str << str.raw
-      @attrs << str.attrs
-#      parse(self.to_str + "\e[0m" + str.to_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)
@@ -63,12 +137,13 @@ 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)
     end
-    
+
     def parse(str)
       @str   = ""
       @attrs = []
@@ -76,20 +151,26 @@ module AnsiTerm
 
       max = str.length
       i   = 0
-      
+
       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
@@ -104,12 +185,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}]"
@@ -125,4 +207,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.3.0"
+  VERSION = "0.4"
 end

data/lib/ansiterm.rb

@@ -1,4 +1,4 @@
 require "ansiterm/version"
 require "ansiterm/attr"
 require "ansiterm/string"
-
+require "ansiterm/buffer"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ansiterm
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: '0.4'
 platform: ruby
 authors:
 - Vidar Hokstad
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-30 00:00:00.000000000 Z
+date: 2021-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -70,6 +70,7 @@ files:
 - bin/setup
 - lib/ansiterm.rb
 - lib/ansiterm/attr.rb
+- lib/ansiterm/buffer.rb
 - lib/ansiterm/string.rb
 - lib/ansiterm/version.rb
 homepage: https://github.com/vidarh/ansiterm
@@ -91,8 +92,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