Fix rescueing without error class

5 files changed, 7 insertions, 7 deletions

diff --git a/lib/highline.rb b/lib/highline.rb
index 360a5c9..b51a1a0 100755
--- a/lib/highline.rb
+++ b/lib/highline.rb
@@ -448,7 +448,7 @@ class HighLine
   def output_cols
     return 80 unless @output.tty?
     terminal.terminal_size.first
-  rescue
+  rescue NoMethodError
     return 80
   end
 
@@ -459,7 +459,7 @@ class HighLine
   def output_rows
     return 24 unless @output.tty?
     terminal.terminal_size.last
-  rescue
+  rescue NoMethodError
     return 24
   end
 
diff --git a/lib/highline/terminal.rb b/lib/highline/terminal.rb
index 55a2d77..cd1d3dc 100755
--- a/lib/highline/terminal.rb
+++ b/lib/highline/terminal.rb
@@ -181,7 +181,7 @@ class HighLine
     def save_stty
       @stty_save = begin
                      `stty -g`.chomp
-                   rescue
+                   rescue StandardError
                      nil
                    end
     end
diff --git a/lib/highline/terminal/unix_stty.rb b/lib/highline/terminal/unix_stty.rb
index 1b6f761..ad9c85d 100644
--- a/lib/highline/terminal/unix_stty.rb
+++ b/lib/highline/terminal/unix_stty.rb
@@ -13,7 +13,7 @@ class HighLine
           require "io/console"
           winsize = begin
                       IO.console.winsize.reverse
-                    rescue
+                    rescue NoMethodError
                       nil
                     end
           return winsize if winsize
diff --git a/test/acceptance/acceptance.rb b/test/acceptance/acceptance.rb
index 9867b55..508b0f6 100644
--- a/test/acceptance/acceptance.rb
+++ b/test/acceptance/acceptance.rb
@@ -38,12 +38,12 @@ HighLine::VERSION: #{HighLine::VERSION}
 Terminal: #{HighLine.default_instance.terminal.class}
 RUBY_DESCRIPTION: #{begin
                       RUBY_DESCRIPTION
-                    rescue
+                    rescue NameError
                       'not available'
                     end}
 Readline::VERSION: #{begin
                        Readline::VERSION
-                     rescue
+                     rescue NameError
                        'not availabe'
                      end}
 ENV['SHELL']: #{ENV['SHELL']}
diff --git a/test/test_highline.rb b/test/test_highline.rb
index eca4670..6f4d1e0 100755
--- a/test/test_highline.rb
+++ b/test/test_highline.rb
@@ -1645,7 +1645,7 @@ class TestHighLine < Minitest::Test
       require "highline/import"
       # this will still blow up, nothing available
       ask("And now?  ")
-    rescue
+    rescue StandardError
       # but HighLine's safe guards are off
       refute_equal(EOFError, $ERROR_INFO.class)
     end