bcat 0.3.0 → 0.4.0

data/bcat.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = 'bcat'
-  s.version = '0.3.0'
-  s.date = '2010-06-21'
+  s.version = '0.4.0'
+  s.date = '2010-06-23'
 
   s.summary     = "browser cat"
   s.description =
@@ -19,16 +19,21 @@ Gem::Specification.new do |s|
     README
     Rakefile
     bcat.gemspec
+    bin/a2h
     bin/bcat
-    bin/bcat-encodehtml
     bin/btee
     lib/bcat.rb
+    lib/bcat/ansi.rb
     lib/bcat/browser.rb
     lib/bcat/html.rb
     lib/bcat/kidgloves.rb
     lib/bcat/reader.rb
+    man/a2h.1.ronn
     man/bcat.1.ronn
     man/btee.1.ronn
+    test/test_bcat_a2h.rb
+    test/test_bcat_ansi.rb
+    test/test_bcat_browser.rb
     test/test_bcat_head_parser.rb
   ]
   # = MANIFEST =

data/bin/a2h

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+# Usage: a2h [-] [<file>...]
+# Convert ANSI/VT100 escape sequences to HTML.
+require 'bcat/ansi'
+require 'bcat/reader'
+
+$stdin.sync = true
+$stdout.sync = true
+
+ARGV.push '-' if ARGV.empty?
+
+reader = Bcat::Reader.new(ARGV.to_a)
+filter = Bcat::ANSI.new(reader)
+filter.each { |text| $stdout.write(text) }

data/bin/bcat

@@ -1,41 +1,45 @@
 #!/usr/bin/env ruby
-#/ Usage: bcat [-ht] [-m <module>] [-T <title>] [<file>]...
+#/ Usage: bcat [-ht] [-a] [-b <browser>] [-T <title>] [<file>]...
 #/        btee <options> [<file>]...
 #/ Pipe to browser utility. Read standard input, possibly one or more <file>s,
 #/ and write concatenated / formatted output to browser. When invoked as btee,
 #/ also write all input back to standard output.
 #/
-#/ Input format (auto detected by default):
-#/   -h, --html           input is already HTML encoded, perhaps a whole document
-#/   -t, --text           input is unencoded text
+#/ Display options:
+#/   -b, --browser=<browser>    open <browser> instead of system default browser
+#/   -T, --title=<text>         use <text> as the browser title
+#/   -a, --ansi                 convert ANSI (color) escape sequences to HTML
 #/
-#/ Tweak output with these options:
-#/   -T, --title=<text>   use <text> as the page title
-#/   -m, --module=<m1>[,<m2>]...
-#/                        inject formatting module(s)
+#/ Input format (auto detected by default):
+#/   -h, --html                 input is already HTML encoded, doc or fragment
+#/   -t, --text                 input is unencoded text
 #/
+#/ Misc options:
 #/   -d, --debug          enable verbose debug logging on stderr
 require 'optparse'
 
 options = {
-  :format => nil,
-  :title  => Dir.pwd,
-  :Host   => '127.0.0.1',
-  :Port   => 8091,
-  :debug  => false,
-  :tee    => !!($0 =~ /tee$/)
+  :Host    => '127.0.0.1',
+  :Port    => 8091,
+  :format  => nil,
+  :title   => Dir.pwd,
+  :browser => (ENV['BCAT_BROWSER'].to_s.size > 0 ? ENV['BCAT_BROWSER'] : 'default'),
+  :ansi    => false,
+  :debug   => false,
+  :tee     => !!($0 =~ /tee$/)
 }
 
 (class <<self;self;end).send(:define_method, :notice) { |message|
   warn "#{File.basename($0)}: #{message}" if options[:debug] }
 
 ARGV.options do |argv|
-  argv.on('-h', '--html')    { options[:format] = 'html' }
-  argv.on('-t', '--text')    { options[:format] = 'text' }
-  argv.on('-a', '--app=v')   { |app|  ENV['BCAT_APPLICATION'] = app }
-  argv.on('-T', '--title=v') { |text| options[:title] = text }
-  argv.on('-d', '--debug')   { options[:debug] = true }
-  argv.on_tail('--help')     { exec "grep ^#/ <#{__FILE__} | cut -c4-" }
+  argv.on('-h', '--html')      { options[:format] = 'html' }
+  argv.on('-t', '--text')      { options[:format] = 'text' }
+  argv.on('-b', '--browser=v') { |app|  options[:browser] = app }
+  argv.on('-T', '--title=v')   { |text| options[:title] = text }
+  argv.on('-a', '--ansi')      { options[:ansi] = true }
+  argv.on('-d', '--debug')     { options[:debug] = true }
+  argv.on_tail('--help')       { exec "grep ^#/ <#{__FILE__} | cut -c4-" }
   argv.parse!
 end
 ARGV.push '-' if ARGV.empty?
