ansiterm 0.3.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 594990b07d22ef5777b36348387c47a3061c4772f5e830a2240294c77574b3ea
-  data.tar.gz: 772aa91059ffa9d4e59bd06b33fd607726befacd0ecfafa61db3a5df862897a9
+  metadata.gz: 92d53d94db9dcd9ed7d7369d4b7df040c5da231bfb2985399b783716f12c7fa0
+  data.tar.gz: 7a50dcdbadfe4cf828de6b98ac674f36052525e0fc5c390a4d018167ccffb4cb
 SHA512:
-  metadata.gz: d3e0fba3540ea67e4126c9ccc6918b778d7fffd971f407c3d4045148dda5b5edf2ef00761ec2465eea55e1e930da15e8a111e62a214753cbfd8a2c6d77fd753b
-  data.tar.gz: 59a9fa226a211ce692a446c7e895631bc19c30e729d3597a7f5f6f97e1de267ac16e4593fe363f460d4a37e3c02bbfb01112772d1cd7489e05cc6ae0406d471c
+  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,4 +1,3 @@
-
 module AnsiTerm
 
   # # Attr #
@@ -25,10 +24,10 @@ module AnsiTerm
 
     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
 
@@ -39,20 +38,28 @@ module AnsiTerm
              flags == other.flags
     end
 
-    def merge(attrs)
+    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.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
+      if attrs.respond_to?(:to_h)
+        attrs = attrs.to_h
       end
-      self.class.new({bgcol: @bgcol, fgcol: @fgcol, flags: @flags}.merge(attrs))
-    end
+      if ignore
+        attrs.delete(ignore)
+      end
+      attrs = to_h.merge(attrs)
+      self.class.new(attrs)
+   end
 
-    def add_flag(flags); merge({flags: @flags | flags}); end
-    def clear_flag(flags); merge({flags: @flags & ~flags}); 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
@@ -60,14 +67,14 @@ 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)
@@ -92,7 +99,7 @@ module AnsiTerm
       if t.empty?
         ""
       else
-        "\e[#{t.join(";")}m"
+        "\e[#{t.flatten.join(";")}m"
       end
     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

@@ -56,16 +56,19 @@ module AnsiTerm
     def set_attr(range, attr)
       min   = [range.first - 1,0].max
       fattr = @attrs[min]
-      attr  = fattr.merge(attr)
+      #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)
+      @attrs[range] = @attrs[range]&.map do |a|
+        n = a ? a.merge(attr) : attr
         last == n ? last : n
-      end
-      rm = range.last
+      end || []
+      rm = range.last+1
       if a = @attrs[rm]
-        @attrs[rm] = Attr.new(bgcol:40).merge(fattr).merge(a)
+        @attrs[rm] = Attr.new.merge(fattr).merge(a)
+        if !a.bgcol
+          @attrs[rm] = @attrs[rm].merge({bgcol: 49})
+        end
       end
     end
 
@@ -76,10 +79,11 @@ module AnsiTerm
       last = nil
       @attrs[range] = @attrs[range].map do |a|
         if a.bgcol == 49
-          a.merge(attr)
+          n = attr.merge(a, ignore: :bgcol)
         else
-          attr.merge(a)
+         n = attr.merge(a)
         end
+         last == n ? last : n
       end
       #fattr #@attrs[min+r].merge(fattr)
     end
@@ -91,7 +95,7 @@ module AnsiTerm
       @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
@@ -106,7 +110,7 @@ module AnsiTerm
     def char_at(index)
       @str[index]
     end
-    
+
     def attr_at(index)
       @attrs[index]
     end
@@ -133,13 +137,13 @@ module AnsiTerm
         if par == "5"
           col = [col,5,params.shift].join(";")
         elsif par == "2"
-          col = ([col,2] << params.slice!(0..2)).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 = []
@@ -147,7 +151,7 @@ module AnsiTerm
 
       max = str.length
       i   = 0
-      
+
       while i < max
         c = str[i]
         if c == "\e" && str[i+1] == "[" # CSI

data/lib/ansiterm/version.rb

@@ -1,3 +1,3 @@
 module AnsiTerm
-  VERSION = "0.3.3"
+  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.3
+  version: '0.4'
 platform: ruby
 authors:
 - Vidar Hokstad
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-05 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