expectr 0.8.4 → 0.9.0

data/Gemfile

@@ -6,8 +6,8 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
+  gem "bundler", ">= 1.0.0"
   gem "shoulda", ">= 0"
   gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.8.3"
 end

data/VERSION

@@ -1 +1 @@
-0.8.4
+0.9.0

data/expectr.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "expectr"
-  s.version = "0.8.4"
+  s.version = "0.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris Wuest"]
-  s.date = "2012-05-11"
+  s.date = "2012-06-11"
   s.description = "Implementation of functionality from NIST Expect in Ruby, with an emphasis on control and extensibility"
   s.email = "chris@chriswuest.com"
   s.extra_rdoc_files = [
@@ -38,20 +38,20 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
     else
+      s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
     end
   else
+    s.add_dependency(%q<bundler>, [">= 1.0.0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
   end
 end

data/lib/expectr.rb

@@ -147,7 +147,6 @@ class Expectr
 					begin
 						@stdout.sysread(@buffer_size, buf)
 					rescue Errno::EIO #Application went away.
-						Process.wait @pid
 						@pid = 0
 						break
 					end
@@ -162,6 +161,11 @@ class Expectr
 				end
 			end
 		end
+
+		Thread.new do
+			Process.wait @pid
+			@pid = 0
+		end
 	end
 
 	# 
@@ -188,7 +192,7 @@ class Expectr
 	#
 	def interact
 		oldtrap = trap 'INT' do
-				@stdin.syswrite "\C-c"
+				send "\C-c"
 		end
 
 		@flush_buffer = true
@@ -199,7 +203,7 @@ class Expectr
 			input = ''
 			while @pid > 0
 				if select([STDIN], nil, nil, 1)
-					@stdin.syswrite STDIN.getc.chr
+					send STDIN.getc.chr
 				end
 			end
 		end
@@ -214,8 +218,12 @@ class Expectr
 	# Send +str+ to application
 	#
 	def send(str)
+		begin
+			@stdin.syswrite str
+		rescue Errno::EIO #Application went away.
+			@pid = 0
+		end
 		raise ArgumentError unless @pid > 0
-		@stdin.syswrite str
 	end
 
 	# 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: expectr
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,16 +9,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-11 00:00:00.000000000 Z
+date: 2012-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,31 +26,31 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: shoulda
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2545022963494714035
+      hash: 3612453504837545327
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: