summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbinoam P. Marques Jr. <abinoam@gmail.com>2015-09-17 01:38:56 -0300
committerAbinoam P. Marques Jr. <abinoam@gmail.com>2015-09-17 01:38:56 -0300
commit9978eea175296410975f757c07f9e1b3d51868cf (patch)
treec64b91a25cd0e34f1cb48feeb49e607cddec9870
parentef986a22d051f4e9046a4254c9b68c6cc39f75bd (diff)
parentf9edd9ac5db024456e04ede9dc920da2690ab562 (diff)
downloadhighline-9978eea175296410975f757c07f9e1b3d51868cf.tar.gz
Merge pull request #156 from abinoam/issue_155v1.7.6
Fix #155 - typo on var name
-rw-r--r--Changelog.md3
-rwxr-xr-xlib/highline/system_extensions.rb2
-rw-r--r--lib/highline/version.rb2
3 files changed, 5 insertions, 2 deletions
diff --git a/Changelog.md b/Changelog.md
index 2211739..bd62891 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,9 @@
Below is a complete listing of changes for each revision of HighLine.
+### 1.7.6 / 2015-09-17
+* Fix a typo in a var name affecting solaris. (Danek Duvall (@dhduvall) and Abinoam P. Marques Jr. (@abinoam), #155, PR #156)
+
### 1.7.5 / 2015-09-14
* Support jruby9k for system extensions (Michael (@mmmries), PR #153)
diff --git a/lib/highline/system_extensions.rb b/lib/highline/system_extensions.rb
index 1ea27c4..7ee0d2f 100755
--- a/lib/highline/system_extensions.rb
+++ b/lib/highline/system_extensions.rb
@@ -235,7 +235,7 @@ class HighLine
if /solaris/ =~ RUBY_PLATFORM and
`stty` =~ /\brows = (\d+).*\bcolumns = (\d+)/
- [$2, $1].map { |c| x.to_i }
+ [$2, $1].map { |x| x.to_i }
elsif `stty size` =~ /^(\d+)\s(\d+)$/
[$2.to_i, $1.to_i]
else
diff --git a/lib/highline/version.rb b/lib/highline/version.rb
index 42c1c50..2495415 100644
--- a/lib/highline/version.rb
+++ b/lib/highline/version.rb
@@ -1,4 +1,4 @@
class HighLine
# The version of the installed library.
- VERSION = "1.7.5".freeze
+ VERSION = "1.7.6".freeze
end