terminal 0.2 → 0.3.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f11cc567d402255f58454144255b1f72881b70e
-  data.tar.gz: df412b25640995f4ee16c04e01bf0de484771f25
+  metadata.gz: a4b4dd150fe6a6cfcad302893bdd602885b6dffd
+  data.tar.gz: f2caa188722eca09b14e8f404ff96b837b6b9652
 SHA512:
-  metadata.gz: 81ea8c713c6b2d49f2bc8b6b0c7c1f82298cb435b25f58a166eedb5ef33a74d9b0171f146b168a0cc2778fb2945df88a0133485b97402f582e8964b998349919
-  data.tar.gz: 2f68cdd314e1503a8227d986497fbf047fe437956dc9a799f1f2b6773d31b22feade0c8c5c06d68f5a8072a385953dc0c4d073465680fcf547d996baddb08a09
+  metadata.gz: c658ae729a6ef14725497173d11eb8169aaaa0f04387e8a84a32c0461447a805b6d08cbb5b71a1f6fd78292d841ee4b30f0f54f853fbd36aa83f6d4fa8929634
+  data.tar.gz: 35e07c07b55db481be848513ee9838d529e8dfc12e7b5b22d44da79078994284e9f039c4704e788dc965bd0a47e5de5ba012192a9c2298506f0dc7934b562401

data/.rspec

@@ -0,0 +1,2 @@
+--color
+-Ilib

data/Gemfile.lock

@@ -1,33 +1,39 @@
 PATH
   remote: .
   specs:
-    terminal (0.1.1)
+    terminal (0.2)
       escape_utils (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    benchmark-ips (2.0.0)
     diff-lcs (1.2.5)
     escape_utils (1.0.1)
+    hirb (0.7.2)
+    method_profiler (2.0.1)
+      hirb (>= 0.6.0)
     rake (10.3.2)
     rspec (3.0.0)
       rspec-core (~> 3.0.0)
       rspec-expectations (~> 3.0.0)
       rspec-mocks (~> 3.0.0)
-    rspec-core (3.0.2)
+    rspec-core (3.0.3)
       rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.2)
+    rspec-expectations (3.0.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.2)
+    rspec-mocks (3.0.3)
       rspec-support (~> 3.0.0)
