pastel 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36792f1ad19da1d3055e30adc845e03e6ac1c3be
-  data.tar.gz: 4ddf64dfbb76fb94f39117fc11f1d037ca192313
+  metadata.gz: e0dff6fb46a4686e16dadf14dbc302c03bec710a
+  data.tar.gz: b3bb1f08fa7a1eb0c6a5529f32d1405419bcc024
 SHA512:
-  metadata.gz: 4c3391540a8a5b9100cb4cadde405ac364b5dc9de035a4192a5002130c5076cf338870e20cacbb30a9704b3bd193587f8793a0440bf50ea3a8f37166ad156525
-  data.tar.gz: 1876b306cb278ec5cbc0bd5cde41a9e5be19733b30d26091c52329bcdd4db3b5cfda1f4e870257e512c7972eaf6c30d0cd67acaa5e17b29719e8e93b0aec9574
+  metadata.gz: 9aad90942603ae1740ee11c2e213b8e4a1058fb7fdffc52ee42bb3764d7e20b74bdd1759421b5a84513b7e140f3d7d72c6605f23b874d22f8d3654a44ba8233c
+  data.tar.gz: c021e7b94a64d5d3d63288fac62346064c99beb3fbec2f0f9a7c162e6d39d440d72a1f03960b2d5fe0f229ec397c53d2ccac197c13d5f3f7286b190406aeef56

data/.travis.yml

@@ -6,18 +6,19 @@ bundler_args: --without yard benchmarks
 script: "bundle exec rake ci"
 rvm:
   - 1.9.3
-  - 2.0
-  - 2.1
-  - 2.2
-  - rbx-2
-  - jruby-19mode
-  - jruby
+  - 2.0.0
+  - 2.1.10
+  - 2.2.5
+  - 2.3.1
+  - 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,14 @@
 # Change log
 
+## [v0.7.0] - 2016-12-27
+
+### Changed
+* Enabled colors on Windows by default
+* Update tty-color dependency
+
+### Fixed
+* Fix Color#decorate to prevent redecoration with the same color
+
 ## [v0.6.1] - 2016-04-09
 
 ### Fixed
@@ -86,6 +95,7 @@
 * Change gemspec to include equatable as dependency
 * Change Delegator to stop creating instances and improve performance
 
