right_scraper 3.0.4 → 3.2.3

data/lib/right_scraper/scraper.rb

@@ -95,12 +95,12 @@ module RightScraper
             @resources += scraper.scrape
           end
         end
-
-        # 3. Cleanup if temporary
-        FileUtils.remove_entry_secure(@options[:basedir]) if @temporary
-      rescue
+      rescue Exception
         # logger handles communication with the end user and appending
         # to our error list, we just need to keep going.
+      ensure
+        # ensure basedir is always removed if temporary (even with errors).
+        ::FileUtils.remove_entry_secure(@options[:basedir]) rescue nil if @temporary
       end
       @logger.callback = nil
       errors.size == errorlen

data/lib/right_scraper/svn_client.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright: Copyright (c) 2010-2011 RightScale, Inc.
+# Copyright: Copyright (c) 2010-2013 RightScale, Inc.
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -20,7 +20,9 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
-require 'process_watcher'
+
+require 'right_popen'
+require 'right_popen/safe_output_buffer'
 
 module RightScraper
   # Simplified interface to the process of creating SVN client
@@ -34,11 +36,22 @@ module RightScraper
   #     ...
   #   end
   module SvnClient
+
+    class SvnClientError < Exception; end
+
     def calculate_version
       unless @svn_version
-        out = ProcessWatcher.watch("svn", ["--version", "--quiet"],
-                                   repo_dir, @max_bytes || -1, @max_seconds || -1)
-        @svn_version = out.chomp.split(".").map {|e| e.to_i}
+        begin
+          cmd = 'svn --version --quiet'
+          out = `#{cmd}`
+          if $?.success?
+            @svn_version = out.chomp.split('.').map {|e| e.to_i}
+          else
+            raise SvnClientError, "Unable to determine svn version: #{cmd.inspect} exited with #{$?.exitstatus}"
+          end
+        rescue Errno::ENOENT => e
+          raise SvnClientError, "Unable to determine svn version: #{e.message}"
+        end
       end
       @svn_version
     end
@@ -74,16 +87,65 @@ module RightScraper
     end
 
     def run_svn_no_chdir(*args)
-      ProcessWatcher.watch("svn", [args, svn_arguments].flatten,
-                           repo_dir, @max_bytes || -1, @max_seconds || -1) do |phase, operation, exception|
-        #$stderr.puts "#{phase} #{operation} #{exception}"
-      end
+      run_svn_with(nil, :safe_output_svn_client, *args)
     end
 
     def run_svn(*args)
-      Dir.chdir(repo_dir) do
-        run_svn_no_chdir(*args)
+      run_svn_with(repo_dir, :safe_output_svn_client, *args)
+    end
+
+    def run_svn_with_buffered_output(*args)
+      run_svn_with(repo_dir, :unsafe_output_svn_client, *args)
+    end
+
+    # runs svn client with safe buffering (by default).
+    #
+    # === Parameters
+    # @param [Array] args for svn client command line
+    #
+    # === Return
+    # @return [Array] lines of output or empty
+    def run_svn_with(initial_directory, output_handler, *args)
+      @output = ::RightScale::RightPopen::SafeOutputBuffer.new
+      cmd = ['svn', args, svn_arguments].flatten
+      ::RightScale::RightPopen.popen3_sync(
+        cmd,
+        :target             => self,
+        :directory          => initial_directory,
+        :timeout_handler    => :timeout_svn_client,
+        :size_limit_handler => :size_limit_svn_client,
+        :exit_handler       => :exit_svn_client,
+        :stderr_handler     => output_handler,
+        :stdout_handler     => output_handler,
+        :inherit_io         => true,  # avoid killing any rails connection
+        :watch_directory    => repo_dir,
+        :size_limit_bytes   => @max_bytes,
+        :timeout_seconds    => @max_seconds)
+      @output.buffer
+    end
+
+    def safe_output_svn_client(data)
+      @output.safe_buffer_data(data)
+    end
+
+    def unsafe_output_svn_client(data)
+      @output.buffer << data.chomp
+    end
+
+    def timeout_svn_client
+      raise SvnClientError, "svn client timed out"
+    end
+
+    def size_limit_svn_client
+      raise SvnClientError, "svn client exceeded size limit"
+    end
+
+    def exit_svn_client(status)
+      unless status.success?
+        self.method(@output_handler).call("Exit code = #{status.exitstatus}")
+        raise SvnClientError, "svn client failed: #{@output.display_text}"
       end
