tty-color 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 172ef7053be12d6a8034734dbdb8762aff8e586a
-  data.tar.gz: f656a2a75764ceded9756d72a48e95d37605158a
+  metadata.gz: 03f11c4bd9e523a3e1cc9c8921345e959f55e478
+  data.tar.gz: 5ddadca9c0867662bf3985d4d32d976d61ca9026
 SHA512:
-  metadata.gz: 2bd34dfe7dad34a85fd13429880c30fbd998e1a84e80c77788f9e5c4568e611d186d97b13d336cd4643ede0c641e5e07dc8ef98446a28183301a71b394375931
-  data.tar.gz: fea1c61b20f4e201cadab45c43b05d5989c53ce6b01baae58edb96918d4e8f1b586e28004e09a54ad5eaa97cd1a4c3493528d9e03083e9f5e892a0c946553cfa
+  metadata.gz: f6b92ae8023568869637cc43a5c993f1fac4f4579daf9f5116d2fc6783ee8d761f5fb89755c8e0c8643a308f0191f6eaa0d91230965ea0b5cfc1163541be8537
+  data.tar.gz: 7210d36bcf7f5d7fff0477e45775fb33587a653b2d968e530e6f9ce7d112b9a66acdf5d3dfab9f89997751513f7b8bfae4888744fe13fec409b4b96c45df0594

data/.travis.yml

@@ -2,22 +2,24 @@
 language: ruby
 sudo: false
 cache: bundler
-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
-  - jruby-head
+  - 2.0.0
+  - 2.1.10
+  - 2.2.5
+  - 2.3.1
   - ruby-head
+  - jruby-9000
+  - jruby-head
+  - rbx-2
 matrix:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
+    - rvm: rbx-2
   fast_finish: true
 branches:
   only: master
+notifications:
+  email: false

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Change log
 
+## [v0.4.0] - 2016-12-27
+
+### Added
+* Add #command? helper
+* Add #windows? helper
+
+### Changed
+* Change to stop checking curses on Windows
+
+### Fixed
+* Fix Support#from_tput check to fail gracefully on non-unix systems
+* Fix Mode#from_tput check to fail gracefuly on non-unix systems
+
 ## [v0.3.0] - 2016-01-13
 
 ### Fixed
@@ -20,6 +33,7 @@
 
 * Initial implementation and release
 
+[v0.4.0]: https://github.com/peter-murach/tty-color/compare/v0.3.0...v0.4.0
 [v0.3.0]: https://github.com/peter-murach/tty-color/compare/v0.2.0...v0.3.0
 [v0.2.0]: https://github.com/peter-murach/tty-color/compare/v0.1.0...v0.2.0
 [v0.1.0]: https://github.com/peter-murach/tty-color/compare/v0.1.0

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.2'
   gem 'simplecov', '~> 0.10.0'
   gem 'yardstick', '~> 0.9.9'
+  gem 'term-ansicolor', '=1.3.2'
 end

data/README.md

