ansiterm 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd09f57b3373ed993f3c332f543fbeafa2626cc7
-  data.tar.gz: 0c046c9f0c3c3215bdc57bb15396724a1c4ef9ab
+  metadata.gz: 0df537615fddd8fe2fed0443af028139d1444979
+  data.tar.gz: c5c72311de8e4022f7d8f951038f782ef8eadf57
 SHA512:
-  metadata.gz: '07481354e1d2dc0af995a64e3d246617e12c01bf84a7d6434f0155969948fb507f4b91a886e1392a332f030e6921ca1ee64ae5ff7748e246e1f86e5eb1a10384'
-  data.tar.gz: 469c7747ad4c930d3a3f759bc772e5018668932b89200fd0b9ca4970e22ad14d1098b1c01e6422fe2939e2283bc7a64b1524366807cbec070390e94151b82f8b
+  metadata.gz: e61b1784d2b29c07bca256043698320180542b7b1a44a3a3af5680e8eaa6c4ebf15bbf1a84cc620772b193e7321733a24d030df990684943b177b69e1fb09f82
+  data.tar.gz: 6e1a7d0b76d5f7f11f85761fabddf6372294681d3f744fa4522d76fc30cab08bd27ce3426d3e01f780b1825135a4e876b1b3dd58e7bce31f67d7c97500b8420e

data/lib/ansiterm.rb

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

data/lib/ansiterm/attr.rb

@@ -35,7 +35,10 @@ module AnsiTerm
     end
     
     def add_flag(flags); merge({flags: @flags | flags}); end
-      
+    def clear_flag(flags); merge({flags: @flags & ~BOLD}); end
+
+    def reset;        self.class.new; end
+    def normal;       clear_flag(BOLD); end
     def bold;         add_flag(BOLD); end
     def underline;    add_flag(UNDERLINE); end
     def crossed_out;  add_flag(CROSSED_OUT); end
@@ -44,11 +47,20 @@ module AnsiTerm
     def underline?;   (@flags & UNDERLINE) != 0; end
     def crossed_out?; (@flags & CROSSED_OUT) != 0; end
 
+    def normal?
+      @flags == NORMAL &&
+        @fgcol.nil? &&
+        @bgcol.nil?
+    end
+
     def transition_to(other)
       t = []
       t << [other.fgcol] if other.fgcol != self.fgcol
       t << [other.bgcol] if other.bgcol != self.bgcol
-      t << [1] if other.bold? && !self.bold?
+      
+      if other.bold? != self.bold?
+        t << [other.bold? ? 1 : 22]
+      end
       
       if other.underline? != self.underline?
         t << [other.underline? ? 4 : 24]
@@ -57,6 +69,8 @@ module AnsiTerm
       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?
         ""

data/lib/ansiterm/string.rb

@@ -0,0 +1,118 @@
+
+module AnsiTerm
+
+  class String
+    def initialize(str="")
+      parse(str)
+    end
+    
+    def to_str
+      out = ""
+      a = Attr.new
+      @str.length.times.each do |i|
+        if a != @attrs[i]
+          old = a
+          a = @attrs[i]||Attr.new
+          out << old.transition_to(a)
+        end
+        out << @str[i]
+      end
+      out
+    end
+
+    def encoding
+      @str.encoding
+    end
+
+    def length
+      @str.length
+    end
+
+    def set(str,attrs)
+      @str, @attrs = str,Array(attrs)
+    end
+
+    def[] i
+      str = @str[i]
+      if str
+        a = self.class.new
+        a.set(str,@attrs[i])
+        a
+      else
+        nil
+      end
+    end
+
+    
+    private
+
+    def parse_color(par, params, a, attr_name)
+      col = par
+      if col == 38 || col == 48
+        par = params.shift
+        if par == "5"
+          col = [col,5,params.shift].join(";")
+        elsif par == "2"
+          col = [col,5,params.shift,params.shift, params.shift].join(";")
+        end
+      end
+      a.merge(attr_name => col)
+    end
+    
+    def parse(str)
+      @str   = ""
+      @attrs = []
+      a = AnsiTerm::Attr.new
+
+      max = str.length
+      i   = 0
+      
+      while i < max
+        c = str[i]
+        if c == "\e" && str[i+1] == "[" # CSI
+          params = ""
+          i += 2
+          while i < max && str[i].ord < 0x40
+            params << str[i]
+            i+=1
+          end
+          final = str[i]
+
+          if final == "m"
+            params = params.split(";")
+            while par = params.shift
+              par = par.to_i
+              case par
+              when 0
+                a = a.reset
+              when 1
+                a = a.bold
+              when 4
+                a = a.underline
+              when 9
+                a = a.crossed_out
+              when 22
+                a = a.normal
+              when 24
+                a = a.clear_flag(Attr::UNDERLINE)
+              when 29
+                a = a.clear_flag(Attr::CROSSED_OUT)
+              when 30..39
+                a = parse_color(par, params, a, :fgcol)
+              when 40..49
+                a = parse_color(par, params, a, :bgcol)
+              else
+                @str << "[unknown escape: #{par}]"
+              end
+            end
+          end
+        else
+          @str   << c
+          @attrs << a
+        end
+        i += 1
+      end
+      self
+    end
+  end
+end

data/lib/ansiterm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ansiterm
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Vidar Hokstad
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-20 00:00:00.000000000 Z
+date: 2017-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,6 +70,7 @@ files:
 - bin/setup
 - lib/ansiterm.rb
 - lib/ansiterm/attr.rb
+- lib/ansiterm/string.rb
 - lib/ansiterm/version.rb
 homepage: https://github.com/vidarh/ansiterm
 licenses: