tty-screen 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf079c51ac4f0fcb5bb6c29031a77ed0d7bf6bb5
-  data.tar.gz: 415b2d5c8e694c8cc3d9b7261b7dedbc20e8b8dd
+  metadata.gz: be4bc4b46b107018a11b33feebb201553f94c41b
+  data.tar.gz: 377b7c1492d822be260e43f11a7686471dc4b06f
 SHA512:
-  metadata.gz: bed4c21fb89f382f348ebf2548e9b0d0344ed9bd0ab46fbdd9448e405c1c2197dcad9a536c890c60dbd1d1ec104850839fd2edcc54834474aa23abc7e09068ff
-  data.tar.gz: 82eb587b1334c125bc509d11259cfb9680218c35d9405912af2f202dfa867c6e9fcbbf11649d06cfc3a27d7e4d4b5575ea9ebab2cfb80cec59cc2a4395f752db
+  metadata.gz: 9cda3d71ea61b665f0feaefca79def7a255b6d65a5cd067eadf6829d4d3f76953e6ae2b0a6faf93542fc4946dae14cd1c52f24e56f838545ef6b25da2ae86eba
+  data.tar.gz: 6884864fdc21364b397a405b2b99c52aeb8d4dfd0c44f912997a9bca20b2421221c536023b258fcbdb26d78c2b687323bcfba284a740b043b9528241049a75c7

data/.travis.yml

@@ -1,5 +1,7 @@
+---
 language: ruby
-bundler_args: --without yard benchmarks
+sudo: false
+cache: bundler
 script: "bundle exec rake ci"
 rvm:
   - 1.9.3

data/CHANGELOG.md

@@ -1,26 +1,55 @@
-0.4.3 (Nov 1, 2015)
+# Change log
 
-* Fix issue with #from_curses method and remove ensure block
+## [v0.5.0] - 2016-01-03
+
+### Changed
+* Change size to accept environment as input
+* Remove Color detection, available as tty-color gem dependency
+
+## [v0.4.3] - 2015-11-01
+
+### Added
 * Add NoValue to Color class to mark failure of reading color value
+
+### Changed
 * Change Color class supports? to recognize lack of color value
 
-0.4.2 (Oct 31, 2015)
+### Fixed
+* Fix issue with #from_curses method and remove ensure block
 
+## [v0.4.2] - 2015-10-31
+
+### Changed
 * Change visibility of output to prevent warnings
 
-0.4.1 (Oct 31, 2015)
+## [v0.4.1] - 2015-10-31
 
+### Changed
 * Change to switch off verbose mode by default
 
-0.4.0 (Sept 12, 2015)
+## [v0.4.0] - 2015-09-12
 
+### Added
 * Add terminal color support detection
 
-0.3.0 (Sept 11, 2015)
+## [v0.3.0] - 2015-09-11
 
+### Fixed
 * Fix bug loading standard library
 
-0.2.0 (May 11, 2015)
+## [v0.2.0] - 2015-05-11
 
-* Fix bug with screen detection from_io_console by @luxflux
+### Changed
 * Change to stop memoization of screen class instance method
+
+### Fixed
+* Fix bug with screen detection from_io_console by @luxflux
+
+[v0.5.0]: https://github.com/peter-murach/tty-screen/compare/v0.4.3...v0.5.0
+[v0.4.3]: https://github.com/peter-murach/tty-screen/compare/v0.4.2...v0.4.3
+[v0.4.2]: https://github.com/peter-murach/tty-screen/compare/v0.4.1...v0.4.2
+[v0.4.1]: https://github.com/peter-murach/tty-screen/compare/v0.4.0...v0.4.1
+[v0.4.0]: https://github.com/peter-murach/tty-screen/compare/v0.3.0...v0.4.0
+[v0.3.0]: https://github.com/peter-murach/tty-screen/compare/v0.2.0...v0.3.0
+[v0.2.0]: https://github.com/peter-murach/tty-screen/compare/v0.1.0...v0.2.0
+[v0.1.0]: https://github.com/peter-murach/tty-screen/compare/v0.1.0

data/Gemfile

@@ -4,7 +4,7 @@ gemspec
 
 group :development do
   gem 'rake',    '~> 10.4.2'
-  gem 'rspec',   '~> 3.3.0'
+  gem 'rspec',   '~> 3.4.0'
   gem 'yard',    '~> 0.8.7'
 end
 

data/README.md

