termcolor 1.1.0 → 1.2.0

data/Rakefile

@@ -17,8 +17,8 @@ task :gemspec do |t|
 Gem::Specification.new do |s|
   s.name = 'termcolor'
   s.version = '#{TermColor::VERSION}'
-  s.summary = "Termcolor is a library for ANSI color formatting like HTML for output in terminal."
-  s.description = "Termcolor is a library for ANSI color formatting like HTML for output in terminal."
+  s.summary = %q(Termcolor is a library for ANSI color formatting like HTML for output in terminal.)
+  s.description = %q(Termcolor is a library for ANSI color formatting like HTML for output in terminal. '<red>red</red>'.termcolor #=> "\e[31mred\e[0m")
   s.files = %w( #{Dir['lib/**/*.rb'].join(' ')}
                 #{Dir['spec/**/*.rb'].join(' ')}
                 #{Dir['examples/**/*.rb'].join(' ')}

data/lib/termcolor.rb

@@ -7,7 +7,7 @@ require 'rexml/parsers/baseparser'
 require 'rexml/streamlistener' 
 
 module TermColor
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
   include REXML
 
   class << self
@@ -86,15 +86,24 @@ module TermColor
     end
 
     def to_esc_seq(name)
-      esc_seq = nil
-      begin
-        esc_seq = HighLine.const_get(name.upcase)
-      rescue NameError
-        if name =~ /^[^0-9]?(\d+)$/
-          esc_seq = "\e[#{$1}m"
+      if (HighLine.const_defined?(name.upcase) rescue false)
+        HighLine.const_get(name.upcase)
+      else
+        case name
+        when /^([fb])(\d+)$/
+          fb = $1 == 'f' ? 38 : 48
+          color = $2.size == 3 ? 16 + $2.to_i(6) : 232 + $2.to_i
+          "\e[#{fb};5;#{color}m"
+        when /^[^0-9]?(\d+)$/
+          "\e[#{$1}m"
         end
       end
-      esc_seq
     end
   end
 end
+
+class String
+  def termcolor
+    TermColor.parse(self)
+  end
+end

data/spec/termcolor_spec.rb

@@ -30,6 +30,18 @@ module TermColor
       text.should == "aa\e[30mbbbbbbb\e[32mcccc\e[90mddd\e[0m\e[32mc\e[0m\e[30mb\e[0maaa"
     end
 
+    it 'should parse 4' do
+      text = TermColor.parse('aa<f123>bbbbbbb<b321>ccccc</b321>b</f123>aaa')
+      puts text
+      text.should == "aa\e[38;5;67mbbbbbbb\e[48;5;137mccccc\e[0m\e[38;5;67mb\e[0maaa"
+    end
+
+    it 'should parse 5' do
+      text = TermColor.parse('aa<f12>bbbbbbb<b6>ccccc</b6>b</f12>aaa')
+      puts text
+      text.should == "aa\e[38;5;244mbbbbbbb\e[48;5;238mccccc\e[0m\e[38;5;244mb\e[0maaa"
+    end
+
     it 'should raise Error' do
       lambda{ TermColor.parse('aaaaa<red>aaaaa</blue>aaaaa') }.should raise_error(REXML::ParseException)
       lambda{ TermColor.parse('aaaaa<red>aaaaaaaaaa') }.should_not raise_error(REXML::ParseException)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: termcolor
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - jugyo
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-18 00:00:00 +09:00
+date: 2009-12-28 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.5.0
     version: 
-description: Termcolor is a library for ANSI color formatting like HTML for output in terminal.
+description: "Termcolor is a library for ANSI color formatting like HTML for output in terminal. '<red>red</red>'.termcolor #=> \"\e[31mred\e[0m\""
 email: jugyo.org@gmail.com
 executables: []
 
@@ -66,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: termcolor
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Termcolor is a library for ANSI color formatting like HTML for output in terminal.