@@ -43,9 +47,9 @@ ARGV.push '-' if ARGV.empty?
 require 'bcat'
 notice "loaded bcat v#{Bcat::VERSION}"
 
-include Bcat::Browser
-notice "env BCAT_APPLICATION=#{ENV['BCAT_APPLICATION'].inspect}"
-notice "env BCAT_COMMAND=#{browser_command.inspect}"
+browser = Bcat::Browser.new(options[:browser])
+notice "env BCAT_BROWSER=#{options[:browser].inspect}"
+notice "env BCAT_COMMAND='#{browser.command}'"
 
 notice "starting server"
 pid = nil
@@ -53,13 +57,13 @@ begin
   bcat = Bcat.new(ARGV, options)
   bcat.serve! do |sock|
     url = "http://#{bcat[:Host]}:#{bcat[:Port]}/#{File.basename(Dir.pwd)}"
-    pid = browser(url)
+    pid = browser.open(url)
   end
 rescue Interrupt
   notice "interrupt"
 end
 
 Process.wait(pid) if pid
-status = $?
-notice "browser exited with #{status}"
+status = $?.exitstatus
+notice "browser [pid: #{pid}] exited with #{status}"
 exit status

data/lib/bcat.rb

@@ -1,11 +1,12 @@
 require 'rack'
 require 'bcat/reader'
+require 'bcat/ansi'
 require 'bcat/html'
 require 'bcat/kidgloves'
 require 'bcat/browser'
 
 class Bcat
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
   include Rack::Utils
 
   attr_reader :format
@@ -18,6 +19,7 @@ class Bcat
     @filter = @reader
     @filter = TeeFilter.new(@filter) if @config[:tee]
     @filter = TextFilter.new(@filter) if @format == 'text'
+    @filter = ANSI.new(@filter) if @format == 'text' || @config[:ansi]
   end
 
   def [](key)

data/lib/bcat/ansi.rb

