term-ansicolor 1.1.3 → 1.1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWQ4Yjg1MjdjMDU0NWRiYjAwZmNlOTZmMjRmMWY3NDhjZjA1ODI2MQ==
+    NmJjN2JlMmUwMTMwOGYzYzZjNTU2NGMyZDc2N2UyMDdmYmFlNTRjZg==
   data.tar.gz: !binary |-
-    MGRkYzFmZGQzOTRkMDY0OGQwNjYwZTFhYjZkYWE3MjEyNDE2MTA0Mw==
+    ZGExZTJkNWY3NWQ5OGI0YmYyYjQ2ZGRiMDQyZGQ2OGJlYjUzNmY2Nw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MjU3MmI1YjhhN2NkZjRlNjJmOGY0MWU5NTJhYzZhNjJkYTQwNjdiYTY4NTVj
-    YzM4MzUzZmRmMjI0MjE0YTEzNWI3NjIwOGYwN2UxZTNiNTk3NGY1ODU3ODU0
-    MDllNTdjOWYyNjBjZmExNGYwNmU3ZmJjYWUwNDRmZGQ1OGI4NjM=
+    MGRjODI4NWNiMzAwY2MzODBlMzUzZTNiNWM0OTAxYzI5NmUyMmMxOGJlZTZi
+    ZDJkYTQ0ZTlhMjJlMzhlZTBkZTZjNmIyMDI5MzljOGJmZTUxZTk2N2QyN2Fi
+    OGExNjJkOTg5NzhmZTZmZjIxMWZkZmViMTc1NmU3ODI2MTgxZjQ=
   data.tar.gz: !binary |-
-    ZTc2NDEwODcxNmFiY2M3NTNjOThlMjZhMGFhZTNiMDc3NmNhZWJmMGQ3MmI4
-    MDRiNDI2MWE4MjdkMzU2MjczZTY3OTMwYzUxMGRlYmFiNWE1MjZjYzg1YmVh
-    NDNhMWU2ZTUxYzEwZjM2YmExMjJhNjhiMDhmNGNhMmQ1MWJjZGE=
+    ZjhlZGUwNTExNDk2NTNjNWMyOTY5NWJmNzYzZjZjZDcxYWZiYjY4MjA3MGEx
+    MmM3ZTBiMzRkZjEyOTAzNzk0YjRkMjZiNjNkMzgwNTVkZTMwMjAzZTA2OTZh
+    YjcwZTI2MTI5ZmUzMzg3Y2Y0ZWY4ZWY0Nzc4MzU4ODcyMTE4Y2E=

data/CHANGES

@@ -1,6 +1,6 @@
-2013-03-26 - 1.1.3 * Fix a bug where respond_to could overflow the stack.
-                   * Easier access to color attributes via color(123) or
+2013-03-26 - 1.1.4 * Easier access to color attributes via color(123) or
                      approximate html colors like color('#336caf').
+2013-03-26 - 1.1.3 * Fix a bug where respond_to could overflow the stack.
 2013-03-25 - 1.1.2 * Change the API: color0 - color255 to color(:color0) -
                      color(:color255), and on_color0 to on_color(:color0) -
                      on_color(:color255); the previous way caused some

data/VERSION

@@ -1 +1 @@
-1.1.3
+1.1.4

data/lib/term/ansicolor.rb

@@ -185,12 +185,7 @@ module Term
     # color +name+. If string isn't a string only the escape sequence to switch
     # on the color +name+ is returned.
     def color(name, string = nil, &block)
-      attribute = Attribute.get(name)
-      attribute ||=
-        name.to_s =~ /\Aon_/ ?
-        Attribute.nearest_rgb_on_color(name) :
-        Attribute.nearest_rgb_color(name)
-      attribute or raise ArgumentError, "unknown attribute #{name.inspect}"
+      attribute = Attribute[name] or raise ArgumentError, "unknown attribute #{name.inspect}"
       result = ''
       result << "\e[#{attribute.code}m" if Term::ANSIColor.coloring?
       if block_given?

data/lib/term/ansicolor/version.rb

@@ -1,6 +1,6 @@
 module Term::ANSIColor
   # Term::ANSIColor version
-  VERSION         = '1.1.3'
+  VERSION         = '1.1.4'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/term-ansicolor.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "term-ansicolor"
-  s.version = "1.1.3"
+  s.version = "1.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Florian Frank"]

data/tests/ansicolor_test.rb

@@ -56,6 +56,13 @@ class ANSIColorTest < Test::Unit::TestCase
     assert_equal "\e[38;5;128mfoo\e[0m", "foo".color(:color128) { "foo" }
     assert_equal "\e[38;5;128mfoo\e[0m", color(:color128) { "foo" }
     assert_equal "\e[38;5;128mfoo\e[0m", color(:color128) + "foo" + color(:reset)
+    assert_equal "\e[38;5;128mfoo\e[0m", Color.color(128, "foo")
+    assert_equal "\e[38;5;128mfoo\e[0m", "foo".color(128)
+    assert_equal "\e[38;5;128mfoo\e[0m", color(128, "foo")
+    assert_equal "\e[38;5;128mfoo\e[0m", Color.color(128) { "foo" }
+    assert_equal "\e[38;5;128mfoo\e[0m", "foo".color(128) { "foo" }
+    assert_equal "\e[38;5;128mfoo\e[0m", color(128) { "foo" }
+    assert_equal "\e[38;5;128mfoo\e[0m", color(128) + "foo" + color(:reset)
   end
 
   def test_on_color
@@ -66,6 +73,13 @@ class ANSIColorTest < Test::Unit::TestCase
     assert_equal "\e[48;5;128mfoo\e[0m", "foo".on_color(:color128) { "foo" }
     assert_equal "\e[48;5;128mfoo\e[0m", on_color(:color128) { "foo" }
     assert_equal "\e[48;5;128mfoo\e[0m", on_color(:color128) + "foo" + color(:reset)
+    assert_equal "\e[48;5;128mfoo\e[0m", Color.on_color(128, "foo")
+    assert_equal "\e[48;5;128mfoo\e[0m", "foo".on_color(128)
+    assert_equal "\e[48;5;128mfoo\e[0m", on_color(128, "foo")
+    assert_equal "\e[48;5;128mfoo\e[0m", Color.on_color(128) { "foo" }
+    assert_equal "\e[48;5;128mfoo\e[0m", "foo".on_color(128) { "foo" }
+    assert_equal "\e[48;5;128mfoo\e[0m", on_color(128) { "foo" }
+    assert_equal "\e[48;5;128mfoo\e[0m", on_color(128) + "foo" + color(:reset)
   end
 
   def test_uncolor

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: term-ansicolor
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Florian Frank