pastel 0.7.4 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f27ae640e6ef241eef25aa65ca531e0bf2b77242c3575c217a50c6679146ca7a
-  data.tar.gz: 87d9af402543b3094c16c233aecaaeea8bf9e418bf1b5b3f04d09998e576c69c
+  metadata.gz: '06693f6ff4f804468ff3802df48c725067fb8eb425e9ba4301627f7c496099bb'
+  data.tar.gz: 0752767e8bbe626d683e5eb8b576f5c1229c322f72475d41b1041f4f15eb2c11
 SHA512:
-  metadata.gz: a1b38a5b8437adf408d6308b96389a846a81e1a13e34446db4b75ce06b37f54f08d05706e8a2505916a29d8e6ee025ca58528676ad978eaee30bd3af0a0eee04
-  data.tar.gz: b43aad885a8d33ff9e9f2ec5abcfbee59dfef0fce1f62c54628190e8196881ca7bbcad76a2af99fdb5d16a02cb161f1045da5763db6825c1f53a8c152bc8e663
+  metadata.gz: 2239724d8aa9165ec045a2f43b6b8ce336c35ad487bc9e5ca1a8005c0321c682a73fff711316710848fee9931790c47a72dc5469afda25e98975bf6c38a9dfc5
+  data.tar.gz: b8f59e4fa1c52973d91d41d4e3f8602da3b164a41125a7416c7f119f53f880e81f4d3a79ea52e25b4e9de4dcb338d37ff1045f9b7b4437056cb7dc1597ce87df

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change log
 
+## [v0.8.0] - 2020-07-04
+
+### Changed
+* Change gemspec to require Ruby 2.0 or higher
+* Change Pastel#new to use keyword arguments in place of hash options
+* Change to freeze all strings
+* Remove equatable dependency
+
+### Fixed
+* Fix Pastel#strip to recognise no-number reset by DanielVartanov(@DanielVartanov)
+* Fix Pastel#undecorate to correctly assign styles for nested colors
+
 ## [v0.7.4] - 2020-05-08
 
 ### Fixed
@@ -122,6 +134,7 @@
 * Change gemspec to include equatable as dependency
 * Change Delegator to stop creating instances and improve performance
 
+[v0.8.0]: https://github.com/piotrmurach/pastel/compare/v0.7.4...v0.8.0
 [v0.7.4]: https://github.com/piotrmurach/pastel/compare/v0.7.3...v0.7.4
 [v0.7.3]: https://github.com/piotrmurach/pastel/compare/v0.7.2...v0.7.3
 [v0.7.2]: https://github.com/piotrmurach/pastel/compare/v0.7.1...v0.7.2

data/README.md

@@ -39,7 +39,7 @@
 
 Add this line to your application's Gemfile:
 
-    gem 'pastel'
+    gem "pastel"
 
 And then execute:
 
@@ -76,7 +76,7 @@ Or install it yourself as:
 ```ruby
 pastel = Pastel.new
 
-puts pastel.red('Unicorns!')
+puts pastel.red("Unicorns!")
 ```
 
 **Pastel** doesn't print the colored string out, just returns it, you'll have to print it yourself.
@@ -84,46 +84,46 @@ puts pastel.red('Unicorns!')
 You can compose multiple styles through chainable API:
 
 ```ruby
-pastel.red.on_green.bold('Unicorns!')
+pastel.red.on_green.bold("Unicorns!")
 ```
 
 It allows you to combine styled strings with unstyled ones:
 
 ```ruby
-pastel.red('Unicorns') + ' will rule ' + pastel.green('the World!')
+pastel.red("Unicorns") + " will rule " + pastel.green("the World!")
 ```
 
 It supports variable number of arguments:
 
 ```ruby
-pastel.red('Unicorns', 'are', 'running', 'everywhere!')
+pastel.red("Unicorns", "are", "running", "everywhere!")
 ```
 
 You can also nest styles as follows:
 
 ```ruby
-pastel.red('Unicorns ', pastel.on_green('everywhere!'))
+pastel.red("Unicorns ", pastel.on_green("everywhere!"))
 ```
 
 Nesting is smart enough to know where one color ends and another one starts:
 
 ```ruby
-pastel.red('Unicorns ' + pastel.green('everywhere') + pastel.on_yellow('!'))
+pastel.red("Unicorns " + pastel.green("everywhere") + pastel.on_yellow("!"))
 ```
 
 You can also nest styles inside blocks:
 
 ```ruby
-pastel.red.on_green('Unicorns') {
-  green.on_red('will ', 'dominate') {
-    yellow('the world!')
+pastel.red.on_green("Unicorns") {
+  green.on_red("will ", "dominate") {
+    yellow("the world!")
   }
 }
 ```
 
 When dealing with multiline strings you can set `eachline` option(more info see [eachline](#211-eachline)):
 
-```
+```ruby
 pastel = Pastel.new(eachline: "\n")
 ```
 
@@ -133,8 +133,8 @@ You can also predefine needed styles and reuse them:
 error    = pastel.red.bold.detach
 warning  = pastel.yellow.detach
 
-puts error.('Error!')
-puts warning.('Warning')
+puts error.("Error!")
+puts warning.("Warning")
 ```
 
 If your output is redirected to a file, you probably don't want Pastel to add color to your text.
@@ -143,7 +143,7 @@ See https://github.com/piotrmurach/pastel#210-enabled for a way to easily accomp
 **Pastel** has companion library called `pastel-cli` that allows you to style text in terminal via `pastel` executable:
 
 ```bash
-$ pastel green 'Unicorns & rainbows!'
+$ pastel green "Unicorns & rainbows!"
 ```
 
 ## 2 Interface
@@ -155,7 +155,7 @@ pastel.`[....](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'), '!')
+pastel.red("Unicorns ", pastel.bold.underline("everywhere"), "!")
 ```
 
 Please refer to [3. Supported Colors](#3-supported-colors) section for full list of supported styles.
@@ -165,7 +165,7 @@ Please refer to [3. Supported Colors](#3-supported-colors) section for full list
 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)
+pastel.decorate("Unicorn", :green, :on_blue, :bold)
 ```
 
 This method will be useful in situations where colors are provided as a list of parameters that have been generated dynamically.
@@ -176,7 +176,7 @@ It performs the opposite to `decorate` method by turning color escape sequences
 
 ```ruby
 pastel.undecorate("\e[32mfoo\e[0m \e[31mbar\e[0m")
-# => [{foreground: :green, text: 'foo'}, {text: ' '}, {foreground: :red, text: 'bar'}]
+# => [{foreground: :green, text: "foo"}, {text: " "}, {foreground: :red, text: "bar"}]
 ```
 
 To translate the color name into sequence use [lookup](#27-lookup)
@@ -188,9 +188,9 @@ The `detach` method allows to keep all the associated colors with the detached i
 ```ruby
 notice = pastel.blue.bold.detach
 
-notice.call('Unicorns running')
-notice.('Unicorns running')
-notice['Unicorns running']
+notice.call("Unicorns running")
+notice.("Unicorns running")
+notice["Unicorns running"]
 ```
 
 ### 2.5 Strip
@@ -278,7 +278,7 @@ pastel.alias_color(:funky, :red, :bold)
 From that point forward, `:funky` alias can be passed to `decorate`, `valid?` with the same meaning as standard colors:
 
 ```ruby
-pastel.funky.on_green('unicorn')   # => will use :red, :bold color
+pastel.funky.on_green("unicorn")   # => will use :red, :bold color
 ```
 
 This method allows you to give more meaningful names to existing colors.
@@ -351,7 +351,7 @@ This environment variable allows you to specify custom color aliases at runtime
 Only alphanumeric and `_` and `.` are allowed in the alias names with the following format:
 
 ```ruby
-PASTEL_COLORS_ALIASES='newcolor_1=red,newcolor_2=on_green,funky=red.bold'
+PASTEL_COLORS_ALIASES="newcolor_1=red,newcolor_2=on_green,funky=red.bold"
 ```
 
 ## 5. Command line
@@ -370,6 +370,10 @@ $ pastel green 'Unicorns & rainbows!'
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create a new Pull Request
 
+## Code of Conduct
+
+Everyone interacting in the Pastel project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/piotrmurach/pastel/blob/master/CODE_OF_CONDUCT.md).
+
 ## Copyright
 
 Copyright (c) 2014 Piotr Murach. See LICENSE for further details.

data/lib/pastel.rb

@@ -1,13 +1,12 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
-require 'tty-color'
+require "tty-color"
 
-require_relative 'pastel/alias_importer'
-require_relative 'pastel/color'
-require_relative 'pastel/color_resolver'
-require_relative 'pastel/delegator'
-require_relative 'pastel/decorator_chain'
-require_relative 'pastel/version'
+require_relative "pastel/alias_importer"
+require_relative "pastel/color"
+require_relative "pastel/color_resolver"
+require_relative "pastel/delegator"
+require_relative "pastel/version"
 
 module Pastel
   # Raised when the style attribute is not supported
@@ -21,19 +20,23 @@ module Pastel
   # @example
   #   pastel = Pastel.new enabled: true
   #
+  # @param [Boolean] :enabled
+  #   whether or not to disable coloring
+  # @param [Boolean] :eachline
+  #   whether or not to wrap eachline with separate coloring
+  #
   # @return [Delegator]
   #
   # @api public
-  def new(options = {})
-    unless options.key?(:enabled)
-      options[:enabled] = (TTY::Color.windows? || TTY::Color.color?)
+  def new(enabled: nil, eachline: false)
+    if enabled.nil?
+      enabled = (TTY::Color.windows? || TTY::Color.color?)
     end
-    color    = Color.new(options)
+    color    = Color.new(enabled: enabled, eachline: eachline)
     importer = AliasImporter.new(color, ENV)
     importer.import
     resolver = ColorResolver.new(color)
-    Delegator.for(resolver, DecoratorChain.empty)
+    Delegator.wrap(resolver)
   end
-
   module_function :new
 end # Pastel

data/lib/pastel/alias_importer.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Pastel
   # A class responsible for importing color aliases
@@ -25,15 +25,16 @@ module Pastel
     #
     # @api public
     def import
-      color_aliases = env['PASTEL_COLORS_ALIASES']
+      color_aliases = env["PASTEL_COLORS_ALIASES"]
       return unless color_aliases
-      color_aliases.split(',').each do |color_alias|
-        new_color, old_colors = color_alias.split('=')
+
+      color_aliases.split(",").each do |color_alias|
+        new_color, old_colors = color_alias.split("=")
         if !new_color || !old_colors
           output.puts "Bad color mapping `#{color_alias}`"
         else
           color.alias_color(new_color.to_sym,
-                            *old_colors.split('.').map(&:to_sym))
+                            *old_colors.split(".").map(&:to_sym))
         end
       end
     end

data/lib/pastel/ansi.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Pastel
   # Mixin that provides ANSI codes

data/lib/pastel/color.rb

@@ -1,32 +1,29 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
-require 'equatable'
-
-require_relative 'ansi'
+require_relative "ansi"
 
 module Pastel
   # A class responsible for coloring strings.
   class Color
-    include Equatable
     include ANSI
 
     # All color aliases
     ALIASES = {}
 
     # Match all color escape sequences
-    ANSI_COLOR_REGEXP = /\x1b+(\[|\[\[)[0-9;:?]+m/mo.freeze
+    ANSI_COLOR_REGEXP = /\x1b\[{1,2}[0-9;:?]*m/mo.freeze
 
     attr_reader :enabled
-    alias_method :enabled?, :enabled
+    alias enabled? enabled
 
     attr_reader :eachline
 
     # Initialize a Terminal Color
     #
     # @api public
-    def initialize(options = {})
-      @enabled  = options[:enabled]
-      @eachline = options.fetch(:eachline) { false }
+    def initialize(enabled: nil, eachline: false)
+      @enabled  = enabled
+      @eachline = eachline
       @cache    = {}
     end
 
@@ -104,7 +101,7 @@ module Pastel
     #
     # @api public
     def strip(*strings)
-      modified = strings.map { |string| string.dup.gsub(ANSI_COLOR_REGEXP, '') }
+      modified = strings.map { |string| string.dup.gsub(ANSI_COLOR_REGEXP, "") }
       modified.size == 1 ? modified[0] : modified
     end
 
@@ -210,16 +207,54 @@ module Pastel
       validate(*colors)
 
       if !(alias_name.to_s =~ /^[\w]+$/)
-        fail InvalidAliasNameError, "Invalid alias name `#{alias_name}`"
+        raise InvalidAliasNameError, "Invalid alias name `#{alias_name}`"
       elsif ANSI::ATTRIBUTES[alias_name]
-        fail InvalidAliasNameError,
-             "Cannot alias standard color `#{alias_name}`"
+        raise InvalidAliasNameError,
+              "Cannot alias standard color `#{alias_name}`"
       end
 
       ALIASES[alias_name.to_sym] = colors.map(&ANSI::ATTRIBUTES.method(:[]))
       colors
     end
 
+    # Compare colors for equality of attributes
+    #
+    # @return [Boolean]
+    #
+    # @api public
+    def eql?(other)
+      instance_of?(other.class) &&
+        enabled.eql?(other.enabled) && eachline.eql?(other.eachline)
+    end
+
+    # Compare colors for equivalence of attributes
+    #
+    # @return [Boolean]
+    #
+    # @api public
+    def ==(other)
+      other.is_a?(self.class) &&
+        enabled == other.enabled && eachline == other.eachline
+    end
+
+    # Inspect this instance attributes
+    #
+    # @return [String]
+    #
+    # @api public
+    def inspect
+      "#<#{self.class.name} enabled=#{enabled.inspect} eachline=#{eachline.inspect}>"
+    end
+
+    # Hash for this instance and its attributes
+    #
+    # @return [Numeric]
+    #
+    # @api public
+    def hash
+      [self.class, enabled, eachline].hash
+    end
+
     private
 
     # Check if value contains anything to style
@@ -228,13 +263,14 @@ module Pastel
     #
     # @api private
     def blank?(value)
-      value.nil? || !value.respond_to?(:to_str) || value.to_s == ''
+      value.nil? || !value.respond_to?(:to_str) || value.to_s == ""
     end
 
     # @api private
     def validate(*colors)
       return if valid?(*colors)
-      fail InvalidAttributeNameError, 'Bad style or unintialized constant, ' \
+
+      raise InvalidAttributeNameError, "Bad style or unintialized constant, " \
         " valid styles are: #{style_names.join(', ')}."
     end
   end # Color

data/lib/pastel/color_parser.rb

@@ -1,8 +1,8 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require "strscan"
 
-require_relative 'ansi'
+require_relative "ansi"
 
 module Pastel
   # Responsible for parsing color symbols out of text with color escapes
@@ -13,15 +13,16 @@ module Pastel
   class ColorParser
     include ANSI
 
-    ESC = "\x1b".freeze
-    CSI = "\[".freeze
+    ESC = "\x1b"
+    CSI = "\["
 
     # Parse color escape sequences into a list of hashes
     # corresponding to the color attributes being set by these
     # sequences
     #
     # @example
-    #   parse("\e[32mfoo\e[0m") # => [{colors: [:green], text: 'foo'}
+    #   parse("\e[32mfoo\e[0m")
+    #   # => [{foreground: :green, text: "foo"}
     #
     # @param [String] text
     #   the text to parse for presence of color ansi codes
@@ -34,20 +35,19 @@ module Pastel
       state = {}
       result = []
       ansi_stack = []
-      text_chunk = ''
+      text_chunk = []
 
       until scanner.eos?
         char = scanner.getch
         # match control
         if char == ESC && (delim = scanner.getch) == CSI
-          if scanner.scan(/^0m/)
+          if scanner.scan(/^0?m/) # reset
             unpack_ansi(ansi_stack) { |attr, name| state[attr] = name }
             ansi_stack = []
           elsif scanner.scan(/^([1-9;:]+)m/)
             # ansi codes separated by text
             if !text_chunk.empty? && !ansi_stack.empty?
               unpack_ansi(ansi_stack) { |attr, name| state[attr] = name }
-              ansi_stack = []
             end
             scanner[1].split(/:|;/).each do |code|
               ansi_stack << code
@@ -55,10 +55,10 @@ module Pastel
           end
 
           if !text_chunk.empty?
-            state[:text] = text_chunk
+            state[:text] = text_chunk.join
             result.push(state)
             state = {}
-            text_chunk = ''
+            text_chunk.clear
           end
         elsif char == ESC # broken escape
           text_chunk << char + delim.to_s
@@ -68,12 +68,12 @@ module Pastel
       end
 
       if !text_chunk.empty?
-        state[:text] = text_chunk
+        state[:text] = text_chunk.join
       end
       if !ansi_stack.empty?
         unpack_ansi(ansi_stack) { |attr, name| state[attr] = name}
       end
-      if state.values.any? { |val| !val.empty? }
+      if !state[:text].to_s.empty?
         result.push(state)
       end
       result
@@ -88,10 +88,8 @@ module Pastel
     #
     # @api private
     def self.unpack_ansi(ansi_stack)
-      ansi_stack.each do |ansi|
-        name = ansi_for(ansi)
-        attr = attribute_for(ansi)
-        yield attr, name
+      ansi_stack.each do |code|
+        yield(attribute_name(code), color_name(code))
       end
     end
 
@@ -103,7 +101,7 @@ module Pastel
     # @return [Symbol]
     #
     # @api private
-    def self.attribute_for(ansi)
+    def self.attribute_name(ansi)
       if ANSI.foreground?(ansi)
         :foreground
       elsif ANSI.background?(ansi)
@@ -113,9 +111,13 @@ module Pastel
       end
     end
 
+    # Convert ANSI code to color name
+    #
+    # @return [String]
+    #
     # @api private
-    def self.ansi_for(ansi)
-      ATTRIBUTES.key(ansi.to_i)
+    def self.color_name(ansi_code)
+      ATTRIBUTES.key(ansi_code.to_i)
     end
   end # Parser
 end # Pastel

data/lib/pastel/color_resolver.rb

@@ -1,6 +1,6 @@
-# coding: utf-8
+# frozen_string_literal: true
 
-require_relative 'detached'
+require_relative "detached"
 
 module Pastel
   # Contains logic for resolving styles applied to component

data/lib/pastel/decorator_chain.rb

@@ -1,6 +1,4 @@
-# coding: utf-8
-
-require 'equatable'
+# frozen_string_literal: true
 
 module Pastel
   # Collects a list of decorators for styling a string
@@ -8,14 +6,27 @@ module Pastel
   # @api private
   class DecoratorChain
     include Enumerable
-    include Equatable
 
-    def initialize(decorators = [])
+    # Create an empty decorator chain
+    #
+    # @return [DecoratorChain]
+    #
+    # @api public
+    def self.empty
+      @empty ||= self.new
+    end
+
+    # Create a decorator chain
+    #
+    # @api public
+    def initialize(decorators = [].freeze)
       @decorators = decorators
     end
 
     # Add decorator
     #
+    # @param [String] decorator
+    #
     # @api public
     def add(decorator)
       if decorators.include?(decorator)
@@ -32,13 +43,40 @@ module Pastel
       decorators.each(&block)
     end
 
-    # Create an empty decorator chain
+    # Compare colors for equality of attributes
     #
-    # @return [DecoratorChain]
+    # @return [Boolean]
     #
     # @api public
-    def self.empty
-      new([])
+    def eql?(other)
+      instance_of?(other.class) && decorators.eql?(other.decorators)
+    end
+
+    # Compare colors for equivalence of attributes
+    #
+    # @return [Boolean]
+    #
+    # @api public
+    def ==(other)
+      other.is_a?(self.class) && decorators == other.decorators
+    end
+
+    # Inspect this instance attributes
+    #
+    # @return [String]
+    #
+    # @api public
+    def inspect
+      "#<#{self.class.name} decorators=#{decorators.inspect}>"
+    end
+
+    # Hash for this instance and its attributes
+    #
+    # @return [Numeric]
+    #
+    # @api public
+    def hash
+      [self.class, decorators].hash
     end
 
     protected

data/lib/pastel/delegator.rb

@@ -1,10 +1,9 @@
-# coding: utf-8
+# frozen_string_literal: true
 
-require 'equatable'
-require 'forwardable'
+require "forwardable"
 
-require_relative 'color_parser'
-require_relative 'decorator_chain'
+require_relative "color_parser"
+require_relative "decorator_chain"
 
 module Pastel
   # Wrapes the {DecoratorChain} to allow for easy resolution
@@ -13,13 +12,19 @@ module Pastel
   # @api private
   class Delegator
     extend Forwardable
-    include Equatable
 
-    def_delegators '@resolver.color', :valid?, :styles, :strip, :decorate,
+    def_delegators "@resolver.color", :valid?, :styles, :strip, :decorate,
                    :enabled?, :colored?, :alias_color, :lookup
 
     def_delegators ColorParser, :parse
-    alias_method :undecorate, :parse
+    alias undecorate parse
+
+    # Wrap resolver and chain
+    #
+    # @api public
+    def self.wrap(resolver, chain = DecoratorChain.empty)
+      new(resolver, chain)
+    end
 
     # Create Delegator
     #
@@ -27,20 +32,31 @@ module Pastel
     #
     # @param [ColorResolver] resolver
     #
-    # @param [DecoratorChain] base
+    # @param [DecoratorChain] chain
     #
     # @api private
-    def initialize(resolver, base)
+    def initialize(resolver, chain)
       @resolver = resolver
-      @base     = base
+      @chain = chain
     end
 
+    # Compare delegated objects for equality of attributes
+    #
+    # @return [Boolean]
+    #
     # @api public
-    def self.for(resolver, base)
-      new(resolver, base)
+    def eql?(other)
+      instance_of?(other.class) && chain.eql?(other.chain)
     end
 
-    remove_method :inspect
+    # Compare delegated objects for equivalence of attributes
+    #
+    # @return [Boolean]
+    #
+    # @api public
+    def ==(other)
+      other.is_a?(self.class) && chain == other.chain
+    end
 
     # Object string representation
     #
@@ -48,35 +64,43 @@ module Pastel
     #
     # @api
     def inspect
-      "#<Pastel @styles=#{base.map(&:to_s)}>"
+      "#<Pastel styles=#{chain.map(&:to_s)}>"
+    end
+    alias to_s inspect
+
+    # Hash for this instance and its attributes
+    #
+    # @return [Numeric]
+    #
+    # @api public
+    def hash
+      [self.class, chain].hash
     end
-    alias_method :to_s, :inspect
 
     protected
 
-    attr_reader :base
+    attr_reader :chain
 
     attr_reader :resolver
 
-    # Wrap colors
+    # Handles color method calls
     #
     # @api private
-    def wrap(base)
-      self.class.new(resolver, base)
-    end
-
     def method_missing(method_name, *args, &block)
-      new_base  = base.add(method_name)
-      delegator = wrap(new_base)
-      if args.empty? && !(method_name.to_sym == :detach)
+      new_chain = chain.add(method_name)
+      delegator = self.class.wrap(resolver, new_chain)
+      if args.empty? && method_name.to_sym != :detach
         delegator
       else
-        string = args.join
-        string << evaluate_block(&block) if block_given?
-        resolver.resolve(new_base, string)
+        strings = args.dup
+        strings << evaluate_block(&block) if block_given?
+        resolver.resolve(new_chain, strings.join)
       end
     end
 
+    # Check if color is valid
+    #
+    # @api private
     def respond_to_missing?(name, include_all = false)
       resolver.color.respond_to?(name, include_all) ||
         resolver.color.valid?(name) || super
@@ -86,7 +110,7 @@ module Pastel
     #
     # @api private
     def evaluate_block(&block)
-      delegator = self.class.new(resolver, DecoratorChain.empty)
+      delegator = self.class.wrap(resolver)
       delegator.instance_eval(&block)
     end
   end # Delegator

data/lib/pastel/detached.rb

@@ -1,12 +1,8 @@
-# encoding: utf-8
-
-require 'equatable'
+# frozen_string_literal: true
 
 module Pastel
   # A class representing detached color
   class Detached
-    include Equatable
-
     # Initialize a detached object
     #
     # @param [Pastel::Color] color
@@ -24,6 +20,8 @@ module Pastel
     # Decorate the values corresponding to styles
     #
     # @example
+    #   Detached(Color.new, :red, :bold).call("hello")
+    #   # => "\e[31mhello\e[0m"
     #
     # @param [String] value
     #   the stirng to decorate with styles
@@ -35,14 +33,50 @@ module Pastel
       value = args.join
       @color.decorate(value, *styles)
     end
-    alias_method :[], :call
+    alias [] call
 
     # @api public
     def to_proc
       self
     end
 
-    private
+    # Compare detached objects for equality of attributes
+    #
+    # @return [Boolean]
+    #
+    # @api public
+    def eql?(other)
+      instance_of?(other.class) && styles.eql?(other.styles)
+    end
+
+    # Compare detached objects for equivalence of attributes
+    #
+    # @return [Boolean]
+    #
+    # @api public
+    def ==(other)
+      other.is_a?(self.class) && styles == other.styles
+    end
+
+    # Inspect this instance attributes
+    #
+    # @return [String]
+    #
+    # @api public
+    def inspect
+      "#<#{self.class.name} styles=#{styles.inspect}>"
+    end
+
+    # Hash for this instance and its attributes
+    #
+    # @return [Numeric]
+    #
+    # @api public
+    def hash
+      [self.class, styles].hash
+    end
+
+    protected
 
     # @api private
     attr_reader :styles

data/lib/pastel/version.rb

@@ -1,5 +1,5 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 module Pastel
-  VERSION = '0.7.4'
+  VERSION = "0.8.0"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: pastel
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.8.0
 platform: ruby
 authors:
 - Piotr Murach
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-08 00:00:00.000000000 Z
+date: 2020-07-04 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: equatable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: tty-color
   requirement: !ruby/object:Gem::Requirement
@@ -107,7 +93,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="