@@ -1,19 +1,22 @@
-# TTY::Color
+# TTY::Color [![Gitter](https://badges.gitter.im/Join%20Chat.svg)][gitter]
 [![Gem Version](https://badge.fury.io/rb/tty-color.svg)][gem]
-[![Build Status](https://secure.travis-ci.org/peter-murach/tty-color.svg?branch=master)][travis]
-[![Code Climate](https://codeclimate.com/github/peter-murach/tty-color/badges/gpa.svg)][codeclimate]
-[![Coverage Status](https://coveralls.io/repos/peter-murach/tty-color/badge.svg)][coverage]
-[![Inline docs](http://inch-ci.org/github/peter-murach/tty-color.svg?branch=master)][inchpages]
+[![Build Status](https://secure.travis-ci.org/piotrmurach/tty-color.svg?branch=master)][travis]
+[![Build status](https://ci.appveyor.com/api/projects/status/j1nflklmnfrb2yrf?svg=true)][appveyor]
+[![Code Climate](https://codeclimate.com/github/piotrmurach/tty-color/badges/gpa.svg)][codeclimate]
+[![Coverage Status](https://coveralls.io/repos/github/piotrmurach/tty-color/badge.svg)][coverage]
+[![Inline docs](http://inch-ci.org/github/piotrmurach/tty-color.svg?branch=master)][inchpages]
 
+[gitter]: https://gitter.im/piotrmurach/tty
 [gem]: http://badge.fury.io/rb/tty-color
-[travis]: http://travis-ci.org/peter-murach/tty-color
-[codeclimate]: https://codeclimate.com/github/peter-murach/tty-color
-[coverage]: https://coveralls.io/r/peter-murach/tty-color
-[inchpages]: http://inch-ci.org/github/peter-murach/tty-color
+[travis]: http://travis-ci.org/piotrmurach/tty-color
+[appveyor]: https://ci.appveyor.com/project/piotrmurach/tty-color
+[codeclimate]: https://codeclimate.com/github/piotrmurach/tty-color
+[coverage]: https://coveralls.io/github/piotrmurach/tty-color
+[inchpages]: http://inch-ci.org/github/piotrmurach/tty-color
 
 > Terminal color capabilities detection.
 
-**TTY::Color** provides independent color support detection component for [TTY](https://github.com/peter-murach/tty) toolkit.
+**TTY::Color** provides independent color support detection component for [TTY](https://github.com/piotrmurach/tty) toolkit.
 
 ## Installation
 
@@ -58,7 +61,7 @@ puts color?
 
 ## Command line tool
 
-[tty-color-cli](https://github.com/peter-murach/tty-color-cli) is a command line tool for the **TTY::Color**.
+[tty-color-cli](https://github.com/piotrmurach/tty-color-cli) is a command line tool for the **TTY::Color**.
 
 To check if terminal supports colors do:
 
@@ -74,7 +77,7 @@ color -m
 
 ## Contributing
 
-1. Fork it ( https://github.com/peter-murach/tty-color/fork )
+1. Fork it ( https://github.com/piotrmurach/tty-color/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

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/tty/color.rb

@@ -47,5 +47,23 @@ module TTY
     def tty?
       output.respond_to?(:tty?) && output.tty?
     end
+
+    # Check if command can be run
+    #
+    # @return [Boolean]
+    #
+    # @api public
+    def command?(cmd)
+      !!system(cmd, out: File::NULL, err: File::NULL)
+    end
+
+    # Check if Windowz
+    #
+    # @return [Boolean]
+    #
+    # @api public
+    def windows?
+      File::ALT_SEPARATOR == "\\"
+    end
   end # Color
 end # TTY

data/lib/tty/color/mode.rb

@@ -56,7 +56,7 @@ module TTY
         when TERM_52  then 52
         when TERM_16  then 16
         when TERM_8   then 8
-        when /dummy/ then 0
+        when /dummy/  then 0
         else NoValue
         end
       end
@@ -67,6 +67,9 @@ module TTY
       #
       # @api private
       def from_tput
+        if !TTY::Color.command?("tput colors")
+          return NoValue
+        end
         colors = `tput colors 2>/dev/null`.to_i
         colors >= 8 ? colors : NoValue
       rescue Errno::ENOENT

data/lib/tty/color/support.rb

@@ -44,7 +44,11 @@ module TTY
       #
       # @api private
       def from_tput
-        `tput colors 2>/dev/null`.to_i > 2
+        cmd = %q(tput colors 2>/dev/null)
+        if !TTY::Color.command?("tput colors")
+          return NoValue
+        end
+        `#{cmd}`.to_i > 2
       rescue Errno::ENOENT
         NoValue
       end
@@ -62,6 +66,7 @@ module TTY
       #
       # @api private
       def from_curses(curses_class = nil)
+        return NoValue if TTY::Color.windows?
         require 'curses'
 
         if defined?(Curses)
@@ -69,10 +74,9 @@ module TTY
           curses_class.init_screen
           has_color = curses_class.has_colors?
           curses_class.close_screen
-          has_color
-        else
-          NoValue
+          return has_color
         end
+        NoValue
       rescue LoadError
         warn 'no native curses support' if @verbose
         NoValue

data/lib/tty/color/version.rb

@@ -2,6 +2,6 @@
 
 module TTY
   module Color
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end # Color
 end # TTY

data/spec/unit/mode_spec.rb

@@ -91,4 +91,13 @@ RSpec.describe TTY::Color::Mode, 'detecting mode' do
       expect(mode.from_term).to eq(TTY::Color::NoValue)
     end
   end
+
+  context '#from_tput' do
+    it "fails to find tput utilty" do
+      mode = described_class.new({})
+      cmd = "tput colors"
+      allow(TTY::Color).to receive(:command?).with(cmd).and_return(nil)
+      expect(mode.from_tput).to eq(TTY::Color::NoValue)
+    end
+  end
 end

data/spec/unit/supports_spec.rb

@@ -36,8 +36,8 @@ RSpec.describe TTY::Color::Support, '#supports?' do
   context '#from_curses' do
     it "fails to load curses for color support" do
       support = described_class.new({})
-      allow(support).to receive(:require).with('curses').
-        and_raise(LoadError)
+      allow(TTY::Color).to receive(:windows?).and_return(false)
+      allow(support).to receive(:require).with('curses').and_raise(LoadError)
       allow(support).to receive(:warn)
 
       expect(support.from_curses).to eq(TTY::Color::NoValue)
@@ -46,6 +46,7 @@ RSpec.describe TTY::Color::Support, '#supports?' do
 
     it "fails to find Curses namespace" do
       support = described_class.new({})
+      allow(TTY::Color).to receive(:windows?).and_return(false)
       allow(support).to receive(:require).with('curses')
 
       expect(support.from_curses).to eq(TTY::Color::NoValue)
@@ -53,8 +54,8 @@ RSpec.describe TTY::Color::Support, '#supports?' do
 
     it "sets verbose mode on" do
       support = described_class.new({}, verbose: true)
-      allow(support).to receive(:require).with('curses').
-        and_raise(LoadError)
+      allow(TTY::Color).to receive(:windows?).and_return(false)
+      allow(support).to receive(:require).with('curses').and_raise(LoadError)
       allow(support).to receive(:warn)
 
       support.from_curses
@@ -64,6 +65,7 @@ RSpec.describe TTY::Color::Support, '#supports?' do
 
     it "loads curses for color support" do
       support = described_class.new({})
+      allow(TTY::Color).to receive(:windows?).and_return(false)
       allow(support).to receive(:require).with('curses').and_return(true)
       stub_const("Curses", Object.new)
       curses = double(:curses)
@@ -74,6 +76,12 @@ RSpec.describe TTY::Color::Support, '#supports?' do
       expect(support.from_curses(curses)).to eql(true)
       expect(curses).to have_received(:has_colors?)
     end
+
+    it "doesn't check on windows" do
+      support = described_class.new({})
+      allow(TTY::Color).to receive(:windows?).and_return(true)
+      expect(support.from_curses).to eq(TTY::Color::NoValue)
+    end
   end
 
   context '#form_term' do
@@ -93,6 +101,15 @@ RSpec.describe TTY::Color::Support, '#supports?' do
     end
   end
 
+  context '#from_tput' do
+    it "fails to find tput utilty" do
+      support = described_class.new({})
+      cmd = "tput colors"
+      allow(TTY::Color).to receive(:command?).with(cmd).and_return(nil)
+      expect(support.from_tput).to eq(TTY::Color::NoValue)
+    end
+  end
+
   context '#from_env' do
     it "finds color support in colorterm variable" do
       support = described_class.new('COLORTERM' => true)

data/tasks/console.rake

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

data/tty-color.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = [""]
   spec.summary       = %q{Terminal color capabilities detection}
   spec.description   = %q{Terminal color capabilities detection}
-  spec.homepage      = "http://peter-murach.github.io/tty"
+  spec.homepage      = "http://piotrmurach.github.io/tty"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

metadata

@@ -1,47 +1,47 @@
 --- !ruby/object:Gem::Specification
 name: tty-color
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Piotr Murach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-13 00:00:00.000000000 Z
+date: 2016-12-27 00:00:00.000000000 Z
 dependencies:
 - !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: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 description: Terminal color capabilities detection
@@ -51,14 +51,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
 - lib/tty-color.rb
 - lib/tty/color.rb
 - lib/tty/color/mode.rb
@@ -72,7 +73,7 @@ files:
 - tasks/coverage.rake
 - tasks/spec.rake
 - tty-color.gemspec
-homepage: http://peter-murach.github.io/tty
+homepage: http://piotrmurach.github.io/tty
 licenses:
 - MIT
 metadata: {}
@@ -82,17 +83,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 color capabilities detection