right_scraper 1.0.6 → 1.0.7

data/lib/right_scraper/watcher.rb

@@ -71,35 +71,46 @@ module RightScale
     # === Return
     # res(RightScale::WatchStatus):: Outcome of watch, see RightScale::WatchStatus
     def launch_and_watch(cmd, dest_dir)
-      status = nil
+      exit_code = nil
       output = ''
 
       # Run external process and monitor it in a new thread
-      r = IO.popen(cmd)
-      Thread.new do
-        Process.wait(r.pid)
-        status = $?
+      io = IO.popen(cmd)
+      reader = Thread.new do
+        o = io.read
+        until o == ''
+          output += o
+          o = io.read
+        end
+        Process.wait(io.pid)
+        exit_code = $?.exitstatus
       end
 
       # Loop until process is done or times out or takes too much space
       timed_out = repeat(1, @max_seconds) do
-        output += r.readlines.join
         if @max_bytes < 0
-          status
+          exit_code
         else
           size = 0
-          Find.find(dest_dir) { |f| size += File.stat(f).size unless File.directory?(f) } if File.directory?(dest_dir)
-          size > @max_bytes || status
+          Find.find(dest_dir) { |f| size += File.stat(f).size rescue 0 if File.file?(f) } if File.directory?(dest_dir)
+          size > @max_bytes || exit_code
         end
       end
 
       # Cleanup and report status
-      output += r.readlines.join
-      Process.kill('TERM', r.pid) unless status
-      r.close
-      s = status ? :success : (timed_out ? :timeout : :size_exceeded)
-      exit_code = status && status.exitstatus || -1
-      res = WatchStatus.new(s, exit_code, output)
+      # Note: We need to store the exit status before we kill the underlying process so that
+      # if it finished in the mean time we still report -1 as exit code
+      if exit_code
+        exit_status = exit_code
+        outcome = :success
+      else
+        exit_status = -1
+        outcome = (timed_out ? :timeout : :size_exceeded)
+        Process.kill('INT', io.pid)
+      end
+      reader.join
+      io.close
+      res = WatchStatus.new(outcome, exit_status, output)
     end
 
     protected

data/right_scraper.gemspec

@@ -23,7 +23,7 @@ require 'rubygems'
 
 spec = Gem::Specification.new do |spec|
   spec.name      = 'right_scraper'
-  spec.version   = '1.0.6'
+  spec.version   = '1.0.7'
   spec.authors   = ['Raphael Simon']
   spec.email     = 'raphael@rightscale.com'
   spec.homepage  = 'https://github.com/rightscale/right_scraper'

data/spec/svn_scraper_spec.rb

@@ -66,10 +66,12 @@ describe RightScale::SvnScraper do
     end
 
     before(:each) do
+	  file_prefix = 'file://'
+	  file_prefix += '/' if RUBY_PLATFORM =~ /mswin/
       @scraper = RightScale::SvnScraper.new(@repo_path, max_bytes=1024**2, max_seconds=20)      
       @repo = RightScale::Repository.from_hash(:display_name => 'test repo',
                                                :repo_type    => :svn,
-                                               :url          => "file://#{@svn_repo_path}")
+                                               :url          => "#{file_prefix}#{@svn_repo_path}")
     end
     
     after(:all) do

data/spec/watcher_spec.rb

@@ -45,7 +45,7 @@ describe RightScale::Watcher do
 
   it 'should report timeouts' do
     watcher = RightScale::Watcher.new(max_bytes=1, max_seconds=2)
-    status = watcher.launch_and_watch('ruby -e "puts 42; sleep 3"', @dest_dir)
+    status = watcher.launch_and_watch('ruby -e "STDOUT.sync = true; puts 42; sleep 5"', @dest_dir)
     status.status.should == :timeout
     status.exit_code.should == -1
     status.output.should == "42\n"
@@ -53,7 +53,7 @@ describe RightScale::Watcher do
 
   it 'should report size exceeded' do
     watcher = RightScale::Watcher.new(max_bytes=1, max_seconds=5)
-    status = watcher.launch_and_watch("ruby -e 'puts 42; File.open(File.join(\"#{@dest_dir}\", \"test\"), \"w\") { |f| f.puts \"MORE THAN 2 CHARS\" }'", @dest_dir)
+    status = watcher.launch_and_watch("ruby -e 'STDOUT.sync = true; puts 42; File.open(File.join(\"#{@dest_dir}\", \"test\"), \"w\") { |f| f.puts \"MORE THAN 2 CHARS\" }'; sleep 5", @dest_dir)
     status.status.should == :size_exceeded
     status.exit_code.should == -1
     status.output.should == "42\n"
@@ -61,7 +61,7 @@ describe RightScale::Watcher do
 
   it 'should allow infinite size and timeout' do
     watcher = RightScale::Watcher.new(max_bytes=-1, max_seconds=-1)
-    status = watcher.launch_and_watch("ruby -e 'puts 42; File.open(File.join(\"#{@dest_dir}\", \"test\"), \"w\") { |f| f.puts \"MORE THAN 2 CHARS\" };sleep 2'", @dest_dir)
+    status = watcher.launch_and_watch("ruby -e 'STDOUT.sync = true; puts 42; File.open(File.join(\"#{@dest_dir}\", \"test\"), \"w\") { |f| f.puts \"MORE THAN 2 CHARS\" };sleep 2'", @dest_dir)
     status.status.should == :success
     status.exit_code.should == 0
     status.output.should == "42\n"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: right_scraper
 version: !ruby/object:Gem::Version 
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors: 
 - Raphael Simon