colsole 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2c590c10a219d6246954a7b1c6708ecf64e3456
-  data.tar.gz: 26ce9466d5e79b292b138e98dc06fc5ab3cf824d
+  metadata.gz: 08c6e757c1ba2ae0e8d05c64da24d3375df09a37
+  data.tar.gz: 269346a9ac9d2acd45ff136faf34254b034171f4
 SHA512:
-  metadata.gz: 626e8866f26c58eef52d61ae76c0c6ef05365eb2ef6411805f75073596d341149233fbd3bad099983c55898988d30f843efa93b9d72a262df41626ab29d95d77
-  data.tar.gz: 3ff7a06d4a61d4a128c65f8127adf5827b54a2cd379dd2183df8b89178673d0ecad277b803393a937d234fc32ce242882b4500f3251398387bd73155b86a36c3
+  metadata.gz: fc87e9e056c23ecfa4b5b5a05b079fca88d920a5b470c9492ca52ce16e3fe9bc5ba3a95d4d73cb97a2318d6814d97822de2e28890d86c2e74dc4f6623998759c
+  data.tar.gz: 39c1186dece6da79bb594948b814efbdbd39f97ad6755b0e53bca9a8147cac769b570e43a086d126a8effaa4db6735d90bc95b55a16cd7066cea8dd64e747fc6

data/lib/colsole.rb

@@ -73,20 +73,21 @@ module Colsole
   # value otherwise.
   def detect_terminal_size(default=[80,30])
     if (ENV['COLUMNS'] =~ /^\d+$/) && (ENV['LINES'] =~ /^\d+$/)
-      [ENV['COLUMNS'].to_i, ENV['LINES'].to_i]
+      result = [ENV['COLUMNS'].to_i, ENV['LINES'].to_i]
     elsif (RUBY_PLATFORM =~ /java/ || (!STDIN.tty? && ENV['TERM'])) && command_exist?('tput')
-      [`tput cols`.to_i, `tput lines`.to_i]
+      result = [`tput cols 2>&1`.to_i, `tput lines 2>&1`.to_i]
     elsif STDIN.tty? && command_exist?('stty')
-      result = `stty size`.scan(/\d+/).map { |s| s.to_i }.reverse
-      result == [0,0] ? default : result
+      result = `stty size 2>&1`.scan(/\d+/).map { |s| s.to_i }.reverse
     else
-      default
+      result = default
     end
+    result = default unless result[0].is_a? Fixnum and result[1].is_a? Fixnum and result[0] > 0 and result[1] > 0
+    result
   end
 
   # Returns terminal width with re-asking
   def terminal_width
-    @terminal_width ||= detect_terminal_size[0]
+    detect_terminal_size[0]
   end
 
   # Converts a long string to be wrapped keeping words in tact.

data/lib/colsole/version.rb

@@ -1,3 +1,3 @@
 module Colsole
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: colsole
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-25 00:00:00.000000000 Z
+date: 2017-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: runfile
@@ -39,33 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.10'
-- !ruby/object:Gem::Dependency
-  name: minitest-reporters
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement