right_popen 1.0.2 → 1.0.3

data/Rakefile

@@ -46,3 +46,8 @@ 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

@@ -26,7 +26,6 @@
 # It relies on EventMachine for most of its internal mechanisms.
 
 require 'rubygems'
-gem 'eventmachine', '=0.12.8'  # has only been tested with 0.12.8
 require 'eventmachine'
 
 module RightScale

data/right_popen.gemspec

@@ -4,7 +4,7 @@ spec = Gem::Specification.new do |spec|
   is_windows = RUBY_PLATFORM =~ /mswin/
 
   spec.name      = 'right_popen'
-  spec.version   = '1.0.2'
+  spec.version   = '1.0.3'
   spec.authors   = ['Scott Messier', 'Raphael Simon']
   spec.email     = 'scott@rightscale.com'
   spec.homepage  = 'https://github.com/rightscale/right_popen'
@@ -46,8 +46,8 @@ EOF
   end
   spec.files = candidates.sort!
 
-  # Current implementation doesn't support > 0.12.8, but support any patched 0.12.8.x versions.
-  spec.add_runtime_dependency(%q<eventmachine>, [">= 0.12.8", "< 0.12.9"])
+  # Current implementation supports > 0.12.8
+  spec.add_runtime_dependency(%q<eventmachine>, [">= 0.12.8"])
   if is_windows
     spec.add_runtime_dependency(%q<win32-process>, [">= 0.6.1"])
   end

data/spec/right_popen_spec.rb

@@ -10,32 +10,73 @@ EXIT_STATUS      = 146
 # for a quick smoke test
 LARGE_OUTPUT_COUNTER = 1000
 
+# bump up count for most exhaustive leak detection.
+REPEAT_TEST_COUNTER = 256
+
 describe 'RightScale::popen3' do
 
   module RightPopenSpec
 
     class Runner
       def initialize
-        @done        = false
+        @done           = false
+        @output_text    = nil
+        @error_text     = nil
+        @status         = nil
+        @last_exception = nil
+        @last_iteration = 0
+      end
+
+      attr_reader :output_text, :error_text, :status
+
+      def do_right_popen(command)
         @output_text = ''
         @error_text  = ''
         @status      = nil
+        RightScale.popen3(command, self, :on_read_stdout, :on_read_stderr, :on_exit)
       end
 
-      attr_reader :output_text, :error_text, :status
-
-      def run_right_popen(command)
+      def run_right_popen(command, count = 1)
+        puts "#{count}>" if count > 1
+        last_iteration = 0
         EM.next_tick do
-          RightScale.popen3(command, self, :on_read_stdout, :on_read_stderr, :on_exit)
+          do_right_popen(command)
         end
         EM.run do
-          timer = EM::PeriodicTimer.new(0.1) do
-            if @done
+          timer = EM::PeriodicTimer.new(0.05) do
+            begin
+              if @done || @last_exception
+                last_iteration = last_iteration + 1
+                if @last_exception.nil? && last_iteration < count
+                  @done = false
+                  EM.next_tick do
+                    if count > 1
+                      print '+'
+                      STDOUT.flush
+                    end
+                    do_right_popen(command)
+                  end
+                else
+                  puts "<" if count > 1
+                  timer.cancel
+                  EM.stop
+                end
+              end
+            rescue Exception => e
+              @last_exception = e
               timer.cancel
               EM.stop
             end
           end
         end
+        if @last_exception
+          if count > 1
+            message = "<#{last_iteration + 1}\n#{last_exception.message}"
+          else
+            message = last_exception.message
+          end
+          raise @last_exception.class, "#{message}\n#{@last_exception.backtrace.join("\n")}"
+        end
       end
 
       def on_read_stdout(data)
@@ -122,4 +163,13 @@ describe 'RightScale::popen3' do
     runner.error_text.should == results
   end
 
+  it 'should run repeatedly without leaking resources' do
+    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, REPEAT_TEST_COUNTER)
+    runner.status.exitstatus.should == 0
+    runner.output_text.should == STANDARD_MESSAGE + "\n"
+    runner.error_text.should == ERROR_MESSAGE + "\n"
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: right_popen
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Scott Messier
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-17 00:00:00 -08:00
+date: 2010-02-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,9 +22,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         version: 0.12.8
-    - - <
-      - !ruby/object:Gem::Version 
-        version: 0.12.9
     version: 
 description: |
   RightPopen allows running external processes aynchronously while still