rainbow 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 173113b6696213f239638a808f56033abc5b7467
-  data.tar.gz: b4794428b131eb7c0d59e3a4d615e211b159b7d9
+  metadata.gz: ae78749f89ed058bfe6d143f96ab9140e243a0bc
+  data.tar.gz: 0ea8625303c1f3c6668ef9cf05692db0295138a3
 SHA512:
-  metadata.gz: 34d9884acf5dfc1af44737a7059a3ab11a274b5cf6517972182c12237e346d0d0ed89f49652dd9ab813408eef275af8dd4df01b8116e0b767d3b91d7da7f7317
-  data.tar.gz: 9d028c71300949cc03b74fa5869cbeb2e749ce23a4c12ef60501e1fb733cdbb0fa7d0a45f96f3c1e9319f3835ff2ed0fa27c75b7f869c9850e62ba615c1161da
+  metadata.gz: 6a4d28dea14c12a91fb545046183a8fe02b1da104f4dd52c59245cb045ce1116b5b2777570a211112f973ccf52d18cea9547ae1f9ce0405e72538d2dceb4237a
+  data.tar.gz: 03c7b7197f82cd5974c01458524217cfd000a67cff73962b67440c3c44dfd261c5fa1b160da99110fb618a09b3830d0fac1b9b47e854daa28ee0543ff40856df

data/Changelog.md

@@ -81,3 +81,7 @@
 # 2.2.1 (2016-12-28)
 
 * fixed gem installation (2.2.0 was a broken release)
+
+# 2.2.2 (2017-04-21)
+
+* added explicit rake dependency to fix installation issue

data/README.markdown

@@ -38,7 +38,8 @@ Rainbow presenter adds the following methods to presented string:
 * `blink`
 * `inverse`
 * `hide`
-* `italic` (not well supported by terminal emulators).
+* `faint` (not well supported by terminal emulators)
+* `italic` (not well supported by terminal emulators)
 
 Text color can also be changed by calling a method named by a color:
 
@@ -181,154 +182,35 @@ gem install rainbow
 
 ### ANSI colors
 
-* `black`
-* `red`
-* `green`
-* `yellow`
-* `blue`
-* `magenta`
-* `cyan`
-* `white`
+`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`
+`aliceblue`, `antiquewhite`, `aqua`, `aquamarine`, `azure`, `beige`, `bisque`,
+`blanchedalmond`, `blueviolet`, `brown`, `burlywood`, `cadetblue`, `chartreuse`,
+`chocolate`, `coral`, `cornflower`, `cornsilk`, `crimson`, `darkblue`,
+`darkcyan`, `darkgoldenrod`, `darkgray`, `darkgreen`, `darkkhaki`,
+`darkmagenta`, `darkolivegreen`, `darkorange`, `darkorchid`, `darkred`,
+`darksalmon`, `darkseagreen`, `darkslateblue`, `darkslategray`, `darkturquoise`,
+`darkviolet`, `deeppink`, `deepskyblue`, `dimgray`, `dodgerblue`, `firebrick`,
+`floralwhite`, `forestgreen`, `fuchsia`, `gainsboro`, `ghostwhite`, `gold`,
+`goldenrod`, `gray`, `greenyellow`, `honeydew`, `hotpink`, `indianred`,
+`indigo`, `ivory`, `khaki`, `lavender`, `lavenderblush`, `lawngreen`,
+`lemonchiffon`, `lightblue`, `lightcoral`, `lightcyan`, `lightgoldenrod`,
+`lightgray`, `lightgreen`, `lightpink`, `lightsalmon`, `lightseagreen`,
+`lightskyblue`, `lightslategray`, `lightsteelblue`, `lightyellow`, `lime`,
+`limegreen`, `linen`, `maroon`, `mediumaquamarine`, `mediumblue`,
+`mediumorchid`, `mediumpurple`, `mediumseagreen`, `mediumslateblue`,
+`mediumspringgreen`, `mediumturquoise`, `mediumvioletred`, `midnightblue`,
+`mintcream`, `mistyrose`, `moccasin`, `navajowhite`, `navyblue`, `oldlace`,
+`olive`, `olivedrab`, `orange`, `orangered`, `orchid`, `palegoldenrod`,
+`palegreen`, `paleturquoise`, `palevioletred`, `papayawhip`, `peachpuff`,
+`peru`, `pink`, `plum`, `powderblue`, `purple`, `rebeccapurple`, `rosybrown`,
+`royalblue`, `saddlebrown`, `salmon`, `sandybrown`, `seagreen`, `seashell`,
+`sienna`, `silver`, `skyblue`, `slateblue`, `slategray`, `snow`, `springgreen`,
+`steelblue`, `tan`, `teal`, `thistle`, `tomato`, `turquoise`, `violet`,
+`webgray`, `webgreen`, `webmaroon`, `webpurple`, `wheat`, `whitesmoke`,
+`yellowgreen`
 
 ## Authors
 

data/lib/rainbow/color.rb

@@ -12,7 +12,12 @@ module Rainbow
       color = values.size == 1 ? values.first : values
 
       case color
-      when Integer
+      # NOTE: Properly handle versions before/after Ruby 2.4.0.
+      # Ruby 2.4+ unifies Fixnum & Bignum into Integer.
+      # However previous versions would still use Fixnum.
+      # To avoid missing `Fixnum` input, call `0.class` which would
+      # return either `Integer` or `Fixnum`.
+      when 0.class
         Indexed.new(ground, color)
       when Symbol
         if Named.color_names.include?(color)

data/lib/rainbow/ext/string.rb

@@ -24,6 +24,10 @@ module Rainbow
           Rainbow(self).bright
         end
 
+        def faint
+          Rainbow(self).faint
+        end
+
         def italic
           Rainbow(self).italic
         end

data/lib/rainbow/null_presenter.rb

@@ -6,6 +6,7 @@ module Rainbow
     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
@@ -32,6 +33,8 @@ module Rainbow
     alias_method :foreground, :color
     alias_method :fg, :color
     alias_method :bg, :background
+    alias_method :bold, :bright
+    alias_method :dark, :faint
 
   end
 

data/lib/rainbow/presenter.rb

@@ -9,6 +9,7 @@ module Rainbow
     TERM_EFFECTS = {
       reset:     0,
       bright:    1,
+      faint:     2,
       italic:    3,
       underline: 4,
       blink:     5,
@@ -46,6 +47,14 @@ module Rainbow
 
     alias_method :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_method :dark, :faint
+
     # Turns on italic style for this text (not well supported by terminal
     # emulators).
     def italic

data/lib/rainbow/version.rb

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

data/rainbow.gemspec

@@ -19,6 +19,8 @@ Gem::Specification.new do |spec|
   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/rainbow_spec.rb

@@ -77,6 +77,11 @@ describe 'Rainbow() wrapper' do
     expect(result).to eq("\e[1mhello\e[0m")
   end
 
+  it 'allows making text faint' do
+    result = Rainbow('hello').faint
+    expect(result).to eq("\e[2mhello\e[0m")
+  end
+
   it 'allows making text italic' do
     result = Rainbow('hello').italic
     expect(result).to eq("\e[3mhello\e[0m")
@@ -111,6 +116,9 @@ describe 'Rainbow() wrapper' do
     result = Rainbow('hello').
       foreground(:red).
       bright.
+      bold.
+      faint.
+      dark.
       italic.
       background('#ff8040').
       underline.
@@ -120,7 +128,7 @@ describe 'Rainbow() wrapper' do
       hide
 
     expect(result).to eq(
-      "\e[31m\e[1m\e[3m\e[48;5;215m\e[4m\e[34m\e[5m\e[7m\e[8mhello\e[0m"
+      "\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"
     )
   end
 
@@ -134,6 +142,9 @@ describe 'Rainbow() wrapper' do
       result = Rainbow('hello').
         foreground(:red).
         bright.
+        bold.
+        faint.
+        dark.
         italic.
         background('#ff8040').
         underline.

data/spec/integration/string_spec.rb

@@ -31,6 +31,10 @@ describe 'String mixin' do
     expect('hello'.bright).to eq(Rainbow('hello').bright)
   end
 
+  it 'proxies faint to Rainbow().faint' do
+    expect('hello'.faint).to eq(Rainbow('hello').faint)
+  end
+
   it 'proxies italic to Rainbow().italic' do
     expect('hello'.italic).to eq(Rainbow('hello').italic)
   end

data/spec/unit/null_presenter_spec.rb

@@ -58,6 +58,24 @@ module Rainbow
       it_behaves_like "rainbow null string method"
     end
 
+    describe '#bold' do
+      subject { presenter.bold }
+
+      it_behaves_like "rainbow null string method"
+    end
+
+    describe '#faint' do
+      subject { presenter.faint }
+
+      it_behaves_like "rainbow null string method"
+    end
+
+    describe '#dark' do
+      subject { presenter.dark }
+
+      it_behaves_like "rainbow null string method"
+    end
+
     describe '#italic' do
       subject { presenter.italic }
 

data/spec/unit/presenter_spec.rb

@@ -117,6 +117,28 @@ module Rainbow
       end
     end
 
+    describe '#faint' do
+      subject { presenter.faint }
+
+      it_behaves_like "rainbow string method"
+
+      it 'wraps with 2 code' do
+        subject
+        expect(StringUtils).to have_received(:wrap_with_sgr).with('hello', [2])
+      end
+    end
+
+    describe '#dark' do
+      subject { presenter.dark }
+
+      it_behaves_like "rainbow string method"
+
+      it 'wraps with 2 code' do
+        subject
+        expect(StringUtils).to have_received(:wrap_with_sgr).with('hello', [2])
+      end
+    end
+
     describe '#italic' do
       subject { presenter.italic }
 

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rainbow
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Marcin Kulik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-28 00:00:00.000000000 Z
+date: 2017-04-21 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement