[DRE-commits] [ruby-commander] 01/05: Imported Upstream version 4.3.5

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository ruby-commander.

commit 91dcef1525128d28dc2747e2fdc2328ef3019c8a
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Mon Aug 17 18:18:55 2015 +0200

    Imported Upstream version 4.3.5
---
 History.rdoc             | 4 ++++
 lib/commander/import.rb  | 5 +----
 lib/commander/methods.rb | 4 +++-
 lib/commander/version.rb | 2 +-
 metadata.yml             | 6 +++---
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/History.rdoc b/History.rdoc
index 74dad12..5173a39 100644
--- a/History.rdoc
+++ b/History.rdoc
@@ -1,3 +1,7 @@
+=== 4.3.5 / 2015-08-09
+
+* Fixed a bug with small terminal widths, changed minimum screen width for wrapping to 40 columns. (@toolmantim)
+
 === 4.3.4 / 2015-05-03
 
 * Fixed a regression with the compact help formatter.
diff --git a/lib/commander/import.rb b/lib/commander/import.rb
index d2bf258..e2e846d 100644
--- a/lib/commander/import.rb
+++ b/lib/commander/import.rb
@@ -1,8 +1,5 @@
 require 'commander'
 
-include Commander::UI
-include Commander::UI::AskForClass
-include Commander::Delegates
+include Commander::Methods
 
-$terminal.wrap_at = HighLine::SystemExtensions.terminal_size.first - 5 rescue 80 if $stdin.tty?
 at_exit { run! }
diff --git a/lib/commander/methods.rb b/lib/commander/methods.rb
index 2a62ee2..a9f2387 100644
--- a/lib/commander/methods.rb
+++ b/lib/commander/methods.rb
@@ -4,6 +4,8 @@ module Commander
     include Commander::UI::AskForClass
     include Commander::Delegates
 
-    $terminal.wrap_at = HighLine::SystemExtensions.terminal_size.first - 5 rescue 80 if $stdin.tty?
+    if $stdin.tty? && (cols = $terminal.output_cols) >= 40
+      $terminal.wrap_at = cols - 5
+    end
   end
 end
diff --git a/lib/commander/version.rb b/lib/commander/version.rb
index 1b12948..37da9ea 100644
--- a/lib/commander/version.rb
+++ b/lib/commander/version.rb
@@ -1,3 +1,3 @@
 module Commander
-  VERSION = '4.3.4'
+  VERSION = '4.3.5'
 end
diff --git a/metadata.yml b/metadata.yml
index eff87e8..c2cf4ef 100644
--- a/metadata.yml
+++ b/metadata.yml
@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commander
 version: !ruby/object:Gem::Version
-  version: 4.3.4
+  version: 4.3.5
 platform: ruby
 authors:
 - TJ Holowaychuk
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-04 00:00:00.000000000 Z
+date: 2015-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: The complete solution for Ruby command-line executables

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-commander.git