term-ansicolor 1.0.6 → 1.0.7

data/.gitignore

@@ -1,3 +1,5 @@
 .*.sw[pon]
+.rvmrc
 Gemfile.lock
+coverage
 pkg

data/.travis.yml

@@ -0,0 +1,8 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - ruby-head
+  - ree
+  - rbx
+  - jruby

data/Rakefile

@@ -12,7 +12,7 @@ GemHadar do
   summary     'Ruby library that colors strings using ANSI escape sequences'
   description ''
   test_dir    'tests'
-  ignore      '.*.sw[pon]', 'pkg', 'Gemfile.lock'
+  ignore      '.*.sw[pon]', 'pkg', 'Gemfile.lock', '.rvmrc', 'coverage'
   readme      'README.rdoc'
   executables << 'cdiff' << 'decolor'
 

data/VERSION

@@ -1 +1 @@
-1.0.6
+1.0.7

data/examples/example.rb

@@ -79,7 +79,7 @@ print red { bold { "All supported attributes = " } },
   blue { symbols.inspect }, "\n\n"
 
 print "Send symbols to strings:".send(:red).send(:bold), "\n"
-print symbols[12, 8].map { |c| c.to_s.send(c) }, "\n\n"
+print symbols[12, 8].map { |c| c.to_s.send(c) } * '', "\n\n"
 
 print red { bold { "Make strings monochromatic again:" } }, "\n"
 print [
@@ -87,4 +87,4 @@ print [
     "not red anymore".red.uncolored,
     uncolored { "not red anymore".red },
     uncolored("not red anymore".red)
-  ].map { |x| x + "\n" }
+  ].map { |x| x + "\n" } * ''

data/lib/term/ansicolor.rb

@@ -1,44 +1,73 @@
 module Term
-  require 'term/ansicolor/version'
 
   # The ANSIColor module can be used for namespacing and mixed into your own
   # classes.
   module ANSIColor
+    require 'term/ansicolor/version'
+
     # :stopdoc:
     ATTRIBUTES = [
-      [ :clear        ,   0 ], 
-      [ :reset        ,   0 ],     # synonym for :clear
-      [ :bold         ,   1 ], 
-      [ :dark         ,   2 ], 
-      [ :italic       ,   3 ],     # not widely implemented
-      [ :underline    ,   4 ], 
-      [ :underscore   ,   4 ],     # synonym for :underline
-      [ :blink        ,   5 ], 
-      [ :rapid_blink  ,   6 ],     # not widely implemented
-      [ :negative     ,   7 ],     # no reverse because of String#reverse
-      [ :concealed    ,   8 ], 
-      [ :strikethrough,   9 ],     # not widely implemented
-      [ :black        ,  30 ], 
-      [ :red          ,  31 ], 
-      [ :green        ,  32 ], 
-      [ :yellow       ,  33 ], 
-      [ :blue         ,  34 ], 
-      [ :magenta      ,  35 ], 
-      [ :cyan         ,  36 ], 
-      [ :white        ,  37 ], 
-      [ :on_black     ,  40 ], 
-      [ :on_red       ,  41 ], 
-      [ :on_green     ,  42 ], 
-      [ :on_yellow    ,  43 ], 
-      [ :on_blue      ,  44 ], 
-      [ :on_magenta   ,  45 ], 
-      [ :on_cyan      ,  46 ], 
-      [ :on_white     ,  47 ], 
+      [ :clear              ,   0 ],     # String#clear is already used to empty string in Ruby 1.9
+      [ :reset              ,   0 ],     # synonym for :clear
+      [ :bold               ,   1 ], 
+      [ :dark               ,   2 ], 
+      [ :italic             ,   3 ],     # not widely implemented
+      [ :underline          ,   4 ], 
+      [ :underscore         ,   4 ],     # synonym for :underline
+      [ :blink              ,   5 ], 
+      [ :rapid_blink        ,   6 ],     # not widely implemented
+      [ :negative           ,   7 ],     # no reverse because of String#reverse
+      [ :concealed          ,   8 ], 
+      [ :strikethrough      ,   9 ],     # not widely implemented
+      [ :black              ,  30 ], 
+      [ :red                ,  31 ], 
+      [ :green              ,  32 ], 
+      [ :yellow             ,  33 ], 
+      [ :blue               ,  34 ], 
+      [ :magenta            ,  35 ], 
+      [ :cyan               ,  36 ], 
+      [ :white              ,  37 ], 
+      [ :on_black           ,  40 ], 
+      [ :on_red             ,  41 ], 
+      [ :on_green           ,  42 ], 
+      [ :on_yellow          ,  43 ], 
+      [ :on_blue            ,  44 ], 
+      [ :on_magenta         ,  45 ], 
+      [ :on_cyan            ,  46 ], 
+      [ :on_white           ,  47 ],
+      [ :intense_black      ,  90 ],    # High intensity, aixterm (works in OS X)
+      [ :intense_red        ,  91 ], 
+      [ :intense_green      ,  92 ], 
+      [ :intense_yellow     ,  93 ], 
+      [ :intense_blue       ,  94 ], 
+      [ :intense_magenta    ,  95 ], 
+      [ :intense_cyan       ,  96 ], 
+      [ :intense_white      ,  97 ], 
+      [ :on_intense_black   , 100 ],    # High intensity background, aixterm (works in OS X)
+      [ :on_intense_red     , 101 ], 
+      [ :on_intense_green   , 102 ], 
+      [ :on_intense_yellow  , 103 ], 
+      [ :on_intense_blue    , 104 ], 
+      [ :on_intense_magenta , 105 ], 
+      [ :on_intense_cyan    , 106 ], 
+      [ :on_intense_white   , 107 ]
     ]
 
     ATTRIBUTE_NAMES = ATTRIBUTES.transpose.first
     # :startdoc:
 
