tty-screen 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 163de431d1fd75a5a29b5d24ef67d3b40ec6a5a4
-  data.tar.gz: 868f17e7ac67424a1b6dd28b8f432401035cbf72
+  metadata.gz: e5b0fdd11a1c93555dd997f4ba8c6068d6004323
+  data.tar.gz: 8d2c77d63960973eee13221cff921e3ba4969837
 SHA512:
-  metadata.gz: d60be14e99f7a97bb5abc5635e873e43f53713d3e286bb02fce9f810acccbb1089d94e9b64c138945fa97e38d20516e6d7ca3f9c08453573a9fe4712b364cd1a
-  data.tar.gz: a777e4b0edc978eaa22616d00baeb26643c594714ceeb79ebc755aa4fd5a24e9eed60a420118599db286105addd00e703beaca1e9b08ff9d3b71e859da40daf6
+  metadata.gz: d1ed7d421d44185fa600b3c7ff22b91f44947a90194ebcc29682692f4e5f4df9287c7f33ec4932124302724791404414eac773e17ac667ef7a3daf18ed8cc22e
+  data.tar.gz: 8075b1853ff419e7690a92ef7ee81436195ba3fd8c52dd41b1b87713028d445cad6a6a5394de04fec3f59aaaedf76db7449bb78b56cf732e0343b9bb7a8409fe

data/.travis.yml

@@ -3,8 +3,9 @@ bundler_args: --without yard benchmarks
 script: "bundle exec rake ci"
 rvm:
   - 1.9.3
-  - 2.0.0
-  - 2.1.0
+  - 2.0
+  - 2.1
+  - 2.2
   - ruby-head
 matrix:
   include:

data/CHANGELOG.md

@@ -0,0 +1,4 @@
+0.2.0 (May 11, 2015)
+
+* Fix bug with screen detection from_io_console by @luxflux
+* Change to stop memoization of screen class instance method

data/Gemfile

@@ -7,7 +7,6 @@ group :development do
   gem 'rspec',   '~> 3.1.0'
   gem 'yard',    '~> 0.8.7'
   gem 'timecop', '~> 0.7.1'
-  gem 'pastel',  '~> 0.3.0'
 end
 
 group :metrics do

data/README.md

@@ -44,7 +44,9 @@ screen.height   # => 51
 You can also use above methods as class instance methods:
 
 ```ruby
-TTY::Screen.size  # => [51, 280]
+TTY::Screen.size     # => [51, 280]
+TTY::Screen.width    # => 280
+TTY::Screen.height   # => 51
 ```
 
 ## Contributing
@@ -57,4 +59,4 @@ TTY::Screen.size  # => [51, 280]
 
 ## Copyright
 
-Copyright (c) 2014 Piotr Murach. See LICENSE for further details.
+Copyright (c) 2014-2015 Piotr Murach. See LICENSE for further details.

data/lib/tty/screen.rb

@@ -7,11 +7,6 @@ module TTY
   #
   # @api public
   class Screen
-    # Specifies an output stream object
-    #
-    # @api public
-    attr_reader :output
-
     # Create terminal screen
     #
     # @param [Hash] options
@@ -23,36 +18,21 @@ module TTY
       @output = options.fetch(:output) { $stderr }
     end
 
+    # @api public
     def self.size
-      @size ||= new.size
+      new.size
     end
 
+    # @api public
     def self.width
       size[1]
     end
 
+    # @api public
     def self.height
       size[0]
     end
 
-    # Get terminal rows and columns
-    #
-    # @return [Array[Integer, Integer]]
-    #   return rows & columns
-    #
-    # @api public
-    def size
-      @size ||= begin
-        size = from_io_console
-        size ||= from_readline
-        size ||= from_tput
-        size ||= from_stty
-        size ||= from_env
-        size ||= from_ansicon
-        size || default_size
-      end
-    end
-
     # Default terminal size
     #
     # @api public
@@ -60,16 +40,44 @@ module TTY
       [27, 80]
     end
 
+    # Terminal lines count
+    #
+    # @return [Integer]
+    #
+    # @api public
     def height
       size[0]
     end
     alias_method :rows, :height
 
+    # Terminal columns count
+    #
+    # @return [Integer]
+    #
+    # @api public
     def width
       size[1]
     end
     alias_method :columns, :width
 
+    # Get terminal rows and columns
+    #
+    # @return [Array[Integer, Integer]]
+    #   return rows & columns
+    #
+    # @api public
+    def size
+      @size ||= begin
+        size =   from_io_console
+        size ||= from_readline
+        size ||= from_tput
+        size ||= from_stty
+        size ||= from_env
+        size ||= from_ansicon
+        size ||  default_size
+      end
+    end
+
     # Detect screen size by loading io/console lib
     #
     # @return [Array[Integer, Integer]]
@@ -78,6 +86,7 @@ module TTY
     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
@@ -134,15 +143,20 @@ module TTY
       size if nonzero_column?(size[1])
     end
 
-    # Runs command in subprocess
+    private
+
+    # Specifies an output stream object
     #
     # @api public
+    attr_reader :output
+
+    # Runs command in subprocess
+    #
+    # @api private
     def run_command(command, name)
       `#{command} #{name} 2>/dev/null`
     end
 
-    private
-
     def nonzero_column?(column)
       column.to_i > 0
     end

data/lib/tty/screen/version.rb

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

data/spec/unit/size_spec.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'spec_helper'
 
 RSpec.describe TTY::Screen, '.size' do
@@ -19,10 +21,9 @@ RSpec.describe TTY::Screen, '.size' do
       screen = double(:screen, size: [51, 280])
       allow(TTY::Screen).to receive(:new).and_return(screen)
       expect(TTY::Screen.size).to eq([51, 280])
-      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).to have_received(:new).once
+      expect(TTY::Screen).to have_received(:new).exactly(3).times
     end
   end
 
@@ -37,6 +38,11 @@ RSpec.describe TTY::Screen, '.size' do
       allow(Kernel).to receive(:require).with('io/console').and_raise(LoadError)
       expect(screen.from_io_console).to eq(nil)
     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)
+    end
   end
 
   context 'from tput' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tty-screen
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Piotr Murach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-23 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -36,6 +36,7 @@ files:
 - .rspec
 - .ruby-version
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md