+      true
     end
 
     # Fetch the tag from the repository, or nil if one doesn't

data/right_scraper.gemspec

@@ -24,8 +24,8 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name      = 'right_scraper'
-  spec.version   = '3.0.4'
-  spec.authors   = ['Graham Hughes', 'Raphael Simon']
+  spec.version   = '3.2.3'
+  spec.authors   = ['Graham Hughes', 'Raphael Simon', 'Scott Messier']
   spec.email     = 'raphael@rightscale.com'
   spec.homepage  = 'https://github.com/rightscale/right_scraper'
   spec.platform  = Gem::Platform::RUBY
@@ -37,29 +37,29 @@ Gem::Specification.new do |spec|
   spec.rubyforge_project = %q{right_scraper}
   spec.require_path = 'lib'
 
-  spec.add_dependency('json', '>= 1.4.5')
-  spec.add_dependency('git', '>= 1.2.5')
-  spec.add_dependency('libarchive', '>= 0.1.1')
+  spec.add_dependency('json', '~> 1.4')
+  spec.add_dependency('blackwinter-git', '~> 1.2.7')
   spec.add_dependency('right_aws', '>= 2.0')
-  spec.add_dependency('process_watcher', '~> 0.3')
+  spec.add_dependency('right_popen', '~> 1.1.1')
+  spec.add_dependency('right_support', '~> 2.6')
 
-  spec.requirements << 'libarchive, 2.8.4'
   spec.requirements << 'curl command line client'
+  spec.requirements << 'git command line client'
   spec.requirements << 'Subversion command line client'
 
-  spec.add_development_dependency('rspec')
-  spec.add_development_dependency('flexmock')
-  spec.add_development_dependency('rtags')
+  spec.add_development_dependency('rspec', '~> 2.0')
+  spec.add_development_dependency('flexmock', '~> 0.9')
+  spec.add_development_dependency('rtags', '~> 0.97')
 
   spec.description = <<-EOF
-  RightScraper provides a simple interface to download and keep local copies of remote
-  repositories up-to-date using the following protocols:
-    * git: RightScraper will clone then pull repos from git
-    * SVN: RightScraper will checkout then update SVN repositories
-    * tarballs: RightScraper will download, optionally uncompress and expand a given tar file
-  On top of retrieving remote repositories, right_scraper also include "scrapers" that
-  will analyze the repository content and instantiate "resources" as a result. Currently
-  supported resources are Chef cookbooks and RightScale workflow definitions.
+RightScraper provides a simple interface to download and keep local copies of remote
+repositories up-to-date using the following protocols:
+  * git: RightScraper will clone then pull repos from git
+  * SVN: RightScraper will checkout then update SVN repositories
+  * tarballs: RightScraper will download, optionally uncompress and expand a given tar file
+On top of retrieving remote repositories, right_scraper also include "scrapers" that
+will analyze the repository content and instantiate "resources" as a result. Currently
+supported resources are Chef cookbooks and RightScale workflow definitions.
 EOF
 
   candidates = Dir.glob("{lib,spec}/**/*") +

data/right_scraper.rconf

@@ -8,6 +8,6 @@ ruby do
   gemset   'right_scraper'
 end
 bundler do
-  version     '1.0.18'
+  version     '1.2.1'
   bundle_path File.join(ENV["HOME"], '.rightscale', 'right_scraper')
 end

data/spec/cookbook_manifest_spec.rb

@@ -29,8 +29,8 @@ module RightScraper::Scanners
   describe CookbookManifest do
     it 'should accumulate files' do
       resource = flexmock(:resource)
