expectr 0.5.1 → 0.7.0

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.7.0

data/expectr.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "expectr"
-  s.version = "0.5.1"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris Wuest"]
-  s.date = "2012-02-23"
+  s.date = "2012-03-01"
   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 = [

data/lib/expectr.rb

@@ -101,7 +101,7 @@ class Expectr
 	#
 	# === Arguments
 	# +cmd+::
-	#   Command to be executed (String)
+	#   Command to be executed (String or File)
 	# +args+::
 	#   Hash of modifiers for Expectr.  Meaningful values are:
 	# * :buffer_size::
@@ -116,13 +116,11 @@ class Expectr
 	# Spawn +cmd+ and attach to STDIN and STDOUT for new process.  Fall back
 	# to using Open4 if PTY is not present (this is the case on Windows
 	# implementations of ruby.
-	#
-  # === BUGS
-  #
-  # * Passing a File object to be executed does not work
   #
 	def initialize(cmd, args={})
-		raise ArgumentError, "String Expected" unless cmd.kind_of?(String)
+		raise ArgumentError, "String or File expected, was given #{cmd.class}" unless cmd.kind_of? String or cmd.kind_of? File
+		cmd = cmd.path if cmd.kind_of? File
+
 		args[0] = {} unless args[0]
 		@buffer = String.new
 		@discard = String.new

data/test/test_expectr.rb

@@ -58,4 +58,18 @@ class TestExpectr < Test::Unit::TestCase
 			assert_not_nil exp.expect /321/
 		end
 	end
+
+	def test_create_with_file
+		assert_nothing_raised { exp = Expectr.new File.new("/bin/ls"), :flush_buffer => false }
+	end
+
+	def test_executable
+		assert_nothing_raised { exp = Expectr.new "/bin/ls", :flush_buffer => false }
+
+		# Ruby 1.8's PTY allows execution of non-executable/nonexistent files without complaint
+		unless RUBY_VERSION =~ /1.8/
+			assert_raises(Errno::ENOENT) { exp = Expectr.new "/bin/ThisFileShouldNotExist", :flush_buffer => false }
+			assert_raises(Errno::EACCES) { exp = Expectr.new "lib/expectr.rb", :flush_buffer => false }
+		end
+	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: expectr
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-23 00:00:00.000000000 Z
+date: 2012-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &17995220 !ruby/object:Gem::Requirement
+  requirement: &10161400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17995220
+  version_requirements: *10161400
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &17990180 !ruby/object:Gem::Requirement
+  requirement: &10160320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *17990180
+  version_requirements: *10160320
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &17944880 !ruby/object:Gem::Requirement
+  requirement: &10158840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *17944880
+  version_requirements: *10158840
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &18334240 !ruby/object:Gem::Requirement
+  requirement: &10157640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *18334240
+  version_requirements: *10157640
 description: Implementation of functionality from NIST Expect in Ruby, with an emphasis
   on control and extensibility
 email: chris@chriswuest.com
@@ -89,7 +89,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3628151474188738487
+      hash: -593338713244342977
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: