pastel 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20dcaf43ced285d36ad7074808b52e6963e2da79
-  data.tar.gz: 592af5b9be60dbd781e909a3dc29222cfc68eef0
+  metadata.gz: ad29856f8ce21205b25f4318d1f26833d14ef771
+  data.tar.gz: efeb5f5eb350302edb488269972623ba7e92bfaa
 SHA512:
-  metadata.gz: bf6a4be639512821cf4e990dbb0a6a15a4e0f009912161be8b9f429bf9287985baa02202378d80ae2b2d8b3de218319150b713f929ed6ec5fb17006e96a530e7
-  data.tar.gz: 204a5342e5b5e2e29d1cd50896db08c8d543467a18d0efac9cfe39a77536aca277f630a7716981aff33239b1a05cac2701d6644c0f224e232704b90eb6a62ba2
+  metadata.gz: 35ee51a33ca2d5dd17d187304ae98e447cb91fbf2e0df607bb4cc13aa2b23eb7bbe0ceeec6c3823c0b588b4e753a23e422f0342f563cfb403ce7c6e1d75dd72e
+  data.tar.gz: 389f85a431b62154d914a42f68ed13526ef4c172b1c4da2ab2123cedd932e349b2aa9e223948349ad4145c504df94f97191027acef23f7fdf868d6bdd25c91cd

data/.rspec

@@ -1,2 +1,3 @@
 --color
 --require spec_helper
+--warnings

data/.travis.yml

@@ -3,8 +3,9 @@ bundler_args: --without yard benchmarks
 script: "bundle exec rake ci"
 rvm:
   - 1.9.3
-  - 2.0.0
-  - 2.1.0
+  - 2.0
+  - 2.1
+  - 2.2
   - ruby-head
 matrix:
   include:

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+0.5.0 (Sept 13, 2015)
+
+* Add external dependency to check for color support
+* Add #colored? to check if string has color escape codes
+* Add #eachline option to allow coloring of multiline strings
+* Further refine #strip method accuracy
+* Fix redefining inspect method
+* Fix string representation for pastel instance
+
 0.4.0 (November 22, 2014)
 
 * Fix Delegator#respond_to method to correctly report existence of methods

data/Gemfile

@@ -3,14 +3,14 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem 'rake',  '~> 10.3.2'
-  gem 'rspec', '~> 3.1.0'
+  gem 'rake',  '~> 10.4.2'
+  gem 'rspec', '~> 3.3.0'
   gem 'yard',  '~> 0.8.7'
   gem 'benchmark-ips', '~> 2.0.0'
 end
 
 group :metrics do
-  gem 'coveralls', '~> 0.7.0'
-  gem 'simplecov', '~> 0.8.2'
+  gem 'coveralls', '~> 0.8.2'
+  gem 'simplecov', '~> 0.10.0'
   gem 'yardstick', '~> 0.9.9'
 end

data/README.md

@@ -1,13 +1,18 @@
+<div align="center">
+  <img width="215" src="https://cdn.rawgit.com/peter-murach/pastel/master/assets/pastel_logo.png" alt="pastel logo" />
+</div>
 # Pastel
