@@ -13,7 +13,7 @@ end Given /^Testjour is configured to run on this machine in a (\w+) directory$/ do |dir_name| @args ||= [] full_path = File.expand_path("./tmp/#{dir_name}") - @args << "--on=testjour://#{`hostname`.chomp}#{full_path}" + @args << "--on=testjour://#{Socket.gethostname}#{full_path}" FileUtils.rm_rf full_path FileUtils.mkdir_p full_path features/step_definitions/testjour_steps.rb @@ -28,20 +28,24 @@ end module Testjour VERSION = "0.3.1" - + + def self.socket_hostname + @socket_hostname ||= Socket.gethostname + end + def self.logger return @logger if @logger setup_logger @logger end - + def self.setup_logger(dir = "./") @logger = Logger.new(File.expand_path(File.join(dir, "testjour.log"))) - + @logger.formatter = proc do |severity, time, progname, msg| "#{time.strftime("%b %d %H:%M:%S")} [#{$PID}]: #{msg}\n" end - + @logger.level = Logger::DEBUG end end \ No newline at end of file lib/testjour.rb @@ -119,7 +119,7 @@ module Commands def testjour_uri user = `whoami`.strip - host = Socket.gethostname + host = Testjour.socket_hostname "http://#{user}@#{host}" + File.expand_path(".") end lib/testjour/commands/run.rb @@ -31,9 +31,9 @@ module Testjour def rsync_uri full_uri.user + "@" + full_uri.host + ":" + full_uri.path end - + def queue_host - @queue_host || `hostname`.chomp + @queue_host || Testjour.socket_hostname end def remote_slaves lib/testjour/configuration.rb @@ -32,7 +32,7 @@ module Testjour end @pid = $PID - @hostname = Socket.gethostname + @hostname = Testjour.socket_hostname end def server_id lib/testjour/result.rb 911fbd01228bf1e1d182c95fc34329c3d923c5c5 Bryan Helmkamp bryan@brynary.com http://github.com/brynary/testjour/commit/8f4e9a82b3d424bde69422d9d1f0cf7064563af1 8f4e9a82b3d424bde69422d9d1f0cf7064563af1 2009-10-22T15:01:43-07:00 2009-10-22T15:01:43-07:00 Use Socket.gethostname instead of `hostname`, and memoize the results globally on the Testjour constant 4c543e3c7ca5daf9fdd4a2a5ffcea39ef2eafe34 Bryan Helmkamp bryan@brynary.com