rainbow 2.2.2 → 3.0.0

data/lib/rainbow/ext/string.rb

@@ -4,13 +4,12 @@ module Rainbow
   module Ext
     module String
       module InstanceMethods
-
         def foreground(*color)
           Rainbow(self).foreground(*color)
         end
 
-        alias_method :color, :foreground
-        alias_method :colour, :foreground
+        alias color foreground
+        alias colour foreground
 
         def background(*color)
           Rainbow(self).background(*color)
@@ -47,7 +46,6 @@ module Rainbow
         def hide
           Rainbow(self).hide
         end
-
       end
     end
   end

data/lib/rainbow/global.rb

@@ -1,7 +1,6 @@
 require_relative 'wrapper'
 
 module Rainbow
-
   def self.global
     @global ||= Wrapper.new
   end
@@ -14,6 +13,9 @@ module Rainbow
     global.enabled = value
   end
 
+  def self.uncolor(string)
+    StringUtils.uncolor(string)
+  end
 end
 
 def Rainbow(string)

data/lib/rainbow/null_presenter.rb

@@ -1,41 +1,93 @@
 module Rainbow
-
   class NullPresenter < ::String
+    def color(*_values)
+      self
+    end
+
+    def background(*_values)
+      self
+    end
+
+    def reset
+      self
+    end
+
+    def bright
+      self
+    end
+
+    def faint
+      self
+    end
+
+    def italic
+      self
+    end
+
+    def underline
+      self
+    end
+
+    def blink
+      self
+    end
+
+    def inverse
+      self
+    end
+
+    def hide
+      self
+    end
+
+    def black
+      self
+    end
+
+    def red
+      self
+    end
 
-    def color(*values); self; end
-    def background(*values); self; end
-    def reset; self; end
-    def bright; self; end
-    def faint; self; end
-    def italic; self; end
-    def underline; self; end
-    def blink; self; end
-    def inverse; self; end
-    def hide; self; end
-
-    def black; self; end
-    def red; self; end
-    def green; self; end
-    def yellow; self; end
-    def blue; self; end
-    def magenta; self; end
-    def cyan; self; end
-    def white; self; end
-
-    def method_missing(method_name,*args)
-      if Color::X11Named.color_names.include? method_name and args.empty? then
+    def green
+      self
+    end
+
+    def yellow
+      self
+    end
+
+    def blue
+      self
+    end
+
+    def magenta
+      self
+    end
+
+    def cyan
+      self
+    end
+
+    def white
+      self
+    end
+
+    def method_missing(method_name, *args)
+      if Color::X11Named.color_names.include?(method_name) && args.empty?
         self
       else
         super
       end
     end
 
-    alias_method :foreground, :color
-    alias_method :fg, :color
-    alias_method :bg, :background
-    alias_method :bold, :bright
-    alias_method :dark, :faint
+    def respond_to_missing?(method_name, *args)
+      Color::X11Named.color_names.include?(method_name) && args.empty? || super
+    end
 
+    alias foreground color
+    alias fg color
+    alias bg background
+    alias bold bright
+    alias dark faint
   end
-
 end

data/lib/rainbow/presenter.rb

@@ -3,9 +3,7 @@ require_relative 'x11_color_names'
 require_relative 'color'
 
 module Rainbow
-
   class Presenter < ::String
-
     TERM_EFFECTS = {
       reset:     0,
       bright:    1,
@@ -14,23 +12,23 @@ module Rainbow
       underline: 4,
       blink:     5,
       inverse:   7,
-      hide:      8,
-    }
+      hide:      8
+    }.freeze
 
     # Sets color of this text.
     def color(*values)
       wrap_with_sgr(Color.build(:foreground, values).codes)
     end
 
-    alias_method :foreground, :color
-    alias_method :fg, :color
+    alias foreground color
+    alias fg color
 
     # Sets background color of this text.
     def background(*values)
       wrap_with_sgr(Color.build(:background, values).codes)
     end
 
-    alias_method :bg, :background
+    alias bg background
 
     # Resets terminal to default colors/backgrounds.
     #
@@ -45,7 +43,7 @@ module Rainbow
       wrap_with_sgr(TERM_EFFECTS[:bright])
     end
 
-    alias_method :bold, :bright
+    alias bold bright
 
     # Turns on faint/dark for this text (not well supported by terminal
     # emulators).
@@ -53,7 +51,7 @@ module Rainbow
       wrap_with_sgr(TERM_EFFECTS[:faint])
     end
 
-    alias_method :dark, :faint
+    alias dark faint
 
     # Turns on italic style for this text (not well supported by terminal
     # emulators).
@@ -116,20 +114,22 @@ module Rainbow
 
     # 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
+    def method_missing(method_name, *args)
+      if Color::X11Named.color_names.include?(method_name) && args.empty?
         color(method_name)
       else
         super
       end
     end
 
+    def respond_to_missing?(method_name, *args)
+      Color::X11Named.color_names.include?(method_name) && args.empty? || super
+    end
+
     private
 
     def wrap_with_sgr(codes) #:nodoc:
       self.class.new(StringUtils.wrap_with_sgr(self, [*codes]))
     end
-
   end
-
 end

data/lib/rainbow/refinement.rb

@@ -0,0 +1,12 @@
+require_relative 'presenter'
+require_relative 'global'
+
+module Rainbow
+  refine String do
+    Presenter.instance_methods(false).each do |method_name|
+      define_method(method_name) do |*args|
+        ::Rainbow.global.wrap(self).send(method_name, *args)
+      end
+    end
+  end
+end

