pastel 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aaa5adc3e15580e13bb1a6e6408c4ae861291eae
-  data.tar.gz: 29d6776a836796d28f8512c90fa2dfcd3e4d5483
+  metadata.gz: a9423d9bb23567a05cccb8fa304de88cf791f01d
+  data.tar.gz: 4c251c76dfabc80d5e2a48b031983eec254c8faa
 SHA512:
-  metadata.gz: f778303c03d07dfedabdb2f7b8d79c8b8e3aca7cd03d9c25a27af616794267305648079841deea03390f56e84867e868edc1146452f247ca89f2d721bd27691a
-  data.tar.gz: a20b24d879adb603257444a760dbe8a23c797be93e2c483634ccd49df4a9d0c7d718e470cb705ab21bd7c114ee81e9e5be318961f0988d70f3213467211b2ad2
+  metadata.gz: c32d02d36f105e11ee28bf219556088bc2a2b84e625490cdc23ab4a5aad99eee136270662a78f779ea13549a278795510d8e97176ce8487f91a6c76441557906
+  data.tar.gz: 925733ccb1ef6cd33cf11362da01eb28b830b8cdb36e681d4b65ae3305816d37fb4c437451c6387cb2d2d6fd6dbb7ef3106e540d922570e61ba99563b0da06bb

data/.travis.yml

@@ -2,23 +2,23 @@
 language: ruby
 sudo: false
 cache: bundler
+before_install: "gem update bundler"
 bundler_args: --without yard benchmarks
 script: "bundle exec rake ci"
 rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.10
-  - 2.2.5
-  - 2.3.1
+  - 2.2.8
+  - 2.3.5
+  - 2.4.2
   - jruby-9000
   - jruby-head
   - ruby-head
-  - rbx-2
 matrix:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
-    - rvm: rbx-2
   fast_finish: true
 branches:
   only: master

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change log
 
+## [v0.7.2] - 2017-11-09
+
+### Changed
+* Change to load relative file paths
+* Change to allow `#alias_color` to accept multiple colors by Jared Ning (@ordinaryzelig)
+
 ## [v0.7.1] - 2017-01-09
 
 ### Changed
@@ -102,6 +108,7 @@
 * Change gemspec to include equatable as dependency
 * Change Delegator to stop creating instances and improve performance
 
+[v0.7.2]: https://github.com/peter-murach/pastel/compare/v0.7.1...v0.7.2
 [v0.7.1]: https://github.com/peter-murach/pastel/compare/v0.7.0...v0.7.1
 [v0.7.0]: https://github.com/peter-murach/pastel/compare/v0.6.1...v0.7.0
 [v0.6.1]: https://github.com/peter-murach/pastel/compare/v0.6.0...v0.6.1

data/Gemfile

@@ -3,7 +3,6 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem 'rspec', '~> 3.5.0'
   gem 'yard',  '~> 0.8.7'
   gem 'benchmark-ips', '~> 2.0.0'
 end

data/README.md

@@ -1,7 +1,9 @@
 <div align="center">
   <img width="215" src="https://cdn.rawgit.com/piotrmurach/pastel/master/assets/pastel_logo.png" alt="pastel logo" />
 </div>
+
 # Pastel