+    # Returns true if Term::ANSIColor supports the +feature+.
+    #
+    # The feature :clear, that is mixing the clear color attribute into String,
+    # is only supported on ruby implementations, that do *not* already
+    # implement the String#clear method. It's better to use the reset color
+    # attribute instead.
+    def support?(feature)
+      case feature
+      when :clear
+        !String.instance_methods(false).map(&:to_sym).include?(:clear)
+      end
+    end
     # Returns true, if the coloring function of this module
     # is switched on, false otherwise.
     def self.coloring?
@@ -54,36 +83,36 @@ module Term
     self.coloring = true
 
     ATTRIBUTES.each do |c, v|
-      eval %Q{
-          def #{c}(string = nil)
-            result = ''
-            result << "\e[#{v}m" if Term::ANSIColor.coloring?
-            if block_given?
-              result << yield
-            elsif string
-              result << string
-            elsif respond_to?(:to_str)
-              result << to_str
-            else
-              return result #only switch on
-            end
-            result << "\e[0m" if Term::ANSIColor.coloring?
-            result
+      eval <<-EOT
+        def #{c}(string = nil)
+          result = ''
+          result << "\e[#{v}m" if Term::ANSIColor.coloring?
+          if block_given?
+            result << yield
+          elsif string.respond_to?(:to_str)
+            result << string.to_str
+          elsif respond_to?(:to_str)
+            result << to_str
+          else
+            return result #only switch on
           end
-      }
+          result << "\e[0m" if Term::ANSIColor.coloring?
+          result
+        end
+      EOT
     end
 
     # Regular expression that is used to scan for ANSI-sequences while
     # uncoloring strings.