@@ -11,9 +11,9 @@
 [coverage]: https://coveralls.io/r/peter-murach/tty-screen
 [inchpages]: http://inch-ci.org/github/peter-murach/tty-screen
 
-> Terminal screen size and color detection which works on Linux, OS X and Windows/Cygwin platforms and supports MRI, JRuby and Rubinius interpreters.
+> Terminal screen size detection which works on Linux, OS X and Windows/Cygwin platforms and supports MRI, JRuby and Rubinius interpreters.
 
-**TTY::Screen** provides independent screen size and color detection component for [TTY](https://github.com/peter-murach/tty) toolkit.
+**TTY::Screen** provides independent screen size detection component for [TTY](https://github.com/peter-murach/tty) toolkit.
 
 ## Installation
 
@@ -43,21 +43,12 @@ screen.width    # => 280
 screen.height   # => 51
 ```
 
-Using the `color?` method, you can check whether terminal has color capabilities like so
-
-```ruby
-screen = TTY::Screen.new
-screen.color?   # => true
-```
-
 You can also use above methods as class instance methods:
 
 ```ruby
 TTY::Screen.size     # => [51, 280]
 TTY::Screen.width    # => 280
 TTY::Screen.height   # => 51
-
-TTY::Screen.color?   # => true
 ```
 
 ## Contributing
@@ -70,4 +61,4 @@ TTY::Screen.color?   # => true
 
 ## Copyright
 
-Copyright (c) 2014-2015 Piotr Murach. See LICENSE for further details.
+Copyright (c) 2014-2016 Piotr Murach. See LICENSE for further details.

data/lib/tty/screen.rb

@@ -1,6 +1,5 @@
 # coding: utf-8
 
-require 'tty/screen/color'
 require 'tty/screen/size'
 require 'tty/screen/version'
 
@@ -19,8 +18,7 @@ module TTY
     def initialize(options = {})
       @output  = options.fetch(:output) { $stderr }
       @verbose = options.fetch(:verbose) { false }
-      @color   = Color.new(output: @output, verbose: @verbose)
-      @size    = Size.new(output: @output, verbose: @verbose)
+      @size    = Size.new(ENV, output: @output, verbose: @verbose)
     end
 
     # @api public
@@ -38,10 +36,11 @@ module TTY
       size[0]
     end
 
-    def self.color?
-      new.color?
-    end
-
+    # Terminal size as tuple
+    #
+    # @return [Array[Integer]]
+    #
+    # @api public
     def size
       @size.size
     end
@@ -65,15 +64,5 @@ module TTY
       size[1]
     end
     alias_method :columns, :width
-
-    # Check if terminal has color support
-    #
-    # @return [Boolean]
-    #   true if can display color, false otherwise
-    #
-    # @api public
-    def color?
-      @color.supports?
-    end
   end # Screen
 end # TTY

data/lib/tty/screen/size.rb

@@ -6,7 +6,8 @@ module TTY
       # Initialize terminal size detection
       #
       # @api public
-      def initialize(options = {})
+      def initialize(env, options = {})
+        @env     = env
         @output  = options.fetch(:output) { $stderr }
         @verbose = options.fetch(:verbose) { false }
       end
@@ -34,9 +35,7 @@ module TTY
       # @api private
       def from_io_console
         return false if jruby?
-        try_io_console { |size|
-          size if nonzero_column?(size[1])
-        }
+        try_io_console { |size| size if nonzero_column?(size[1]) }
       end
 
       # Attempts to load native console extension
@@ -45,22 +44,20 @@ module TTY
       #
       # @api private
       def try_io_console
+        require 'io/console'
+
         begin
-          require 'io/console'
-
-          begin
-            if output.tty? && IO.method_defined?(:winsize)
-              yield output.winsize
-            else
-              false
-            end
-          rescue Errno::EOPNOTSUPP
+          if output.tty? && IO.method_defined?(:winsize)
+            yield output.winsize
+          else
             false
           end
-        rescue LoadError
-          warn 'no native io/console support' if @verbose
+        rescue Errno::EOPNOTSUPP
           false
         end
+      rescue LoadError
+        warn 'no native io/console support' if @verbose
+        false
       end
 
       # Detect screen size using Readline
@@ -98,8 +95,8 @@ module TTY
       #
       # @api private
       def from_env
-        return unless ENV['COLUMNS'] =~ /^\d+$/
-        size = [(ENV['LINES'] || ENV['ROWS']).to_i, ENV['COLUMNS'].to_i]
+        return unless @env['COLUMNS'] =~ /^\d+$/
+        size = [(@env['LINES'] || @env['ROWS']).to_i, @env['COLUMNS'].to_i]
         size if nonzero_column?(size[1])
       end
 
@@ -107,7 +104,7 @@ module TTY
       #
       # @api private
       def from_ansicon
-        return unless ENV['ANSICON'] =~ /\((.*)x(.*)\)/
+        return unless @env['ANSICON'] =~ /\((.*)x(.*)\)/
         size = [$2, $1].map(&:to_i)
         size if nonzero_column?(size[1])
       end
@@ -117,8 +114,8 @@ module TTY
       # @api public
       def default_size
         [
-          ENV['LINES'].to_i.nonzero? || 27,
-          ENV['COLUMNS'].to_i.nonzero? || 80
+          @env['LINES'].to_i.nonzero? || 27,
+          @env['COLUMNS'].to_i.nonzero? || 80
         ]
       end
 

data/lib/tty/screen/version.rb

@@ -2,6 +2,6 @@
 
 module TTY
   class Screen
-    VERSION = "0.4.3"
+    VERSION = "0.5.0"
   end # Screen
 end # TTY

data/spec/unit/new_spec.rb

@@ -1,18 +1,21 @@
 # encoding: utf-8
 
-require 'spec_helper'
-
 RSpec.describe TTY::Screen, '.new' do
-  let(:output) { StringIO.new('', 'w+') }
 
-  it "initializes size and color detection" do
-    allow(TTY::Screen::Color).to receive(:new).with(output: output, verbose: false)
-    allow(TTY::Screen::Size).to receive(:new).with(output: output, verbose: false)
+  it "initializses size with defaults" do
+    allow(TTY::Screen::Size).to receive(:new)
+    TTY::Screen.new
+    expect(TTY::Screen::Size).to have_received(:new).
+      with(ENV, {output: $stderr, verbose: false})
+  end
+
+  it "initializes size with values" do
+    allow(TTY::Screen::Size).to receive(:new)
 
-    TTY::Screen.new(output: output)
+    TTY::Screen.new(output: :output, verbose: true)
 
-    expect(TTY::Screen::Color).to have_received(:new).with(output: output, verbose: false)
-    expect(TTY::Screen::Size).to have_received(:new).with(output: output, verbose: false)
+    expect(TTY::Screen::Size).to have_received(:new).
+      with(ENV, output: :output, verbose: true)
   end
 
   it "delegates size call" do
@@ -25,31 +28,25 @@ RSpec.describe TTY::Screen, '.new' do
     expect(size_instance).to have_received(:size)
   end
 
-  it "allows to call size as class instance" do
+  it "calls size" do
     size_instance = double(:size, size: [51, 280])
     allow(TTY::Screen::Size).to receive(:new).and_return(size_instance)
 
     expect(TTY::Screen.size).to eq([51, 280])
-    expect(TTY::Screen.width).to eq(280)
-    expect(TTY::Screen.height).to eq(51)
-    expect(TTY::Screen::Size).to have_received(:new).exactly(3).times
+    expect(TTY::Screen::Size).to have_received(:new).once
   end
 
-  it "delegates color call" do
-    color_instance = spy(:color)
-    allow(TTY::Screen::Color).to receive(:new).and_return(color_instance)
-
-    screen = described_class.new
-    screen.color?
+  it "calls width" do
+    size_instance = double(:size, size: [51, 280])
+    allow(TTY::Screen::Size).to receive(:new).and_return(size_instance)
 
-    expect(color_instance).to have_received(:supports?)
+    expect(TTY::Screen.width).to eq(280)
+    expect(TTY::Screen::Size).to have_received(:new).once
   end
 
-  it "allows to call color as class instance" do
-    color_instance = double(:size, supports?: false)
-    allow(TTY::Screen::Color).to receive(:new).and_return(color_instance)
-
-    expect(TTY::Screen.color?).to eq(false)
-    expect(TTY::Screen::Color).to have_received(:new).exactly(1).times
+  it "calls height" do
+    size_instance = double(:size, size: [51, 280])
+    allow(TTY::Screen::Size).to receive(:new).and_return(size_instance)
+    expect(TTY::Screen.height).to eq(51)
   end
 end

data/spec/unit/size_spec.rb

@@ -1,9 +1,8 @@
 # coding: utf-8
 
-require 'spec_helper'
 require 'delegate'
 
-RSpec.describe TTY::Screen::Size, '.size' do
+RSpec.describe TTY::Screen::Size, '#size' do
   class Output < SimpleDelegator
     def winsize
       [100, 200]
@@ -12,24 +11,9 @@ RSpec.describe TTY::Screen::Size, '.size' do
 
   let(:output) { Output.new(StringIO.new('', 'w+')) }
 
-  subject(:screen) { described_class.new(output: output) }
-
-  context 'default size' do
-    it "suggests default terminal size" do
-      allow(ENV).to receive(:[]).with('LINES').and_return(0)
-      allow(ENV).to receive(:[]).with('COLUMNS').and_return(0)
-      expect(screen.default_size).to eq([27, 80])
-    end
-
-    it "attempts to get default terminal size from environment" do
-      allow(ENV).to receive(:[]).with('LINES').and_return(52)
-      allow(ENV).to receive(:[]).with('COLUMNS').and_return(200)
-      expect(screen.default_size).to eq([52, 200])
-    end
-  end
-
   context 'size' do
     it "correctly falls through choices" do
+      screen = described_class.new({}, output: output)
       allow(screen).to receive(:from_io_console).and_return([51, 280])
       allow(screen).to receive(:from_readline).and_return(nil)
 
@@ -40,11 +24,13 @@ RSpec.describe TTY::Screen::Size, '.size' do
 
   context 'from io console' do
     it "doesn't calculate size if jruby " do
+      screen = described_class.new({})
       allow(screen).to receive(:jruby?).and_return(true)
       expect(screen.from_io_console).to eq(false)
     end
 
     it "calcualtes the size" do
+      screen = described_class.new({}, output: output)
       allow(screen).to receive(:jruby?).and_return(false)
       allow(screen).to receive(:require).with('io/console').
         and_return(true)
@@ -57,6 +43,7 @@ RSpec.describe TTY::Screen::Size, '.size' do
     end
 
     it "doesn't calculate size if io/console not available" do
+      screen = described_class.new({})
       allow(screen).to receive(:jruby?).and_return(false)
       allow(screen).to receive(:require).with('io/console').
         and_raise(LoadError)
@@ -64,6 +51,7 @@ RSpec.describe TTY::Screen::Size, '.size' do
     end
 
     it "doesn't calculate size if it is run without a console" do
+      screen = described_class.new({}, output: output)
       allow(screen).to receive(:jruby?).and_return(false)
       allow(screen).to receive(:require).with('io/console').
         and_return(true)
@@ -75,11 +63,13 @@ RSpec.describe TTY::Screen::Size, '.size' do
 
   context 'from tput' do
     it "doesn't run command if outside of terminal" do
+      screen = described_class.new({}, output: output)
       allow(output).to receive(:tty?).and_return(false)
       expect(screen.from_tput).to eq(nil)
     end
 
     it "runs tput commands" do
+      screen = described_class.new({}, output: output)
       allow(output).to receive(:tty?).and_return(true)
       allow(screen).to receive(:run_command).with('tput', 'lines').and_return(51)
       allow(screen).to receive(:run_command).with('tput', 'cols').and_return(280)
@@ -87,6 +77,7 @@ RSpec.describe TTY::Screen::Size, '.size' do
     end
 
     it "doesn't return zero size" do
+      screen = described_class.new({}, output: output)
       allow(output).to receive(:tty?).and_return(true)
       allow(screen).to receive(:run_command).with('tput', 'lines').and_return(0)
       allow(screen).to receive(:run_command).with('tput', 'cols').and_return(0)
@@ -96,17 +87,20 @@ RSpec.describe TTY::Screen::Size, '.size' do
 
   context 'from stty' do
     it "doesn't run command if outside of terminal" do
+      screen = described_class.new({}, output: output)
       allow(output).to receive(:tty?).and_return(false)
       expect(screen.from_stty).to eq(nil)
     end
 
     it "runs stty commands" do
+      screen = described_class.new({}, output: output)
       allow(output).to receive(:tty?).and_return(true)
       allow(screen).to receive(:run_command).with('stty', 'size').and_return("51 280")
       expect(screen.from_stty).to eq([51, 280])
     end
 
     it "doesn't return zero size" do
+      screen = described_class.new({}, output: output)
       allow(output).to receive(:tty?).and_return(true)
       allow(screen).to receive(:run_command).with('stty', 'size').and_return("0 0")
       expect(screen.from_stty).to eq(nil)
@@ -115,37 +109,47 @@ RSpec.describe TTY::Screen::Size, '.size' do
 
   context 'from env' do
     it "doesn't calculate size without COLUMNS key" do
-      allow(ENV).to receive(:[]).with('COLUMNS').and_return nil
+      screen = described_class.new({'COLUMNS' => nil})
       expect(screen.from_env).to eq(nil)
     end
 
     it "extracts lines and columns from environment" do
-      allow(ENV).to receive(:[]).with('COLUMNS').and_return("280")
-      allow(ENV).to receive(:[]).with('LINES').and_return("51")
+      screen = described_class.new({'COLUMNS' => '280', 'LINES' => '51'})
       expect(screen.from_env).to eq([51, 280])
     end
 
     it "doesn't return zero size" do
-      allow(ENV).to receive(:[]).with('COLUMNS').and_return("0")
-      allow(ENV).to receive(:[]).with('LINES').and_return("0")
+      screen = described_class.new({'COLUMNS' => '0', 'LINES' => '0'})
       expect(screen.from_env).to eq(nil)
     end
   end
 
   context 'from ansicon' do
     it "doesn't calculate size without ANSICON key" do
-      allow(ENV).to receive(:[]).with('ANSICON').and_return nil
+      screen = described_class.new({'ANSICON' => nil})
       expect(screen.from_ansicon).to eq(nil)
     end
 
     it "extracts lines and columns from environment" do
-      allow(ENV).to receive(:[]).with('ANSICON').and_return("(280x51)")
+      screen = described_class.new({'ANSICON' => '(280x51)'})
       expect(screen.from_ansicon).to eq([51, 280])
     end
 
     it "doesn't return zero size" do
-      allow(ENV).to receive(:[]).with('ANSICON').and_return("(0x0)")
+      screen = described_class.new({'ANSICON' => '(0x0)'})
       expect(screen.from_ansicon).to eq(nil)
     end
   end
+
+  context 'default size' do
+    it "suggests default terminal size" do
+      screen = described_class.new({'LINES' => 0, 'COLUMNS' => 0})
+      expect(screen.default_size).to eq([27, 80])
+    end
+
+    it "attempts to get default terminal size from environment" do
+      screen = described_class.new({'LINES' => 52, 'COLUMNS' => 200})
+      expect(screen.default_size).to eq([52, 200])
+    end
+  end
 end

data/tty-screen.gemspec

@@ -4,19 +4,20 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'tty/screen/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "tty-screen"
+  spec.name          = 'tty-screen'
   spec.version       = TTY::Screen::VERSION
   spec.authors       = ["Piotr Murach"]
   spec.email         = [""]
-  spec.summary       = %q{Terminal screen size and color detection which works on Linux, OS X and Windows/Cygwin platforms and supports MRI, JRuby and Rubinius interpreters.}
-  spec.description   = %q{Terminal screen size and color detection which works on Linux, OS X and Windows/Cygwin platforms and supports MRI, JRuby and Rubinius interpreters.}
+  spec.summary       = %q{Terminal screen size detection which works on Linux, OS X and Windows/Cygwin platforms and supports MRI, JRuby and Rubinius interpreters.}
+  spec.description   = %q{Terminal screen size detection which works on Linux, OS X and Windows/Cygwin platforms and supports MRI, JRuby and Rubinius interpreters.}
   spec.homepage      = "http://peter-murach.github.io/tty/"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.test_files    = spec.files.grep(%r{^(spec)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency 'bundler', '>= 1.5.0', '< 2.0'
+  spec.add_development_dependency 'rake',    '~> 10.0'
 end

metadata

@@ -1,31 +1,51 @@
 --- !ruby/object:Gem::Specification
 name: tty-screen
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Piotr Murach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-01 00:00:00.000000000 Z
+date: 2016-01-03 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: '1.6'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
-description: Terminal screen size and color detection which works on Linux, OS X and
-  Windows/Cygwin platforms and supports MRI, JRuby and Rubinius interpreters.
+        version: '10.0'
+description: Terminal screen size detection which works on Linux, OS X and Windows/Cygwin
+  platforms and supports MRI, JRuby and Rubinius interpreters.
 email:
 - ''
 executables: []
@@ -43,11 +63,9 @@ files:
 - Rakefile
 - lib/tty-screen.rb
 - lib/tty/screen.rb
-- lib/tty/screen/color.rb
 - lib/tty/screen/size.rb
 - lib/tty/screen/version.rb
 - spec/spec_helper.rb
-- spec/unit/color_spec.rb
 - spec/unit/new_spec.rb
 - spec/unit/size_spec.rb
 - tasks/console.rake
@@ -77,11 +95,10 @@ rubyforge_project:
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: Terminal screen size and color detection which works on Linux, OS X and Windows/Cygwin
+summary: Terminal screen size detection which works on Linux, OS X and Windows/Cygwin
   platforms and supports MRI, JRuby and Rubinius interpreters.
 test_files:
 - spec/spec_helper.rb
-- spec/unit/color_spec.rb
 - spec/unit/new_spec.rb
 - spec/unit/size_spec.rb
 has_rdoc: 

data/lib/tty/screen/color.rb

@@ -1,87 +0,0 @@
-# coding: utf-8
-
-module TTY
-  class Screen
-    class Color
-      NoValue = Module.new
-
-      # Initialize color support
-      #
-      # @api public
-      def initialize(options = {})
-        @output  = options.fetch(:output) { $stderr }
-        @verbose = options.fetch(:verbose) { false }
-      end
-
-      # Detect if terminal supports color
-      #
-      # @return [Boolean]
-      #   true when terminal supports color, false otherwise
-      #
-      # @api public
-      def supports?
-        return false unless tty?
-
-        value = false
-        %w(from_curses from_tput from_term from_env).each do |from_check|
-          break if (value = public_send(from_check)) != NoValue
-        end
-        return false if value == NoValue
-        value
-      end
-
-      # Attempt to load curses to check color support
-      #
-      # @return [Boolean]
-      #
-      # @api private
-      def from_curses(curses_class = nil)
-        require 'curses'
-
-        if defined?(Curses)
-          curses_class ||= Curses
-          curses_class.init_screen
-          has_color = curses_class.has_colors?
-          curses_class.close_screen
-          has_color
-        else
-          NoValue
-        end
-      rescue LoadError
-        warn 'no native curses support' if @verbose
-        NoValue
-      end
-
-      # Shell out to tput to check color support
-      #
-      # @api private
-      def from_tput
-        %x(tput colors 2>/dev/null).to_i > 2
-      rescue Errno::ENOENT
-        NoValue
-      end
-
-      # Inspect environment $TERM variable for color support
-      #
-      # @api private
-      def from_term
-        if ENV['TERM'] == 'dumb'
-          false
-        elsif ENV['TERM'] =~ /^screen|^xterm|^vt100|color|ansi|cygwin|linux/i
-          true
-        else NoValue
-        end
-      end
-
-      def from_env
-        ENV.include?('COLORTERM')
-      end
-
-      attr_reader :output
-
-      def tty?
-        output.tty?
-      end
-    end # Color
-  end # Screen
-end # TTY

data/spec/unit/color_spec.rb

@@ -1,52 +0,0 @@
-# encoding: utf-8
-
-require 'spec_helper'
-
-RSpec.describe TTY::Screen::Color, '.supports?' do
-  let(:output) { StringIO.new('', 'w+') }
-
-  subject(:color) { described_class.new(output: output) }
-
-  it "doesn't check color support for non tty terminal" do
-    allow(output).to receive(:tty?).and_return(false)
-
-    expect(color.supports?).to eq(false)
-  end
-
-  it "fails to load curses for color support" do
-    allow(color).to receive(:require).with('curses').
-      and_raise(LoadError)
-
-    expect(color.from_curses).to eq(described_class::NoValue)
-  end
-
-  it "loads curses for color support" do
-    allow(color).to receive(:require).with('curses').and_return(true)
-    stub_const("Curses", Object.new)
-    curses = double(:curses)
-    allow(curses).to receive(:init_screen)
-    allow(curses).to receive(:has_colors?).and_return(true)
-    allow(curses).to receive(:close_screen)
-
-    expect(color.from_curses(curses)).to eql(true)
-    expect(curses).to have_received(:has_colors?)
-  end
-
-  it "fails to find color for dumb terminal" do
-    allow(ENV).to receive(:[]).with('TERM').and_return('dumb')
-
-    expect(color.from_term).to eq(false)
-  end
-
-  it "inspects term variable for color capabilities" do
-    allow(ENV).to receive(:[]).with('TERM').and_return('xterm')
-
-    expect(color.from_term).to eq(true)
-  end
-
-  it "inspects color terminal variable for support" do
-    allow(ENV).to receive(:include?).with('COLORTERM').and_return(true)
-
-    expect(color.from_env).to eq(true)
-  end
-end