oats_agent 0.0.2 → 0.0.3

data/bin/oats_agent

@@ -19,20 +19,4 @@ Log4r::StdoutOutputter.new('console', :level=>1,
 $log = Log4r::Logger.new('R')
 $log.add('console')
 options = OatsAgent::CommandlineOptions.options(ARGV.dup)
-if options["agent_host"].nil? or options["agent_host"] == ENV['HOSTNAME']
-  OatsAgent.spawn(options)
-else
-  params = ARGV.dup
-  if RUBY_PLATFORM =~ /(mswin|mingw)/
-    cmd = "psexec.exe -d -i -n 10 -w " + ENV['HOME'] + '/results_archive' +
-      ' -u qa -p ' + 'passwd' + ' \\\\' + options["agent_host"] +
-      ' ruby oats_agent ' + params.join(' ')
-  else
-    #  params.delete('-a')
-    #  params.delete(options["agent_host"])
-    #  options['agent_host'] = ENV['HOSTNAME']
-    cmd = "ssh " + options["agent_host"] + ' oats_agent ' + params.join(' ')
-  end
-  out = `#{cmd}`
-  $log.info out unless out == ''
-end
+OatsAgent.spawn(options)

data/lib/oats_agent.rb

@@ -65,7 +65,6 @@ module OatsAgent
     #    optional: oats_user, test_directory, repository_version
       
     def spawn(options)
-      agent_host = options["agent_host"] || ENV['HOSTNAME']
       nick = options["nickname"] || ENV['HOSTNAME']
       port = options["port"] || 3010
       port = port.to_s
@@ -79,7 +78,26 @@ module OatsAgent
       config_file = "#{log_dir}/config-agent.txt"
       agent_log_file = "#{log_dir}/agent.log"
       params =  "-n #{nick} -p #{port}"
-
+      
+      agent_params = params.dup
+      agent_params +=  "-r #{repo_version}" if repo_version
+      agent_params +=  "-u #{user}" if user
+      if options["agent_host"] and options["agent_host"] != ENV['HOSTNAME']
+        if RUBY_PLATFORM =~ /(mswin|mingw)/
+          cmd = "psexec.exe -d -i -n 10 -w " + archive_dir +
+            ' -u qa -p ' + 'passwd' + ' \\\\' + options["agent_host"] +
+            ' ruby oats_agent ' + agent_params.join(' ')
+        else
+          #  options['agent_host'] = ENV['HOSTNAME']
+          cmd = "ssh " + options["agent_host"] + ' oats_agent ' + agent_params
+        end
+        $log.info "Issuing remote host request: #{cmd}"
+        out = `#{cmd}`
+        $log.info out unless out == ''
+        return
+      end
+      
+      
       FileUtils.mkdir_p(log_dir) unless File.exists?(log_dir)
       ENV['OATS_AGENT_LOGFILE'] = log_file
 
@@ -88,7 +106,7 @@ module OatsAgent
       # Need these off when called by OCC, otherwise the OCC values are inherited
       %w(RUBYOPT BUNDLE_BIN_PATH BUNDLE_GEMFILE).each { |e| ENV[e] = nil }
       kill_matching ruby_cmd
-      exit if options["kill_agent"]
+      return if options["kill_agent"]
 
       if File.directory?(dir_tests + '/.svn') and ENV['OATS_TESTS_SVN_REPOSITORY']
         svn_out =nil

data/lib/oats_agent/version.rb

@@ -1,3 +1,3 @@
 module OatsAgent
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oats_agent
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Levent Atasoy