data/lib/rainbow/string_utils.rb

@@ -1,6 +1,5 @@
 module Rainbow
   class StringUtils
-
     def self.wrap_with_sgr(string, codes)
       return string if codes.empty?
 
@@ -9,12 +8,14 @@ module Rainbow
       seq_pos = match.end(0)
       string = string[0...seq_pos] + seq + string[seq_pos..-1]
 
-      unless string =~ /\e\[0m$/
-        string = string + "\e[0m"
-      end
+      string += "\e[0m" unless string =~ /\e\[0m$/
 
       string
     end
 
+    def self.uncolor(string)
+      # See http://www.commandlinefu.com/commands/view/3584/remove-color-codes-special-characters-with-sed
+      string.gsub(/\e\[[0-9;]*m/, '')
+    end
   end
 end

data/lib/rainbow/version.rb

@@ -1,3 +1,3 @@
 module Rainbow
-  VERSION = "2.2.2".freeze
+  VERSION = "3.0.0".freeze
 end

data/lib/rainbow/wrapper.rb

@@ -2,7 +2,6 @@ require_relative 'presenter'
 require_relative 'null_presenter'
 
 module Rainbow
-
   class Wrapper
     attr_accessor :enabled
 
@@ -18,5 +17,4 @@ module Rainbow
       end
     end
   end
-
 end

data/lib/rainbow/x11_color_names.rb

@@ -1,7 +1,6 @@
 module Rainbow
-
   module X11ColorNames
-    NAMES= {
+    NAMES = {
       aqua: [0, 255, 255],
       aquamarine: [127, 255, 212],
       mediumaquamarine: [102, 205, 170],
@@ -147,6 +146,6 @@ module Rainbow
       yellow: [255, 255, 0],
       lightyellow: [255, 255, 224],
       greenyellow: [173, 255, 47]
-    }
+    }.freeze
   end
-end
+end

data/rainbow.gemspec

@@ -1,4 +1,3 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'rainbow/version'
@@ -6,21 +5,18 @@ require 'rainbow/version'
 Gem::Specification.new do |spec|
   spec.name                  = "rainbow"
   spec.version               = Rainbow::VERSION
-  spec.authors               = ["Marcin Kulik"]
+  spec.authors               = ["Marcin Kulik", "Olle Jonsson"]
   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           = 'Colorize printed text on ANSI terminals'
+  spec.summary               = 'Colorize printed text on ANSI terminals'
   spec.homepage              = "https://github.com/sickill/rainbow"
   spec.license               = "MIT"
-  spec.required_ruby_version = '>= 1.9.2'
+  spec.required_ruby_version = '>= 2.1.0'
 
   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_dependency "rake"
-
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.extensions    = ["ext/mkrf_conf.rb"]
 end

data/spec/integration/instance_spec.rb

@@ -1,8 +1,7 @@
 require 'spec_helper'
 require 'rainbow'
 
-describe 'Custom Rainbow instance' do
-
+RSpec.describe 'Custom Rainbow instance' do
   it 'inherits enabled state from the global instance' do
     Rainbow.enabled = :yep
     expect(Rainbow.new.enabled).to eq(:yep)
@@ -31,5 +30,4 @@ describe 'Custom Rainbow instance' do
 
     expect(rainbow.wrap('hello').green).to eq('hello')
   end
-
 end

data/spec/integration/rainbow_spec.rb

@@ -1,8 +1,7 @@
 require 'spec_helper'
 require 'rainbow'
 
-describe 'Rainbow() wrapper' do
-
+RSpec.describe 'Rainbow() wrapper' do
   before do
     Rainbow.enabled = true
   end
@@ -113,19 +112,19 @@ describe 'Rainbow() wrapper' do
   end
 
   it 'allows chaining' do
-    result = Rainbow('hello').
-      foreground(:red).
-      bright.
-      bold.
-      faint.
-      dark.
-      italic.
-      background('#ff8040').
-      underline.
-      color(:blue).
-      blink.
-      inverse.
-      hide
+    result = Rainbow('hello')
+             .foreground(:red)
+             .bright
+             .bold
+             .faint
+             .dark
+             .italic
+             .background('#ff8040')
+             .underline
+             .color(:blue)
+             .blink
+             .inverse
+             .hide
 
     expect(result).to eq(
       "\e[31m\e[1m\e[1m\e[2m\e[2m\e[3m\e[48;5;215m\e[4m\e[34m\e[5m\e[7m\e[8mhello\e[0m"
@@ -133,28 +132,26 @@ describe 'Rainbow() wrapper' do
   end
 
   context "when Rainbow is disabled" do
-
     before do
       Rainbow.enabled = false
     end
 
     it "allows chaining but doesn't wrap with escape codes" do
-      result = Rainbow('hello').
-        foreground(:red).
-        bright.
-        bold.
-        faint.
-        dark.
-        italic.
-        background('#ff8040').
-        underline.
-        color(:blue).
-        blink.
-        inverse.
-        hide
+      result = Rainbow('hello')
+               .foreground(:red)
+               .bright
+               .bold
+               .faint
+               .dark
+               .italic
+               .background('#ff8040')
+               .underline
+               .color(:blue)
+               .blink
+               .inverse
+               .hide
 
       expect(result).to eq('hello')
     end
   end
-
 end