+
 [![Gem Version](https://badge.fury.io/rb/pastel.svg)][gem]
 [![Build Status](https://secure.travis-ci.org/piotrmurach/pastel.svg?branch=master)][travis]
 [![Build status](https://ci.appveyor.com/api/projects/status/9blbjfq42o4v1rk4?svg=true)][appveyor]
@@ -119,7 +121,7 @@ pastel.red.on_green('Unicorns') {
 }
 ```
 
-When dealing with multiline strings you can set `eachline` option(more info see [eachline](#29-eachline)):
+When dealing with multiline strings you can set `eachline` option(more info see [eachline](#211-eachline)):
 
 ```
 pastel = Pastel.new(eachline: "\n")
@@ -266,16 +268,16 @@ pastel.red("foo\nbar")  # => "\e[31mfoo\e[0m\n\e[31mbar\e[0m"
 
 ### 2.12 Alias Color
 
-In order to setup an alias for the standard color do:
+In order to setup an alias for standard colors do:
 
 ```ruby
-pastel.alias_color(:funky, :red)
+pastel.alias_color(:funky, :red, :bold)
 ```
 
-From that point forward, `:funky` alias can be passed to `decorate`, `valid?` with the same meaning as standard color:
+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 color
+pastel.funky.on_green('unicorn')   # => will use :red, :bold color
 ```
 
 This method allows you to give more meaningful names to existing colors.
@@ -345,10 +347,10 @@ Generic styles:
 
 This environment variable allows you to specify custom color aliases at runtime that will be understood by **Pastel**. The environment variable is read and used when the instance of **Pastel** is created. You can also use `alias_color` to create aliases.
 
-Only alphanumeric and `_` are allowed in the alias names with the following format:
+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'
+PASTEL_COLORS_ALIASES='newcolor_1=red,newcolor_2=on_green,funky=red.bold'
 ```
 
 ## 5. Command line

data/appveyor.yml

@@ -9,7 +9,6 @@ test_script:
   - bundle exec rake ci
 environment:
   matrix:
-    - ruby_version: "193"
     - ruby_version: "200"
     - ruby_version: "200-x64"
     - ruby_version: "21"
@@ -18,6 +17,5 @@ environment:
     - ruby_version: "22-x64"
     - ruby_version: "23"
     - ruby_version: "23-x64"
-matrix:
-  allow_failures:
-    - ruby_version: "193"
+    - ruby_version: "24"
+    - ruby_version: "24-x64"

data/lib/pastel.rb

@@ -2,12 +2,12 @@
 
 require 'tty-color'
 
-require 'pastel/alias_importer'
-require 'pastel/color'
-require 'pastel/color_resolver'
-require 'pastel/delegator'
-require 'pastel/decorator_chain'
-require 'pastel/version'
+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'
 
 module Pastel
   # Raised when the style attribute is not supported

data/lib/pastel/alias_importer.rb

@@ -18,7 +18,7 @@ module Pastel
     # Import aliases from the environment
     #
     # @example
-    #   importer = Pastel::AliasImporter.new(Pastel::Color.new)
+    #   importer = Pastel::AliasImporter.new(Pastel::Color.new, {})
     #   importer.import
     #
     # @return [nil]
@@ -28,11 +28,12 @@ module Pastel
       color_aliases = env['PASTEL_COLORS_ALIASES']
       return unless color_aliases
       color_aliases.split(',').each do |color_alias|
-        new_color, old_color = color_alias.split('=').map(&:to_sym)
-        if !new_color || !old_color
+        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, old_color)
+          color.alias_color(new_color.to_sym,
+                            *old_colors.split('.').map(&:to_sym))
         end
       end
     end

data/lib/pastel/color.rb

@@ -1,7 +1,8 @@
 # encoding: utf-8
 
 require 'equatable'
-require 'pastel/ansi'
+
+require_relative 'ansi'
 
 module Pastel
   # A class responsible for coloring strings.
@@ -194,19 +195,19 @@ module Pastel
       colors.all? { |color| style_names.include?(color.to_sym) }
     end
 
-    # Define a new color alias
+    # Define a new colors alias
     #
     # @param [String] alias_name
-    #   the color alias to define
-    # @param [String] color
-    #   the color the alias will correspond to
+    #   the colors alias to define
+    # @param [Array[Symbol,String]] color
+    #   the colors the alias will correspond to
     #
-    # @return [String]
-    #   the standard color value of the alias
+    # @return [Array[String]]
+    #   the standard color values of the alias
     #
     # @api public
-    def alias_color(alias_name, color)
-      validate(color)
+    def alias_color(alias_name, *colors)
+      validate(*colors)
 
       if !(alias_name.to_s =~ /^[\w]+$/)
         fail InvalidAliasNameError, "Invalid alias name `#{alias_name}`"
@@ -215,8 +216,8 @@ module Pastel
              "Cannot alias standard color `#{alias_name}`"
       end
 
-      ALIASES[alias_name.to_sym] = ANSI::ATTRIBUTES[color]
-      color
+      ALIASES[alias_name.to_sym] = colors.map(&ANSI::ATTRIBUTES.method(:[]))
+      colors
     end
 
     private

data/lib/pastel/color_parser.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require 'pastel/ansi'
+require_relative 'ansi'
 
 module Pastel
   # Responsible for parsing color symbols out of text with color escapes

data/lib/pastel/color_resolver.rb

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

data/lib/pastel/delegator.rb

@@ -3,8 +3,8 @@
 require 'equatable'
 require 'forwardable'
 
-require 'pastel/color_parser'
-require 'pastel/decorator_chain'
+require_relative 'color_parser'
+require_relative 'decorator_chain'
 
 module Pastel
   # Wrapes the {DecoratorChain} to allow for easy resolution

data/lib/pastel/version.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
 
 module Pastel
-  VERSION = '0.7.1'
+  VERSION = '0.7.2'
 end

data/pastel.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '>= 1.5.0', '< 2.0'
   spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec', '~> 3.1'
 end

data/spec/unit/alias_color_spec.rb

@@ -5,13 +5,13 @@ RSpec.describe Pastel, '#alias_color' do
   subject(:pastel) { described_class.new(enabled: true) }
 
   it "aliases color" do
-    pastel.alias_color(:funky, :red)
-    expect(pastel.funky('unicorn')).to eq("\e[31municorn\e[0m")
+    pastel.alias_color(:funky, :red, :bold)
+    expect(pastel.funky('unicorn')).to eq("\e[31;1municorn\e[0m")
   end
 
   it "aliases color and combines with regular ones" do
-    pastel.alias_color(:funky, :red)
-    expect(pastel.funky.on_green('unicorn')).to eq("\e[31;42municorn\e[0m")
+    pastel.alias_color(:funky, :red, :bold)
+    expect(pastel.funky.on_green('unicorn')).to eq("\e[31;1;42municorn\e[0m")
   end
 
   it "reads aliases from the environment" do

data/spec/unit/alias_importer_spec.rb

@@ -5,13 +5,13 @@ RSpec.describe Pastel::AliasImporter, '#import' do
   let(:output) { StringIO.new }
 
   it "imports aliases from environment" do
-    color_aliases = "funky=red,base=bright_yellow"
+    color_aliases = "funky=red.bold,base=bright_yellow"
     env = {'PASTEL_COLORS_ALIASES' => color_aliases}
     importer = described_class.new(color, env)
 
     importer.import
 
-    expect(color).to have_received(:alias_color).with(:funky, :red)
+    expect(color).to have_received(:alias_color).with(:funky, :red, :bold)
     expect(color).to have_received(:alias_color).with(:base, :bright_yellow)
   end
 

data/spec/unit/color/alias_color_spec.rb

@@ -23,10 +23,10 @@ RSpec.describe Pastel::Color, '.alias_color' do
   end
 
   it 'aliases color :red to :funky' do
-    color.alias_color(:funky, :red)
+    color.alias_color(:funky, :red, :bold)
     expect(color.valid?(:funky)).to eq(true)
-    expect(color.code(:funky)).to eq([31])
-    expect(color.lookup(:funky)).to eq("\e[31m")
+    expect(color.code(:funky)).to eq([[31, 1]])
+    expect(color.lookup(:funky)).to eq("\e[31;1m")
   end
 
   it "has global aliases" do

data/spec/unit/color/code_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe Pastel::Color, '#code' do
   end
 
   it "finds alias code" do
-    color.alias_color(:funky, :red)
-    expect(color.code(:funky)).to eq(color.code(:red))
+    color.alias_color(:funky, :red, :bold)
+    expect(color.code(:funky)).to eq([color.code(:red) + color.code(:bold)])
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pastel
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Piotr Murach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-09 00:00:00.000000000 Z
+date: 2017-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equatable
@@ -72,6 +72,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 description: Terminal strings styling with intuitive and clean API.
 email:
 - ''