right_scraper 1.0.5 → 1.0.6

data/lib/right_scraper.rb

@@ -29,3 +29,4 @@ require File.join(File.dirname(__FILE__), 'right_scraper', 'scrapers', 'git_scra
 require File.join(File.dirname(__FILE__), 'right_scraper', 'scrapers', 'svn_scraper')
 require File.join(File.dirname(__FILE__), 'right_scraper', 'repository')
 require File.join(File.dirname(__FILE__), 'right_scraper', 'scraper')
+require File.join(File.dirname(__FILE__), 'right_scraper', 'watcher')

data/lib/right_scraper/watcher.rb

@@ -84,9 +84,13 @@ module RightScale
       # Loop until process is done or times out or takes too much space
       timed_out = repeat(1, @max_seconds) do
         output += r.readlines.join
-        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
+        if @max_bytes < 0
+          status
+        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
+        end
       end
 
       # Cleanup and report status
@@ -127,7 +131,7 @@ module RightScale
     # res(TrueClass|FalseClass):: true if timeout is reached, false otherwise.
     def repeat(period, timeout)
       end_at = Time.now + timeout
-      while res = (Time.now < end_at)
+      while res = (timeout < 0 || Time.now < end_at)
         exit = false
         elapsed = timed { exit = yield }
         break if exit

data/right_scraper.gemspec

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

data/spec/watcher_spec.rb

@@ -59,4 +59,12 @@ describe RightScale::Watcher do
     status.output.should == "42\n"
   end
 
+  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.status.should == :success
+    status.exit_code.should == 0
+    status.output.should == "42\n"
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: right_scraper
 version: !ruby/object:Gem::Version 
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors: 
 - Raphael Simon
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-08 00:00:00 -08:00
+date: 2010-02-09 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -34,7 +34,6 @@ files:
 - lib/right_scraper/scrapers/svn_scraper.rb
 - lib/right_scraper/watcher.rb
 - right_scraper.gemspec
-- spec/__origin/config
 - spec/download_scraper_spec.rb
 - spec/git_scraper_spec.rb
 - spec/rcov.opts

data/spec/__origin/config

@@ -1,5 +0,0 @@
-[core]
-	repositoryformatversion = 0
-	filemode = true
-	bare = true
-	ignorecase = true