@@ -0,0 +1,169 @@
+class Bcat
+
+  # Converts ANSI color sequences to HTML.
+  #
+  # The ANSI module is based on code from the following libraries:
+  #
+  # ansi2html.sh:
+  #   http://code.google.com/p/wrdese/source/browse/trunk/b/ansi2html.sh?r=5
+  #
+  # HTML::FromANSI:
+  #   http://cpansearch.perl.org/src/NUFFIN/HTML-FromANSI-2.03/lib/HTML/FromANSI.pm
+  class ANSI
+    ESCAPE = "\x1b"
+
+    # Linux console palette
+    STYLES = {
+      'ef0'  => 'color:#000',
+      'ef1'  => 'color:#A00',
+      'ef2'  => 'color:#0A0',
+      'ef3'  => 'color:#A50',
+      'ef4'  => 'color:#00A',
+      'ef5'  => 'color:#A0A',
+      'ef6'  => 'color:#0AA',
+      'ef7'  => 'color:#AAA',
+      'ef8'  => 'color:#555',
+      'ef9'  => 'color:#F55',
+      'ef10' => 'color:#5F5',
+      'ef11' => 'color:#FF5',
+      'ef12' => 'color:#55F',
+      'ef13' => 'color:#F5F',
+      'ef14' => 'color:#5FF',
+      'ef15' => 'color:#FFF',
+      'eb0'  => 'background-color:#000',
+      'eb1'  => 'background-color:#A00',
+      'eb2'  => 'background-color:#0A0',
+      'eb3'  => 'background-color:#A50',
+      'eb4'  => 'background-color:#00A',
+      'eb5'  => 'background-color:#A0A',
+      'eb6'  => 'background-color:#0AA',
+      'eb7'  => 'background-color:#AAA',
+      'eb8'  => 'background-color:#555',
+      'eb9'  => 'background-color:#F55',
+      'eb10' => 'background-color:#5F5',
+      'eb11' => 'background-color:#FF5',
+      'eb12' => 'background-color:#55F',
+      'eb13' => 'background-color:#F5F',
+      'eb14' => 'background-color:#5FF',
+      'eb15' => 'background-color:#FFF'
+    }
+
+    ##
+    # The default xterm 256 colour palette
+
+    (0..5).each do |red|
+      (0..5).each do |green|
+        (0..5).each do |blue|
+          c = 16 + (red * 36) + (green * 6) + blue
+          r = red   > 0 ? red   * 40 + 55 : 0
+          g = green > 0 ? green * 40 + 55 : 0
+          b = blue  > 0 ? blue  * 40 + 55 : 0
+          STYLES["ef#{c}"] = "color:#%2.2x%2.2x%2.2x" % [r, g, b]
+          STYLES["eb#{c}"] = "background-color:#%2.2x%2.2x%2.2x" % [r, g, b]
+        end
+      end
+    end
+
+    (0..23).each do |gray|
+      c = gray+232
+      l = gray*10 + 8
+      STYLES["ef#{c}"] = "color:#%2.2x%2.2x%2.2x" % [l, l, l]
+      STYLES["eb#{c}"] = "background-color:#%2.2x%2.2x%2.2x" % [l, l, l]
+    end
+
+    def initialize(input)
+      @input =
+        if input.respond_to?(:to_str)
+          [input]
+        elsif !input.respond_to?(:each)
+          raise ArgumentError, "input must respond to each"
+        else
+          input
+        end
+      @stack = []
+    end
+
+    def to_html
+      buf = []
+      each { |chunk| buf << chunk }
+      buf.join
+    end
+
+    def each
+      buf = ''
+      @input.each do |chunk|
+        buf << chunk
+        tokenize(buf) do |tok, data|
+          case tok
+          when :text
+            yield data
+          when :display
+            case code = data
+            when 0        ; yield reset_styles if @stack.any?
+            when 1        ; yield push_tag("b") # bright
+            when 2        ; #dim
+            when 3        ; yield push_tag("u")
+            when 5        ; yield push_tag("blink")
+            when 7        ; #reverse
+            when 8        ; yield push_style("display:none")
+            when 9        ; yield push_tag("strike")
+            when 30..37   ; yield push_style("ef#{code - 30}")
+            when 40..47   ; yield push_style("eb#{code - 40}")
+            when 90..97   ; yield push_style("ef#{8 + code - 90}")
+            when 100..107 ; yield push_style("eb#{8 + code - 100}")
+            end 
+          end
+        end
+      end
+      yield buf if !buf.empty?
+      yield reset_styles if @stack.any?
+      self
+    end
+
+    def push_tag(tag, style=nil)
+      style = STYLES[style] if style && !style.include?(':')
+      @stack.push tag
+      [ "<#{tag}",
+        (" style='#{style}'" if style),
+        ">"
+      ].join
+    end
+
+    def push_style(style)
+      push_tag "span", style
+    end
+
+    def reset_styles
+      stack, @stack = @stack, []
+      stack.reverse.map { |tag| "</#{tag}>" }.join
+    end
+
+    def tokenize(text)
+      tokens = [
+        # characters to remove completely
+        [/\A\x08+/, lambda { |m| '' }],
+
+        # ansi escape sequences that mess with the display
+        [/\A\x1b\[((?:\d{1,3};?)+)m/, lambda { |m|
+          m.chomp(';').split(';').
+          each { |code| yield :display, code.to_i };
+          '' }],
+
+        # malformed sequences
+        [/\A\x1b\[?[\d;]{0,3}/, lambda { |m| '' }],
+
+        # real text
+        [/\A([^\x1b\x08]+)/m, lambda { |m| yield :text, m; '' }]
+      ]
+
+      while (size = text.size) > 0
+        tokens.each do |pattern, sub|
+          while text.sub!(pattern) { sub.call($1) }
+          end
+        end
+        break if text.size == size
+      end
+    end
+
+  end
+end

data/lib/bcat/browser.rb

@@ -1,24 +1,69 @@
 class Bcat
-  module Browser
-    def browser(url, application=ENV['BCAT_APPLICATION'])
+  class Browser
+    ENVIRONMENT =
+      case `uname`
+      when /Darwin/       ; 'Darwin'
+      when /Linux/, /BSD/ ; 'X11'
+      else                  'X11'
+      end
+
+    # browser name -> command mappings
+    COMMANDS = {
+      'Darwin' => {
+        'default'     => "open",
+        'safari'      => "open -a Safari",
+        'firefox'     => "open -a Firefox",
+        'chrome'      => "open -a Google\\ Chrome",
+        'chromium'    => "open -a Chromium",
+        'opera'       => "open -a Opera",
+        'curl'        => "curl -s"
+      },
+
+      'X11'  => {
+        'default'     => "xdg-open",
+        'firefox'     => "firefox",
+        'chrome'      => "google-chrome",
+        'chromium'    => "chromium",
+        'mozilla'     => "mozilla",
+        'epiphany'    => "epiphany",
+        'curl'        => "curl -s"
+      }
+    }
+
+    # alternative names for browsers
+    ALIASES = {
+      'google-chrome' => 'chrome',
+      'google chrome' => 'chrome',
+      'gnome'         => 'epiphany'
+    }
+
+    def initialize(browser, command=ENV['BCAT_COMMAND'])
+      @browser = browser
+      @command = command
+    end
+
+    def open(url)
       command = browser_command
       fork do
         [$stdin, $stdout].each { |fd| fd.close }
-        ENV['BCAT_ARGS'] = "-a '#{application}'" if !application.to_s.empty?
-        ENV['BCAT_URL'] = url
-        ENV['BCAT_COMMAND'] = command
-        exec "/bin/sh -c \"#{command.gsub(/"/, '\"')}\""
+        exec "#{command} #{shell_quote(url)}"
       end
     end
 
