tty-screen 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be4bc4b46b107018a11b33feebb201553f94c41b
-  data.tar.gz: 377b7c1492d822be260e43f11a7686471dc4b06f
+  metadata.gz: 9a63a2019e73caf56b233666335b21ec5f0f5200
+  data.tar.gz: c01de14e847e44852e352a7a916379f82c657560
 SHA512:
-  metadata.gz: 9cda3d71ea61b665f0feaefca79def7a255b6d65a5cd067eadf6829d4d3f76953e6ae2b0a6faf93542fc4946dae14cd1c52f24e56f838545ef6b25da2ae86eba
-  data.tar.gz: 6884864fdc21364b397a405b2b99c52aeb8d4dfd0c44f912997a9bca20b2421221c536023b258fcbdb26d78c2b687323bcfba284a740b043b9528241049a75c7
+  metadata.gz: 9c7da830b7bfcc5c08f061d27e5ced6593fe39c26e503adee00364937531b7cee77a1eda6134eec8d344dd8e2fe412b28fd6de12edd56e37aa586ac401a453df
+  data.tar.gz: 474a96f5cfe40c0d4cae44be6bbc928d2f350adc4aa96bfe32f399409f851b3dae50c266b135463410e7cc263f2146cad5bb726e0fd874a7c63dded3d5663b16

data/.travis.yml

@@ -2,25 +2,21 @@
 language: ruby
 sudo: false
 cache: bundler
+before_install: "gem update bundler"
 script: "bundle exec rake ci"
 rvm:
-  - 1.9.3
-  - 2.0
-  - 2.1
-  - 2.2
+  - 2.0.0
+  - 2.1.10
+  - 2.2.5
+  - 2.3.1
+  - 2.4.1
   - ruby-head
+  - jruby-9000
+  - jruby-head
 matrix:
-  include:
-    - rvm: jruby-19mode
-    - rvm: jruby-20mode
-    - rvm: jruby-21mode
-    - rvm: jruby-head
-    - rvm: rbx-2
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
-    - rvm: jruby-20mode
-    - rvm: jruby-21mode
   fast_finish: true
 branches:
   only: master

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Change log
 
+## [v0.5.1] - 2017-10-26
+
+### Changed
+* Change #from_io_console to return nil when no size present
+* Change #run_command to silently ignore any errors
+
+### Fixed
+* Fix #from_readline check to prevent from failing on missing api call
+* Fix #from_stty to only extract size when stty command returns output
+* Fix #run_command to correctly capture command output and fix #from_tput check
+
 ## [v0.5.0] - 2016-01-03
 
 ### Changed
@@ -45,6 +56,7 @@
 ### Fixed
 * Fix bug with screen detection from_io_console by @luxflux
 
+[v0.5.1]: https://github.com/peter-murach/tty-screen/compare/v0.5.0...v0.5.1
 [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

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,74 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at [email]. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

data/Gemfile

@@ -3,9 +3,8 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem 'rake',    '~> 10.4.2'
-  gem 'rspec',   '~> 3.4.0'
-  gem 'yard',    '~> 0.8.7'
+  gem 'rspec',   '~> 3.7.0'
+  gem 'yard',    '~> 0.9.9'
 end
 
 group :metrics do

data/README.md

@@ -1,19 +1,23 @@
-# TTY::Screen
+# TTY::Screen [![Gitter](https://badges.gitter.im/Join%20Chat.svg)][gitter]
+
 [![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]
+[![Build Status](https://secure.travis-ci.org/piotrmurach/tty-screen.svg?branch=master)][travis]
+[![Build status](https://ci.appveyor.com/api/projects/status/myjv8kahk1iwrlha?svg=true)][appveyor]
+[![Code Climate](https://codeclimate.com/github/piotrmurach/tty-screen/badges/gpa.svg)][codeclimate]
+[![Coverage Status](https://coveralls.io/repos/piotrmurach/tty-screen/badge.svg)][coverage]
+[![Inline docs](http://inch-ci.org/github/piotrmurach/tty-screen.svg?branch=master)][inchpages]
 
+[gitter]: https://gitter.im/piotrmurach/tty
 [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
+[travis]: http://travis-ci.org/piotrmurach/tty-screen
+[appveyor]: https://ci.appveyor.com/project/piotrmurach/tty-screen
+[codeclimate]: https://codeclimate.com/github/piotrmurach/tty-screen
+[coverage]: https://coveralls.io/r/piotrmurach/tty-screen
+[inchpages]: http://inch-ci.org/github/piotrmurach/tty-screen
 
 > 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 detection component for [TTY](https://github.com/peter-murach/tty) toolkit.
+**TTY::Screen** provides independent screen size detection component for [TTY](https://github.com/piotrmurach/tty) toolkit.
 
 ## Installation
 
@@ -53,12 +57,14 @@ TTY::Screen.height   # => 51
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/tty-screen/fork )
+1. Fork it ( https://github.com/piotrmurach/tty-screen/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`)
 5. Create a new Pull Request
 
+This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+
 ## Copyright
 
-Copyright (c) 2014-2016 Piotr Murach. See LICENSE for further details.
+Copyright (c) 2014-2017 Piotr Murach. See LICENSE for further details.

data/appveyor.yml

@@ -0,0 +1,21 @@
+---
+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: "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"
+    - ruby_version: "24"
+    - ruby_version: "24-x64"

data/lib/tty-screen.rb

@@ -1,3 +1 @@
-# coding: utf-8
-
 require 'tty/screen'

data/lib/tty/screen.rb

@@ -1,7 +1,5 @@
-# coding: utf-8
-
-require 'tty/screen/size'
-require 'tty/screen/version'
+require_relative 'screen/size'
+require_relative 'screen/version'
 
 module TTY
   # Used for detecting screen properties

data/lib/tty/screen/size.rb

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 module TTY
   class Screen
     class Size
@@ -34,7 +32,7 @@ module TTY
       #
       # @api private
       def from_io_console
-        return false if jruby?
+        return if jruby?
         try_io_console { |size| size if nonzero_column?(size[1]) }
       end
 
@@ -49,24 +47,22 @@ module TTY
         begin
           if output.tty? && IO.method_defined?(:winsize)
             yield output.winsize
-          else
-            false
           end
         rescue Errno::EOPNOTSUPP
-          false
+          # no support for winsize on output
         end
       rescue LoadError
-        warn 'no native io/console support' if @verbose
-        false
+        warn 'no native io/console support or io-console gem' if @verbose
       end
 
       # Detect screen size using Readline
       #
       # @api private
       def from_readline
-        return unless defined?(Readline)
-        size = Readline.get_screen_size
-        size if nonzero_column?(size[1])
+        if defined?(Readline) && Readline.respond_to?(:get_screen_size)
+          size = Readline.get_screen_size
+          size if nonzero_column?(size[1])
+        end
       rescue NotImplementedError
       end
 
@@ -86,7 +82,9 @@ module TTY
       # @api private
       def from_stty
         return unless output.tty?
-        size = run_command('stty', 'size').split.map(&:to_i)
+        out = run_command('stty', 'size')
+        return unless out
+        size = out.split.map(&:to_i)
         size if nonzero_column?(size[1])
       rescue Errno::ENOENT
       end
@@ -126,13 +124,25 @@ module TTY
 
       private
 
-      # Runs command in subprocess
+      # Runs command silently capturing the output
       #
       # @api private
-      def run_command(command, *args)
-        `#{command} #{args.join(' ')} 2>/dev/null`
+      def run_command(*args)
+        require 'tempfile'
+        out = Tempfile.new('tty-screen')
+        result = system(*args, out: out.path)
+        return if result.nil?
+        out.rewind
+        out.read
+      ensure
+        out.close if out
       end
 
+      # Check if number is non zero
+      #
+      # return [Boolean]
+      #
+      # @api private
       def nonzero_column?(column)
         column.to_i > 0
       end

data/lib/tty/screen/version.rb

@@ -1,7 +1,5 @@
-# coding: utf-8
-
 module TTY
   class Screen
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
   end # Screen
 end # TTY

data/spec/spec_helper.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 if RUBY_VERSION > '1.9' and (ENV['COVERAGE'] || ENV['TRAVIS'])
   require 'simplecov'
   require 'coveralls'

data/spec/unit/new_spec.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 RSpec.describe TTY::Screen, '.new' do
 
   it "initializses size with defaults" do

data/spec/unit/size_spec.rb

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 require 'delegate'
 
 RSpec.describe TTY::Screen::Size, '#size' do
@@ -26,7 +24,7 @@ RSpec.describe TTY::Screen::Size, '#size' 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)
+      expect(screen.from_io_console).to eq(nil)
     end
 
     it "calcualtes the size" do
@@ -47,7 +45,7 @@ RSpec.describe TTY::Screen::Size, '#size' do
       allow(screen).to receive(:jruby?).and_return(false)
       allow(screen).to receive(:require).with('io/console').
         and_raise(LoadError)
-      expect(screen.from_io_console).to eq(false)
+      expect(screen.from_io_console).to eq(nil)
     end
 
     it "doesn't calculate size if it is run without a console" do
@@ -57,7 +55,7 @@ RSpec.describe TTY::Screen::Size, '#size' do
         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)
+      expect(screen.from_io_console).to eq(nil)
     end
   end
 

data/tasks/console.rake

@@ -4,7 +4,7 @@ desc 'Load gem inside irb console'
 task :console do
   require 'irb'
   require 'irb/completion'
-  require File.join(__FILE__, '../../lib/tty-screen')
+  require_relative '../lib/tty-screen'
   ARGV.clear
   IRB.start
 end

data/tty-screen.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = [""]
   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.homepage      = "https://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-screen
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Piotr Murach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-03 00:00:00.000000000 Z
+date: 2017-10-26 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 screen size detection which works on Linux, OS X and Windows/Cygwin
@@ -52,15 +52,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
+- CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- appveyor.yml
 - lib/tty-screen.rb
 - lib/tty/screen.rb
 - lib/tty/screen/size.rb
@@ -72,7 +73,7 @@ files:
 - tasks/coverage.rake
 - tasks/spec.rake
 - tty-screen.gemspec
-homepage: http://peter-murach.github.io/tty/
+homepage: https://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 screen size detection which works on Linux, OS X and Windows/Cygwin
@@ -101,4 +102,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/unit/new_spec.rb
 - spec/unit/size_spec.rb
-has_rdoc: 

data/.ruby-version

@@ -1 +0,0 @@
-2.0.0