expectr 1.0.3 → 1.1.0

data/lib/expectr/version.rb

@@ -1,3 +1,3 @@
 class Expectr
-  VERSION = '1.0.3'
+  VERSION = '1.1.0'
 end

data/lib/expectr.rb

@@ -1,6 +1,7 @@
 require 'pty'
 require 'timeout'
 require 'thread'
+require 'io/console'
 
 require 'expectr/error'
 require 'expectr/version'
@@ -88,6 +89,7 @@ class Expectr
     @interact = false
 
     @stdout,@stdin,@pid = PTY.spawn(cmd)
+    @stdout.winsize = STDOUT.winsize
 
     Thread.new do
       while @pid > 0
@@ -152,6 +154,11 @@ class Expectr
     old_tstp_trap = trap 'TSTP' do
       send "\C-z"
     end
+
+    # SIGWINCH should trigger an update to the child process
+    old_winch_trap = trap 'WINCH' do
+      @stdout.winsize = STDOUT.winsize
+    end
     
     interact = Thread.new do
       input = ''.encode("UTF-8")
@@ -164,6 +171,7 @@ class Expectr
 
       trap 'INT', old_int_trap
       trap 'TSTP', old_tstp_trap
+      trap 'WINCH', old_winch_trap
       `stty #{old_tty}`
       @interact = false
     end
@@ -293,6 +301,13 @@ class Expectr
     end
   end
 
+  # Public: Return the child's window size.
+  #
+  # Returns a two-element array (same as IO#winsize).
+  def winsize
+    @stdout.winsize
+  end
+
   # Internal: Print buffer to STDOUT if @flush_buffer is true
   #
   # buf - String to be printed to STDOUT

data/test/test_initialization.rb

@@ -9,7 +9,7 @@ class InitializationTests < Test::Unit::TestCase
     assert_nothing_raised { exp = Expectr.new(File.new("/bin/ls"), flush_buffer: false) }
   end
 
-  # lib/expectr.rb's permissions should hopefully be set to 0644
+  # lib/expectr.rb's permissions should be set to 0644
   def test_spawn_failures
     assert_raises(Errno::ENOENT) { exp = Expectr.new("lib/ThisFileShouldNotExist", flush_buffer: false) }
     assert_raises(Errno::EACCES) { exp = Expectr.new("lib/expectr.rb", flush_buffer: false) }

data/test/test_interaction.rb

@@ -37,6 +37,10 @@ class InteractionTest < Test::Unit::TestCase
     assert_raises(Expectr::ProcessError) { @exp.send("test\n") }
   end
 
+  def test_winsize_set
+    assert_not_equal [0, 0], @exp.winsize
+  end
+
   def test_interact_sets_appropriate_flags
     [
       Thread.new {
@@ -105,10 +109,4 @@ class InteractionTest < Test::Unit::TestCase
 
     assert_not_nil @exp.expect(/321/)
   end
-
-  def test_kill_process
-    assert_equal true, @exp.kill!
-    assert_equal 0, @exp.pid
-    assert_raises(Expectr::ProcessError) { @exp.send("test\n") }
-  end
 end

data/test/test_signals.rb

@@ -0,0 +1,35 @@
+require 'helper'
+
+class SignalHandlerTest < Test::Unit::TestCase
+  def setup
+    @exp = Expectr.new("bc", flush_buffer: false, timeout: 1)
+  end
+
+  def test_winsz_change
+    winsize = $stdout.winsize
+    [
+      Thread.new {
+        sleep 0.5
+        @exp.interact!.join
+      },
+      Thread.new {
+        sleep 1
+        @exp.flush_buffer=false
+        assert_nothing_raised do
+          $stdout.winsize = [10,10]
+        end
+        sleep 0.1
+        assert_equal [10,10], @exp.winsize
+        @exp.puts("quit")
+      }
+    ].each {|x| x.join}
+
+    $stdout.winsize = winsize
+  end
+
+  def test_kill_process
+    assert_equal true, @exp.kill!
+    assert_equal 0, @exp.pid
+    assert_raises(Expectr::ProcessError) { @exp.send("test\n") }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: expectr
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-05 00:00:00.000000000 Z
+date: 2013-02-18 00:00:00.000000000 Z
 dependencies: []
 description: Expectr is an interface to the functionality of Expect in Ruby
 email: chris@chriswuest.com
@@ -29,6 +29,7 @@ files:
 - test/test_core.rb
 - test/test_initialization.rb
 - test/test_interaction.rb
+- test/test_signals.rb
 homepage: http://github.com/cwuest/expectr
 licenses:
 - MIT
@@ -50,7 +51,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Expect for Ruby
@@ -58,3 +59,4 @@ test_files:
 - test/test_core.rb
 - test/test_initialization.rb
 - test/test_interaction.rb
+- test/test_signals.rb