-      resource.should_receive(:manifest=).with({"foo" => Digest::SHA1.hexdigest("bar"),
-                                                 "baz" => Digest::SHA1.hexdigest("quux")
+      resource.should_receive(:manifest=).with({"foo" => Digest::MD5.hexdigest("bar"),
+                                                 "baz" => Digest::MD5.hexdigest("quux")
                                                }).once
       manifest = CookbookManifest.new
       manifest.notice("foo") { "bar" }
@@ -39,10 +39,10 @@ module RightScraper::Scanners
     end
     it 'should keep different resources separated' do
       resource = flexmock(:resource)
-      resource.should_receive(:manifest=).with({"foo" => Digest::SHA1.hexdigest("bar"),
-                                                 "baz" => Digest::SHA1.hexdigest("quux")
+      resource.should_receive(:manifest=).with({"foo" => Digest::MD5.hexdigest("bar"),
+                                                 "baz" => Digest::MD5.hexdigest("quux")
                                                }).once
-      resource.should_receive(:manifest=).with({"bar" => Digest::SHA1.hexdigest("fred")
+      resource.should_receive(:manifest=).with({"bar" => Digest::MD5.hexdigest("fred")
                                                }).once
       manifest = CookbookManifest.new
       manifest.notice("foo") { "bar" }
@@ -51,5 +51,43 @@ module RightScraper::Scanners
       manifest.notice("bar") { "fred" }
       manifest.end(resource)
     end
+    it 'should hash to the same value despite resource order' do
+      cookbook1 = RightScraper::Resources::Cookbook.new('<empty>', '')
+      cookbook2 = RightScraper::Resources::Cookbook.new('<empty>', '')
+
+      manifest = CookbookManifest.new
+
+      manifest.notice("foo") {"bar"}
+      manifest.notice("baz") {"quux"}
+      manifest.notice("bar/none") {"fred"}
+      manifest.notice("bar/all") {"fred"}
+      manifest.notice("a/really/deep/directory/fox") {"stray"}
+      manifest.end(cookbook1)
+
+      manifest.notice("bar/none") {"fred"}
+      manifest.notice("a/really/deep/directory/fox") {"stray"}
+      manifest.notice("foo") {"bar"}
+      manifest.notice("baz") {"quux"}
+      manifest.notice("bar/all") {"fred"}
+      manifest.end(cookbook2)
+
+      cookbook1.resource_hash.should == cookbook2.resource_hash
+    end
+    it 'should hash to the same value despite repository location' do
+      cookbook1 = RightScraper::Resources::Cookbook.new('git://github.com/somerepo', '')
+      cookbook2 = RightScraper::Resources::Cookbook.new('svn://mycompany/rss/myrepo', '')
+
+      manifest = CookbookManifest.new
+
+      manifest.notice("foo") {"bar"}
+      manifest.notice("baz") {"quux"}
+      manifest.end(cookbook1)
+
+      manifest.notice("foo") {"bar"}
+      manifest.notice("baz") {"quux"}
+      manifest.end(cookbook2)
+
+      cookbook1.resource_hash.should == cookbook2.resource_hash
+    end
   end
 end

data/spec/cookbook_s3_upload_spec.rb

@@ -120,7 +120,11 @@ describe RightScraper::Scanners::CookbookS3Upload do
       s3 = RightAws::S3.new(aws_access_key_id=ENV['AWS_ACCESS_KEY_ID'],
                             aws_secret_access_key=ENV['AWS_SECRET_ACCESS_KEY'],
                             :logger => RightScraper::Logger.new)
-      @bucket = s3.bucket(bucket_name, create=true)
+
+      # create=true is prone to the too-many-buckets error even when the bucket
+      # already exists. since the bucket always exists for the test account
+      # there is no need to try creating it programmatically and fail specs.
+      @bucket = s3.bucket(bucket_name, create=false)
       FileUtils.rm_rf(RightScraper::Retrievers::Base.repo_dir(@repo_path, @repo))
     end
 
@@ -137,8 +141,9 @@ describe RightScraper::Scanners::CookbookS3Upload do
       it 'the cookbook should exist' do
         s3cookbook = @bucket.get(File.join('Cooks', @cookbook.resource_hash))
         s3cookbook.should_not be_nil
+        ::Digest::MD5.hexdigest(s3cookbook).should == @cookbook.resource_hash
+        s3cookbook.should_not == ::RightScraper::Resources::Cookbook::EMPTY_MANIFEST_JSON
         hash = JSON.parse(s3cookbook)
-        hash["metadata"].should == @cookbook.metadata
         hash["manifest"].should == @cookbook.manifest
       end
 
@@ -146,7 +151,7 @@ describe RightScraper::Scanners::CookbookS3Upload do
         @cookbook.manifest.each do |key, value|
           file = @bucket.get(File.join('Files', value))
           file.should_not be_nil
-          Digest::SHA1.hexdigest(file).should == value
+          value.should == Digest::MD5.hexdigest(file)
         end
       end
     end

data/spec/download/download_spec.rb

@@ -54,10 +54,8 @@ describe RightScraper::Resources::Cookbook do
     it_should_behave_like 'a download repository'
 
     it 'should have a cookbook hash' do
-      checkout_hash =
-        Digest::SHA1.hexdigest("1\000download\000http://a.site/foo/bar/baz\000")
       example_cookbook(@repository).resource_hash.should ==
-        Digest::SHA1.hexdigest("1\000#{checkout_hash}\000")
+        Digest::MD5.hexdigest(RightScraper::Resources::Cookbook::EMPTY_MANIFEST_JSON)
     end
 
     it 'should have a cookbook hash invariant under credential changes' do
@@ -66,8 +64,8 @@ describe RightScraper::Resources::Cookbook do
       example_cookbook(@repository).resource_hash.should == old_hash
     end
 
-    it 'should have a cookbook hash that varies when the position changes' do
-      example_cookbook(@repository, "foo").resource_hash.should_not ==
+    it 'should have a cookbook hash invariant under position changes' do
+      example_cookbook(@repository, "foo").resource_hash.should ==
         example_cookbook(@repository, "bar").resource_hash
     end
   end

data/spec/git/cookbook_spec.rb

@@ -76,7 +76,7 @@ describe RightScraper::Resources::Cookbook do
         ensure
           FileUtils.remove_entry_secure(@tmpdir)
         end
-      }.should raise_exception(ProcessWatcher::NonzeroExitCode)
+      }.should raise_exception(::RightScraper::Processes::SSHAgent::SSHAgentError, /Attempted to use credentials that require passwords; bailing/)
       ENV['SSH_AGENT_PID'].should == oldpid
     end
   end
@@ -124,9 +124,8 @@ describe RightScraper::Resources::Cookbook do
     end
 
     it 'should have a cookbook hash' do
-      repo_hash = Digest::SHA1.hexdigest("1\000git\000http://a.site/foo/bar/baz\000master")
       example_cookbook(@repository).resource_hash.should ==
-        Digest::SHA1.hexdigest("1\000#{repo_hash}\000")
+        Digest::MD5.hexdigest(RightScraper::Resources::Cookbook::EMPTY_MANIFEST_JSON)
     end
 
     it 'should have a cookbook hash invariant under credential changes' do
@@ -135,14 +134,14 @@ describe RightScraper::Resources::Cookbook do
       example_cookbook(@repository).resource_hash.should == old_hash
     end
 
-    it 'should have a cookbook hash that varies when the tag changes' do
+    it 'should have a cookbook hash invariant under tag changes' do
       old_hash = example_cookbook(@repository).resource_hash
       @repository.tag = "tag"
-      example_cookbook(@repository).resource_hash.should_not == old_hash
+      example_cookbook(@repository).resource_hash.should == old_hash
     end
 
-    it 'should have a cookbook hash that varies when the position changes' do
-      example_cookbook(@repository, "foo").resource_hash.should_not ==
+    it 'should have a cookbook hash invariant under position changes' do
+      example_cookbook(@repository, "foo").resource_hash.should ==
         example_cookbook(@repository, "bar").resource_hash
     end
   end

data/spec/git/retriever_spec.rb

@@ -23,7 +23,6 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__), 'retriever_spec_helper'))
 require 'set'
-require 'libarchive_ruby'
 
 describe RightScraper::Retrievers::Git do
   include RightScraper::SpecHelpers::DevelopmentModeEnvironment
@@ -206,8 +205,8 @@ describe RightScraper::Retrievers::Git do
 
       context 'with a subcookbook' do
         before(:each) do
-          subdir = File.join(@helper.repo_path, "cookbook")
-          secondary_cookbook(subdir)
+          @subdir = File.join(@helper.repo_path, "cookbook")
+          secondary_cookbook(@subdir)
           @helper.commit_content("subcookbook added")
         end
 
@@ -221,7 +220,8 @@ describe RightScraper::Retrievers::Git do
 
         it 'should have the subcookbook in the manifest' do
           cookbook = @scraper.next_resource
-          cookbook.manifest["cookbook/metadata.json"].should == "c2901d21c81ba5a152a37a5cfae35a8e092f7b39"
+          contents = ::File.read(::File.join(@subdir, "metadata.json"))
+          cookbook.manifest["cookbook/metadata.json"].should ==  ::Digest::MD5.hexdigest(contents)
         end
       end
 
@@ -335,7 +335,7 @@ describe RightScraper::Retrievers::Git do
         end
 
         after(:each) do
-          @scraper.close
+          @scraper.close if @scraper
           @scraper = nil
         end
 

data/spec/git/scraper_spec.rb

@@ -33,8 +33,23 @@ describe RightScraper::Scraper do
   include RightScraper::SharedExamples
 
   before(:each) do
-    @stream = StringIO.new()
+    # ulimit is a /usr/bin file on the Mac but only a shell command in Linux.
+    # invoking `sh -c ulimit -a` only returns the last token of output, in fact
+    # invoking 'ulimit -a' programmatically seems to omit the 'open files' field
+    # in which we are actually interested (whereas it is visible when run
+    # manually in bash). the more specific 'ulimit -n' appears to work as
+    # expected on mac and linux platforms *but* calling `sh -c ulimit -n`
+    # returns a nonsensical 'unlimited' token in ruby so we have to jump the
+    # additional hurdle of outputing to a temp file to get the right answer :@
     @tmpdir = Dir.mktmpdir
+    output_file_path = File.join(@tmpdir, "ulimit_n.txt")
+    system('sh', '-c', "ulimit -n>#{output_file_path}")
+    ulimit = File.read(output_file_path).to_i
+    File.delete(output_file_path)
+    if ulimit < 512
+      raise "Cannot run this spec because ulimit -n is only #{ulimit}; need 512 minimum!"
+    end
+    @stream = StringIO.new()
     @scraper = RightScraper::Scraper.new(:basedir => @tmpdir, :kind => :cookbook)
   end
 

data/spec/git/ssh_spec.rb

@@ -148,11 +148,14 @@ FULLOUTPUT
     lambda {
       RightScraper::Processes::SSHAgent.with do |agent|
         pid = ENV['SSH_AGENT_PID'].to_i
+        pid.should_not == 0
         demofile = File.expand_path(File.join(File.dirname(__FILE__), 'password_key'))
         File.chmod(0600, demofile)
-        agent.add_keyfile(demofile)
+        agent.add_keyfile(demofile)  # will fail due to missing password
       end
-    }.should raise_exception(ProcessWatcher::NonzeroExitCode, /Attempted to use credentials that require passwords; bailing/)
+    }.should raise_exception(::RightScraper::Processes::SSHAgent::SSHAgentError, /Attempted to use credentials that require passwords; bailing/)
+
+    # the .with statement must ensure that the ssh-agent process terminates.
     lambda {
       Process.kill(0, pid)
     }.should raise_exception(Errno::ESRCH)

data/spec/retriever_spec_helper.rb

@@ -63,7 +63,7 @@ module RightScraper
     def manifest
       hash = {}
       scan(@repo_content, hash, nil)
-      hash['metadata.json'] = Digest::SHA1.hexdigest(@repo_content.to_json + "\n")
+      hash['metadata.json'] = Digest::MD5.hexdigest(@repo_content.to_json + "\n")
       hash
     end
 
@@ -76,7 +76,7 @@ module RightScraper
           end
         else
           relative_position = position ? File.join(position, object) : object
-          hash[relative_position] = Digest::SHA1.hexdigest(object + "\n")
+          hash[relative_position] = Digest::MD5.hexdigest(object + "\n")
         end
       end
     end

data/spec/scraper_helper.rb

@@ -76,16 +76,6 @@ module RightScraper
 
   end
   module ScraperHelper
-    def archive_skeleton(archive)
-      files = Set.new
-      Archive.read_open_memory(archive) do |ar|
-        while entry = ar.next_header
-          files << [entry.pathname, ar.read_data]
-        end
-      end
-      files
-    end
-
     def check_resource(resource, params={})
       position = params[:position] || "."
       resource.should_not == nil

data/spec/spec_helper.rb

@@ -170,11 +170,11 @@ module RightScraper
         @scraper.resources.should_not == []
         @scraper.resources.size.should == 1
         @scraper.resources[0].manifest.should == {
-                "folder1/file3"=>"1eb2267bae4e47cab81f8866bbc7e06764ea9be0",
-                "file1"=>"38be7d1b981f2fb6a4a0a052453f887373dc1fe8",
-                "folder2/folder3/file4"=>"a441d6d72884e442ef02692864eee99b4ad933f5",
-                "metadata.json"=>"c2901d21c81ba5a152a37a5cfae35a8e092f7b39",
-                "folder1/file2"=>"639daad06642a8eb86821ff7649e86f5f59c6139"}
+                "folder1/file3"=>"60b91f1875424d3b4322b0fdd0529d5d",
+                "file1"=>"5149d403009a139c7e085405ef762e1a",
+                "folder2/folder3/file4"=>"857c6673d7149465c8ced446769b523c",
+                "metadata.json"=>"7c72b234162002a96f4ba60f0db38601",
+                "folder1/file2"=>"3d709e89c8ce201e3c928eb917989aef"}
         @scraper.resources[0].metadata.should == [{"folder1"=>["file2", "file3"]},
                                                   {"folder2"=>[{"folder3"=>["file4"]}]},
                                                   "file1"]

data/spec/svn/cookbook_spec.rb

@@ -54,9 +54,8 @@ describe RightScraper::Resources::Cookbook do
     end
 
     it 'should have a cookbook hash' do
-      repo_hash = Digest::SHA1.hexdigest("1\000svn\000http://a.site/foo/bar/baz\000HEAD")
       example_cookbook(@repository).resource_hash.should ==
-        Digest::SHA1.hexdigest("1\000#{repo_hash}\000")
+        Digest::MD5.hexdigest(RightScraper::Resources::Cookbook::EMPTY_MANIFEST_JSON)
     end
 
     it 'should have a cookbook hash invariant under credential changes' do
@@ -65,14 +64,14 @@ describe RightScraper::Resources::Cookbook do
       example_cookbook(@repository).resource_hash.should == old_hash
     end
 
-    it 'should have a cookbook hash that varies when the tag changes' do
+    it 'should have a cookbook hash invariant under tag changes' do
       old_hash = example_cookbook(@repository).resource_hash
       @repository.tag = "tag"
-      example_cookbook(@repository).resource_hash.should_not == old_hash
+      example_cookbook(@repository).resource_hash.should == old_hash
     end
 
-    it 'should have a cookbook hash that varies when the position changes' do
-      example_cookbook(@repository, "foo").resource_hash.should_not ==
+    it 'should have a cookbook hash invariant under position changes' do
+      example_cookbook(@repository, "foo").resource_hash.should ==
         example_cookbook(@repository, "bar").resource_hash
     end
   end

data/spec/svn/svn_retriever_spec_helper.rb

@@ -22,7 +22,6 @@
 #++
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'retriever_spec_helper'))
-require 'process_watcher'
 
 module RightScraper
 
@@ -44,7 +43,7 @@ module RightScraper
 
     def repo_url
       file_prefix = 'file://'
-      file_prefix += '/' if RUBY_PLATFORM =~ /mswin/
+      file_prefix += '/' if RUBY_PLATFORM =~ /mswin|mingw/
       url = "#{file_prefix}#{svn_repo_path}"
     end
 
@@ -57,8 +56,8 @@ module RightScraper
                                                  :display_name => 'test repo',
                                                  :repo_type    => :svn,
                                                  :url          => repo_url)
-      output, status = ProcessWatcher.run("svnadmin", "create", svn_repo_path)
-      raise "Can't create repo: #{output}" if status != 0
+      output = `svnadmin create #{svn_repo_path}`
+      raise "Can't create repo: #{output}" unless $?.success?
       run_svn_no_chdir "checkout", repo_url, repo_path
       make_cookbooks
       commit_content
@@ -78,9 +77,9 @@ module RightScraper
     end
 
     def commit_id(index_from_last=0)
-      output = run_svn "log", "-l", (index_from_last + 1).to_s, "-r", "HEAD:0"
+      lines = run_svn_with_buffered_output "log", "-l", (index_from_last + 1).to_s, "-r", "HEAD:0"
       id = nil
-      output.split(/\n/).each do |line|
+      lines.each do |line|
         if line =~ /^r(\d+)/
           id = $1
         end