ansiterm 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67a711d64ca029c1b3fb2a2cea32da16996f76ad440e901c4a2edad13564b7fd
-  data.tar.gz: dd675c62ede4b0530ffa53fcd9208f312bc6e44757d62ce3fa01b14d5ac9c392
+  metadata.gz: f0dae91bb1ebbc0bda9632bf8846262e97819da55d1288c3c0b5beed53a3b11f
+  data.tar.gz: 055362e6766853205246e45ed3ee67646c30b0233cdbcdeeceaf6809e938ce7f
 SHA512:
-  metadata.gz: 053de29389ed592194707f8406d83f7b56d09932657288d43a679a63bdd14300d73520160d932957c4f61919cfad4e1633519eb583a24a6a765f22f3d0edeca1
-  data.tar.gz: edd85d4d45baed56de37b1637ff4111e8e4687610fb91a4ea2206a4d92b0542899285da0766640b3eda2c8bb1bf0e05228d0473f5f0dc0cc7495251151d557ae
+  metadata.gz: 620a6db97f8729c25c336c663db0ec2d27ef412414990f4317fc115a77fab2ec7d316b46c8677b9aa300ea50cd83c4aaa6a10e132aafa787a1465ef54ac1dda9
+  data.tar.gz: 84cdb955fdebe1ea70e0f9ee7cf3c8795217929b3d65984868d799576b97eec6ed73def2d849c2685661754d30bcc3750008372aa4a79e4942e9680d1615e9c9

data/lib/ansiterm/attr.rb

@@ -55,7 +55,7 @@ module AnsiTerm
         attrs.delete(ignore)
       end
       attrs = to_h.merge(attrs)
-      self.class.new(attrs)
+      self.class.new(**attrs)
    end
 
     def add_flag(flags);   merge({flags: @flags.to_i | flags.to_i}); end
@@ -104,7 +104,7 @@ module AnsiTerm
     end
   end
 
-  def self.attr(*args)
-    Attr.new(*args)
+  def self.attr(...)
+    Attr.new(...)
   end
 end

data/lib/ansiterm/buffer.rb

@@ -1,4 +1,7 @@
 
+
+
+
 module AnsiTerm
 
   # # AnsiTerm::Buffer #
@@ -20,7 +23,7 @@ module AnsiTerm
       @y = 0
       @w = w
       @h = h
-      @cache = []
+      @cache = Array.new { AnsiTerm::String.new }
     end
 
     def cls
@@ -58,6 +61,20 @@ module AnsiTerm
         r=@x..@x+str.length-1
         #p [r, str]
         l[r] = str
+        @x += str.length
+        # FIXME: Handle wrap.
+      end
+    end
+
+    # This scrolls the *buffer* up
+    # If you want it to also scroll the *cache*
+    # pass `scroll_cache: true`. This will presume
+    # that you've scrolled the *terminal* yourself.
+    def scroll_up(num=1, scroll_cache: false)
+      @lines.slice!(0)
+      @lines << AnsiTerm::String.new
+      if scroll_cache
+        @cache.slice!(0)
       end
     end
 
@@ -73,11 +90,22 @@ module AnsiTerm
         if @cache[y] != s
           # Move to start of line; output line; clear to end
           #if l > 0
-            out << "\e[#{y+1};1H" << s
-            if l < @w
-              out << "\e[0m\e[0K"
-            end
+          #s.lstrip!
+          #x = l - s.length
+          out << "\e[#{y+1};1H"
+          #if x > 1
+          #  out << "\e[1K"
           #end
+          #FIXME: We can only do this if:
+          #1. we know no background color has been set
+          #2. OR we add support for specifying it.
+          #out << s.rstrip
+          out << s
+          if l < @w
+              # FIXME: Allow setting background colour
+              out << "\e[0m\e[0K"
+            #end
+          end
           cachemiss += s.length
           old = @cache[y]
           @cache[y] = s

data/lib/ansiterm/string.rb

@@ -11,6 +11,8 @@ module AnsiTerm
       end
     end
 
+    attr_reader :str, :attrs
+    
     def to_plain_str
       @str.dup
     end
@@ -78,7 +80,7 @@ module AnsiTerm
       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
+        if a&.bgcol == 49
           n = attr.merge(a, ignore: :bgcol)
         else
          n = attr.merge(a)
@@ -89,13 +91,20 @@ module AnsiTerm
     end
 
     def[]= range, str
-      s = @str.dup
-      a = @attrs.dup
-      parse(str)
-      s[range] = @str
-      @str = s
-      a[range] = @attrs
-      @attrs = a
+      if str.is_a?(self.class)
+        #@str = @str.dup
+        #@attrs = @attrs.dup
+        @str[range] = str.str
+        @attrs[range] = str.attrs
+      else
+        s = @str.dup
+        a = @attrs.dup
+        parse(str)
+        s[range] = @str
+        @str = s
+        a[range] = @attrs
+        @attrs = a
+      end
     end
 
     def[] i
@@ -143,7 +152,7 @@ module AnsiTerm
 #          ,params.shift,params.shift, params.shift].join(";")
         end
       end
-      a.merge(attr_name => col)
+      a.merge({attr_name => col})
     end
 
     def parse(str)

data/lib/ansiterm/version.rb

@@ -1,3 +1,3 @@
 module AnsiTerm
-  VERSION = "0.4.1"
+  VERSION = "0.4.3"
 end

data/visual-spec/buffer.rb

@@ -6,7 +6,7 @@ require 'io/console'
 
 h,w = IO.console.winsize
 
-t = AnsiTerm::Buffer.new(w,h)
+t = AnsiTerm::Buffer.new(w,h-1)
 
 t.cls
 t.move_cursor(1,1)
@@ -20,6 +20,22 @@ t.print("LR")
 t.move_cursor(0,h-2)
 t.print("LL")
 t.move_cursor(1,2)
-t.print ("Hello world")
+t.print ("Hello world. UL/UR/LL/LR should fit the corners but one line above the bottom.")
+print t.to_s
+gets
+t.scroll_up
+t.move_cursor(0,0)
+t.print("ul")
+t.move_cursor(w-2,0)
+t.print("ur")
+t.move_cursor(w-2,h-2)
+t.print("lr")
+t.move_cursor(0,h-2)
+t.print("ll")
+
+t.move_cursor(1,2)
+t.print ("We've scrolled one line up. This should display right below the Hello World.")
+t.move_cursor(1,3)
+t.print ("Old LL/LR should be visible one line up; new, lower case ones replacing them")
 print t.to_s
 gets

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ansiterm
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
 platform: ruby
 authors:
 - Vidar Hokstad
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-12 00:00:00.000000000 Z
+date: 2025-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: ANSI/VT102 terminal output with windowing