rainbow 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 372e902e66070b47cdb7c31a2261929f57086e59
-  data.tar.gz: 57e6af68cbd87bf8c79298b9d6d77e0a46719dc5
+  metadata.gz: e50d4d60cddebd63162aa542384109c229e019b4
+  data.tar.gz: 5240ea5388eb6b8df8715227cd2830dc9cba19db
 SHA512:
-  metadata.gz: 37394c88313337fb8fc04dc6d1f649eaea0c257d25a4e44e4cd1f54d07a87fb3cfce3673c86a33079468440fd040d21bf4c57d53fd4ef9d8a8a01169465236fc
-  data.tar.gz: a0a235ea3d51152d2a107435229730daa19f8d4a1f838803af6af87707a2e17fc2f48fb6195d78fab26acce0673aca33535a499c9ebc4feb5b64d6696edf63f2
+  metadata.gz: 4953dabd646d05ea36be2d0e4d4d8b4f1eb070a3bf0576413ab31335e8513302deb8399e8fc111de20948e049f8e3b17a8fd081bafca36455c5bc1721dec05b7
+  data.tar.gz: 7fdee7a80bd1ee2292e274d7e0694a79a03d6f7f99d004d79b21eb88e3f3e1d5d22f9bfb81f478cbbd5505c8c7b10ba95bcdb6aa952a9275c684930abde1ab42

data/.travis.yml

@@ -1,4 +1,4 @@
-bundler_args: --without guard
+bundler_args: --without guard development
 rvm:
   - 1.9.2
   - 1.9.3
@@ -8,3 +8,4 @@ rvm:
   - jruby
 
 script: "bundle exec rake"
+sudo: false

data/Changelog.md

@@ -65,3 +65,9 @@
 ## 2.0.0 (2014-01-24)
 
 * disable string mixin by default
+
+## 2.1.0 (2016-01-24)
+
+* added X11 color support
+* fixed `require` issue when rainbow is used as a dependency in another gem
+* improved Windows support

data/Gemfile

@@ -3,8 +3,14 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in rainbow.gemspec
 gemspec
 
+gem 'rake'
 gem 'coveralls', require: false
 gem 'mime-types', '< 2.0.0', platforms: [:ruby_18]
+gem 'rspec', '3.0.0beta2'
+
+group :development do
+  gem 'mutant-rspec'
+end
 
 group :guard do
   gem 'guard'

data/README.markdown

@@ -22,7 +22,7 @@ To make your string colored wrap it with `Rainbow()` presenter and call
 ```ruby
 require 'rainbow'
 
-p Rainbow("this is red").red + " and " + Rainbow("this on yellow bg").bg(:yellow) + " and " + Rainbow("even bright underlined!").underline.bright
+puts Rainbow("this is red").red + " and " + Rainbow("this on yellow bg").bg(:yellow) + " and " + Rainbow("even bright underlined!").underline.bright
 
 # => "\e[31mthis is red\e[0m and \e[43mthis on yellow bg\e[0m and \e[4m\e[1meven bright underlined!\e[0m"
 ```
@@ -50,6 +50,10 @@ Text color can also be changed by calling a method named by a color:
 * `magenta`
 * `cyan`
 * `white`
+* `aqua`
+* `silver`
+* `aliceblue`
+* `indianred`
 
 All of the methods return `self` (the presenter object) so you can chain method
 calls:
