right_popen 1.0.6 → 1.0.7

data/Rakefile

@@ -9,12 +9,14 @@ include Config
 
 desc "Clean any build files for right_popen"
 task :clean do
-  if File.exists?('ext/Makefile')
-    Dir.chdir('ext') do
-      sh 'nmake distclean'
+  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
-  rm 'lib/win32/right_popen.so' if File.file?('lib/win32/right_popen.so')
 end
 
 desc "Build right_popen (but don't install it)"
@@ -30,13 +32,13 @@ task :build => [:clean] do
 end
 
 desc "Build a binary gem"
-task :build_binary_gem => [:build] do
+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 => [:build_binary_gem] do
+task :install_gem => [:gem] do
    file = Dir["*.gem"].first
    sh "gem install #{file}"
 end

data/right_popen.gemspec

@@ -6,7 +6,7 @@ end
 
 spec = Gem::Specification.new do |spec|
   spec.name      = 'right_popen'
-  spec.version   = '1.0.6'
+  spec.version   = '1.0.7'
   spec.authors   = ['Scott Messier', 'Raphael Simon']
   spec.email     = 'scott@rightscale.com'
   spec.homepage  = 'https://github.com/rightscale/right_popen'
@@ -48,13 +48,12 @@ EOF
   end
   spec.files = candidates.sort!
 
-  # Current implementation supports >= 0.12.8
-  spec.add_runtime_dependency(%q<eventmachine>, [">= 0.12.8"])
+  # Current implementation supports >= 0.12.10
+  spec.add_runtime_dependency(%q<eventmachine>, [">= 0.12.10"])
   if is_windows?
     # Windows implementation currently depends on deprecated behavior from
     # 0.12.8, but we also need to support the 0.12.8.1 patch version. the Linux
     # side is free to use 0.12.10+
-    spec.add_runtime_dependency(%q<eventmachine>, ["< 0.12.9"])
     spec.add_runtime_dependency(%q<win32-process>, [">= 0.6.1"])
   end
 end

data/spec/right_popen_spec.rb

@@ -33,6 +33,7 @@ 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 }
         @output_text = ''
         @error_text  = ''
         @status      = nil
@@ -45,45 +46,16 @@ describe 'RightScale::popen3' do
       end
 
       def run_right_popen(command, env=nil, count = 1)
-        puts "#{count}>" if count > 1
-        last_iteration = 0
-        EM.next_tick do
-          do_right_popen(command, env)
-        end
-        EM.run do
-          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, env)
-                  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")}"
+        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) } }
+        rescue Exception => e
+          puts "** Failed: #{e.message} FROM\n#{e.backtrace.join("\n")}"
+          raise e
         end
       end
 
@@ -96,8 +68,19 @@ describe 'RightScale::popen3' do
       end
 
       def on_exit(status)
+        @last_iteration += 1
+        @timeout.cancel if @timeout
+        if @last_iteration < @count
+          EM.next_tick do
+            print '+'
+            STDOUT.flush
+            do_right_popen(@command, @env)
+          end
+        else
+          puts "<" if @count > 1
+          EM.stop
+        end
         @status = status
-        @done = true
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: right_popen
 version: !ruby/object:Gem::Version 
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors: 
 - Scott Messier
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-18 00:00:00 -07:00
+date: 2010-04-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.12.8
+        version: 0.12.10
     version: 
 description: |
   RightPopen allows running external processes aynchronously while still