tty-screen 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5b0fdd11a1c93555dd997f4ba8c6068d6004323
-  data.tar.gz: 8d2c77d63960973eee13221cff921e3ba4969837
+  metadata.gz: 17a06a8743f9b9c8201505e62561368c0ee30173
+  data.tar.gz: 5076f6033f0be8495506a2585bd551697eeff316
 SHA512:
-  metadata.gz: d1ed7d421d44185fa600b3c7ff22b91f44947a90194ebcc29682692f4e5f4df9287c7f33ec4932124302724791404414eac773e17ac667ef7a3daf18ed8cc22e
-  data.tar.gz: 8075b1853ff419e7690a92ef7ee81436195ba3fd8c52dd41b1b87713028d445cad6a6a5394de04fec3f59aaaedf76db7449bb78b56cf732e0343b9bb7a8409fe
+  metadata.gz: 8659b0a56e2b205ebcd8793a0005ab7c48c91eb32fb336c96dff63ea1823ab02cbb74e9a0451e19246b13924ecd545b9366c3efc7fb7dfc97e3aaebd985c9cdd
+  data.tar.gz: 1f8600f8c43ae74fb85862abb98fae26537551db81b1f35a086d3cfee2b53a44c62fcc208ec72222ce38a1065cb94a4c7d7580676279c4a0d8c967e3b934b93c

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+0.3.0 (Sept 12, 2015)
+
+* Fix bug loading standard library
+
 0.2.0 (May 11, 2015)
 
 * Fix bug with screen detection from_io_console by @luxflux

data/Gemfile

@@ -3,14 +3,13 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem 'rake',    '~> 10.3.2'
-  gem 'rspec',   '~> 3.1.0'
+  gem 'rake',    '~> 10.4.2'
+  gem 'rspec',   '~> 3.3.0'
   gem 'yard',    '~> 0.8.7'
-  gem 'timecop', '~> 0.7.1'
 end
 
 group :metrics do
-  gem 'coveralls', '~> 0.7.0'
-  gem 'simplecov', '~> 0.8.2'
+  gem 'coveralls', '~> 0.8.1'
+  gem 'simplecov', '~> 0.10.0'
   gem 'yardstick', '~> 0.9.9'
 end

data/README.md

@@ -1,13 +1,15 @@
 # TTY::Screen