-[![Gem Version](https://badge.fury.io/rb/pastel.png)][gem]
-[![Build Status](https://secure.travis-ci.org/peter-murach/pastel.png?branch=master)][travis]
-[![Code Climate](https://codeclimate.com/github/peter-murach/pastel.png)][codeclimate]
-[![Coverage Status](https://coveralls.io/repos/peter-murach/pastel/badge.png)][coverage]
+[![Gem Version](https://badge.fury.io/rb/pastel.svg)][gem]
+[![Build Status](https://secure.travis-ci.org/peter-murach/pastel.svg?branch=master)][travis]
+[![Code Climate](https://codeclimate.com/github/peter-murach/pastel/badges/gpa.svg)][codeclimate]
+[![Coverage Status](https://coveralls.io/repos/peter-murach/pastel/badge.svg)][coverage]
+[![Inline docs](http://inch-ci.org/github/peter-murach/tty.svg?branch=master)][inchpages]
 
 [gem]: http://badge.fury.io/rb/pastel
 [travis]: http://travis-ci.org/peter-murach/pastel
 [codeclimate]: https://codeclimate.com/github/peter-murach/pastel
 [coverage]: https://coveralls.io/r/peter-murach/pastel
+[inchpages]: http://inch-ci.org/github/peter-murach/pastel
 
 > Terminal output styling with intuitive and clean API that doesn't monkey patch String class.
 
@@ -23,6 +28,7 @@
 * Intuitive and expressive API
 * Minimal and focused to work on all terminal emulators
 * Auto-detection of color support
+* Allows nested styles
 * Performant
 
 ## Installation
@@ -49,8 +55,10 @@ Or install it yourself as:
   * [2.4 Strip](#24-strip)
   * [2.5 Styles](#25-styles)
   * [2.6 Valid?](#26-valid)
-  * [2.7 Enabled?](#27-enabled)
-  * [2.8 Alias Color](#28-alias-color)
+  * [2.7 Colored?](#27-colored)
+  * [2.8 Enabled?](#28-enabled)
+  * [2.9 Eachline](#29-eachline)
+  * [2.10 Alias Color](#30-alias-color)
 * [3. Supported Colors](#3-supported-colors)
 * [4. Environment](#4-environment)
 
@@ -61,7 +69,7 @@ Or install it yourself as:
 ```ruby
 pastel = Pastel.new
 
-puts pastel.red('Unicorns!')
+pastel.red('Unicorns!')
 ```
 
 You can compose multiple styles through chainable API:
@@ -104,6 +112,12 @@ pastel.red.on_green('Unicorns') {
 }
 ```
 
+When dealing with multiline strings you can set `eachline` option(more info see [eachline](#29-eachline)):
+
+```
+pastel = Pastel.new(eachline: "\n")
+```
+
 You can also predefine needed styles and reuse them:
 
 ```ruby
@@ -118,7 +132,9 @@ puts warning('Warning')
 
 ### 2.1 Color
 
-You can pass variable number of styled strings like so:
+pastel.`<color>[.<color>...](string, [string...])`
+
+Color styles are invoked as method calls with a string argument. A given color can take any number of strings as arguments. Then it returns a colored string which isn't printed out to terminal. You need to print it yourself if you need to. This is done so that you can save it as a string, pass to something else, send it to a file handle and so on.
 
 ```ruby
 pastel.red('Unicorns ', pastel.bold.underline('everywhere'), '!')
@@ -128,13 +144,13 @@ Please refer to [3. Supported Colors](#3-supported-colors) section for full list
 
 ### 2.2 Decorate
 
-This method is a lower level string styling call that takes as the first argument the string to style and any number of attributes, and returns string wrapped in styles.
+This method is a lower level string styling call that takes as the first argument the string to style followed by any number of color attributes, and returns string wrapped in styles.
 
 ```ruby
 pastel.decorate('Unicorn', :green, :on_blue, :bold)
 ```
 
-This method will be useful in situations where colors are provided as a list of parameters.
+This method will be useful in situations where colors are provided as a list of parameters that have been generated dynamically.
 
 ### 2.3 Detach
 
@@ -148,7 +164,7 @@ puts notice.call('They are super wild')
 
 ### 2.4 Strip
 
-Strip all color sequence characters from the provided strings. The return value will be eithre array of modified strings or a single string. The arguments are not modified.
+Strip only color sequence characters from the provided strings and preserve any movement codes or other escape sequences. The return value will be either array of modified strings or a single string. The arguments are not modified.
 
 ```ruby
 pastel.strip("\e[1m\e[34mbold blue text\e[0m")  # => "bold blue text"
@@ -171,7 +187,15 @@ pastel.valid?(:red, :blue) # => true
 pastel.valid?(:unicorn)    # => false
 ```
 
-### 2.7 Enabled?
+### 2.7 Colored?
+
+In order to determine if string has color escape codes use `colored?` like so
+
+```ruby
+pastel.colored?("\e[31mcolorful\e[0m")  # => true
+```
+
+### 2.8 Enabled?
 
 In order to detect if your terminal supports coloring do:
 
@@ -186,7 +210,16 @@ pastel = Pastel.new(enabled: true)
 pastel.enabled?   # => false
 ```
 
-### 2.8 Alias Color
+### 2.9 Eachline
+
+Normally **Pastel** colors string by putting color codes at the beginning and end of the string, but if you provide `eachline` option set to some string, that string will be considered the line delimiter. Consequently, each line will be separately colored with escape sequence and reset code at the end. This option is desirable if the output string contains newlines and you're using background colors. Since color code that spans more than one line is often interpreted by terminal as providing background for all the lines that follow. This in turn may cause programs such as pagers to spill the colors throughout the text. In most cases you will want to set `eachline` to `\n` character like so:
+
+```ruby
+pastel = Pastel.new(eachline: "\n")
+pastel.red("foo\nbar")  # => "\e[31mfoo\e[0m\n\e[31mbar\e[0m"
+```
+
+### 2.10 Alias Color
 
 In order to setup an alias for the standard color do:
 
@@ -283,4 +316,4 @@ PASTEL_COLORS_ALIASES='newcolor_1=red,newcolor_2=on_green'
 
 ## Copyright
 
-Copyright (c) 2014 Piotr Murach. See LICENSE for further details.
+Copyright (c) 2014-2015 Piotr Murach. See LICENSE for further details.

data/examples/palette.rb

@@ -0,0 +1,14 @@
+require_relative 'lib/pastel'
+
+pastel = Pastel.new
+
+puts pastel.bold('bold  ') + ' ' + pastel.dim('dim   ') + ' ' + pastel.italic('italic  ') + ' ' + pastel.underline('underline') + '  ' + pastel.inverse('inverse  ') + '  ' + pastel.strikethrough('strikethrough')
+
+puts pastel.red('red   ') + ' ' + pastel.green('green   ')  + ' ' + pastel.yellow('yellow   ') + ' ' + pastel.blue('blue   ') + ' ' + pastel.magenta('magenta   ') + ' ' + pastel.cyan('cyan   ') + ' ' + pastel.white('white')
+
+puts pastel.bright_red('red   ') + ' ' + pastel.bright_green('green   ')  + ' ' + pastel.bright_yellow('yellow   ') + ' ' + pastel.bright_blue('blue   ') + ' ' + pastel.bright_magenta('magenta   ') + ' ' + pastel.bright_cyan('cyan   ') + ' ' + pastel.bright_white('white')
+
+
+puts pastel.on_red('on_red') + ' ' + pastel.on_green('on_green') + ' ' + pastel.on_yellow('on_yellow') + ' ' + pastel.on_blue('on_blue') + ' ' + pastel.on_magenta('on_magenta') + ' ' + pastel.on_cyan('on_cyan') + ' ' + pastel.on_white('on_white')
+
+puts pastel.on_bright_red('on_red') + ' ' + pastel.on_bright_green('on_green') + ' ' + pastel.on_bright_yellow('on_yellow') + ' ' + pastel.on_bright_blue('on_blue') + ' ' + pastel.on_bright_magenta('on_magenta') + ' ' + pastel.on_bright_cyan('on_cyan') + ' ' + pastel.on_bright_white('on_white')

data/lib/pastel.rb

@@ -2,6 +2,7 @@
 
 require 'forwardable'
 require 'equatable'
+require 'tty-screen'
 
 require 'pastel/ansi'
 require 'pastel/alias_importer'

data/lib/pastel/color.rb

@@ -8,14 +8,20 @@ module Pastel
 
     ALIASES = {}
 
+    ANSI_REGEX = /(\[)?\033(\[)?[:;?\d]*[\dA-Za-z](\])?/.freeze
+
     attr_reader :enabled
     alias_method :enabled?, :enabled
 
+    attr_reader :eachline
+
     # Initialize a Terminal Color
     #
     # @api public
     def initialize(options = {})
-      @enabled = options.fetch(:enabled) { supports? }
+      @enabled = options.fetch(:enabled) { TTY::Screen.color? }
+      @eachline = options.fetch(:eachline) { false }
+      freeze
     end
 
     # Disable coloring of this terminal session
@@ -25,22 +31,6 @@ module Pastel
       @enabled = false
     end
 
-    # Detect terminal color support
-    #
-    # @return [Boolean]
-    #   true when terminal supports color, false otherwise
-    #
-    # @api public
-    def supports?
-      return false unless $stdout.tty?
-      return false if ENV['TERM'] == 'dumb'
-      if ENV['TERM'] =~ /^screen|^xterm|^vt100|color|ansi|cygwin|linux/i
-        return true
-      end
-      return true if ENV.include?('COLORTERM')
-      true
-    end
-
     # Apply ANSI color to the given string.
     #
     # @param [String] string
@@ -60,15 +50,39 @@ module Pastel
       return string if string.empty? || !enabled
 
       ansi_colors = lookup(*colors)
-      ansi_string = "#{ansi_colors}#{string}#{clear}"
+      ansi_string = wrap_eachline(string, ansi_colors)
       ansi_string = nest_color(collapse_reset(ansi_string), ansi_colors)
       ansi_string
     end
 
+    # Reset sequence
+    #
+    # @api public
     def clear
       lookup(:clear)
     end
 
+    # Wraps eachline with clear character
+    #
+    # @param [String] string
+    #   string to wrap with multiline characters
+    #
+    # @param [String] ansi_colors
+    #   colors to apply to string
+    #
+    # @return [String]
+    #
+    # @api private
+    def wrap_eachline(string, ansi_colors)
+      if eachline
+        string.split(eachline).map do |line|
+          "#{ansi_colors}#{line}#{clear}"
+        end.join(eachline)
+      else
+        "#{ansi_colors}#{string}#{clear}"
+      end
+    end
+
     # Collapse reset
     #
     # @param [String] string
@@ -99,32 +113,43 @@ module Pastel
     def nest_color(string, ansi_colors)
       ansi_string = string.dup
       matches = ansi_string.scan(/#{Regexp.quote(clear)}/)
-      if matches.length > 1
+      if matches.length > 1 && !eachline
         ansi_string.sub!(/#{Regexp.quote(clear)}/, ansi_colors)
       end
       ansi_string
     end
     private :collapse_reset, :nest_color
 
-    # Same as instance method.
+    # Strip ANSI color codes from a string.
+    #
+    # Only ANSI color codes are removed, not movement codes or
+    # other escapes sequences are stripped.
+    #
+    # @param [Array[String]] strings
+    #   a string or array of strings to sanitize
+    #
+    # @example
+    #   strip("foo\e[1mbar\e[0m")  # => "foobar"
     #
     # @return [String]
     #
     # @api public
-    def self.decorate(string, *colors)
-      new.decorate(string, *colors)
+    def strip(*strings)
+      modified = strings.map { |string| string.dup.gsub(ANSI_REGEX, '') }
+      modified.size == 1 ? modified[0] : modified
     end
 
-    # Strip ANSI color codes from a string.
+    # Check if string has color escape codes
     #
     # @param [String] string
-    #   the string to sanitize
+    #   the string to check for color strings
     #
-    # @return [String]
+    # @return [Boolean]
+    #   true when string contains color codes, false otherwise
     #
     # @api public
-    def strip(string)
-      string.to_s.gsub(/(\[)?\033(\[)?[;?\d]*[\dA-Za-z](\])?/, '')
+    def colored?(string)
+      !ANSI_REGEX.match(string).nil?
     end
 
     # Return raw color code without embeding it into a string.
@@ -146,7 +171,7 @@ module Pastel
       attribute
     end
 
-    # Find color representation.
+    # Find the escape code for color attribute.
     #
     # @param [Symbol,String] colors
     #   the color name(s) to lookup
@@ -183,7 +208,10 @@ module Pastel
     # @param [Array[Symbol,String]]
     #   the list of colors to check
     #
-    # @reutrn [Boolean]
+    # @example
+    #   valid?(:red)   # => true
+    #
+    # @return [Boolean]
     #   true if all colors are valid, false otherwise
     #
     # @api public

data/lib/pastel/delegator.rb

@@ -10,7 +10,7 @@ module Pastel
     include Equatable
 
     def_delegators '@resolver.color', :valid?, :styles, :strip, :decorate,
-                   :enabled?, :alias_color
+                   :enabled?, :colored?, :alias_color
 
     # Create Delegator
     #
@@ -31,12 +31,17 @@ module Pastel
       new(resolver, base)
     end
 
+    remove_method :inspect
+
     # Object string representation
     #
+    # @return [String]
+    #
     # @api
     def inspect
-      "<##{self.class.name}>"
+      "#<Pastel @styles=#{base.map(&:to_s)}>"
     end
+    alias_method :to_s, :inspect
 
     protected
 

data/lib/pastel/version.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
 
 module Pastel
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/pastel.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "equatable", "~> 0.5"
+  spec.add_dependency "tty-screen", "~> 0.4"
 
   spec.add_development_dependency "bundler", "~> 1.6"
 end

data/spec/unit/alias_importer_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe Pastel::AliasImporter, '.import' do
-  let(:color) { double(:color, alias_color: true) }
+  let(:color) { spy(:color, alias_color: true) }
   let(:output) { StringIO.new }
 
   subject(:importer) { described_class.new(color, output) }
@@ -12,15 +12,19 @@ RSpec.describe Pastel::AliasImporter, '.import' do
     color_aliases = "funky=red,base=bright_yellow"
     allow(ENV).to receive(:[]).with('PASTEL_COLORS_ALIASES').
       and_return(color_aliases)
+
     importer.import
+
     expect(color).to have_received(:alias_color).twice
   end
 
-  it "fails to import incorrectly formattd colors" do
+  it "fails to import incorrectly formatted colors" do
     color_aliases = "funky red,base=bright_yellow"
     allow(ENV).to receive(:[]).with('PASTEL_COLORS_ALIASES').
       and_return(color_aliases)
+
     importer.import
+
     output.rewind
     expect(output.string).to eq("Bad color mapping `funky red`\n")
     expect(color).to have_received(:alias_color).with(:base, :bright_yellow)

data/spec/unit/color/code_spec.rb

@@ -18,4 +18,9 @@ RSpec.describe Pastel::Color, '.code' do
   it "doesn't find code" do
     expect { color.code(:unkown) }.to raise_error(ArgumentError)
   end
+
+  it "finds alias code" do
+    color.alias_color(:funky, :red)
+    expect(color.code(:funky)).to eq(color.code(:red))
+  end
 end

data/spec/unit/color/colored_spec.rb

@@ -0,0 +1,17 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+RSpec.describe Pastel::Color, '.colored?' do
+  subject(:color) { described_class.new(enabled: true) }
+
+  it "checks if string has color codes" do
+    string = "foo\e[31mbar\e[0m"
+    expect(color.colored?(string)).to eq(true)
+  end
+
+  it "checks that string doesn't contain color codes" do
+    string = "foo\nbar"
+    expect(color.colored?(string)).to eq(false)
+  end
+end

data/spec/unit/color/decorate_spec.rb

@@ -38,6 +38,21 @@ RSpec.describe Pastel::Color, '.decorate' do
     expect(decorated).to eq("\e[32m#{string}\e[31m#{string}\e[32m#{string}\e[0m")
   end
 
+  it "decorates multiline string as regular by default" do
+    string = "foo\nbar\nbaz"
+    expect(color.decorate(string, :red)).to eq("\e[31mfoo\nbar\nbaz\e[0m")
+  end
+
+  it "allows to decorate each line separately" do
+    string = "foo\nbar\nbaz"
+    color = described_class.new(enabled: true, eachline: "\n")
+    expect(color.decorate(string, :red)).to eq([
+      "\e[31mfoo\e[0m",
+      "\e[31mbar\e[0m",
+      "\e[31mbaz\e[0m"
+    ].join("\n"))
+  end
+
   it 'errors for unknown color' do
     expect {
       color.decorate(string, :crimson)

data/spec/unit/color/equal_spec.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+RSpec.describe Pastel::Color, '#==' do
+  it "is true with the same enabled and eachline attributes" do
+    expect(Pastel::Color.new(enabled: false, eachline: "\n")).
+      to eq(Pastel::Color.new(enabled: false, eachline: "\n"))
+  end
+
+  it "is false with different enabled attribute" do
+    expect(Pastel::Color.new(enabled: true, eachline: "\n")).
+      not_to eq(Pastel::Color.new(enabled: false, eachline: "\n"))
+  end
+
+  it "is false with different eachline attribute" do
+    expect(Pastel::Color.new(enabled: false, eachline: "\n")).
+      not_to eq(Pastel::Color.new(enabled: false, eachline: "\r\n"))
+  end
+
+  it "is false with non-color" do
+    expect(Pastel::Color.new(enabled: true)).not_to eq(:other)
+  end
+end

data/spec/unit/color/new_spec.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+RSpec.describe Pastel::Color, '.new' do
+  it "is immutable" do
+    expect(described_class.new).to be_frozen
+  end
+
+  it "allows to disable coloring" do
+    color = described_class.new(enabled: false)
+
+    expect(color.enabled?).to eq(false)
+    expect(color.decorate("Unicorn", :red)).to eq("Unicorn")
+  end
+
+  it "invokes screen dependency to check color support" do
+    allow(TTY::Screen).to receive(:color?).and_return(true)
+    color = described_class.new
+
+    expect(color.enabled?).to eq(true)
+    expect(TTY::Screen).to have_received(:color?)
+  end
+end

data/spec/unit/color/strip_spec.rb

@@ -3,45 +3,56 @@
 require 'spec_helper'
 
 RSpec.describe Pastel::Color, '.strip' do
-  let(:instance) { described_class.new(enabled: true) }
 
-  subject(:color) { instance.strip(string) }
+  subject(:color) { described_class.new(enabled: true) }
 
-  context 'with ansi colors' do
-    let(:string)   { "This is a \e[1m\e[34mbold blue text\e[0m" }
-
-    it 'removes color from string' do
-      is_expected.to eq('This is a bold blue text')
-    end
+  it 'strips ansi color from string' do
+    string = "This is a \e[1m\e[34mbold blue text\e[0m"
+    expect(color.strip(string)).to eq('This is a bold blue text')
   end
 
-  context 'with octal in encapsulating brackets' do
-    let(:string) { "\[\033[01;32m\]u@h \[\033[01;34m\]W $ \[\033[00m\]" }
-
-    it { is_expected.to eq('u@h W $ ') }
+  it "strips partial ansi color" do
+    string = "foo\e[1mbar"
+    expect(color.strip(string)).to eq('foobar')
   end
 
-  context 'with octal without brackets' do
-    let(:string) { "\033[01;32mu@h \033[01;34mW $ \033[00m" }
+  it 'preserves movement characters' do
+    # [176A - move cursor up n lines
+    expect(color.strip("foo\e[176Abar")).to eq('foobar')
+  end
 
-    it { is_expected.to eq('u@h W $ ') }
+  it 'strips reset/setfg/setbg/italics/strike/underline sequence' do
+    string = "\x1b[0;33;49;3;9;4mfoo\x1b[0m"
+    expect(color.strip(string)).to eq("foo")
   end
 
-  context 'with octal with multiple colors' do
-    let(:string) { "\e[3;0;0;t\e[8;50;0t" }
+  it 'strips octal in encapsulating brackets' do
+    string = "\[\033[01;32m\]u@h \[\033[01;34m\]W $ \[\033[00m\]"
+    expect(color.strip(string)).to eq('u@h W $ ')
+  end
 
-    it { is_expected.to eq('') }
+  it 'strips octal codes without brackets' do
+    string = "\033[01;32mu@h \033[01;34mW $ \033[00m"
+    expect(color.strip(string)).to eq('u@h W $ ')
   end
 
-  context 'with control codes' do
-    let(:string ) { "WARN. \x1b[1m&\x1b[0m ERR. \x1b[7m&\x1b[0m" }
+  it 'strips octal with multiple colors' do
+    string = "\e[3;0;0;tfoo\e[8;50;0t"
+    expect(color.strip(string)).to eq('foo')
+  end
 
-    it { is_expected.to eq('WARN. & ERR. &') }
+  it "strips multiple colors delimited by :" do
+    string = "\e[31:44:4mfoo\e[0m"
+    expect(color.strip(string)).to eq('foo')
   end
 
-  context 'with escape byte' do
-    let(:string) { "This is a \e[1m\e[34mbold blue text\e[0m" }
+  it 'strips control codes' do
+    string = "WARN. \x1b[1m&\x1b[0m ERR. \x1b[7m&\x1b[0m"
+    expect(color.strip(string)).to eq('WARN. & ERR. &')
+  end
 
-    it { is_expected.to eq("This is a bold blue text") }
+  it 'strips escape bytes' do
+    string = "This is a \e[1m\e[34mbold blue text\e[0m"
+    expect(color.strip(string)).to eq("This is a bold blue text")
   end
 end

data/spec/unit/color/valid_spec.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+RSpec.describe Pastel::Color, '.valid?' do
+  it "detects valid colors" do
+    color = described_class.new
+    expect(color.valid?(:red, :on_green, :bold)).to eq(true)
+  end
+
+  it "detects valid color aliases" do
+    color = described_class.new
+    color.alias_color(:funky, :red)
+    expect(color.valid?(:funky)).to eq(true)
+  end
+
+  it "detects invalid color" do
+    color = described_class.new
+    expect(color.valid?(:red, :unknown)).to eq(false)
+  end
+end

data/spec/unit/delegator_spec.rb

@@ -3,6 +3,21 @@
 require 'spec_helper'
 
 RSpec.describe Pastel::Delegator do
+
+  it "returns delegator for color without argument" do
+    pastel = Pastel.new(enabled: true)
+    expect(pastel.red).to be_a(Pastel::Delegator)
+  end
+
+  describe ".inspect" do
+    it "inspects delegator styles chain" do
+      chain = ['red', 'on_green']
+      delegator = described_class.new(:resolver, chain)
+      allow(delegator).to receive(:styles).and_return({red: 31, on_green: 42})
+      expect(delegator.inspect).to eq("#<Pastel @styles=[\"red\", \"on_green\"]>")
+    end
+  end
+
   describe ".respond_to_missing?" do
     context 'for a method defined on' do
       it "returns true" do

data/spec/unit/new_spec.rb

@@ -93,11 +93,22 @@ RSpec.describe Pastel do
     end
   end
 
+  describe '.colored?' do
+    it "checks if string is colored" do
+      expect(pastel.colored?("\e[31mfoo\e[0m")).to eq(true)
+    end
+  end
+
   describe 'options passed in' do
     it "receives enabled option" do
       pastel = described_class.new(enabled: false)
       expect(pastel.enabled?).to eq(false)
       expect(pastel.red('Unicorn', pastel.green('!'))).to eq('Unicorn!')
     end
+
+    it "sets eachline option" do
+      pastel = described_class.new(enabled: true, eachline: "\n")
+      expect(pastel.red("foo\nbar")).to eq("\e[31mfoo\e[0m\n\e[31mbar\e[0m")
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pastel
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Piotr Murach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-22 00:00:00.000000000 Z
+date: 2015-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equatable
@@ -24,6 +24,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: tty-screen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -55,9 +69,11 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- assets/pastel_logo.png
 - assets/screenshot.png
 - benchmarks/nesting_speed.rb
 - benchmarks/speed.rb
+- examples/palette.rb
 - lib/pastel.rb
 - lib/pastel/alias_importer.rb
 - lib/pastel/ansi.rb
@@ -73,10 +89,13 @@ files:
 - spec/unit/alias_importer_spec.rb
 - spec/unit/color/alias_color_spec.rb
 - spec/unit/color/code_spec.rb
+- spec/unit/color/colored_spec.rb
 - spec/unit/color/decorate_spec.rb
+- spec/unit/color/equal_spec.rb
+- spec/unit/color/new_spec.rb
 - spec/unit/color/strip_spec.rb
 - spec/unit/color/styles_spec.rb
-- spec/unit/color/supports_spec.rb
+- spec/unit/color/valid_spec.rb
 - spec/unit/decorator_chain_spec.rb
 - spec/unit/delegator_spec.rb
 - spec/unit/detach_spec.rb
@@ -115,10 +134,13 @@ test_files:
 - spec/unit/alias_importer_spec.rb
 - spec/unit/color/alias_color_spec.rb
 - spec/unit/color/code_spec.rb
+- spec/unit/color/colored_spec.rb
 - spec/unit/color/decorate_spec.rb
+- spec/unit/color/equal_spec.rb
+- spec/unit/color/new_spec.rb
 - spec/unit/color/strip_spec.rb
 - spec/unit/color/styles_spec.rb
-- spec/unit/color/supports_spec.rb
+- spec/unit/color/valid_spec.rb
 - spec/unit/decorator_chain_spec.rb
 - spec/unit/delegator_spec.rb
 - spec/unit/detach_spec.rb

data/spec/unit/color/supports_spec.rb

@@ -1,49 +0,0 @@
-# encoding: utf-8
-
-require 'spec_helper'
-
-RSpec.describe Pastel::Color, '.supports?' do
-
-  before { allow(ENV).to receive(:[]).with('PASTEL_COLORS_ALIASES') }
-
-  it "isn't enabled for non tty terminal" do
-    allow($stdout).to receive(:tty?).and_return(false)
-    color = described_class.new
-
-    expect(color.enabled?).to eq(false)
-    expect(color.decorate("Unicorn", :red)).to eq("Unicorn")
-  end
-
-  it "isn't enabled for dumb terminal" do
-    allow($stdout).to receive(:tty?).and_return(true)
-    allow(ENV).to receive(:[]).with('TERM').and_return('dumb')
-    color = described_class.new
-
-    expect(color.enabled?).to eq(false)
-  end
-
-  it "is enabled for term with color support" do
-    allow($stdout).to receive(:tty?).and_return(true)
-    allow(ENV).to receive(:[]).with('TERM').and_return('xterm')
-    color = described_class.new
-
-    expect(color.enabled?).to eq(true)
-  end
-
-  it "is enabled for color terminal" do
-    allow($stdout).to receive(:tty?).and_return(true)
-    allow(ENV).to receive(:[]).with('TERM').and_return('unknown')
-    allow(ENV).to receive(:[]).with('COLORTERM').and_return(true)
-    color = described_class.new
-
-    expect(color.enabled?).to eq(true)
-  end
-
-  it "forces to be enabled with supports? check" do
-    color = described_class.new(enabled: false)
-    allow(color).to receive(:supports?)
-
-    expect(color.enabled?).to eq(false)
-    expect(color).to_not have_received(:supports?)
-  end
-end