right_popen 1.0.8 → 1.0.9

data/Rakefile

@@ -1,55 +1,55 @@
-require 'rubygems'
-require 'fileutils'
-require 'rake'
-require 'rake/clean'
-require 'rake/testtask'
-require 'rbconfig'
-
-include Config
-
-desc "Clean any build files for right_popen"
-task :clean do
-  if RUBY_PLATFORM =~ /mswin/
-    if File.exists?('ext/Makefile')
-      Dir.chdir('ext') do
-        sh 'nmake distclean'
-      end
-    end
-    rm 'lib/win32/right_popen.so' if File.file?('lib/win32/right_popen.so')
-  end
-end
-
-desc "Build right_popen (but don't install it)"
-task :build => [:clean] do
-  if RUBY_PLATFORM =~ /mswin/
-    Dir.chdir('ext') do
-      ruby 'extconf.rb'
-      sh 'nmake'
-    end
-    FileUtils::mkdir_p 'lib/win32'
-    mv 'ext/right_popen.so', 'lib/win32'
-  end
-end
-
-desc "Build a binary gem"
-task :gem => [:build] do
-   Dir["*.gem"].each { |gem| rm gem }
-   ruby 'right_popen.gemspec'
-end
-
-desc 'Install the right_popen library as a gem'
-task :install_gem => [:gem] do
-   file = Dir["*.gem"].first
-   sh "gem install #{file}"
-end
-
-desc 'Uninstalls and reinstalls the right_popen library as a gem'
-task :reinstall_gem do
-   sh "gem uninstall right_popen"
-   sh "rake install_gem"
-end
-
-desc 'Runs all spec tests'
-task :spec do
-  sh "spec spec/*_spec.rb"
-end
+require 'rubygems'
+require 'fileutils'
+require 'rake'
+require 'rake/clean'
+require 'rake/testtask'
+require 'rbconfig'
+
+include Config
+
+desc "Clean any build files for right_popen"
+task :clean do
+  if RUBY_PLATFORM =~ /mswin/
+    if File.exists?('ext/Makefile')
+      Dir.chdir('ext') do
+        sh 'nmake distclean'
+      end
+    end
+    rm 'lib/win32/right_popen.so' if File.file?('lib/win32/right_popen.so')
+  end
+end
+
+desc "Build right_popen (but don't install it)"
+task :build => [:clean] do
+  if RUBY_PLATFORM =~ /mswin/
+    Dir.chdir('ext') do
+      ruby 'extconf.rb'
+      sh 'nmake'
+    end
+    FileUtils::mkdir_p 'lib/win32'
+    mv 'ext/right_popen.so', 'lib/win32'
+  end
+end
+
+desc "Build a binary gem"
+task :gem => [:build] do
+   Dir["*.gem"].each { |gem| rm gem }
+   ruby 'right_popen.gemspec'
+end
+
+desc 'Install the right_popen library as a gem'
+task :install_gem => [:gem] do
+   file = Dir["*.gem"].first
+   sh "gem install #{file}"
+end
+
+desc 'Uninstalls and reinstalls the right_popen library as a gem'
+task :reinstall_gem do
+   sh "gem uninstall right_popen"
+   sh "rake install_gem"
+end
+
+desc 'Runs all spec tests'
+task :spec do
+  sh "spec spec/*_spec.rb"
+end

data/lib/linux/right_popen.rb

@@ -34,6 +34,7 @@ module RightScale
   module StdOutHandler
 
     # === Parameters
+    # options[:input](String):: Input to be sent to child process stdin
     # options[:target](Object):: Object defining handler methods to be called.
     # options[:stdout_handler(String):: Token for stdout handler method name.
     # options[:exit_handler(String):: Token for exit handler method name.
@@ -42,6 +43,7 @@ module RightScale
     # read_fd(IO):: Standard output read file descriptor.
     # write_fd(IO):: Standard output write file descriptor.
     def initialize(options, stderr_eventable, read_fd, write_fd)
+      @input = options[:input]
       @target = options[:target]
       @stdout_handler = options[:stdout_handler]
       @exit_handler = options[:exit_handler]
@@ -52,6 +54,11 @@ module RightScale
       @write_fd = write_fd
     end
 
+    # Send input to child process stdin
+    def post_init
+      send_data(@input) if @input
+    end
+
     # Callback from EM to receive data.
     def receive_data(data)
       @target.method(@stdout_handler).call(data) if @stdout_handler

data/lib/right_popen.rb

@@ -47,6 +47,7 @@ module RightScale
   # === Parameters
   # options[:command](String):: Command to execute, including any arguments
   # options[:environment](Hash):: Hash of environment variables values keyed by name
+  # options[:input](String):: Input string that will get streamed into child's process stdin
   # options[:target](Object):: object defining handler methods to be called, optional (no handlers can be defined if not specified)
   # options[:stdout_handler](String):: Stdout handler method name, optional
   # options[:stderr_handler](String):: Stderr handler method name, optional
@@ -62,4 +63,4 @@ module RightScale
     true
   end
 
-end
+end

data/right_popen.gemspec

@@ -6,7 +6,7 @@ end
 
 spec = Gem::Specification.new do |spec|
   spec.name      = 'right_popen'
-  spec.version   = '1.0.8'
+  spec.version   = '1.0.9'
   spec.authors   = ['Scott Messier', 'Raphael Simon']
   spec.email     = 'scott@rightscale.com'
   spec.homepage  = 'https://github.com/rightscale/right_popen'