@@ -73,7 +77,7 @@ puts "this is red".color(:red) + " and " + "this on yellow bg".background(:yello
 This way of using Rainbow is not recommended though as it pollutes String's
 public interface with methods that are presentation specific.
 
-NOTE: the mixing doesn't include shortcut methods for changing text color, you
+NOTE: the mixin doesn't include shortcut methods for changing text color, you
 should use "string".color(:blue) instead of "string".blue
 
 NOTE: the mixin is included in String by default in rainbow 1.x versions.
@@ -86,13 +90,16 @@ extension as shown above or update your code to use the new presenter API.
 Both `color` and `background` accept color specified in any
 of the following ways:
 
-* color number (where 0 is black, 1 is red, 2 is green and so on):
+* ANSI color number (where 0 is black, 1 is red, 2 is green and so on):
   `Rainbow("hello").color(1)`
 
-* color name as a symbol (:black, :red, :green, :yellow, :blue,
-  :magenta, :cyan, :white):
+* [ANSI color](https://en.wikipedia.org/wiki/ANSI_escape_code#Colors) name or [X11 color](https://en.wikipedia.org/wiki/X11_color_names) name as a symbol:
   `Rainbow("hello").color(:yellow)`.
-  This can be simplified to `Rainbow("hello").yellow`
+  This can be simplified to `Rainbow("hello").yellow`  
+  
+  See [Color list](#user-content-color-list) for all available color names.  
+  Note that ANSI colors can be changed in accordance with terminal setting.  
+  But X11 color is just a syntax sugar for RGB triplet. So you always see what you specified.
 
 * RGB triplet as separate values in the range 0-255:
   `Rainbow("hello").color(115, 23, 98)`
@@ -170,6 +177,159 @@ Or just install it via rubygems:
 gem install rainbow
 ```
 
+## Color list
+
+### ANSI colors
+
+* `black`
+* `red`
+* `green`
+* `yellow`
+* `blue`
+* `magenta`
+* `cyan`
+* `white`
+
+### X11 colors
+
+* `aqua`
+* `aquamarine`
+* `mediumaquamarine`
+* `azure`
+* `beige`
+* `bisque`
+* `blanchedalmond`
+* `darkblue`
+* `lightblue`
+* `mediumblue`
+* `aliceblue`
+* `cadetblue`
+* `dodgerblue`
+* `midnightblue`
+* `navyblue`
+* `powderblue`
+* `royalblue`
+* `skyblue`
+* `deepskyblue`
+* `lightskyblue`
+* `slateblue`
+* `darkslateblue`
+* `mediumslateblue`
+* `steelblue`
+* `lightsteelblue`
+* `brown`
+* `rosybrown`
+* `saddlebrown`
+* `sandybrown`
+* `burlywood`
+* `chartreuse`
+* `chocolate`
+* `coral`
+* `lightcoral`
+* `cornflower`
+* `cornsilk`
+* `crimson`
+* `darkcyan`
+* `lightcyan`
+* `firebrick`
+* `fuchsia`
+* `gainsboro`
+* `gold`
+* `goldenrod`
+* `darkgoldenrod`
+* `lightgoldenrod`
+* `palegoldenrod`
+* `gray`
+* `darkgray`
+* `dimgray`
+* `lightgray`
+* `slategray`
+* `lightslategray`
+* `webgray`
+* `darkgreen`
+* `lightgreen`
+* `palegreen`
+* `darkolivegreen`
+* `yellowgreen`
+* `forestgreen`
+* `lawngreen`
+* `limegreen`
+* `seagreen`
+* `darkseagreen`
+* `lightseagreen`
+* `mediumseagreen`
+* `springgreen`
+* `mediumspringgreen`
+* `webgreen`
+* `honeydew`
+* `indianred`
+* `indigo`
+* `ivory`
+* `khaki`
+* `darkkhaki`
+* `lavender`
+* `lavenderblush`
+* `lemonchiffon`
+* `lime`
+* `linen`
+* `darkmagenta`
+* `maroon`
+* `webmaroon`
+* `mintcream`
+* `mistyrose`
+* `moccasin`
+* `oldlace`
+* `olive`
+* `olivedrab`
+* `orange`
+* `darkorange`
+* `orchid`
+* `darkorchid`
+* `mediumorchid`
+* `papayawhip`
+* `peachpuff`
+* `peru`
+* `pink`
+* `deeppink`
+* `lightpink`
+* `hotpink`
+* `plum`
+* `purple`
+* `mediumpurple`
+* `rebeccapurple`
+* `webpurple`
+* `darkred`
+* `orangered`
+* `mediumvioletred`
+* `palevioletred`
+* `salmon`
+* `darksalmon`
+* `lightsalmon`
+* `seashell`
+* `sienna`
+* `silver`
+* `darkslategray`
+* `snow`
+* `tan`
+* `teal`
+* `thistle`
+* `tomato`
+* `turquoise`
+* `darkturquoise`
+* `mediumturquoise`
+* `paleturquoise`
+* `violet`
+* `darkviolet`
+* `blueviolet`
+* `wheat`
+* `antiquewhite`
+* `floralwhite`
+* `ghostwhite`
+* `navajowhite`
+* `whitesmoke`
+* `lightyellow`
+* `greenyellow`
+
 ## Authors
 
 [Marcin Kulik](http://ku1ik.com/) and [great open-source contributors](https://github.com/sickill/rainbow/graphs/contributors).

data/lib/rainbow.rb

@@ -1,5 +1,5 @@
-require 'rainbow/global'
-require 'rainbow/legacy'
+require_relative 'rainbow/global'
+require_relative 'rainbow/legacy'
 
 module Rainbow
 
@@ -11,9 +11,10 @@ module Rainbow
   self.enabled = false if ENV['TERM'] == 'dumb'
   self.enabled = true if ENV['CLICOLOR_FORCE'] == '1'
 
-  # On Windows systems, try to load the local ANSI support library
+  # On Windows systems, try to load the local ANSI support library if Ruby version < 2
+  # Ruby 2.x on Windows includes ANSI support. 
   require 'rbconfig'
-  if RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
+  if RbConfig::CONFIG['host_os'] =~ /mswin|mingw/  && RUBY_VERSION.to_i < 2
     begin
       require 'Win32/Console/ANSI'
     rescue LoadError

data/lib/rainbow/color.rb

@@ -12,19 +12,23 @@ module Rainbow
       color = values.size == 1 ? values.first : values
 
       case color
-      when ::Fixnum
+      when Fixnum
         Indexed.new(ground, color)
-      when ::Symbol
-        Named.new(ground, color)
-      when ::Array
+      when Symbol
+        if Named.color_names.include?(color)
+          Named.new(ground, color)
+        else X11Named.color_names.include?(color)
+          X11Named.new(ground, color)
+        end
+      when Array
         RGB.new(ground, *color)
-      when ::String
+      when String
         RGB.new(ground, *parse_hex_color(color))
       end
     end
 
     def self.parse_hex_color(hex)
-      hex = hex.gsub('#', '')
+      hex = hex.sub(/^#/, '')
       r   = hex[0..1].to_i(16)
       g   = hex[2..3].to_i(16)
       b   = hex[4..5].to_i(16)
@@ -63,21 +67,19 @@ module Rainbow
         default: 9,
       }
 
+      def self.color_names
+        NAMES.keys
+      end
+
       def initialize(ground, name)
-        unless color_names.include?(name)
+        unless Named.color_names.include?(name)
           fail ArgumentError,
-            "Unknown color name, valid names: #{color_names.join(', ')}"
+            "Unknown color name, valid names: #{Named.color_names.join(', ')}"
         end
 
         super(ground, NAMES[name])
       end
 
-      private
-
-      def color_names
-        NAMES.keys
-      end
-
     end
 
     class RGB < Indexed
@@ -111,5 +113,23 @@ module Rainbow
 
     end
 
+    class X11Named < RGB
+      include X11ColorNames
+
+      def self.color_names
+        NAMES.keys
+      end
+
+      def initialize(ground, name)
+        unless X11Named.color_names.include?(name)
+          fail ArgumentError,
+            "Unknown color name, valid names: #{X11Named.color_names.join(', ')}"
+        end
+
+        super(ground, *NAMES[name])
+      end
+
+    end
+
   end
 end

data/lib/rainbow/global.rb

@@ -1,4 +1,4 @@
-require 'rainbow/wrapper'
+require_relative 'wrapper'
 
 module Rainbow
 

data/lib/rainbow/presenter.rb

@@ -1,5 +1,6 @@
-require 'rainbow/string_utils'
-require 'rainbow/color'
+require_relative 'string_utils'
+require_relative 'x11_color_names'
+require_relative 'color'
 
 module Rainbow
 
@@ -102,6 +103,16 @@ module Rainbow
       color(:white)
     end
 
+    # We take care of X11 color method call here.
+    # Such as #aqua, #ghostwhite.
+    def method_missing(method_name,*args)
+      if Color::X11Named.color_names.include? method_name and args.empty? then
+        color(method_name)
+      else
+        super
+      end
+    end
+
     private
 
     def wrap_with_sgr(codes) #:nodoc:

data/lib/rainbow/string_utils.rb

@@ -6,16 +6,13 @@ module Rainbow
 
       seq = "\e[" + codes.join(";") + "m"
       match = string.match(/^(\e\[([\d;]+)m)*/)
+      seq_pos = match.end(0)
+      string = string[0...seq_pos] + seq + string[seq_pos..-1]
 
-      if match
-        seq_pos = match.end(0)
-        string = string[0...seq_pos] + seq + string[seq_pos..-1]
-      else
-        string = seq + string
+      unless string =~ /\e\[0m$/
+        string = string + "\e[0m"
       end
 
-      string = string + "\e[0m" unless string =~ /\e\[0m$/
-
       string
     end
 

data/lib/rainbow/version.rb

@@ -1,3 +1,3 @@
 module Rainbow
-  VERSION = "2.0.0".freeze
+  VERSION = "2.1.0".freeze
 end

data/lib/rainbow/wrapper.rb

@@ -1,5 +1,5 @@
-require 'rainbow/presenter'
-require 'rainbow/null_presenter'
+require_relative 'presenter'
+require_relative 'null_presenter'
 
 module Rainbow
 
@@ -12,9 +12,9 @@ module Rainbow
 
     def wrap(string)
       if enabled
-        Rainbow::Presenter.new(string.to_s)
+        Presenter.new(string.to_s)
       else
-        Rainbow::NullPresenter.new(string.to_s)
+        NullPresenter.new(string.to_s)
       end
     end
   end

data/lib/rainbow/x11_color_names.rb

@@ -0,0 +1,152 @@
+module Rainbow
+
+  module X11ColorNames
+    NAMES= {
+      aqua: [0, 255, 255],
+      aquamarine: [127, 255, 212],
+      mediumaquamarine: [102, 205, 170],
+      azure: [240, 255, 255],
+      beige: [245, 245, 220],
+      bisque: [255, 228, 196],
+      black: [0, 0, 0],
+      blanchedalmond: [255, 235, 205],
+      blue: [0, 0, 255],
+      darkblue: [0, 0, 139],
+      lightblue: [173, 216, 230],
+      mediumblue: [0, 0, 205],
+      aliceblue: [240, 248, 255],
+      cadetblue: [95, 158, 160],
+      dodgerblue: [30, 144, 255],
+      midnightblue: [25, 25, 112],
+      navyblue: [0, 0, 128],
+      powderblue: [176, 224, 230],
+      royalblue: [65, 105, 225],
+      skyblue: [135, 206, 235],
+      deepskyblue: [0, 191, 255],
+      lightskyblue: [135, 206, 250],
+      slateblue: [106, 90, 205],
+      darkslateblue: [72, 61, 139],
+      mediumslateblue: [123, 104, 238],
+      steelblue: [70, 130, 180],
+      lightsteelblue: [176, 196, 222],
+      brown: [165, 42, 42],
+      rosybrown: [188, 143, 143],
+      saddlebrown: [139, 69, 19],
+      sandybrown: [244, 164, 96],
+      burlywood: [222, 184, 135],
+      chartreuse: [127, 255, 0],
+      chocolate: [210, 105, 30],
+      coral: [255, 127, 80],
+      lightcoral: [240, 128, 128],
+      cornflower: [100, 149, 237],
+      cornsilk: [255, 248, 220],
+      crimson: [220, 20, 60],
+      cyan: [0, 255, 255],
+      darkcyan: [0, 139, 139],
+      lightcyan: [224, 255, 255],
+      firebrick: [178, 34, 34],
+      fuchsia: [255, 0, 255],
+      gainsboro: [220, 220, 220],
+      gold: [255, 215, 0],
+      goldenrod: [218, 165, 32],
+      darkgoldenrod: [184, 134, 11],
+      lightgoldenrod: [250, 250, 210],
+      palegoldenrod: [238, 232, 170],
+      gray: [190, 190, 190],
+      darkgray: [169, 169, 169],
+      dimgray: [105, 105, 105],
+      lightgray: [211, 211, 211],
+      slategray: [112, 128, 144],
+      lightslategray: [119, 136, 153],
+      webgray: [128, 128, 128],
+      green: [0, 255, 0],
+      darkgreen: [0, 100, 0],
+      lightgreen: [144, 238, 144],
+      palegreen: [152, 251, 152],
+      darkolivegreen: [85, 107, 47],
+      yellowgreen: [154, 205, 50],
+      forestgreen: [34, 139, 34],
+      lawngreen: [124, 252, 0],
+      limegreen: [50, 205, 50],
+      seagreen: [46, 139, 87],
+      darkseagreen: [143, 188, 143],
+      lightseagreen: [32, 178, 170],
+      mediumseagreen: [60, 179, 113],
+      springgreen: [0, 255, 127],
+      mediumspringgreen: [0, 250, 154],
+      webgreen: [0, 128, 0],
+      honeydew: [240, 255, 240],
+      indianred: [205, 92, 92],
+      indigo: [75, 0, 130],
+      ivory: [255, 255, 240],
+      khaki: [240, 230, 140],
+      darkkhaki: [189, 183, 107],
+      lavender: [230, 230, 250],
+      lavenderblush: [255, 240, 245],
+      lemonchiffon: [255, 250, 205],
+      lime: [0, 255, 0],
+      linen: [250, 240, 230],
+      magenta: [255, 0, 255],
+      darkmagenta: [139, 0, 139],
+      maroon: [176, 48, 96],
+      webmaroon: [127, 0, 0],
+      mintcream: [245, 255, 250],
+      mistyrose: [255, 228, 225],
+      moccasin: [255, 228, 181],
+      oldlace: [253, 245, 230],
+      olive: [128, 128, 0],
+      olivedrab: [107, 142, 35],
+      orange: [255, 165, 0],
+      darkorange: [255, 140, 0],
+      orchid: [218, 112, 214],
+      darkorchid: [153, 50, 204],
+      mediumorchid: [186, 85, 211],
+      papayawhip: [255, 239, 213],
+      peachpuff: [255, 218, 185],
+      peru: [205, 133, 63],
+      pink: [255, 192, 203],
+      deeppink: [255, 20, 147],
+      lightpink: [255, 182, 193],
+      hotpink: [255, 105, 180],
+      plum: [221, 160, 221],
+      purple: [160, 32, 240],
+      mediumpurple: [147, 112, 219],
+      rebeccapurple: [102, 51, 153],
+      webpurple: [127, 0, 127],
+      red: [255, 0, 0],
+      darkred: [139, 0, 0],
+      orangered: [255, 69, 0],
+      mediumvioletred: [199, 21, 133],
+      palevioletred: [219, 112, 147],
+      salmon: [250, 128, 114],
+      darksalmon: [233, 150, 122],
+      lightsalmon: [255, 160, 122],
+      seashell: [255, 245, 238],
+      sienna: [160, 82, 45],
+      silver: [192, 192, 192],
+      darkslategray: [47, 79, 79],
+      snow: [255, 250, 250],
+      tan: [210, 180, 140],
+      teal: [0, 128, 128],
+      thistle: [216, 191, 216],
+      tomato: [255, 99, 71],
+      turquoise: [64, 224, 208],
+      darkturquoise: [0, 206, 209],
+      mediumturquoise: [72, 209, 204],
+      paleturquoise: [175, 238, 238],
+      violet: [238, 130, 238],
+      darkviolet: [148, 0, 211],
+      blueviolet: [138, 43, 226],
+      wheat: [245, 222, 179],
+      white: [255, 255, 255],
+      antiquewhite: [250, 235, 215],
+      floralwhite: [255, 250, 240],
+      ghostwhite: [248, 248, 255],
+      navajowhite: [255, 222, 173],
+      whitesmoke: [245, 245, 245],
+      yellow: [255, 255, 0],
+      lightyellow: [255, 255, 224],
+      greenyellow: [173, 255, 47]
+    }
+  end
+end

data/rainbow.gemspec

@@ -8,18 +8,16 @@ Gem::Specification.new do |spec|
   spec.version               = Rainbow::VERSION
   spec.authors               = ["Marcin Kulik"]
   spec.email                 = ["m@ku1ik.com"]
-  spec.description           = %q{Colorize printed text on ANSI terminals}
-  spec.summary               = %q{Colorize printed text on ANSI terminals}
+  spec.description           = %q(Colorize printed text on ANSI terminals)
+  spec.summary               = %q(Colorize printed text on ANSI terminals)
   spec.homepage              = "https://github.com/sickill/rainbow"
   spec.license               = "MIT"
   spec.required_ruby_version = '>= 1.9.2'
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
 end

data/spec/integration/rainbow_spec.rb

@@ -17,12 +17,17 @@ describe 'Rainbow() wrapper' do
     expect(result).to eq("\e[31mhello\e[0m")
   end
 
-  it 'allows foreground coloring directly by method name' do
+  it 'allows foreground coloring directly by ANSI method name' do
     result = Rainbow('hello').red
     expect(result).to eq("\e[31mhello\e[0m")
   end
 
-  it 'allows foreground coloring by color name (color alias)' do
+  it 'allows foreground coloring directly by X11 method name' do
+    result = Rainbow('hello').midnightblue
+    expect(result).to eq("\e[38;5;18mhello\e[0m")
+  end
+
+  it 'allows foreground coloring by ANSI color name (color alias)' do
     result = Rainbow('hello').color(:red)
     expect(result).to eq("\e[31mhello\e[0m")
   end
@@ -32,6 +37,11 @@ describe 'Rainbow() wrapper' do
     expect(result).to eq("\e[31mhello\e[0m")
   end
 
+  it 'allows foreground coloring by X11 color name' do
+    result = Rainbow('hello').foreground(:midnightblue)
+    expect(result).to eq("\e[38;5;18mhello\e[0m")
+  end
+
   it 'allows foreground coloring by color rgb' do
     result = Rainbow('hello').foreground(255, 128, 64)
     expect(result).to eq("\e[38;5;215mhello\e[0m")
@@ -47,18 +57,18 @@ describe 'Rainbow() wrapper' do
     expect(result).to eq("\e[43mhello\e[0m")
   end
 
-  it 'allows background coloring by color name' do
+  it 'allows background coloring by ANSI color name' do
     result = Rainbow('hello').background(:green)
     expect(result).to eq("\e[42mhello\e[0m")
   end
 
-  it 'allows background coloring by color rgb' do
-    result = Rainbow('hello').background(255, 128, 64)
-    expect(result).to eq("\e[48;5;215mhello\e[0m")
+  it 'allows background coloring by X11 color name' do
+    result = Rainbow('hello').background(:midnightblue)
+    expect(result).to eq("\e[48;5;18mhello\e[0m")
   end
 
-  it 'allows background coloring by color rgb (hex string)' do
-    result = Rainbow('hello').background('ff8040')
+  it 'allows background coloring by color rgb' do
+    result = Rainbow('hello').background(255, 128, 64)
     expect(result).to eq("\e[48;5;215mhello\e[0m")
   end
 

data/spec/integration/string_spec.rb

@@ -15,6 +15,10 @@ describe 'String mixin' do
     expect('hello'.color(:red)).to eq(Rainbow('hello').color(:red))
   end
 
+  it 'proxies x11 color to Rainbow().color' do
+    expect('hello'.color(:midnightblue)).to eq(Rainbow('hello').color(:midnightblue))
+  end
+
   it 'proxies colour to Rainbow().colour' do
     expect('hello'.colour(:red)).to eq(Rainbow('hello').colour(:red))
   end

data/spec/unit/color_spec.rb

@@ -12,19 +12,41 @@ module Rainbow
       context "when single fixnum given" do
         let(:values) { [1] }
 
-        it { should be_a(Color) }
+        it { should be_instance_of(Color::Indexed) }
+
+        specify { expect(subject.ground).to eq(ground) }
+        specify { expect(subject.num).to eq(1) }
       end
 
-      context "when single symbol given" do
+      context "when single ansi symbol given" do
         let(:values) { [:red] }
 
-        it { should be_a(Color) }
+        it { should be_instance_of(Color::Named) }
+
+        specify { expect(subject.ground).to eq(ground) }
+        specify { expect(subject.num).to eq(1) }
+      end
+
+      context "when single x11 symbol given" do
+        let(:values) { [:midnightblue] }
+
+        it { should be_instance_of(Color::X11Named) }
+
+        specify { expect(subject.ground).to eq(ground) }
+        specify { expect(subject.r).to eq(25) }
+        specify { expect(subject.g).to eq(25) }
+        specify { expect(subject.b).to eq(112) }
       end
 
       context "when single string given" do
-        let(:values) { ['#dead00'] }
+        let(:values) { ['#deadcc'] }
 
-        it { should be_a(Color) }
+        it { should be_instance_of(Color::RGB) }
+
+        specify { expect(subject.ground).to eq(ground) }
+        specify { expect(subject.r).to eq(222) }
+        specify { expect(subject.g).to eq(173) }
+        specify { expect(subject.b).to eq(204) }
       end
 
       context "when 2 elements" do
@@ -38,7 +60,12 @@ module Rainbow
       context "when 3 elements given" do
         let(:values) { [1, 2, 3] }
 
-        it { should be_a(Color) }
+        it { should be_instance_of(Color::RGB) }
+
+        specify { expect(subject.ground).to eq(ground) }
+        specify { expect(subject.r).to eq(1) }
+        specify { expect(subject.g).to eq(2) }
+        specify { expect(subject.b).to eq(3) }
       end
 
       context "when 4 elements" do
@@ -241,4 +268,34 @@ module Rainbow
 
     end
   end
+
+  describe Color::X11Named do
+    let(:color) { described_class.new(ground, name) }
+
+    describe '#codes' do
+      subject { color.codes }
+
+      context "when ground is :foreground" do
+        let(:name) { :midnightblue }
+        let(:ground) { :foreground }
+        it { should eq([38, 5, 18]) }
+      end
+
+      context "when ground is :background" do
+        let(:name) { :midnightblue }
+        let(:ground) { :background }
+        it { should eq([48, 5, 18]) }
+      end
+
+      context "when name is invalid" do
+        let(:name) { :foo }
+        let(:ground) { :background }
+        it 'raises ArgumentError' do
+          expect { subject }.to raise_error(ArgumentError)
+        end
+      end
+
+    end
+  end
+
 end

data/spec/unit/wrapper_spec.rb

@@ -6,20 +6,26 @@ module Rainbow
 
     let(:wrapper) { described_class.new(enabled) }
 
+    it "is enabled by default" do
+      expect(described_class.new.enabled).to be(true)
+    end
+
     describe '#wrap' do
-      subject { wrapper.wrap('hello') }
+      subject { wrapper.wrap(object) }
+
+      let(:object) { Object.new }
 
       context "when wrapping is enabled" do
         let(:enabled) { true }
 
-        it { should eq('hello') }
+        it { should eq(object.to_s) }
         it { should be_kind_of(Rainbow::Presenter) }
       end
 
       context "when wrapping is disabled" do
         let(:enabled) { false }
 
-        it { should eq('hello') }
+        it { should eq(object.to_s) }
         it { should be_kind_of(Rainbow::NullPresenter) }
       end
     end

metadata

@@ -1,57 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rainbow
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Marcin Kulik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-24 00:00:00.000000000 Z
+date: 2016-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Colorize printed text on ANSI terminals
 email:
 - m@ku1ik.com
@@ -59,9 +31,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rubocop.yml
-- .travis.yml
+- ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
 - Changelog.md
 - Gemfile
 - Guardfile
@@ -78,6 +50,7 @@ files:
 - lib/rainbow/string_utils.rb
 - lib/rainbow/version.rb
 - lib/rainbow/wrapper.rb
+- lib/rainbow/x11_color_names.rb
 - rainbow.gemspec
 - spec/integration/instance_spec.rb
 - spec/integration/rainbow_spec.rb
@@ -100,17 +73,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Colorize printed text on ANSI terminals