Fix test errors by updating SVN regex

These changes update the Ohloh SCM so that it
works with Ubuntu 14 and the current versions
of the SCM libraries.

Author: Peter Degen-Portnoy

lib/scm/adapters/abstract/system.rb

@@ -17,7 +17,7 @@ def logger
 		# Raises an exception if the shell returns non-zero exit code.
 		def self.run(cmd)
 			logger.debug { cmd }
-			status, out, err = Shellout.new.run(cmd)
+			status, out, err = Shellout.execute(cmd)
 			raise RuntimeError.new("#{cmd} failed: #{out}\n#{err}") if status.exitstatus != 0
 			out
 		end

lib/scm/adapters/svn/cat_file.rb

@@ -12,7 +12,7 @@ def cat(path, revision)
 			begin
 				run "svn cat --trust-server-cert --non-interactive -r #{revision} '#{SvnAdapter.uri_encode(File.join(self.root, self.branch_name.to_s, path.to_s))}@#{revision}'"
 			rescue
-				raise unless $!.message =~ /svn: (File not found|.* is not a directory in filesystem)/
+				raise unless $!.message =~ /svn:.*Could not cat all targets because some targets don't exist/
 			end
 		end
 	end

lib/scm/adapters/svn/misc.rb

@@ -98,14 +98,14 @@ def ls(path=nil, revision=final_token || 'HEAD')
 		end
 
 		def node_kind(path=nil, revision=final_token || 'HEAD')
-			$1 if self.info(path, revision) =~ /^Node Kind: (.+)$/
+			$1 if self.info(path, revision) =~ /Node Kind: (\w+)\W/
 		end
 
 		def is_directory?(path=nil, revision=final_token || 'HEAD')
 			begin
 				return node_kind(path, revision) == 'directory'
-			rescue
-				if $!.message =~ /svn: .* is not a directory in filesystem/ || $!.message =~ /.*Not a valid URL.*/
+			rescue Exception
+				if $!.message =~ /svn: E200009: Could not display info for all targets because some targets don't exist/
 					return false
 				else
 					raise

lib/scm/shellout.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
 require 'stringio'
-require 'open4'
+require 'open3'
 
 class Shellout
 
@@ -9,17 +9,19 @@ def self.relay src, dst
   end 
 
   def self.execute(cmd)
-    outbuf = StringIO.new
-    errbuf = StringIO.new
-    status = Open4::popen4("sh") do | pid, stdin, stdout, stderr |
-      stdin.puts cmd
-      stdin.close
-      to = Thread.new { relay stdout, outbuf }
-      te = Thread.new { relay stderr, errbuf }
-      to.join
-      te.join
-    end
-    return status, outbuf.string, errbuf.string
+    out = ''
+    err = ''
+    exit_status = nil
+    Open3.popen3(cmd) { |stdin, stdout, stderr, wait_thread|
+      while line = stdout.gets
+        out << line
+      end
+      while line = stderr.gets
+        err << line
+      end
+      exit_status = wait_thread.value
+    }
+    return exit_status, out, err
   end
 
   def run(cmd)

test/unit/svn_pull_test.rb

@@ -14,8 +14,9 @@ def test_svnadmin_create
 				assert svn.exist?
 
 				# Ensure that revision properties are settable
-				svn.propset('foo','bar')
-				assert_equal 'bar', svn.propget('foo')
+        # Note that only valid properties can be set
+				svn.propset('log','bar')
+				assert_equal 'bar', svn.propget('log')
 			end
 		end