-    rspec-support (3.0.2)
+    rspec-support (3.0.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  benchmark-ips
   bundler (~> 1.6)
+  method_profiler
   rake
   rspec
   terminal!

data/app/assets/stylesheets/terminal.css

@@ -0,0 +1,256 @@
+.term-fg30 { color: #666; } /* black (but we can't use black, so a diff color) */
+.term-fg31 { color: #e10c02; } /* red */
+.term-fg32 { color: #00bd02; } /* green */
+.term-fg33 { color: #c6c502; } /* yellow */
+.term-fg34 { color: #8db7e0; } /* blue */
+.term-fg35 { color: #ceacde; } /* magenta */
+.term-fg36 { color: #00cdd9; } /* cyan */
+.term-fg90 { color: #838887; } /* grey */
+
+/* high intense colors */
+.term-fgi1 { color: #5ef765; }
+
+/* background colors */
+.term-bg42 { background: #99ff5f; }
+
+/* xterm colors */
+.term-fgx16 { color: #000000; }
+.term-fgx17 { color: #00005f; }
+.term-fgx18 { color: #000087; }
+.term-fgx19 { color: #0000af; }
+.term-fgx20 { color: #0000d7; }
+.term-fgx21 { color: #0000ff; }
+.term-fgx22 { color: #005f00; }
+.term-fgx23 { color: #005f5f; }
+.term-fgx24 { color: #005f87; }
+.term-fgx25 { color: #005faf; }
+.term-fgx26 { color: #005fd7; }
+.term-fgx27 { color: #005fff; }
+.term-fgx28 { color: #008700; }
+.term-fgx29 { color: #00875f; }
+.term-fgx30 { color: #008787; }
+.term-fgx31 { color: #0087af; }
+.term-fgx32 { color: #0087d7; }
+.term-fgx33 { color: #0087ff; }
+.term-fgx34 { color: #00af00; }
+.term-fgx35 { color: #00af5f; }
+.term-fgx36 { color: #00af87; }
+.term-fgx37 { color: #00afaf; }
+.term-fgx38 { color: #00afd7; }
+.term-fgx39 { color: #00afff; }
+.term-fgx40 { color: #00d700; }
+.term-fgx41 { color: #00d75f; }
+.term-fgx42 { color: #00d787; }
+.term-fgx43 { color: #00d7af; }
+.term-fgx44 { color: #00d7d7; }
+.term-fgx45 { color: #00d7ff; }
+.term-fgx46 { color: #00ff00; }
+.term-fgx47 { color: #00ff5f; }
+.term-fgx48 { color: #00ff87; }
+.term-fgx49 { color: #00ffaf; }
+.term-fgx50 { color: #00ffd7; }
+.term-fgx51 { color: #00ffff; }
+.term-fgx52 { color: #5f0000; }
+.term-fgx53 { color: #5f005f; }
+.term-fgx54 { color: #5f0087; }
+.term-fgx55 { color: #5f00af; }
+.term-fgx56 { color: #5f00d7; }
+.term-fgx57 { color: #5f00ff; }
+.term-fgx58 { color: #5f5f00; }
+.term-fgx59 { color: #5f5f5f; }
+.term-fgx60 { color: #5f5f87; }
+.term-fgx61 { color: #5f5faf; }
+.term-fgx62 { color: #5f5fd7; }
+.term-fgx63 { color: #5f5fff; }
+.term-fgx64 { color: #5f8700; }
+.term-fgx65 { color: #5f875f; }
+.term-fgx66 { color: #5f8787; }
+.term-fgx67 { color: #5f87af; }
+.term-fgx68 { color: #5f87d7; }
+.term-fgx69 { color: #5f87ff; }
+.term-fgx70 { color: #5faf00; }
+.term-fgx71 { color: #5faf5f; }
+.term-fgx72 { color: #5faf87; }
+.term-fgx73 { color: #5fafaf; }
+.term-fgx74 { color: #5fafd7; }
+.term-fgx75 { color: #5fafff; }
+.term-fgx76 { color: #5fd700; }
+.term-fgx77 { color: #5fd75f; }
+.term-fgx78 { color: #5fd787; }
+.term-fgx79 { color: #5fd7af; }
+.term-fgx80 { color: #5fd7d7; }
+.term-fgx81 { color: #5fd7ff; }
+.term-fgx82 { color: #5fff00; }
+.term-fgx83 { color: #5fff5f; }
+.term-fgx84 { color: #5fff87; }
+.term-fgx85 { color: #5fffaf; }
+.term-fgx86 { color: #5fffd7; }
+.term-fgx87 { color: #5fffff; }
+.term-fgx88 { color: #870000; }
+.term-fgx89 { color: #87005f; }
+.term-fgx90 { color: #870087; }
+.term-fgx91 { color: #8700af; }
+.term-fgx92 { color: #8700d7; }
+.term-fgx93 { color: #8700ff; }
+.term-fgx94 { color: #875f00; }
+.term-fgx95 { color: #875f5f; }
+.term-fgx96 { color: #875f87; }
+.term-fgx97 { color: #875faf; }
+.term-fgx98 { color: #875fd7; }
+.term-fgx99 { color: #875fff; }
+.term-fgx100 { color: #878700; }
+.term-fgx101 { color: #87875f; }
+.term-fgx102 { color: #878787; }
+.term-fgx103 { color: #8787af; }
+.term-fgx104 { color: #8787d7; }
+.term-fgx105 { color: #8787ff; }
+.term-fgx106 { color: #87af00; }
+.term-fgx107 { color: #87af5f; }
+.term-fgx108 { color: #87af87; }
+.term-fgx109 { color: #87afaf; }
+.term-fgx110 { color: #87afd7; }
+.term-fgx111 { color: #87afff; }
+.term-fgx112 { color: #87d700; }
+.term-fgx113 { color: #87d75f; }
+.term-fgx114 { color: #87d787; }
+.term-fgx115 { color: #87d7af; }
+.term-fgx116 { color: #87d7d7; }
+.term-fgx117 { color: #87d7ff; }
+.term-fgx118 { color: #87ff00; }
+.term-fgx119 { color: #87ff5f; }
+.term-fgx120 { color: #87ff87; }
+.term-fgx121 { color: #87ffaf; }
+.term-fgx122 { color: #87ffd7; }
+.term-fgx123 { color: #87ffff; }
+.term-fgx124 { color: #af0000; }
+.term-fgx125 { color: #af005f; }
+.term-fgx126 { color: #af0087; }
+.term-fgx127 { color: #af00af; }
+.term-fgx128 { color: #af00d7; }
+.term-fgx129 { color: #af00ff; }
+.term-fgx130 { color: #af5f00; }
+.term-fgx131 { color: #af5f5f; }
+.term-fgx132 { color: #af5f87; }
+.term-fgx133 { color: #af5faf; }
+.term-fgx134 { color: #af5fd7; }
+.term-fgx135 { color: #af5fff; }
+.term-fgx136 { color: #af8700; }
+.term-fgx137 { color: #af875f; }
+.term-fgx138 { color: #af8787; }
+.term-fgx139 { color: #af87af; }
+.term-fgx140 { color: #af87d7; }
+.term-fgx141 { color: #af87ff; }
+.term-fgx142 { color: #afaf00; }
+.term-fgx143 { color: #afaf5f; }
+.term-fgx144 { color: #afaf87; }
+.term-fgx145 { color: #afafaf; }
+.term-fgx146 { color: #afafd7; }
+.term-fgx147 { color: #afafff; }
+.term-fgx148 { color: #afd700; }
+.term-fgx149 { color: #afd75f; }
+.term-fgx150 { color: #afd787; }
+.term-fgx151 { color: #afd7af; }
+.term-fgx152 { color: #afd7d7; }
+.term-fgx153 { color: #afd7ff; }
+.term-fgx154 { color: #afff00; }
+.term-fgx155 { color: #afff5f; }
+.term-fgx156 { color: #afff87; }
+.term-fgx157 { color: #afffaf; }
+.term-fgx158 { color: #afffd7; }
+.term-fgx159 { color: #afffff; }
+.term-fgx160 { color: #d70000; }
+.term-fgx161 { color: #d7005f; }
+.term-fgx162 { color: #d70087; }
+.term-fgx163 { color: #d700af; }
+.term-fgx164 { color: #d700d7; }
+.term-fgx165 { color: #d700ff; }
+.term-fgx166 { color: #d75f00; }
+.term-fgx167 { color: #d75f5f; }
+.term-fgx168 { color: #d75f87; }
+.term-fgx169 { color: #d75faf; }
+.term-fgx170 { color: #d75fd7; }
+.term-fgx171 { color: #d75fff; }
+.term-fgx172 { color: #d78700; }
+.term-fgx173 { color: #d7875f; }
+.term-fgx174 { color: #d78787; }
+.term-fgx175 { color: #d787af; }
+.term-fgx176 { color: #d787d7; }
+.term-fgx177 { color: #d787ff; }
+.term-fgx178 { color: #d7af00; }
+.term-fgx179 { color: #d7af5f; }
+.term-fgx180 { color: #d7af87; }
+.term-fgx181 { color: #d7afaf; }
+.term-fgx182 { color: #d7afd7; }
+.term-fgx183 { color: #d7afff; }
+.term-fgx184 { color: #d7d700; }
+.term-fgx185 { color: #d7d75f; }
+.term-fgx186 { color: #d7d787; }
+.term-fgx187 { color: #d7d7af; }
+.term-fgx188 { color: #d7d7d7; }
+.term-fgx189 { color: #d7d7ff; }
+.term-fgx190 { color: #d7ff00; }
+.term-fgx191 { color: #d7ff5f; }
+.term-fgx192 { color: #d7ff87; }
+.term-fgx193 { color: #d7ffaf; }
+.term-fgx194 { color: #d7ffd7; }
+.term-fgx195 { color: #d7ffff; }
+.term-fgx196 { color: #ff0000; }
+.term-fgx197 { color: #ff005f; }
+.term-fgx198 { color: #ff0087; }
+.term-fgx199 { color: #ff00af; }
+.term-fgx200 { color: #ff00d7; }
+.term-fgx201 { color: #ff00ff; }
+.term-fgx202 { color: #ff5f00; }
+.term-fgx203 { color: #ff5f5f; }
+.term-fgx204 { color: #ff5f87; }
+.term-fgx205 { color: #ff5faf; }
+.term-fgx206 { color: #ff5fd7; }
+.term-fgx207 { color: #ff5fff; }
+.term-fgx208 { color: #ff8700; }
+.term-fgx209 { color: #ff875f; }
+.term-fgx210 { color: #ff8787; }
+.term-fgx211 { color: #ff87af; }
+.term-fgx212 { color: #ff87d7; }
+.term-fgx213 { color: #ff87ff; }
+.term-fgx214 { color: #ffaf00; }
+.term-fgx215 { color: #ffaf5f; }
+.term-fgx216 { color: #ffaf87; }
+.term-fgx217 { color: #ffafaf; }
+.term-fgx218 { color: #ffafd7; }
+.term-fgx219 { color: #ffafff; }
+.term-fgx220 { color: #ffd700; }
+.term-fgx221 { color: #ffd75f; }
+.term-fgx222 { color: #ffd787; }
+.term-fgx223 { color: #ffd7af; }
+.term-fgx224 { color: #ffd7d7; }
+.term-fgx225 { color: #ffd7ff; }
+.term-fgx226 { color: #ffff00; }
+.term-fgx227 { color: #ffff5f; }
+.term-fgx228 { color: #ffff87; }
+.term-fgx229 { color: #ffffaf; }
+.term-fgx230 { color: #ffffd7; }
+.term-fgx231 { color: #ffffff; }
+.term-fgx232 { color: #080808; }
+.term-fgx233 { color: #121212; }
+.term-fgx234 { color: #1c1c1c; }
+.term-fgx235 { color: #262626; }
+.term-fgx236 { color: #303030; }
+.term-fgx237 { color: #3a3a3a; }
+.term-fgx238 { color: #444444; }
+.term-fgx239 { color: #4e4e4e; }
+.term-fgx240 { color: #585858; }
+.term-fgx241 { color: #626262; }
+.term-fgx242 { color: #6c6c6c; }
+.term-fgx243 { color: #767676; }
+.term-fgx244 { color: #808080; }
+.term-fgx245 { color: #8a8a8a; }
+.term-fgx246 { color: #949494; }
+.term-fgx247 { color: #9e9e9e; }
+.term-fgx248 { color: #a8a8a8; }
+.term-fgx249 { color: #b2b2b2; }
+.term-fgx250 { color: #bcbcbc; }
+.term-fgx251 { color: #c6c6c6; }
+.term-fgx252 { color: #d0d0d0; }
+.term-fgx253 { color: #dadada; }
+.term-fgx254 { color: #e4e4e4; }
+.term-fgx255 { color: #eeeeee; }

data/bin/terminal

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# encoding: UTF-8
 
 $:.unshift(File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib'))
 

data/lib/terminal.rb

@@ -1,13 +1,12 @@
 require "terminal/version"
-require "terminal/node"
-require "terminal/color"
-require "terminal/reset"
+require "terminal/screen"
 require "terminal/renderer"
 require "terminal/cli"
 require "terminal/preview"
+require "terminal/engine" if defined?(Rails)
 
 module Terminal
   def self.render(output)
-    Terminal::Renderer.new.render(output)
+    Terminal::Renderer.new(output).render
   end
 end

data/lib/terminal/engine.rb

@@ -0,0 +1,4 @@
+module Terminal
+  class Engine < ::Rails::Engine
+  end
+end

data/lib/terminal/preview.rb

@@ -2,7 +2,30 @@ require 'erb'
 
 module Terminal
   class Preview
-    class Binding < Struct.new(:raw, :rendered)
+    class Binding
+      def initialize(asset_path, raw, rendered)
+        @asset_path = asset_path
+        @raw = raw
+        @rendered = rendered
+      end
+
+      def asset_path(path)
+        File.join(@asset_path, path)
+      end
+
+      def raw
+        # Call out special escape characters to make debugging easier
+        @raw.
+          gsub("\n", "\\n\n").
+          gsub("\r", "\\r").
+          gsub("\b", "\\b").
+          gsub(/\e/, "\\\\e")
+      end
+
+      def rendered
+        @rendered
+      end
+
       def get_binding
         binding
       end
@@ -16,15 +39,23 @@ module Terminal
     def render
       template = File.read(template_path)
       renderer = ERB.new(template)
-      binding = Binding.new(@raw, @rendered)
+      binding = Binding.new(assets_path, @raw, @rendered)
 
       renderer.result(binding.get_binding)
     end
 
     private
 
+    def root_path
+      File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
+    end
+
+    def assets_path
+      File.join(root_path, 'app/assets')
+    end
+
     def template_path
-      File.join(File.expand_path(File.dirname(__FILE__)), 'templates/preview.html.erb')
+      File.join(root_path, 'lib/terminal/templates/preview.html.erb')
     end
   end
 end

data/lib/terminal/renderer.rb

@@ -2,52 +2,30 @@ require 'escape_utils'
 
 module Terminal
   class Renderer
-    # If the string (which is a regex) matches, it'll split on that space, so we
-    # end up with an array of special characters and normal characters, i.e:
-    # [ '\n', '\r', 'a', 'b', '\e123m' ]
-    SPLIT_BY_CHARACTERS = [
-      # \n moves the cursor to a new line
-      # \r moves the cursor to the begining of the line
-      # \b moves the cursor back one
-      '[\n\r\b]',
-
-      # [K Erases from the current cursor position to the end of the current line.
-      '\e\[0?K',
-
-      # Clears tab at the current position
-      '\e\[0?[Gg]',
-
-      # [1K Erases from the current cursor position to the start of the current line.
-      # [2K Erases the entire current line.
-      '\e\[[1-2]K',
-
-      # \e[?D move the cursor back ? many characters
-      '\e\[[\d;]+D',
-
-      # \e[0m reset color information
-      # \e[?m use the ? color going forward
-      '\e\[[\d;]+m',
+    ESCAPE_CONTROL_CHARACTERS = "qQmKGgKAaBbCcDd"
+    MEGABYTES = 1024 * 1024
 
-      # Random escpae sequences
-      '\e',
-
-      # Every other character
-      '.'
-    ]
+    def initialize(output)
+      @output = output
+      @screen = Screen.new
+    end
 
-    SPLIT_BY_CHARACTERS_REGEX = Regexp.new(SPLIT_BY_CHARACTERS.join("|"))
+    def render
+      return "" if @output.nil? || @output.strip.length == 0
 
-    def render(output)
-      return "" if output.nil? || output.strip.length == 0
+      # First duplicate the string, because we're going to be editing and chopping it
+      # up directly.
+      output = @output.dup
 
-      # Limit the entire size of the output to 4 meg (4 * megabyte * kilabyte)
-      max_total_size = 4 * 1024 * 1024
+      # Limit the entire size of the output to 4 meg
+      max_total_size = 4 * MEGABYTES
       if output.bytesize > max_total_size
         output = output.byteslice(0, max_total_size)
         output << "\n\nWarning: Terminal has chopped off the rest of the build as it's over the allowed 4 megabyte limit for logs."
       end
 
       # Limit each line to (x) chars
+      # TODO: Move this to the screen
       max_line_length = 50_000
       output = output.split("\n").map do |line|
         if line.length > max_line_length
@@ -58,154 +36,125 @@ module Terminal
         end
       end.join("\n")
 
-      # Now do the terminal rendering
-      output = emulate_terminal_rendering(sanitize(output))
+      # Force encoding on the output first
+      force_encoding!(output)
 
-      # Replace empty lines with a non breaking space.
-      output.gsub(/$^/, "&nbsp;")
-    end
+      # Now do the render the output to the screen
+      render_to_screen(output)
 
-    private
+      # Convert the screen to a string
+      output = convert_screen_to_string
 
-    def emulate_terminal_rendering(string)
-      # Splits the output into intersting parts.
-      parts = string.scan(SPLIT_BY_CHARACTERS_REGEX)
-
-      lines = []
-
-      index = 0
-      length = string.length
-
-      line = []
-      cursor = 0
-
-      # Every time a color is found, we increment this
-      # counter, every time it resets, we decrement.
-      # We do this so we close all the open spans at the
-      # end of the output.
-      colors_opened = 0
-
-      parts.each do |char|
-        case char
-        when "\n"
-          # Starts writing from a new line
-          lines << line
-          line = []
-          cursor = 0
-        when "\r"
-          # Returns the writing cursor back to the begining of the line
-          cursor = 0
-        when "\e[G", "\e[0G", "\e[g"
-          # TODO: I have no idea how these characters are supposed to work,
-          # but this seems to be produce nicer results that what currently
-          # gets rendered.
-          cursor = 0
-        when "\e[K", "\e[0K"
-          # erases everything after the cursor
-          line = line.fill(" ", cursor..line.length)
-        when "\e[1K"
-          # erases everything before the cursor
-          line = line.fill(" ", 0..cursor)
-        when "\e[2K"
-          # erase entire line
-          line = Array.new(line.length, " ")
-        when "\b"
-          pointer = cursor-1
-
-          # Seek backwards until something that isn't a color is reached. When we
-          # reach it (probably a string) remove the last character of it.
-          # Colors aren't affected by \b
-          while pointer >= 0
-            char_at_pointer = line[pointer]
-
-            unless char_at_pointer.kind_of?(Terminal::Node)
-              line[pointer] = char_at_pointer[0..-2]
-              break
-            end
-
-            pointer -= 1
-          end
-        when /\e\[(\d+)D/
-          backwards = $1.to_i
+      # Escape any HTML
+      output = escape_html(output)
 
-          new_position = cursor - backwards
-          new_position = 0 if new_position < 0
+      # Now convert the colors to HTML
+      convert_to_html(output)
+    end
 
-          cursor = new_position
-        when /\A\e\[(.*)m\z/
-          color_code = $1.to_s
+    private
 
-          # Determine what sort of color code it is.
-          if color_code == "0"
-            line[cursor] = Terminal::Reset.new(colors_opened)
+    def force_encoding!(string)
+      string.force_encoding('UTF-8')
 
-            colors_opened = 0
-          else
-            line[cursor] = Terminal::Color.new(color_code)
+      if string.valid_encoding?
+        string
+      else
+        string.force_encoding('ASCII-8BIT').encode!('UTF-8', invalid: :replace, undef: :replace)
+      end
+    end
 
-            colors_opened += 1
+    def render_to_screen(string)
+      # The when cases are ordered by most likely, the lest checks it has to go
+      # through before matching, the faster the render will be. Colors are
+      # usually most likey, so that's first.
+      split_by_escape_character(string).each do |char|
+        # Hackers way of not having to run a regex over every
+        # character.
+        if char.length == 1
+          case char
+          when "\n"
+            @screen.x = 0
+            @screen.y += 1
+          when "\r"
+            @screen.x = 0
+          when "\r"
+            @screen.x = 0
+          when "\b"
+            @screen.x -= 1
+          else
+            @screen << char
           end
-
-          index += char.length
-          cursor += 1
         else
-          line[cursor] = char
-          cursor += 1
+          handle_escape_code(char)
         end
-
-        # The cursor can't go back furthur than 0, so if you \b at the begining
-        # of a line, nothing happens.
-        cursor = 0 if cursor < 0
-
-        index += 1
-      end
-
-      # Be sure to reset any unclosed colors on the last line
-      if colors_opened > 0
-        line << Terminal::Reset.new(colors_opened)
       end
+    end
 
-      # Add back in the last line if the end of the output
-      # didn't end with a \n
-      lines << line if line.any?
-
-      # Join all the strings back together again
-      lines = lines.map do |parts|
-        completed_line = parts.map(&:to_s).join("")
-      end.join("\n")
-
-      # Now escape all the things
-      lines = EscapeUtils.escape_html(lines)
+    def escape_html(string)
+      EscapeUtils.escape_html(string)
+    end
 
-      matches = []
+    def convert_screen_to_string
+      @screen.to_s
+    end
 
-      # Now we can easily gsub colors like a baws
-      lines.gsub!(/\e\[([0-9;]+)m/) do |match|
-        color_codes = $1.split(';')
+    def handle_escape_code(sequence)
+      # Escapes have the following: \e [ (instruction) (code)
+      parts = sequence.match(/\e\[(.*)([#{ESCAPE_CONTROL_CHARACTERS}])/)
+
+      instruction = parts[1].to_s
+      code = parts[2].to_s
+
+      case code
+      when ""
+        # no-op - an empty \e
+      when "m"
+        @screen.color(instruction)
+      when "G", "g"
+        @screen.x = 0
+      when "K", "k"
+        case instruction
+        when nil, "0"
+          # clear everything after the current x co-ordinate
+          @screen.clear(@screen.y, @screen.x, Screen::END_OF_LINE)
+        when "1"
+          # clear everything before the current x co-ordinate
+          @screen.clear(@screen.y, Screen::START_OF_LINE, @screen.x)
+        when "2"
+          @screen.clear(@screen.y, Screen::START_OF_LINE, Screen::END_OF_LINE)
+        end
+      when "A"
+        @screen.up(instruction)
+      when "B"
+        @screen.down(instruction)
+      when "C"
+        @screen.foward(instruction)
+      when "D"
+        @screen.backward(instruction)
+      end
+    end
 
-        if color_codes == [ "0" ]
-          "</span>"
+    def convert_to_html(string)
+      string = string.gsub(/\e\[([^;m]+);([^;m]+)?;m/) do |match|
+        if $2
+          %{<span class='term-#{$1} term-#{$2}'>}
         else
-          classes = color_codes.map { |code| "c#{code}" }
-
-          "<span class='#{classes.join(" ")}'>"
+          %{<span class='term-#{$1}'>}
         end
       end
 
-      lines
+      string = string.gsub("\e[0m", "</span>")
+
+      # Replace empty lines with a non breaking space.
+      string.gsub(/$^/, "&nbsp;")
     end
 
-    def sanitize(string)
-      string = string.dup.force_encoding('UTF-8')
-      if string.valid_encoding?
-        string
-      else
-        string.
-          force_encoding('ASCII-8BIT').
-          encode!('UTF-8',
-                  invalid: :replace,
-                  undef:   :replace)
-      end
+    # Scan the string to create an array of interesting things, for example
+    # it would look like this:
+    # [ '\n', '\r', 'a', 'b', '\e123m' ]
+    def split_by_escape_character(string)
+      string.scan(/[\n\r\b]|\e\[[\d;]*[#{ESCAPE_CONTROL_CHARACTERS}]|./)
     end
   end
 end