tty-screen 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f0cbb3be9dc7a2c6ead432ccd7826162076f6da
-  data.tar.gz: e407aeb6ff3960e5390935d6b95022cb852f915f
+  metadata.gz: cf079c51ac4f0fcb5bb6c29031a77ed0d7bf6bb5
+  data.tar.gz: 415b2d5c8e694c8cc3d9b7261b7dedbc20e8b8dd
 SHA512:
-  metadata.gz: 2004945e60fbcbd8416a7bbe54e79466c871b4433c53efde1cc64ef93ee5ab06f9aba599e53195a14c375ae01396a6d7347214b10833e52ea7fb7207a1c0b304
-  data.tar.gz: d5462d5be2dee1bd365749ab395245373fcfd98d8580e2feb4862af0b5d3466aa4f0d01fcdb12632cd1948ce8a57d4f8a8cc4b1f09c875da9c7212671155bd45
+  metadata.gz: bed4c21fb89f382f348ebf2548e9b0d0344ed9bd0ab46fbdd9448e405c1c2197dcad9a536c890c60dbd1d1ec104850839fd2edcc54834474aa23abc7e09068ff
+  data.tar.gz: 82eb587b1334c125bc509d11259cfb9680218c35d9405912af2f202dfa867c6e9fcbbf11649d06cfc3a27d7e4d4b5575ea9ebab2cfb80cec59cc2a4395f752db

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+0.4.3 (Nov 1, 2015)
+
+* Fix issue with #from_curses method and remove ensure block
+* Add NoValue to Color class to mark failure of reading color value
+* Change Color class supports? to recognize lack of color value
+
 0.4.2 (Oct 31, 2015)
 
 * Change visibility of output to prevent warnings

data/lib/tty/screen/color.rb

@@ -3,6 +3,8 @@
 module TTY
   class Screen
     class Color
+      NoValue = Module.new
+
       # Initialize color support
       #
       # @api public
@@ -20,7 +22,12 @@ module TTY
       def supports?
         return false unless tty?
 
-        from_curses || from_tput || from_term || from_env
+        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
@@ -31,16 +38,18 @@ module TTY
       def from_curses(curses_class = nil)
         require 'curses'
 
-        begin
+        if defined?(Curses)
           curses_class ||= Curses
           curses_class.init_screen
-          curses_class.has_colors?
-        ensure
+          has_color = curses_class.has_colors?
           curses_class.close_screen
+          has_color
+        else
+          NoValue
         end
       rescue LoadError
         warn 'no native curses support' if @verbose
-        false
+        NoValue
       end
 
       # Shell out to tput to check color support
@@ -49,7 +58,7 @@ module TTY
       def from_tput
         %x(tput colors 2>/dev/null).to_i > 2
       rescue Errno::ENOENT
-        false
+        NoValue
       end
 
       # Inspect environment $TERM variable for color support
@@ -60,7 +69,7 @@ module TTY
           false
         elsif ENV['TERM'] =~ /^screen|^xterm|^vt100|color|ansi|cygwin|linux/i
           true
-        else false
+        else NoValue
         end
       end
 

data/lib/tty/screen/version.rb

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

data/spec/unit/color_spec.rb

@@ -17,11 +17,12 @@ RSpec.describe TTY::Screen::Color, '.supports?' do
     allow(color).to receive(:require).with('curses').
       and_raise(LoadError)
 
-    expect(color.from_curses).to eq(false)
+    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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tty-screen
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Piotr Murach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-31 00:00:00.000000000 Z
+date: 2015-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler