rainbow 2.2.1 → 3.1.1

data/lib/rainbow/null_presenter.rb

@@ -1,38 +1,100 @@
-module Rainbow
+# frozen_string_literal: true
 
+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 color(*values); self; end
-    def background(*values); self; end
-    def reset; self; end
-    def bright; 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 cross_out
+      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) && args.empty?
         self
       else
         super
       end
     end
 
-    alias_method :foreground, :color
-    alias_method :fg, :color
-    alias_method :bg, :background
+    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
+    alias strike cross_out
   end
-
 end

data/lib/rainbow/presenter.rb

@@ -1,35 +1,37 @@
+# frozen_string_literal: true
+
 require_relative 'string_utils'
 require_relative 'x11_color_names'
 require_relative 'color'
 
 module Rainbow
-
   class Presenter < ::String
-
     TERM_EFFECTS = {
-      reset:     0,
-      bright:    1,
-      italic:    3,
+      reset: 0,
+      bright: 1,
+      faint: 2,
+      italic: 3,
       underline: 4,
-      blink:     5,
-      inverse:   7,
-      hide:      8,
-    }
+      blink: 5,
+      inverse: 7,
+      hide: 8,
+      cross_out: 9
+    }.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.
     #
@@ -44,7 +46,15 @@ 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).
+    def faint
+      wrap_with_sgr(TERM_EFFECTS[:faint])
+    end
+
+    alias dark faint
 
     # Turns on italic style for this text (not well supported by terminal
     # emulators).
@@ -73,6 +83,12 @@ module Rainbow
       wrap_with_sgr(TERM_EFFECTS[:hide])
     end
 
+    def cross_out
+      wrap_with_sgr(TERM_EFFECTS[:cross_out])
+    end
+
+    alias strike cross_out
+
     def black
       color(:black)
     end
@@ -107,20 +123,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,14 @@
+# frozen_string_literal: true
+
+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,20 +1,22 @@
+# frozen_string_literal: true
+
 module Rainbow
   class StringUtils
-
     def self.wrap_with_sgr(string, codes)
       return string if codes.empty?
 
       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]
 
-      unless string =~ /\e\[0m$/
-        string = string + "\e[0m"
-      end
+      string = string.sub(/^(\e\[([\d;]+)m)*/) { |m| m + seq }
 
-      string
+      return string if string.end_with? "\e[0m"
+
+      string + "\e[0m"
     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,5 @@
+# frozen_string_literal: true
+
 module Rainbow
-  VERSION = "2.2.1".freeze
+  VERSION = "3.1.1"
 end

data/lib/rainbow/wrapper.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
+
 require_relative 'presenter'
 require_relative 'null_presenter'
 
 module Rainbow
-
   class Wrapper
     attr_accessor :enabled
 
@@ -18,5 +19,4 @@ module Rainbow
       end
     end
   end
-
 end

data/lib/rainbow/x11_color_names.rb

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

data/lib/rainbow.rb

@@ -1,8 +1,8 @@
+# frozen_string_literal: true
+
 require_relative 'rainbow/global'
-require_relative 'rainbow/legacy'
 
 module Rainbow
-
   def self.new
     Wrapper.new(global.enabled)
   end
@@ -10,15 +10,4 @@ module Rainbow
   self.enabled = false unless STDOUT.tty? && STDERR.tty?
   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 if Ruby version < 2
-  # Ruby 2.x on Windows includes ANSI support. 
-  if RUBY_PLATFORM =~ /mswin|cygwin|mingw/ && RUBY_VERSION.to_i < 2
-    begin
-      require 'Win32/Console/ANSI'
-    rescue LoadError
-      self.enabled = false
-    end
-  end
-
 end

metadata

@@ -1,103 +1,78 @@
 --- !ruby/object:Gem::Specification
 name: rainbow
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 3.1.1
 platform: ruby
 authors:
 - Marcin Kulik
-autorequire: 
+- Olle Jonsson
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-12-28 00:00:00.000000000 Z
+date: 2022-01-11 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'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 description: Colorize printed text on ANSI terminals
 email:
 - m@ku1ik.com
 executables: []
-extensions:
-- ext/mkrf_conf.rb
+extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rubocop.yml
-- .travis.yml
 - Changelog.md
-- Gemfile
-- Guardfile
 - LICENSE
 - README.markdown
-- Rakefile
-- ext/mkrf_conf.rb
 - lib/rainbow.rb
 - lib/rainbow/color.rb
 - lib/rainbow/ext/string.rb
 - lib/rainbow/global.rb
-- lib/rainbow/legacy.rb
 - lib/rainbow/null_presenter.rb
 - lib/rainbow/presenter.rb
+- lib/rainbow/refinement.rb
 - 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
-- spec/integration/string_spec.rb
-- spec/spec_helper.rb
-- spec/support/presenter_shared_examples.rb
-- spec/unit/color_spec.rb
-- spec/unit/namespace_spec.rb
-- spec/unit/null_presenter_spec.rb
-- spec/unit/presenter_spec.rb
-- spec/unit/string_utils_spec.rb
-- spec/unit/wrapper_spec.rb
 homepage: https://github.com/sickill/rainbow
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.14.1
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: Colorize printed text on ANSI terminals
-test_files:
-- spec/integration/instance_spec.rb
-- spec/integration/rainbow_spec.rb
-- spec/integration/string_spec.rb
-- spec/spec_helper.rb
-- spec/support/presenter_shared_examples.rb
-- spec/unit/color_spec.rb
-- spec/unit/namespace_spec.rb
-- spec/unit/null_presenter_spec.rb
-- spec/unit/presenter_spec.rb
-- spec/unit/string_utils_spec.rb
-- spec/unit/wrapper_spec.rb
+test_files: []

data/.gitignore

@@ -1,17 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp

data/.rubocop.yml

@@ -1,14 +0,0 @@
-Documentation:
-  Enabled: false
-
-EmptyLinesAroundBody:
-  Enabled: false
-
-HashSyntax:
-  Enabled: false
-
-MethodName:
-  Enabled: false
-
-StringLiterals:
-  Enabled: false

data/.travis.yml

@@ -1,22 +0,0 @@
-language: ruby
-cache:
-  - bundler
-before_install:
-  - gem update --system
-  - gem install bundler
-bundler_args: --without guard development
-
-matrix:
-  include:
-    - rvm: 2.0.0
-    - rvm: 2.1.9
-    - rvm: 2.2.6
-    - rvm: 2.3.3
-    - rvm: 2.4.0
-    - rvm: jruby-9.1.6.0
-      jdk: oraclejdk8
-      env:
-        - JRUBY_OPTS=--debug
-    - rvm: 2.2.6
-      install: true # This skips 'bundle install'
-      script: gem build rainbow && gem install *.gem

data/Gemfile

@@ -1,23 +0,0 @@
-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'
-
-group :development do
-  gem 'mutant-rspec'
-end
-
-group :guard do
-  gem 'guard'
-  gem 'guard-rspec'
-end
-
-platform :rbx do
-  gem 'json'
-  gem 'rubysl'
-end

data/Guardfile

@@ -1,9 +0,0 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
-guard :rspec, cmd: 'rspec --color' do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { "spec" }
-  watch('spec/spec_helper.rb')  { "spec" }
-end
-

data/Rakefile

@@ -1,6 +0,0 @@
-require "bundler/gem_tasks"
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec

data/ext/mkrf_conf.rb

@@ -1,22 +0,0 @@
-require 'rubygems'
-require 'rubygems/command'
-require 'rubygems/dependency_installer'
-
-begin
-  Gem::Command.build_args = ARGV
-rescue NoMethodError
-  exit 1
-end
-
-installer = Gem::DependencyInstaller.new
-
-begin
-  if RUBY_PLATFORM =~ /mswin|cygwin|mingw/ && RUBY_VERSION.to_i < 2
-    installer.install('windows-pr')
-    installer.install('win32console')
-  end
-rescue
-  exit 1
-end
-
-File.write(File.join(File.dirname(__FILE__), 'Rakefile'), "task :default\n")

data/lib/rainbow/legacy.rb

@@ -1,15 +0,0 @@
-module Sickill
-  module Rainbow
-
-    def self.enabled=(value)
-      STDERR.puts("Rainbow gem notice: Sickill::Rainbow.enabled= is " \
-                  "deprecated, use Rainbow.enabled= instead.")
-      ::Rainbow.enabled = value
-    end
-
-    def self.enabled
-      ::Rainbow.enabled
-    end
-
-  end
-end

data/rainbow.gemspec

@@ -1,24 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'rainbow/version'
-
-Gem::Specification.new do |spec|
-  spec.name                  = "rainbow"
-  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.homepage              = "https://github.com/sickill/rainbow"
-  spec.license               = "MIT"
-  spec.required_ruby_version = '>= 1.9.2'
-
-  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.extensions    = ["ext/mkrf_conf.rb"]
-end

data/spec/integration/instance_spec.rb

@@ -1,35 +0,0 @@
-require 'spec_helper'
-require 'rainbow'
-
-describe 'Custom Rainbow instance' do
-
-  it 'inherits enabled state from the global instance' do
-    Rainbow.enabled = :yep
-    expect(Rainbow.new.enabled).to eq(:yep)
-  end
-
-  it 'tracks its own state separately from the global instance' do
-    Rainbow.enabled = :yep
-    rainbow = Rainbow.new
-    expect(Rainbow.new.enabled).to eq(:yep)
-
-    rainbow.enabled = :nope
-    expect(Rainbow.enabled).to eq(:yep)
-    expect(rainbow.enabled).to eq(:nope)
-  end
-
-  it 'wraps string with escape codes when enabled' do
-    rainbow = Rainbow.new
-    rainbow.enabled = true
-
-    expect(rainbow.wrap('hello').green).to eq("\e[32mhello\e[0m")
-  end
-
-  it "doesn't wrap string with any escape code when disabled" do
-    rainbow = Rainbow.new
-    rainbow.enabled = false
-
-    expect(rainbow.wrap('hello').green).to eq('hello')
-  end
-
-end