Include user in testjour URIs

brynary · Oct 23, 2008 · 291f229 · 291f229
1 parent 340eb6b
commit 291f229
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/lib/testjour/commands/run.rb b/lib/testjour/commands/run.rb
@@ -87,7 +87,11 @@ def request_build_from(server)
       end
 
       def testjour_uri
-        DRb.uri.gsub(/^druby:/, "testjour:") + File.expand_path(".")
+        uri = URI.parse(DRb.uri)
+        uri.path = File.expand_path(".")
+        uri.scheme = "testjour"
+        uri.user = `whoami`.strip
+        uri.to_s
       end
     end
 

diff --git a/lib/testjour/commands/slave_run.rb b/lib/testjour/commands/slave_run.rb
@@ -73,6 +73,7 @@ def drb_uri
         uri = URI.parse(@queue)
         uri.scheme = "druby"
         uri.path = ""
+        uri.user = nil
         uri.to_s
       end
 

diff --git a/lib/testjour/rsync.rb b/lib/testjour/rsync.rb
@@ -8,7 +8,7 @@ def self.copy_to_current_directory_from(source_uri)
       destination_dir = File.expand_path(".")
       uri = URI.parse(source_uri)
 
-      command = "rsync -az --delete --exclude=.git --exclude=*.log --exclude=*.pid #{uri.host}:#{uri.path}/ #{destination_dir}"
+      command = "rsync -az --delete --exclude=.git --exclude=*.log --exclude=*.pid #{uri.user}@#{uri.host}:#{uri.path}/ #{destination_dir}"
 
       Testjour.logger.info "Rsyncing: #{command}"
       start_time = Time.now