-    def browser_command
-      return ENV['BCAT_COMMAND'] if !ENV['BCAT_COMMAND'].to_s.empty?
+    def command
+      return @command if @command
+      browser_command
+    end
 
-      case `uname`
-      when /Darwin/       ; 'open $BCAT_ARGS "$BCAT_URL"'
-      when /Linux/, /BSD/ ; 'xdg-open $BCAT_ARGS "$BCAT_URL"'
-      else                ; 'xdg-open "$BCAT_URL"'
-      end
+    def browser_command(browser=@browser)
+      browser ||= 'default'
+      browser = browser.downcase
+      browser = ALIASES[browser] || browser
+      COMMANDS[ENVIRONMENT][browser]
+    end
+
+    def shell_quote(argument)
+      arg = argument.to_s.gsub(/([\\'])/) { "\\" + $1 }
     end
   end
 end

data/man/a2h.1.ronn

@@ -0,0 +1,39 @@
+a2h(1) -- convert ANSI/VT100 escape sequences to HTML
+=====================================================
+
+## SYNOPSIS
+
+`a2h` [-] [<file>...]
+
+## DESCRIPTION
+
+The `a2h` utility reads from standard input, or one or more <file>s, and
+converts ANSI/VT100 escape sequences to inline HTML.
+
+## ESCAPE SEQUENCES
+
+The following escape sequences are supported:
+
+  * `<ESC>[0m`:
+    Resets all attributes / closes all HTML tags.
+  * `<ESC>[1m`=`<b>`:
+    Bold.
+  * `<ESC>[4m`=`<u>`:
+    Underscore.
+  * `<ESC>[5m`=`<blink>`:
+    Blink. Really.
+  * `<ESC>[8m`=`<span style='display:none'>`:
+    Hidden.
+  * `<ESC>[30-37m`=`<span style='color:`<color>`>`:
+    Foreground color.
+  * `<ESC>[40-47m`=`<span style='background-color:`<color>`>`:
+    Background color.
+  * `<ESC>[90-97m`=`<span style='color:`<color>`>`:
+    Light foreground colors.
+  * `<ESC>[100-107m`=`<span style='background-color:`<color>`>`:
+    Light background color.
+
+## SEE ALSO
+
+[ansi2html.sh](http://code.google.com/p/wrdese/source/browse/trunk/b/ansi2html.sh?r=5),
+[HTML::FromANSI](http://cpansearch.perl.org/src/NUFFIN/HTML-FromANSI-2.03/lib/HTML/FromANSI.pm)

data/man/bcat.1.ronn

@@ -17,6 +17,25 @@ addition to being piped into the browser.
 
 ## OPTIONS
 
+`bcat` opens a simple, undecorated page with the system default web browser and
+immediately begins streaming input. The following options control the browser
+display:
+
+  * `-b`, `--browser`=default|firefox|safari|chrome|opera|<other>
+    The name of the browser application. Defaults to the value of the
+    `BCAT_BROWSER` environment variable, or the system default browser when
+    no `BCAT_BROWSER` is defined.
+
+  * `-T`, `--title`=<text>:
+    Use <text> as the page `<title>`. By default, the path to the current working
+    directory is used as the title.
+
+  * `-a`, `--ansi`:
+    Turns on VT100/ANSI escape sequence conversion. This causes all input to be
+    piped through a2h(1), replacing ANSI escape sequences with HTML for things
+    like bold, underline, and colors. On by default when the input is text; use
+    the `-a` option to turn it on when the input is HTML.
+
 By default, `bcat` attempts to detect whether input is HTML or plain text using
 a simple heuristic, but you can force input to be treated as one or the other
 with these options:
@@ -32,15 +51,7 @@ with these options:
     document, or it may be an HTML fragment. `bcat` outputs `<html>`, `<head>`,
     and `<body>` elements even if they are not included in the input.
 
-Customization
-
-  * `-T`, `--title`=<text>:
-    Use <text> as the page `<title>`. By default, the path to the current working
-    directory is used as the title.
-
-  * `-a`, `--app`=`Safari`|`Google Chrome`|`Firefox`:
-    MacOS only. The name of the browser application. This can also be set using
-    the `BCAT_APPLICATION` environment variable.
+Miscellaneous options:
 
   * `-d`, `--debug`:
     Turn on verbose debug logging to standard error. Include this output when
@@ -48,14 +59,16 @@ Customization
 
 ## ENVIRONMENT
 
-  * `BCAT_COMMAND`=`open -a $BCAT_APPLICATION $url`:
-  * `BCAT_COMMAND`=`xdg-open "$url"`:
-    The command used to launch to the browser application.
+  * `BCAT_BROWSER`=default|firefox|safari|chrome|opera|<other>:
+    The name of the browser to use by default. `bcat` maps this to an
+    actual browser command based on the current platform. The special
+    value "default" maps to the system default browser.
 
-  * `BCAT_APPLICATION`=[`Safari` | `Google Chrome` | `Firefox`]:
-    MacOS X only. The name of the browser application . This is given as the
-    value of the `-a` argument to open(1). When `BCAT_APPLICATION` is undefined,
-    the system default browser is used.
+  * `BCAT_COMMAND`=<command>:
+    The entire browser command line (to be executed by `/bin/sh`). This
+    overrides the `BCAT_BROWSER` environment variable and makes the `--browser`
+    (`-b`) option a no-op. This should only be necessary when running a
+    browser unknown to bcat or in order to pass special arguments.
 
 ## SEE ALSO
 

data/man/btee.1.ronn

@@ -17,6 +17,25 @@ addition to being piped into the browser.
 
 ## OPTIONS
 
+`bcat` opens a simple, undecorated page with the system default web browser and
+immediately begins streaming input. The following options control the browser
+display:
+
+  * `-b`, `--browser`=default|firefox|safari|chrome|opera|<other>
+    The name of the browser application. Defaults to the value of the
+    `BCAT_BROWSER` environment variable, or the system default browser when
+    no `BCAT_BROWSER` is defined.
+
+  * `-T`, `--title`=<text>:
+    Use <text> as the page `<title>`. By default, the path to the current working
+    directory is used as the title.
+
+  * `-a`, `--ansi`:
+    Turns on VT100/ANSI escape sequence conversion. This causes all input to be
+    piped through a2h(1), replacing ANSI escape sequences with HTML for things
+    like bold, underline, and colors. On by default when the input is text; use
+    the `-a` option to turn it on when the input is HTML.
+
 By default, `bcat` attempts to detect whether input is HTML or plain text using
 a simple heuristic, but you can force input to be treated as one or the other
 with these options:
@@ -32,15 +51,7 @@ with these options:
     document, or it may be an HTML fragment. `bcat` outputs `<html>`, `<head>`,
     and `<body>` elements even if they are not included in the input.
 
-Customization
-
-  * `-T`, `--title`=<text>:
-    Use <text> as the page `<title>`. By default, the path to the current working
-    directory is used as the title.
-
-  * `-a`, `--app`=`Safari`|`Google Chrome`|`Firefox`:
-    MacOS only. The name of the browser application. This can also be set using
-    the `BCAT_APPLICATION` environment variable.
+Miscellaneous options:
 
   * `-d`, `--debug`:
     Turn on verbose debug logging to standard error. Include this output when
@@ -48,14 +59,16 @@ Customization
 
 ## ENVIRONMENT
 
-  * `BCAT_COMMAND`=`open -a $BCAT_APPLICATION $url`:
-  * `BCAT_COMMAND`=`xdg-open "$url"`:
-    The command used to launch to the browser application.
+  * `BCAT_BROWSER`=default|firefox|safari|chrome|opera|<other>:
+    The name of the browser to use by default. `bcat` maps this to an
+    actual browser command based on the current platform. The special
+    value "default" maps to the system default browser.
 
-  * `BCAT_APPLICATION`=[`Safari` | `Google Chrome` | `Firefox`]:
-    MacOS X only. The name of the browser application . This is given as the
-    value of the `-a` argument to open(1). When `BCAT_APPLICATION` is undefined,
-    the system default browser is used.
+  * `BCAT_COMMAND`=<command>:
+    The entire browser command line (to be executed by `/bin/sh`). This
+    overrides the `BCAT_BROWSER` environment variable and makes the `--browser`
+    (`-b`) option a no-op. This should only be necessary when running a
+    browser unknown to bcat or in order to pass special arguments.
 
 ## SEE ALSO
 

data/test/test_bcat_a2h.rb

@@ -0,0 +1,19 @@
+require 'contest'
+
+ENV['PATH'] = [File.expand_path('../../bin'), ENV['PATH']].join(':')
+
+class ANSI2HTMLCommandTest < Test::Unit::TestCase
+  test "piping stuff through a2h" do
+    IO.popen("a2h", 'w+') do |io|
+      io.sync = true
+      io.puts "hello there"
+      io.flush
+      assert_equal "hello there\n", io.read("hello there\n".size)
+      io.puts "and \x1b[1mhere's some bold"
+      assert_equal "and <b>here's some bold\n", io.read(24)
+      io.close_write
+      assert_equal "</b>", io.read(4)
+      io.close
+    end
+  end
+end

data/test/test_bcat_ansi.rb

@@ -0,0 +1,115 @@
+require 'contest'
+require 'bcat/ansi'
+
+class ANSITest < Test::Unit::TestCase
+  test 'should not modify input string' do
+    text = "some text"
+    Bcat::ANSI.new(text).to_html
+    assert_equal "some text", text
+  end
+
+  test 'passing through text with no escapes' do
+    text = "hello\nthis is bcat\n"
+    ansi = Bcat::ANSI.new(text)
+    assert_equal text, ansi.to_html
+  end
+
+  test "removing backspace characters" do
+    text = "like this"
+    ansi = Bcat::ANSI.new(text)
+    assert_equal "like this", ansi.to_html
+  end
+
+  test "foreground colors" do
+    text = "colors: \x1b[30mblack\x1b[37mwhite"
+    expect = "colors: " +
+      "<span style='color:#000'>black" +
+      "<span style='color:#AAA'>white" +
+      "</span></span>"
+    assert_equal expect, Bcat::ANSI.new(text).to_html
+  end
+
+  test "light foreground colors" do
+    text = "colors: \x1b[90mblack\x1b[97mwhite"
+    expect = "colors: " +
+      "<span style='color:#555'>black" +
+      "<span style='color:#FFF'>white" +
+      "</span></span>"
+    assert_equal expect, Bcat::ANSI.new(text).to_html
+  end
+
+  test "background colors" do
+    text = "colors: \x1b[40mblack\x1b[47mwhite"
+    expect = "colors: " +
+      "<span style='background-color:#000'>black" +
+      "<span style='background-color:#AAA'>white" +
+      "</span></span>"
+    assert_equal expect, Bcat::ANSI.new(text).to_html
+  end
+
+  test "light background colors" do
+    text = "colors: \x1b[100mblack\x1b[107mwhite"
+    expect = "colors: " +
+      "<span style='background-color:#555'>black" +
+      "<span style='background-color:#FFF'>white" +
+      "</span></span>"
+    assert_equal expect, Bcat::ANSI.new(text).to_html
+  end
+
+  test "strikethrough" do
+    text = "strike: \x1b[9mthat"
+    expect = "strike: <strike>that</strike>"
+    assert_equal expect, Bcat::ANSI.new(text).to_html
+  end
+
+  test "blink!" do
+    text = "blink: \x1b[5mwhat"
+    expect = "blink: <blink>what</blink>"
+    assert_equal expect, Bcat::ANSI.new(text).to_html
+  end
+
+  test "underline" do
+    text = "underline: \x1b[3mstuff"
+    expect = "underline: <u>stuff</u>"
+    assert_equal expect, Bcat::ANSI.new(text).to_html
+  end
+
+  test "bold" do
+    text = "bold: \x1b[1mstuff"
+    expect = "bold: <b>stuff</b>"
+    assert_equal expect, Bcat::ANSI.new(text).to_html
+  end
+
+  test "resetting a single sequence" do
+    text = "\x1b[1mthis is bold\x1b[0m, but this isn't"
+    expect = "<b>this is bold</b>, but this isn't"
+    assert_equal expect, Bcat::ANSI.new(text).to_html
+  end
+
+  test "resetting many sequences" do
+    text = "normal, \x1b[1mbold, \x1b[3munderline, \x1b[31mred\x1b[0m, normal"
+    expect = "normal, <b>bold, <u>underline, " +
+      "<span style='color:#A00'>red</span></u></b>, normal"
+    assert_equal expect, Bcat::ANSI.new(text).to_html
+  end
+
+  test "multi-attribute sequences" do
+    text = "normal, \x1b[1;3;31mbold, underline, and red\x1b[0m, normal"
+    expect = "normal, <b><u><span style='color:#A00'>" +
+      "bold, underline, and red</span></u></b>, normal"
+    assert_equal expect, Bcat::ANSI.new(text).to_html
+  end
+
+  test "multi-attribute sequences with a trailing semi-colon" do
+    text = "normal, \x1b[1;3;31;mbold, underline, and red\x1b[0m, normal"
+    expect = "normal, <b><u><span style='color:#A00'>" +
+      "bold, underline, and red</span></u></b>, normal"
+    assert_equal expect, Bcat::ANSI.new(text).to_html
+  end
+
+  test "eating malformed sequences" do
+    text = "\x1b[25oops forgot the 'm'"
+    expect = "oops forgot the 'm'"
+    assert_equal expect, Bcat::ANSI.new(text).to_html
+  end
+end

data/test/test_bcat_browser.rb

@@ -0,0 +1,5 @@
+require 'contest'
+require 'bcat/browser'
+
+class BrowserTest < Test::Unit::TestCase
+end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bcat
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  hash: 15
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Ryan Tomayko
@@ -9,19 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-21 00:00:00 -07:00
+date: 2010-06-23 00:00:00 -07:00
 default_executable: bcat
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: Concatenate input from standard input, or one or more files, and write progressive output to a browser.
 email: rtomayko@gmail.com
 executables: 
@@ -37,16 +47,21 @@ files:
 - README
 - Rakefile
 - bcat.gemspec
+- bin/a2h
 - bin/bcat
-- bin/bcat-encodehtml
 - bin/btee
 - lib/bcat.rb
+- lib/bcat/ansi.rb
 - lib/bcat/browser.rb
 - lib/bcat/html.rb
 - lib/bcat/kidgloves.rb
 - lib/bcat/reader.rb
+- man/a2h.1.ronn
 - man/bcat.1.ronn
 - man/btee.1.ronn
+- test/test_bcat_a2h.rb
+- test/test_bcat_ansi.rb
+- test/test_bcat_browser.rb
 - test/test_bcat_head_parser.rb
 has_rdoc: true
 homepage: http://github.com/rtomayko/bcat/
@@ -59,21 +74,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: browser cat

data/bin/bcat-encodehtml

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-# Usage: bcat-encodehtml
-# Read text from stdin and write HTML encoded result to stdout.
-
-while char = $stdin.getc
-  case char
-  when ?<
-    $stdout.write('&lt;')
-  when ?&
-    $stdout.write('&amp;')
-  else
-    $stdout.putc(char)
-  end
-end