+[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
 [v0.6.0]: https://github.com/peter-murach/pastel/compare/v0.5.3...v0.6.0
 [v0.5.3]: https://github.com/peter-murach/pastel/compare/v0.5.2...v0.5.3

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem 'rspec', '~> 3.4.0'
+  gem 'rspec', '~> 3.5.0'
   gem 'yard',  '~> 0.8.7'
   gem 'benchmark-ips', '~> 2.0.0'
 end
@@ -12,4 +12,5 @@ group :metrics do
   gem 'coveralls', '~> 0.8.9'
   gem 'simplecov', '~> 0.10.0'
   gem 'yardstick', '~> 0.9.9'
+  gem 'term-ansicolor', '=1.3.2'
 end

data/README.md

@@ -4,12 +4,14 @@
 # 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]
 [![Code Climate](https://codeclimate.com/github/piotrmurach/pastel/badges/gpa.svg)][codeclimate]
 [![Coverage Status](https://coveralls.io/repos/github/piotrmurach/pastel/badge.svg)][coverage]
 [![Inline docs](http://inch-ci.org/github/piotrmurach/pastel.svg?branch=master)][inchpages]
 
 [gem]: http://badge.fury.io/rb/pastel
 [travis]: http://travis-ci.org/piotrmurach/pastel
+[appveyor]: https://ci.appveyor.com/project/piotrmurach/pastel
 [codeclimate]: https://codeclimate.com/github/piotrmurach/pastel
 [coverage]: https://coveralls.io/github/piotrmurach/pastel
 [inchpages]: http://inch-ci.org/github/piotrmurach/pastel
@@ -367,4 +369,4 @@ $ pastel green 'Unicorns & rainbows!'
 
 ## Copyright
 
-Copyright (c) 2014-2016 Piotr Murach. See LICENSE for further details.
+Copyright (c) 2014-2017 Piotr Murach. See LICENSE for further details.

data/appveyor.yml

@@ -0,0 +1,23 @@
+---
+install:
+  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
+  - ruby --version
+  - gem --version
+  - bundle install
+build: off
+test_script:
+  - bundle exec rake ci
+environment:
+  matrix:
+    - ruby_version: "193"
+    - ruby_version: "200"
+    - ruby_version: "200-x64"
+    - ruby_version: "21"
+    - ruby_version: "21-x64"
+    - ruby_version: "22"
+    - ruby_version: "22-x64"
+    - ruby_version: "23"
+    - ruby_version: "23-x64"
+matrix:
+  allow_failures:
+    - ruby_version: "193"

data/lib/pastel.rb

@@ -31,7 +31,7 @@ module Pastel
   # @api public
   def new(options = {})
     unless options.key?(:enabled)
-      options.merge!(enabled: TTY::Color.color?)
+      options.merge!(enabled: TTY::Color.windows? || TTY::Color.color?)
     end
     color    = Color.new(options)
     importer = AliasImporter.new(color, ENV)

data/lib/pastel/color.rb

@@ -53,7 +53,7 @@ module Pastel
     def decorate(string, *colors)
       return string if blank?(string) || !enabled || colors.empty?
 
-      ansi_colors = lookup(*colors)
+      ansi_colors = lookup(*colors.dup.uniq)
       if eachline
         string.dup.split(eachline).map! do |line|
           apply_codes(line, ansi_colors)

data/lib/pastel/decorator_chain.rb

@@ -16,7 +16,11 @@ module Pastel
     #
     # @api public
     def add(decorator)
-      self.class.new(decorators + [decorator])
+      if decorators.include?(decorator)
+        self.class.new(decorators)
+      else
+        self.class.new(decorators + [decorator])
+      end
     end
 
     # Iterate over list of decorators

data/lib/pastel/version.rb

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

data/pastel.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'equatable', '~> 0.5.0'
-  spec.add_dependency 'tty-color', '~> 0.3.0'
+  spec.add_dependency 'tty-color', '~> 0.4.0'
 
   spec.add_development_dependency 'bundler', '>= 1.5.0', '< 2.0'
   spec.add_development_dependency 'rake'

data/spec/unit/decorate_dsl_spec.rb

@@ -80,6 +80,10 @@ RSpec.describe Pastel, 'coloring dsl' do
     expect(pastel.red(' ')).to eq("\e[31m \e[0m")
   end
 
+  it "applies color only once" do
+    expect(pastel.red.red.red("unicorn")).to eq(pastel.red("unicorn"))
+  end
+
   it "raises error when chained with unrecognized color" do
     expect {
       pastel.unknown.on_red('unicorn')

data/spec/unit/new_spec.rb

@@ -31,6 +31,7 @@ RSpec.describe Pastel, '#new' do
   describe 'options passed in' do
     it 'defaults enabled to color detection' do
       allow(TTY::Color).to receive(:color?).and_return(true)
+      allow(TTY::Color).to receive(:windows?).and_return(false)
 
       pastel = described_class.new
 
@@ -38,6 +39,16 @@ RSpec.describe Pastel, '#new' do
       expect(TTY::Color).to have_received(:color?)
     end
 
+    it "defaults to enabled on Windows" do
+      allow(TTY::Color).to receive(:color?).and_return(false)
+      allow(TTY::Color).to receive(:windows?).and_return(true)
+
+      pastel = described_class.new
+
+      expect(pastel.enabled?).to eq(true)
+      expect(TTY::Color).to_not have_received(:color?)
+    end
+
     it "sets enabled option" do
       pastel = described_class.new(enabled: false)
       expect(pastel.enabled?).to eq(false)

data/tasks/console.rake

@@ -8,3 +8,4 @@ task :console do
   ARGV.clear
   IRB.start
 end
+task c: :console

metadata

@@ -1,75 +1,75 @@
 --- !ruby/object:Gem::Specification
 name: pastel
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Piotr Murach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-09 00:00:00.000000000 Z
+date: 2016-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equatable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: tty-color
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Terminal strings styling with intuitive and clean API.
@@ -79,14 +79,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- appveyor.yml
 - assets/pastel_logo.png
 - assets/screenshot.png
 - benchmarks/nesting_speed.rb
@@ -137,17 +138,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Terminal strings styling with intuitive and clean API.