data/spec/increment.rb

@@ -0,0 +1,2 @@
+input = gets.to_i
+$stdout.puts input + 1

data/spec/print_env.rb

@@ -1,2 +1,2 @@
-puts "__test__=#{ENV['__test__']}" if ENV['__test__']
-puts "PATH=#{ENV['PATH']}"
+puts "__test__=#{ENV['__test__']}" if ENV['__test__']
+puts "PATH=#{ENV['PATH']}"

data/spec/produce_mixed_output.rb

@@ -1,8 +1,8 @@
-count = ARGV[0] ? ARGV[0].to_i : 1
-
-count.times do |i|
-  $stderr.puts "stderr #{i}" if 0 == i % 10
-  $stdout.puts "stdout #{i}"
-end
-
-exit 99
+count = ARGV[0] ? ARGV[0].to_i : 1
+
+count.times do |i|
+  $stderr.puts "stderr #{i}" if 0 == i % 10
+  $stdout.puts "stdout #{i}"
+end
+
+exit 99

data/spec/produce_output.rb

@@ -1,2 +1,2 @@
-$stdout.puts ARGV[0]
-$stderr.puts ARGV[1]
+$stdout.puts ARGV[0]
+$stderr.puts ARGV[1]

data/spec/produce_stderr_only.rb

@@ -1,5 +1,5 @@
-count = ARGV[0] ? ARGV[0].to_i : 1
-
-count.times do |i|
-  $stderr.puts "stderr #{i}"
-end
+count = ARGV[0] ? ARGV[0].to_i : 1
+
+count.times do |i|
+  $stderr.puts "stderr #{i}"
+end

data/spec/produce_stdout_only.rb

@@ -1,5 +1,5 @@
-count = ARGV[0] ? ARGV[0].to_i : 1
-
-count.times do |i|
-  $stdout.puts "stdout #{i}"
-end
+count = ARGV[0] ? ARGV[0].to_i : 1
+
+count.times do |i|
+  $stdout.puts "stdout #{i}"
+end

data/spec/right_popen_spec.rb

@@ -32,12 +32,13 @@ describe 'RightScale::popen3' do
 
       attr_reader :output_text, :error_text, :status
 
-      def do_right_popen(command, env=nil)
-        @timeout = EM::Timer.new(10) { puts "** Failed: Timeout"; EM.stop }
+      def do_right_popen(command, env=nil, input=nil)
+        @timeout = EM::Timer.new(2) { puts "\n** Failed to run #{command.inspect}: Timeout"; EM.stop }
         @output_text = ''
         @error_text  = ''
         @status      = nil
         RightScale.popen3(:command        => command, 
+                          :input          => input,
                           :target         => self, 
                           :environment    => env,
                           :stdout_handler => :on_read_stdout, 
@@ -45,16 +46,16 @@ describe 'RightScale::popen3' do
                           :exit_handler   => :on_exit)
       end
 
-      def run_right_popen(command, env=nil, count = 1)
+      def run_right_popen(command, env=nil, input=nil, count=1)
         begin
           @command = command
           @env = env
           @last_iteration = 0
           @count = count
           puts "#{count}>" if count > 1
-          EM.run { EM.next_tick { do_right_popen(command, env) } }
+          EM.run { EM.next_tick { do_right_popen(command, env, input) } }
         rescue Exception => e
-          puts "** Failed: #{e.message} FROM\n#{e.backtrace.join("\n")}"
+          puts "\n** Failed: #{e.message} FROM\n#{e.backtrace.join("\n")}"
           raise e
         end
       end
@@ -199,12 +200,22 @@ describe 'RightScale::popen3' do
   end
 
   it 'should run repeatedly without leaking resources' do
+    pending 'Set environment variable TEST_LEAK to enable' unless ENV['TEST_LEAK']
     command = "\"#{RUBY_CMD}\" \"#{File.expand_path(File.join(File.dirname(__FILE__), 'produce_output.rb'))}\" \"#{STANDARD_MESSAGE}\" \"#{ERROR_MESSAGE}\""
     runner = RightPopenSpec::Runner.new
-    runner.run_right_popen(command, nil, REPEAT_TEST_COUNTER)
+    runner.run_right_popen(command, nil, nil, REPEAT_TEST_COUNTER)
     runner.status.exitstatus.should == 0
     runner.output_text.should == STANDARD_MESSAGE + "\n"
     runner.error_text.should == ERROR_MESSAGE + "\n"
   end
 
+  it 'should pass input to child process' do
+    command = "\"#{RUBY_CMD}\" \"#{File.expand_path(File.join(File.dirname(__FILE__), 'increment.rb'))}\""
+    runner = RightPopenSpec::Runner.new
+    runner.run_right_popen(command, nil, "42\n")
+    runner.status.exitstatus.should == 0
+    runner.output_text.should == "43\n"
+    runner.error_text.should be_empty
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: right_popen
 version: !ruby/object:Gem::Version 
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors: 
 - Scott Messier
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-11 00:00:00 -07:00
+date: 2010-06-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,6 +43,7 @@ files:
 - lib/linux/right_popen.rb
 - lib/right_popen.rb
 - right_popen.gemspec
+- spec/increment.rb
 - spec/print_env.rb
 - spec/produce_mixed_output.rb
 - spec/produce_output.rb