right_popen 1.0.6-x86-mswin32-60 → 1.0.7-x86-mswin32-60

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/lib/win32/right_popen.rb

@@ -23,9 +23,9 @@
 
 require 'rubygems'
 begin
-  gem 'eventmachine', '=0.12.8.1'  # patched version for Windows-only socket close fix
+  gem 'eventmachine', '=0.12.10.1'  # patched version for Windows-only socket close fix
 rescue Gem::LoadError
-  gem 'eventmachine', '=0.12.8'  # notify_readable is deprecated, so currently cannot use >=0.12.10 in Windows gem
+  gem 'eventmachine', '=0.12.10'  
 end
 require 'eventmachine'
 require 'win32/process'
@@ -122,7 +122,7 @@ module RightScale
 
     # Callback from EM to unbind.
     def unbind
-      # We force the attached stderr handler to go away so that
+    # We force the stderr watched handler to go away so that
       # we don't end up with a broken pipe
       @stderr_eventable.force_detach if @stderr_eventable
       @target.method(@exit_handler).call(get_status) if @exit_handler
@@ -198,13 +198,13 @@ module RightScale
     # attach handlers to event machine and let it monitor incoming data. the
     # streams aren't used directly by the connectors except that they are closed
     # on unbind.
-    stderr_eventable = EM.attach(stream_err, StdErrHandler, options[:target], options[:stderr_handler], stream_err) if options[:stderr_handler]
-    EM.attach(stream_out, StdOutHandler, options[:target], options[:stdout_handler], options[:exit_handler], stderr_eventable, stream_out, pid)
+    stderr_eventable = EM.watch(stream_err, StdErrHandler, options[:target], options[:stderr_handler], stream_err) { |c| c.notify_readable = true } if options[:stderr_handler]
+    EM.watch(stream_out, StdOutHandler, options[:target], options[:stdout_handler], options[:exit_handler], stderr_eventable, stream_out, pid) { |c| c.notify_readable = true }
 
     # note that control returns to the caller, but the launched cmd continues
     # running and sends output to the handlers. the caller is not responsible
     # for waiting for the process to terminate or closing streams as the
-    # attached eventables will handle this automagically. notification will be
+    # watched eventables will handle this automagically. notification will be
     # sent to the exit_handler on process termination.
   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
 
@@ -205,6 +188,14 @@ describe 'RightScale::popen3' do
       runner.status.exitstatus.should == 0
       runner.output_text.should include('PATH=c:\\bogus\\bin;')
     end
+  else
+    it 'should allow running bash command lines starting with a built-in command' do
+      command = "for i in 1 2 3 4 5; do echo $i;done"
+      runner = RightPopenSpec::Runner.new
+      runner.run_right_popen(command)
+      runner.status.exitstatus.should == 0
+      runner.output_text.should == "1\n2\n3\n4\n5\n"
+    end
   end
 
   it 'should run repeatedly without leaking resources' do

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: right_popen
 version: !ruby/object:Gem::Version 
-  version: 1.0.6
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 7
+  version: 1.0.7
 platform: x86-mswin32-60
 authors: 
 - Scott Messier
@@ -10,40 +15,43 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-16 00:00:00 -07:00
+date: 2010-04-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.12.8
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: eventmachine
+        segments: 
+        - 0
+        - 12
+        - 10
+        version: 0.12.10
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - <
-      - !ruby/object:Gem::Version 
-        version: 0.12.9
-    version: 
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: win32-process
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 6
+        - 1
         version: 0.6.1
-    version: 
-description: RightPopen allows running external processes aynchronously while still capturing their standard and error outputs. It relies on EventMachine for most of its internal mechanisms. The Linux implementation is valid for any Linux platform but there is also a native implementation for Windows platforms.
+  type: :runtime
+  version_requirements: *id002
+description: |
+  RightPopen allows running external processes aynchronously while still
+  capturing their standard and error outputs. It relies on EventMachine for most
+  of its internal mechanisms. The Linux implementation is valid for any Linux
+  platform but there is also a native implementation for Windows platforms.
+
 email: scott@rightscale.com
 executables: []
 
@@ -56,12 +64,9 @@ files:
 - README.rdoc
 - Rakefile
 - ext/extconf.rb
-- ext/win32
 - ext/win32/right_popen.c
 - ext/win32/right_popen.h
-- lib/linux
 - lib/right_popen.rb
-- lib/win32
 - lib/win32/right_popen.rb
 - lib/win32/right_popen.so
 - right_popen.gemspec
@@ -75,6 +80,8 @@ files:
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: https://github.com/rightscale/right_popen
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -87,20 +94,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 8
+      - 6
       version: 1.8.6
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: right_popen
-rubygems_version: 1.3.1
+rubygems_version: 1.3.6
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Provides a platform-independent popen implementation
 test_files: []