-[![Gem Version](https://badge.fury.io/rb/tty-screen.png)][gem]
-[![Build Status](https://secure.travis-ci.org/peter-murach/tty-screen.png?branch=master)][travis]
-[![Code Climate](https://codeclimate.com/github/peter-murach/tty-screen.png)][codeclimate]
-[![Coverage Status](https://coveralls.io/repos/peter-murach/tty-screen/badge.png)][coverage]
+[![Gem Version](https://badge.fury.io/rb/tty-screen.svg)][gem]
+[![Build Status](https://secure.travis-ci.org/peter-murach/tty-screen.svg?branch=master)][travis]
+[![Code Climate](https://codeclimate.com/github/peter-murach/tty-screen/badges/gpa.svg)][codeclimate]
+[![Coverage Status](https://coveralls.io/repos/peter-murach/tty-screen/badge.svg)][coverage]
+[![Inline docs](http://inch-ci.org/github/peter-murach/tty-screen.svg?branch=master)][inchpages]
 
 [gem]: http://badge.fury.io/rb/tty-screen
 [travis]: http://travis-ci.org/peter-murach/tty-screen
 [codeclimate]: https://codeclimate.com/github/peter-murach/tty-screen
 [coverage]: https://coveralls.io/r/peter-murach/tty-screen
+[inchpages]: http://inch-ci.org/github/peter-murach/tty-screen
 
 > Terminal screen size detection which works both on Linux, OS X and Windows/Cygwin platforms and supports MRI, JRuby and Rubinius interpreters.
 

data/lib/tty/screen.rb

@@ -37,7 +37,10 @@ module TTY
     #
     # @api public
     def default_size
-      [27, 80]
+      [
+        ENV['LINES'].to_i.nonzero? || 27,
+        ENV['COLUMNS'].to_i.nonzero? || 80
+      ]
     end
 
     # Terminal lines count
@@ -84,17 +87,37 @@ module TTY
     #
     # @api private
     def from_io_console
-      return if jruby?
-      Kernel.require 'io/console'
-      return unless IO.respond_to?(:console)
-      size = IO.console.winsize
-      size if nonzero_column?(size[1])
-    rescue LoadError
-      # Didn't find io/console in stdlib
+      return false if jruby?
+      try_io_console { |size|
+        size if nonzero_column?(size[1])
+      }
     end
 
-    # Detect screen size using Readline
+    # Attempts to load native console extension
+    #
+    # @return [Boolean, Array]
     #
+    # @api private
+    def try_io_console
+      begin
+        require 'io/console'
+
+        begin
+          if output.tty? && IO.method_defined?(:winsize)
+            yield output.winsize
+          else
+            false
+          end
+        rescue Errno::EOPNOTSUPP
+          false
+        end
+      rescue LoadError
+        warn 'no native io/console support' if $VERBOSE
+        false
+      end
+    end
+
+    # Detect screen size using Readline
     #
     # @api private
     def from_readline
@@ -106,7 +129,7 @@ module TTY
 
     # Detect terminal size from tput utility
     #
-    # @api public
+    # @api private
     def from_tput
       return unless output.tty?
       lines = run_command('tput', 'lines').to_i
@@ -117,7 +140,7 @@ module TTY
 
     # Detect terminal size from stty utility
     #
-    # @api public
+    # @api private
     def from_stty
       return unless output.tty?
       size = run_command('stty', 'size').split.map(&:to_i)
@@ -153,8 +176,8 @@ module TTY
     # Runs command in subprocess
     #
     # @api private
-    def run_command(command, name)
-      `#{command} #{name} 2>/dev/null`
+    def run_command(command, *args)
+      `#{command} #{args.join(' ')} 2>/dev/null`
     end
 
     def nonzero_column?(column)

data/lib/tty/screen/version.rb

@@ -2,6 +2,6 @@
 
 module TTY
   class Screen
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end # Screen
 end # TTY

data/spec/unit/size_spec.rb

@@ -1,12 +1,33 @@
 # coding: utf-8
 
 require 'spec_helper'
+require 'delegate'
 
 RSpec.describe TTY::Screen, '.size' do
-  let(:output) { StringIO.new('', 'w+') }
+  class Output < SimpleDelegator
+    def winsize
+      [100, 200]
+    end
+  end
+
+  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
       allow(screen).to receive(:from_io_console).and_return([51, 280])
@@ -30,18 +51,35 @@ RSpec.describe TTY::Screen, '.size' do
   context 'from io console' do
     it "doesn't calculate size if jruby " do
       allow(screen).to receive(:jruby?).and_return(true)
-      expect(screen.from_io_console).to eq(nil)
+      expect(screen.from_io_console).to eq(false)
+    end
+
+    it "calcualtes the size" do
+      allow(screen).to receive(:jruby?).and_return(false)
+      allow(TTY::Screen).to receive(:require).with('io/console').
+        and_return(true)
+      allow(output).to receive(:tty?).and_return(true)
+      allow(IO).to receive(:method_defined?).with(:winsize).and_return(true)
+      allow(output).to receive(:winsize).and_return([100, 200])
+
+      expect(screen.from_io_console).to eq([100, 200])
+      expect(output).to have_received(:winsize)
     end
 
     it "doesn't calculate size if io/console not available" do
       allow(screen).to receive(:jruby?).and_return(false)
-      allow(Kernel).to receive(:require).with('io/console').and_raise(LoadError)
-      expect(screen.from_io_console).to eq(nil)
+      allow(TTY::Screen).to receive(:require).with('io/console').
+        and_raise(LoadError)
+      expect(screen.from_io_console).to eq(false)
     end
 
     it "doesn't calculate size if it is run without a console" do
-      allow(IO).to receive(:respond_to?).with(:console).and_return(false)
-      expect(screen.from_io_console).to eq(nil)
+      allow(screen).to receive(:jruby?).and_return(false)
+      allow(TTY::Screen).to receive(:require).with('io/console').
+        and_return(true)
+      allow(output).to receive(:tty?).and_return(true)
+      allow(IO).to receive(:method_defined?).with(:winsize).and_return(false)
+      expect(screen.from_io_console).to eq(false)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tty-screen
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Piotr Murach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler