paint 2.0.2 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec3dd2072102f8ebdfe49f0520b5d6096dc91541301690d04607a0df83586890
-  data.tar.gz: 17d070ed26e8c27466117331bb6100df05aa3bb010fa0d89ae6cef98c88a8ac3
+  metadata.gz: 135bf13e5c9d57769e3e312c0dd5baa485a42e493b70d1c8a1eda802af1d78b2
+  data.tar.gz: 49651386bc399d9156936fabab7a046e311812a1ab14ecd682ca6d0e61f83caf
 SHA512:
-  metadata.gz: 79b1b15e9ce5ff5a59f88c878f20c43630e9eb03832e3fb45f2ac3bde16ee4efc36427d39b043adc65d1d7ad97839ed9e16d12fc8e701deb2e5cb721c2f7b7ea
-  data.tar.gz: b1059a3b96fc5248cfdd23b939c062bbea838ec48f09db7d5c2e3af6578be02060629e862572953d6b951b424bb47e6d8c3c553cd427ce1abf7416eb0f3e9ba5
+  metadata.gz: 28b1dff99750f9625c3d2d40b7521911840192483779fd0b7798fda970e8b6ce1de471e6cc6288d6053bddd9fb81b6a5a999d0d82b5bdb3de53f48dbb7dd9060
+  data.tar.gz: 6e667bd06608d7a2036369b21d73cc712467fb71f6a8c44e133f68b4ebe31b7a21cf3364ba72342e11fbe91a735f63cc7fcb62d825f696fad48643d07b53f6e5

data/.travis.yml

@@ -2,20 +2,26 @@ sudo: false
 language: ruby
 
 rvm:
-- 2.5.0
-- 2.4.3
-- 2.3.6
+- 2.7
+- 2.6
+- 2.5
+- 2.4
+- 2.3
 - 2.2
 - 2.1
 - 2.0
 - 1.9.3
 - ruby-head
 - jruby-head
-- jruby-9.1.15.0
+- jruby-9.2.9.0
+- truffleruby
 
 matrix:
   allow_failures:
     - rvm: jruby-head
+    - rvm: 2.3
+    - rvm: 2.2
     - rvm: 2.1
     - rvm: 2.0
     - rvm: 1.9.3
+    - rvm: truffleruby

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # CHANGELOG
 
+### 2.2.1
+
+* Explicitly set mac's Terminal.app to 256 colors only, fixes #28
+
+### 2.2.0
+
+* Support NO_COLOR environment variable, implements #26 (see no-color.org)
+
+### 2.1.1
+
+* Blacklist True Color support for urxvt, fixes #25
+
+### 2.1.0
+
+* Set True Color as default mode on more terminals, patch by @smoochbot
+
+### 2.0.3
+
+* Add `gray` alias for `white` color, patch by @AlexWayfer
+
 ### 2.0.2
 
 * Remove `gunzip` deprecation warning

data/MIT-LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT LICENSE
 
-Copyright (c) 2011-2016 Jan Lelis
+Copyright (c) 2011-2020 Jan Lelis
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,12 +1,16 @@
-# Ruby Paint [<img src="https://badge.fury.io/rb/paint.svg" />](http://badge.fury.io/rb/paint) [<img src="https://travis-ci.org/janlelis/paint.svg" />](https://travis-ci.org/janlelis/paint)
+# Ruby Paint [<img src="https://badge.fury.io/rb/paint.svg" />](https://badge.fury.io/rb/paint) [<img src="https://travis-ci.org/janlelis/paint.svg" />](https://travis-ci.org/janlelis/paint)
 
 Paint creates terminal colors and effects for you. It combines the strengths of **term-ansicolor**, **rainbow**, and similar projects into a simple to use, however still flexible terminal colors gem with no core extensions by default.
 
+Supported Rubies: **2.7**, **2.6**, **2.5**
+
+Unsupported, but might still work: **2.4**, **2.3**, **2.2**, **2.1**, **2.0**, **1.9**
+
 ## Features
 
 * No string extensions (suitable for library development)
 * Simple API
-* Faster than other terminal color gems ([as of December 2016](https://gist.github.com/janlelis/91413b9295c81ee873dc))
+* Faster than other terminal color gems ([as of January 2020](https://gist.github.com/janlelis/91413b9295c81ee873dc))
 * Supports *true color* or 256 colors (for capable terminals)
 * Allows you to set any terminal effects
 * `Paint.mode`: Fall-back modes for terminals with less colors, supported modes:
@@ -23,14 +27,6 @@ Starting with **Paint 2.0**, *true color* mode is the new default mode, since mo
 - Manually set `Paint.mode = 256` at the beginning of your code
 - Please [open a new issue](https://github.com/janlelis/paint/issues/new) so we can figure out how to blacklist the terminal used
 
-## Supported Rubies
-
-* **2.5**, **2.4**, **2.3**, **2.2**
-
-Unsupported, but might still work:
-
-* **2.1**, **2.0**, **1.9**
-
 ## Setup
 
 Add to `Gemfile`:
@@ -79,7 +75,7 @@ When you pass multiple colors, the first one is taken as foreground color and th
 
 ## Windows Support
 
-For ANSI support in Windows OS, you can use [ansicon](https://github.com/adoxa/ansicon) or [ConEmu](http://code.google.com/p/conemu-maximus5/).
+For ANSI support in Windows OS, you can use [ansicon](https://github.com/adoxa/ansicon) or [ConEmu](https://conemu.github.io/) or WSL(https://docs.microsoft.com/en-us/windows/wsl/install-win10).
 
 ## `Paint.mode`
 
@@ -93,9 +89,13 @@ You can choose between five ways to use `Paint.[]` by setting `Paint.mode` to on
 
 Paint tries to automatically detect the proper value your terminal is capable of, please [open an issue](https://github.com/janlelis/paint/issues/new) if `Paint.detect_mode` yields a wrong value for you.
 
+`Paint.detect_mode` will return 0 if the [NO_COLOR environment variable is set](https://github.com/jcs/no_color/).
+
 ## More Details About Terminal Colors and Effects
 
-Terminal colors/effects get created by [ANSI escape sequences](http://en.wikipedia.org/wiki/ANSI_escape_code). These are strings that look like this: `\e[X;X;X;X;X]m` where X are integers with some meaning. For example, `0` means *reset*, `31` means *red foreground* and `41` stands for red background. When you tell **Paint** to use one of the eight ANSI base colors as foreground color, it just inserts a number between `30` and `37` into the sequence. The following colors are available:
+<img src="https://pbs.twimg.com/media/ENyLvgVXUAgeDTn.jpg" />
+
+Terminal colors/effects get created by [ANSI escape sequences](https://en.wikipedia.org/wiki/ANSI_escape_code). These are strings that look like this: `\e[X;X;X;X;X]m` where X are integers with some meaning. For example, `0` means *reset*, `31` means *red foreground* and `41` stands for red background. When you tell **Paint** to use one of the eight ANSI base colors as foreground color, it just inserts a number between `30` and `37` into the sequence. The following colors are available:
 
 * `:black`
 * `:red`
@@ -104,7 +104,7 @@ Terminal colors/effects get created by [ANSI escape sequences](http://en.wikiped
 * `:blue`
 * `:magenta`
 * `:cyan`
-* `:white`
+* `:white`, `:gray`
 * (`:default`)
 
 When combined with the `:bright` (= `:bold`) effect, the color in the terminal emulator often differs a little bit, thus it is possible to represent 16 colors.
@@ -115,7 +115,7 @@ When using the `Paint.[]` method, Paint wraps the given string between the calcu
 
 ### Effects
 
-See [en.wikipedia.org/wiki/ANSI_escape_code](http://en.wikipedia.org/wiki/ANSI_escape_code) for a more detailed discussion:
+See [en.wikipedia.org/wiki/ANSI_escape_code](https://en.wikipedia.org/wiki/ANSI_escape_code) for a more detailed discussion:
 
 #### Often supported
 
@@ -184,11 +184,11 @@ pa "Ruby", :red, :underline  # same as puts Paint["Ruby", :red, :underline]
 
 ## Advanced Usage: Shortcuts
 
-There is an extension gem available which allows you to define custom color definitions, which you can reuse later. See [SHORTCUTS.md](https://github.com/janlelis/paint/blob/master/SHORTCUTS.md) for documentation. This is completely optional.
+There is an extension gem available which allows you to define custom color definitions, which you can reuse later. See [SHORTCUTS.md](https://github.com/janlelis/paint/blob/main/SHORTCUTS.md) for documentation. This is completely optional.
 
 ## J-_-L
 
-Copyright (c) 2011-2016 Jan Lelis <http://janlelis.com>, released under the
+Copyright (c) 2011-2020 Jan Lelis <https://janlelis.com>, released under the
 MIT license.
 
 Thank you to [rainbow](https://github.com/sickill/rainbow) and [term-ansicolor](https://github.com/flori/term-ansicolor) for ideas and inspiration. Also, a lot of thanks to all the [contributors](https://github.com/janlelis/paint/contributors)!

data/Rakefile

@@ -35,7 +35,7 @@ desc "Install the gem locally"
 task :install => :gems do
   gemspecs.each{ |gemspec|
     spec = gemspec_spec_for(gemspec)
-    sh %{gem install pkg/#{spec.name}-#{spec.version}.gem --no-rdoc --no-ri}
+    sh %{gem install pkg/#{spec.name}-#{spec.version}.gem --no-doc}
   }
 end
 

data/lib/paint.rb

@@ -172,7 +172,9 @@ module Paint
     # Determine supported colors
     # Note: there's no reliable test for 24-bit color support
     def detect_mode
-      if RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ # windows
+      if ENV['NO_COLOR'] # see https://no-color.org/
+        0
+      elsif RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ # windows
         if ENV['ANSICON']
           16
         elsif ENV['ConEmuANSI'] == 'ON'
@@ -180,14 +182,16 @@ module Paint
         else
           0
         end
+      elsif ENV['TERM_PROGRAM'] == 'Apple_Terminal'
+        256
       else
         case ENV['TERM']
-        when /-256color$/, 'xterm'
+        when /^rxvt-(?:.*)-256color$/
           256
-        when /-color$/, 'rxvt'
+        when /-color$/, /^rxvt/
           16
         else # optimistic default
-          256
+          TRUE_COLOR
         end
       end
     end
@@ -226,7 +230,7 @@ module Paint
     end
 
     # Returns best ANSI color matching an RGB value, without fore-/background information
-    # See http://mail.python.org/pipermail/python-list/2008-December/1150496.html
+    # See https://mail.python.org/pipermail/python-list/2008-December/1150496.html
     def rgb_to_ansi(red, green, blue, use_bright = false)
       color_pool =  RGB_COLORS_ANSI.values
       color_pool += RGB_COLORS_ANSI_BRIGHT.values if use_bright

data/lib/paint/constants.rb

@@ -15,7 +15,7 @@ module Paint
     :blue    => 4,
     :magenta => 5,
     :cyan    => 6,
-    :white   => 7,
+    :white   => 7, :gray => 7,
     :default => 9,
   }.freeze
 
@@ -27,7 +27,7 @@ module Paint
     :blue    => 34,
     :magenta => 35,
     :cyan    => 36,
-    :white   => 37,
+    :white   => 37, :gray => 37,
     :default => 39,
   }.freeze
 
@@ -39,12 +39,12 @@ module Paint
     :blue    => 44,
     :magenta => 45,
     :cyan    => 46,
-    :white   => 47,
+    :white   => 47, :gray => 47,
     :default => 49,
   }.freeze
 
   # Terminal effects - most of them are not supported ;)
-  # See http://en.wikipedia.org/wiki/ANSI_escape_code
+  # See https://en.wikipedia.org/wiki/ANSI_escape_code
   ANSI_EFFECTS = {
     :reset         => 0,  :nothing         => 0,  # usually supported
     :bright        => 1,  :bold            => 1,  # usually supported
@@ -75,7 +75,7 @@ module Paint
   }.freeze
 
   # A list of color names for standard ansi colors, needed for 16/8 color fallback mode
-  # See http://en.wikipedia.org/wiki/ANSI_escape_code#Colors
+  # See https://en.wikipedia.org/wiki/ANSI_escape_code#Colors
   RGB_COLORS_ANSI = {
     :black   => [  0,   0,   0],
     :red     => [205,   0,   0],
@@ -84,11 +84,11 @@ module Paint
     :blue    => [  0,   0, 238],
     :magenta => [205,   0, 205],
     :cyan    => [  0, 205, 205],
-    :white   => [229, 229, 229],
+    :white   => [229, 229, 229], :gray => [229, 229, 229],
   }.each { |k, v| v.freeze }.freeze
 
   # A list of color names for standard bright ansi colors, needed for 16 color fallback mode
-  # See http://en.wikipedia.org/wiki/ANSI_escape_code#Colors
+  # See https://en.wikipedia.org/wiki/ANSI_escape_code#Colors
   RGB_COLORS_ANSI_BRIGHT = {
     :black   => [127, 127, 127],
     :red     => [255,   0,   0],
@@ -97,6 +97,6 @@ module Paint
     :blue    => [ 92,  92, 255],
     :magenta => [255,   0, 255],
     :cyan    => [  0, 255, 255],
-    :white   => [255, 255, 255],
+    :white   => [255, 255, 255], :gray => [255, 255, 255],
   }.each { |k, v| v.freeze }.freeze
 end

data/lib/paint/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Paint
-  VERSION = "2.0.2".freeze
+  VERSION = "2.2.1"
 end

data/paint.gemspec

@@ -6,10 +6,10 @@ Gem::Specification.new do |s|
   s.name        = "paint"
   s.version     = Paint::VERSION
   s.authors     = ["Jan Lelis"]
-  s.email       = "mail@janlelis.de"
+  s.email       = ["hi@ruby.consulting"]
   s.homepage    = "https://github.com/janlelis/paint"
   s.summary     = "Terminal painter!"
-  s.description = "Terminal painter: No string extensions / RGB and 256 color support / effect support. Usage: Paint['string', :red, :bright]"
+  s.description = "Terminal painter with RGB and 256 (fallback) color and terminal effects support. No string extensions! Usage: Paint['string', :red, :bright]"
   s.license = 'MIT'
 
   s.files = %w[
@@ -32,13 +32,12 @@ Gem::Specification.new do |s|
   ]
 
   s.required_ruby_version = '>= 1.9.3'
-  s.requirements = ['Windows: ansicon (https://github.com/adoxa/ansicon) or ConEmu (http://code.google.com/p/conemu-maximus5)']
   s.add_development_dependency 'rspec', '~> 3.2'
-  s.add_development_dependency 'rake', '~> 10.4'
+  s.add_development_dependency 'rake', '~> 12.3'
   s.add_development_dependency 'benchmark-ips', '~> 2.7'
-  s.add_development_dependency 'rainbow', '~> 2.1'
-  s.add_development_dependency 'term-ansicolor', '~> 1.4'
+  s.add_development_dependency 'rainbow', '~> 3.0'
+  s.add_development_dependency 'term-ansicolor', '~> 1.7'
   s.add_development_dependency 'ansi', '~> 1.5'
   s.add_development_dependency 'hansi', '~> 0.2'
-  s.add_development_dependency 'pastel', '~> 0.6'
+  s.add_development_dependency 'pastel', '~> 0.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paint
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.2.1
 platform: ruby
 authors:
 - Jan Lelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-16 00:00:00.000000000 Z
+date: 2020-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: ansi
   requirement: !ruby/object:Gem::Requirement
@@ -114,17 +114,18 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
-description: 'Terminal painter: No string extensions / RGB and 256 color support /
-  effect support. Usage: Paint[''string'', :red, :bright]'
-email: mail@janlelis.de
+        version: '0.7'
+description: 'Terminal painter with RGB and 256 (fallback) color and terminal effects
+  support. No string extensions! Usage: Paint[''string'', :red, :bright]'
+email:
+- hi@ruby.consulting
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -164,10 +165,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements:
-- 'Windows: ansicon (https://github.com/adoxa/ansicon) or ConEmu (http://code.google.com/p/conemu-maximus5)'
-rubyforge_project: 
-rubygems_version: 2.7.7
+requirements: []
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Terminal painter!