-    COLORED_REGEXP = /\e\[(?:[34][0-7]|[0-9])?m/
+    COLORED_REGEXP = /\e\[(?:(?:[349]|10)[0-7]|[0-9])?m/
 
     # Returns an uncolored version of the string, that is all
     # ANSI-sequences are stripped from the string.
     def uncolored(string = nil) # :yields:
       if block_given?
-        yield.gsub(COLORED_REGEXP, '')
-      elsif string
-        string.gsub(COLORED_REGEXP, '')
+        yield.to_str.gsub(COLORED_REGEXP, '')
+      elsif string.respond_to?(:to_str)
+        string.to_str.gsub(COLORED_REGEXP, '')
       elsif respond_to?(:to_str)
         to_str.gsub(COLORED_REGEXP, '')
       else

data/lib/term/ansicolor/version.rb

@@ -1,6 +1,6 @@
 module Term::ANSIColor
   # Term::ANSIColor version
-  VERSION         = '1.0.6'
+  VERSION         = '1.0.7'
   VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/term-ansicolor.gemspec

@@ -1,33 +1,33 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{term-ansicolor}
-  s.version = "1.0.6"
+  s.name = "term-ansicolor"
+  s.version = "1.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Florian Frank}]
-  s.date = %q{2011-07-21}
-  s.description = %q{}
-  s.email = %q{flori@ping.de}
-  s.executables = [%q{decolor}, %q{cdiff}]
-  s.extra_rdoc_files = [%q{README.rdoc}, %q{lib/term/ansicolor/version.rb}, %q{lib/term/ansicolor.rb}]
-  s.files = [%q{.gitignore}, %q{CHANGES}, %q{COPYING}, %q{Gemfile}, %q{README.rdoc}, %q{Rakefile}, %q{VERSION}, %q{bin/cdiff}, %q{bin/decolor}, %q{doc-main.txt}, %q{examples/example.rb}, %q{install.rb}, %q{lib/term/ansicolor.rb}, %q{lib/term/ansicolor/.keep}, %q{lib/term/ansicolor/version.rb}, %q{term-ansicolor.gemspec}, %q{tests/ansicolor_test.rb}]
-  s.homepage = %q{http://flori.github.com/term-ansicolor}
-  s.rdoc_options = [%q{--title}, %q{Term-ansicolor - Ruby library that colors strings using ANSI escape sequences}, %q{--main}, %q{README.rdoc}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.5}
-  s.summary = %q{Ruby library that colors strings using ANSI escape sequences}
-  s.test_files = [%q{tests/ansicolor_test.rb}]
+  s.authors = ["Florian Frank"]
+  s.date = "2011-10-13"
+  s.description = ""
+  s.email = "flori@ping.de"
+  s.executables = ["cdiff", "decolor"]
+  s.extra_rdoc_files = ["README.rdoc", "lib/term/ansicolor/version.rb", "lib/term/ansicolor.rb"]
+  s.files = [".gitignore", ".travis.yml", "CHANGES", "COPYING", "Gemfile", "README.rdoc", "Rakefile", "VERSION", "bin/cdiff", "bin/decolor", "doc-main.txt", "examples/example.rb", "install.rb", "lib/term/ansicolor.rb", "lib/term/ansicolor/.keep", "lib/term/ansicolor/version.rb", "term-ansicolor.gemspec", "tests/ansicolor_test.rb"]
+  s.homepage = "http://flori.github.com/term-ansicolor"
+  s.rdoc_options = ["--title", "Term-ansicolor - Ruby library that colors strings using ANSI escape sequences", "--main", "README.rdoc"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.11"
+  s.summary = "Ruby library that colors strings using ANSI escape sequences"
+  s.test_files = ["tests/ansicolor_test.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<gem_hadar>, ["~> 0.0.8"])
+      s.add_development_dependency(%q<gem_hadar>, ["~> 0.1.1"])
     else
-      s.add_dependency(%q<gem_hadar>, ["~> 0.0.8"])
+      s.add_dependency(%q<gem_hadar>, ["~> 0.1.1"])
     end
   else
-    s.add_dependency(%q<gem_hadar>, ["~> 0.0.8"])
+    s.add_dependency(%q<gem_hadar>, ["~> 0.1.1"])
   end
 end

data/tests/ansicolor_test.rb

@@ -11,6 +11,16 @@ class Color
   extend Term::ANSIColor
 end
 
+class StringLike
+  def initialize(string)
+    @string = string
+  end
+
+  def to_str
+    @string
+  end
+end
+
 class ANSIColorTest < Test::Unit::TestCase
   include Term::ANSIColor
 
@@ -18,9 +28,11 @@ class ANSIColorTest < Test::Unit::TestCase
     @string = "red"
     @string_red = "\e[31mred\e[0m"
     @string_red_on_green = "\e[42m\e[31mred\e[0m\e[0m"
+    @string_like = StringLike.new(@string)
+    @string_like_red = StringLike.new(@string_red)
   end
 
-  attr_reader :string, :string_red, :string_red_on_green
+  attr_reader :string, :string_red, :string_red_on_green, :string_like, :string_like_red
 
   def test_red
     assert_equal string_red, string.red
@@ -43,16 +55,24 @@ class ANSIColorTest < Test::Unit::TestCase
   def test_uncolored
     assert_equal string, string_red.uncolored
     assert_equal string, Color.uncolored(string_red)
+    assert_equal string, Color.uncolored(string_like_red)
     assert_equal string, Color.uncolored { string_red }
+    assert_equal string, Color.uncolored { string_like_red }
     assert_equal string, Term::ANSIColor.uncolored { string_red }
+    assert_equal string, Term::ANSIColor.uncolored { string_like_red }
     assert_equal string, uncolored { string }
+    assert_equal string, uncolored { string_like_red }
+    assert_equal "", uncolored(Object.new)
   end
 
   def test_attributes
     foo = 'foo'
     for (a, _) in Term::ANSIColor.attributes
-      assert_not_equal foo, foo_colored = foo.__send__(a)
-      assert_equal foo, foo_colored.uncolored
+      # skip clear for Ruby 1.9 which implements String#clear to empty the string
+      if a != :clear || Term::ANSIColor.support?(:clear)
+        assert_not_equal foo, foo_colored = foo.__send__(a)
+        assert_equal foo, foo_colored.uncolored
+      end
       assert_not_equal foo, foo_colored = Color.__send__(a, foo)
       assert_equal foo, Color.uncolored(foo_colored)
       assert_not_equal foo, foo_colored = Color.__send__(a) { foo }
@@ -63,4 +83,8 @@ class ANSIColorTest < Test::Unit::TestCase
       assert_equal foo, uncolored { foo_colored }
     end
   end
+
+  def test_coloring_string_like
+    assert_equal "\e[31mred\e[0m", red(string_like)
+  end
 end

metadata

@@ -1,51 +1,40 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: term-ansicolor
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 1.0.7
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 6
-  version: 1.0.6
 platform: ruby
-authors: 
+authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-21 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-13 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: gem_hadar
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &74228550 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 0
-        - 8
-        version: 0.0.8
+      - !ruby/object:Gem::Version
+        version: 0.1.1
   type: :development
-  version_requirements: *id001
-description: ""
+  prerelease: false
+  version_requirements: *74228550
+description: ''
 email: flori@ping.de
-executables: 
-- decolor
+executables:
 - cdiff
+- decolor
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - lib/term/ansicolor/version.rb
 - lib/term/ansicolor.rb
-files: 
+files:
 - .gitignore
+- .travis.yml
 - CHANGES
 - COPYING
 - Gemfile
@@ -64,39 +53,31 @@ files:
 - tests/ansicolor_test.rb
 homepage: http://flori.github.com/term-ansicolor
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --title
 - Term-ansicolor - Ruby library that colors strings using ANSI escape sequences
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Ruby library that colors strings using ANSI escape sequences
-test_files: 
+test_files:
 - tests/ansicolor_test.rb