oats 0.0.6 → 0.0.7

data/Gemfile

@@ -11,7 +11,6 @@ unless defined?(OATS_GEM_IS_ALREADY_INCLUDED)
   end
   test_gemfile = $oats_execution['options'][ "_:gemfile"] if $oats_execution and $oats_execution['options']
   test_gemfile ||= ENV['OATS_TESTS'] + '/Gemfile'
-  puts "AUT Gemfile :" + test_gemfile
   if File.exist?(test_gemfile)
     puts "Including AUT Gemfile: " + test_gemfile
     eval(IO.read(test_gemfile), binding)

data/bin/agent

@@ -1,7 +1,7 @@
 #!/bin/bash
 # This script is used to start OATS in agent mode and communicate with OCC.
 
-[ "$OS" ] || export OS=$(uname)
+[ "$OS" ] || export OS=$(uname)                     
 if [ "$OS" == "Windows_NT" ]; then
     export PATH="$PATH:/cygdrive/c/apps/cygwin/bin"
     [ "$HOSTNAME" ] || HOSTNAME="$COMPUTERNAME"
@@ -14,14 +14,14 @@ doc="
 Starts OATS agent to be used with OCC
 
 USAGE: agent [-k[ill]] [-n[ickname] OATS_AGENT_NICKNAME] [ -p[ort]  OATS_AGENT_PORT ]
-             [ -r[epo] OATS_REPOSITORY_VERSION ] [ -u OATS_USER]
+             [ -r[epo] OATS_TESTS_REPOSITORY_VERSION ] [ -u OATS_USER]
 
 Parameters: (also can be passed in via environment variables
  -n OATS_AGENT_NICKNAME OCC ID of the agent.
  -p OATS_AGENT_PORT Agent port to communicate with OCC. Default is port previously
     used for OATS_AGENT_NICKNAME.
  -u OATS_USER who started the agent. Used for logging purposes only.
- -r OATS_REPOSITORY_VERSION Required to update the agent.
+ -r OATS_TESTS_REPOSITORY_VERSION Required to update the agent.
  -k kill the agent, or set OATS_KILL_AGENT
  -d DISPLAY_NUM Number of the VNC Display, for Linux only
 
@@ -29,7 +29,7 @@ Example:
 /home/occadmin/oats/bin/agent -p 3011 -n occ_1 -r 403cc620c265db84dbd3fb7d7cce4d57416bff09
 
 The agent script should be in the path so that ssh from occ can pick it up.
-Git requires definition of OATS_GIT_REPOSITORY environment variable.
+Git requires definition of OATS_TESTS_GIT_REPOSITORY environment variable.
  "
 input_pars="$@"
 while [ "$1" ]; do
@@ -38,7 +38,7 @@ while [ "$1" ]; do
 	-n*) shift; OATS_AGENT_NICKNAME="$1" ;;
 	-u*) shift; OATS_USER="$1" ;;
 	-k*) OATS_KILL_AGENT='OATS_KILL_AGENT' ;;
-	-r*) shift; OATS_REPOSITORY_VERSION="$1" ;;
+	-r*) shift; OATS_TESTS_REPOSITORY_VERSION="$1" ;;
 	-d*) shift; DISPLAY_NUM="$1" ;;
 	*) echo "Unrecognized parameter: $1" ;
 	    echo "$doc"
@@ -60,22 +60,12 @@ function fkill {
 }
 
 {
-    agent_echo  "$0 $input_pars"
+    agent_echo  "Invoking $0 $input_pars"
 
     # Need these off when called by OCC, otherwise they OCC values are inherited
     unset RUBYOPT BUNDLE_BIN_PATH BUNDLE_GEMFILE  # GEM_HOME GEM_PATH # RAILS_ENV
-    if [ -z "$OATS_HOME" ]; then
-	cd $(dirname $(type -p $0))/..
-	OATS_HOME=$PWD
-    fi
-    [ "$OATS_GIT_REPOSITORY" ] && OATS_HOME="$HOME/results_archive/$OATS_AGENT_NICKNAME"/oats
-    export OATS_HOME
-    export OATS_AGENT_LOGFILE="$logFile"
-    oats_bin="$OATS_HOME/bin"
-#    [ "$OS" == "Windows_NT" ] && oats_bin=$(cygpath -w $oats_bin)
-#    ruby_com="$oats_bin/oats -n $OATS_AGENT_NICKNAME -p $OATS_AGENT_PORT"
-    ruby_com="oats -n $OATS_AGENT_NICKNAME -p $OATS_AGENT_PORT"
-    export PATH="$PATH:$OATS_HOME/bin:$OATS_HOME/bin/$OS"
+    [ "$OATS_TESTS_GIT_REPOSITORY" ] && export OATS_TESTS="$HOME/results_archive/$OATS_AGENT_NICKNAME"/oats_tests
+    ruby_com="$(dirname $(type -p $0))/oats -n $OATS_AGENT_NICKNAME -p $OATS_AGENT_PORT"
     if [ -e "$config_agent_file" ]; then
 	line=$(grep "^$OATS_AGENT_NICKNAME" "$config_agent_file")
 	read nickname PREV_OATS_AGENT_PORT pid display<<< $line
@@ -92,7 +82,7 @@ function fkill {
     fi
     if [ -z "$OATS_AGENT_PORT" ]; then
 	agent_echo "$0: Must specify a port, exiting..." >&2
-    exit 1
+	exit 1
     fi
 
     [ "$OATS_AGENT_PORT" == "$PREV_OATS_AGENT_PORT" ] && PREV_OATS_AGENT_PORT=''
@@ -129,16 +119,32 @@ function fkill {
     done
     [ "$OATS_KILL_AGENT" ] && return
 
-    if [ "$OATS_GIT_REPOSITORY" ]; then
-	[ -d $OATS_HOME ] || git clone $OATS_GIT_REPOSITORY $OATS_HOME
-	cd $OATS_HOME
-        origin="$OATS_GIT_REPOSITORY"
+    if [ -d $OATS_TESTS/.svn ]; then
+	COUNTER=0
+	[ "$OATS_TESTS_REPOSITORY_VERSION" ] && agent_echo "Requested OATS Version: $OATS_TESTS_REPOSITORY_VERSION"
+	while [ $COUNTER -lt 5 ]; do
+            let COUNTER=COUNTER+1
+	    OATS_TESTS_CODE_VERSION=$(svn info $OATS_TESTS | sed -n 's/Last Changed Rev: *//p')
+	    [ "$OATS_TESTS_REPOSITORY_VERSION" ] || break
+	    [ "$OATS_TESTS_CODE_VERSION" -ge "$OATS_TESTS_REPOSITORY_VERSION" ] && break
+	    [ $COUNTER -eq 1 ] || sleep 3
+	    svn update $OATS_TESTS 2>&1
+	done
+	if [ $COUNTER -eq 5 ]; then
+	    agent_echo "Could not update the code version $OATS_TESTS_CODE_VERSION to $OATS_TESTS_REPOSITORY_VERSION" >&2
+	    return 2
+	fi
+	agent_echo "Current OATS code version: $OATS_TESTS_CODE_VERSION"
+    elif [ "$OATS_TESTS_GIT_REPOSITORY" ]; then
+	[ -d $OATS_TESTS ] || git clone $OATS_TESTS_GIT_REPOSITORY $OATS_TESTS
+	cd $OATS_TESTS
+        origin="$OATS_TESTS_GIT_REPOSITORY"
         [ "$origin" ] || origin=origin
-	if [ "$OATS_REPOSITORY_VERSION" ]; then
+	if [ "$OATS_TESTS_REPOSITORY_VERSION" ]; then
 	    for i in 1 2; do
-		out=$(git checkout $OATS_REPOSITORY_VERSION 2>&1) && break # may detach HEAD, but it is OK
-		if [ "$out" == "fatal: reference is not a tree: $OATS_REPOSITORY_VERSION" ]; then
-		    echo -n "Need to pull requested version: $OATS_REPOSITORY_VERSION "
+		out=$(git checkout $OATS_TESTS_REPOSITORY_VERSION 2>&1) && break # may detach HEAD, but it is OK
+		if [ "$out" == "fatal: reference is not a tree: $OATS_TESTS_REPOSITORY_VERSION" ]; then
+		    echo -n "Need to pull requested version: $OATS_TESTS_REPOSITORY_VERSION "
 		else
 		    echo "$out"
 		fi
@@ -147,33 +153,17 @@ function fkill {
         else
             git pull $origin master # fast-forward master from origin
 	fi
-	OATS_CODE_VERSION=$(git rev-list HEAD -1) # last commit in checked out version
-	if [ "${OATS_CODE_VERSION##$OATS_REPOSITORY_VERSION*}" ]; then
-	    agent_echo "Could not update the code version $OATS_CODE_VERSION to $OATS_REPOSITORY_VERSION" >&2
-	    return 2
-	fi
-	[ "$OATS_REPOSITORY_VERSION" ] || agent_echo "Using OATS code version: $OATS_CODE_VERSION"
-    elif [ -d .svn ]; then
-	COUNTER=0
-	[ "$OATS_REPOSITORY_VERSION" ] && agent_echo "Requested OATS Version: $OATS_REPOSITORY_VERSION"
-	while [ $COUNTER -lt 5 ]; do
-            let COUNTER=COUNTER+1
-	    OATS_CODE_VERSION=$(svn info $OATS_HOME | sed -n 's/Last Changed Rev: *//p')
-	    [ "$OATS_REPOSITORY_VERSION" ] || break
-	    [ "$OATS_CODE_VERSION" -ge "$OATS_REPOSITORY_VERSION" ] && break
-	    [ $COUNTER -eq 1 ] || sleep 3
-	    svn update $OATS_HOME 2>&1
-	done
-	if [ $COUNTER -eq 5 ]; then
-	    agent_echo "Could not update the code version $OATS_CODE_VERSION to $OATS_REPOSITORY_VERSION" >&2
+	OATS_TESTS_CODE_VERSION=$(git rev-list HEAD -1) # last commit in checked out version
+	if [ "${OATS_TESTS_CODE_VERSION##$OATS_TESTS_REPOSITORY_VERSION*}" ]; then
+	    agent_echo "Could not update the code version $OATS_TESTS_CODE_VERSION to $OATS_TESTS_REPOSITORY_VERSION" >&2
 	    return 2
 	fi
-	agent_echo "Current OATS code version: $OATS_CODE_VERSION"
+	[ "$OATS_TESTS_REPOSITORY_VERSION" ] || agent_echo "Using OATS code version: $OATS_TESTS_CODE_VERSION"
     else
-	OATS_CODE_VERSION=$OATS_REPOSITORY_VERSION
-	[ "$OATS_CODE_VERSION" ] && agent_echo "Setting OATS code version to the requested version: $OATS_CODE_VERSION]" # This is not set for development/debug
+	OATS_TESTS_CODE_VERSION=$OATS_TESTS_REPOSITORY_VERSION
+	[ "$OATS_TESTS_CODE_VERSION" ] && agent_echo "Setting OATS code version to the requested version: $OATS_TESTS_CODE_VERSION]" # This is not set for development/debug
     fi
-    export OATS_CODE_VERSION
+    export OATS_TESTS_CODE_VERSION
 #    echo "$OATS_AGENT_NICKNAME $OATS_AGENT_PORT" >| $config_agent_file
     if [ "$OS" == "Linux" ]; then # Do this with VNC displays
 	# Allocate 2x as display. VNC takes 592x, vino takes next available from 59++
@@ -187,9 +177,9 @@ function fkill {
     cd $OATS_HOME  # Needed for bundler
     agent_echo "Starting agent $OATS_AGENT_NICKNAME on port $OATS_AGENT_PORT"
     $ruby_com
-} >> $LOGFILE 2>&1 &
+} >> $OATS_AGENT_LOGFILE 2>&1 &
 
 PID=$(jobs -p)
-echo "Initiated PID: $PID"  >> $LOGFILE
+echo "Initiated PID: $PID"  >> $OATS_AGENT_LOGFILE
 echo "$PID"
-echo "$OATS_AGENT_NICKNAME $OATS_AGENT_PORT $PID $DISPLAY_NUM"  >| $CONFIG_FILE
+echo "$OATS_AGENT_NICKNAME $OATS_AGENT_PORT $PID $DISPLAY_NUM"  >| $OATS_AGENT_CONFIG_FILE

data/doc/oats_httpd.conf

@@ -11,6 +11,12 @@
     Order allow,deny
     Allow from all
 </Directory>
+<Directory "/home/occadmin/oats_tests">
+    Options Indexes FollowSymLinks
+    AllowOverride None
+    Order allow,deny
+    Allow from all
+</Directory>
 <Directory "/home/occadmin/results">
     Options Indexes FollowSymLinks
     AllowOverride None
@@ -23,10 +29,12 @@
     Order allow,deny
     Allow from all
 </Directory>
-# Point this alias to the test folders of AUT or put in the appropriate soft link
+
+# Point this alias to the test folders of AUT or use a link 
 #Alias /oats/tests <FolderOfYourApplicationUnderTest>
+Alias /oats/tests /home/occadmin/oats_tests
 Alias /oats /home/occadmin/oats
-Alias /r /home/occadmin/results
-Alias /a /home/occadmin/results_archive
-ServerAdmin Levent.Atasoy@GMail.com
+Alias /oats/r /home/occadmin/results
+Alias /oats/a /home/occadmin/results_archive
+ServerAdmin OccAdminO@your.com
 DocumentRoot "/home/occadmin/results_archive"

data/lib/oats/driver.rb

@@ -12,17 +12,17 @@ module Oats
     def Driver.agent
       ENV['KILL_AGENT' ] = 'KILL_AGENT' if $oats_execution['options']["_:kill_agent"]
       ENV['OATS_USER' ] = $oats_execution['options']["_:oats_user"] if $oats_execution['options']["_:oats_user"]
-      ENV['OATS_REPOSITORY_VERSION' ] = $oats_execution['options']["_:repository_version"] if $oats_execution['options']["_:repository_version"]
+      ENV['OATS_TESTS_REPOSITORY_VERSION' ] = $oats_execution['options']["_:repository_version"] if $oats_execution['options']["_:repository_version"]
       nick = $oats_execution['options']["execution:occ:agent_nickname"]
       ENV['OATS_AGENT_NICKNAME' ] = nick if nick
       port = $oats_execution['options']["execution:occ:agent_port"].to_s
       ENV['OATS_AGENT_PORT'] = port if port
       dir = ENV['HOME'] + "/results_archive/#{nick}/agent_logs"
       FileUtils.mkdir_p(dir) unless File.exists?(dir)
-      ENV['CONFIG_FILE'] = "#{dir}/config-agent.txt"
+      ENV['OATS_AGENT_CONFIG_FILE'] = "#{dir}/config-agent.txt"
       dat = `date +'%m%d%H%M%S'`.chomp
       log_file = "#{dir}/agent_#{dat}.log"
-      ENV['LOGFILE'] = log_file
+      ENV['OATS_AGENT_LOGFILE'] = log_file
       agent_log_file = "#{dir}/agent.log"
       cmd = ENV['OATS_HOME'] + '/bin/agent'
       pid = `#{cmd}`.chomp
@@ -191,6 +191,7 @@ module Oats
           #      oats_data['_']['load_history'].last.omit = true
         when /\.xls$/
           suite = id
+          require 'spreadsheet' unless defined?(Spreadsheet)
           book = Spreadsheet.open test_yaml
           tests = $oats_global['xl']
           unless tests and tests[id]

data/lib/oats/ragent.rb

@@ -222,7 +222,7 @@ module Oats
         'machine' => occ['agent_host'],
         'port' => occ['agent_port'] }
       query['jobid'] = prev_jobid if prev_jobid
-      query['repo'] = ENV['OATS_CODE_VERSION'].to_s if ENV['OATS_CODE_VERSION'] and ENV['OATS_CODE_VERSION'] != ''
+      query['repo'] = ENV['OATS_TESTS_CODE_VERSION'].to_s if ENV['OATS_TESTS_CODE_VERSION'] and ENV['OATS_TESTS_CODE_VERSION'] != ''
       query['logfile'] = File.basename(ENV['OATS_AGENT_LOGFILE']||'agent.log')
       Ragent.server_logger ra, "Getting next OCC job: " + query.inspect
       query['password='] = ra.request[:password] if ra and ra.request[:password]

data/lib/oats/{oats.rb → user_api.rb}

@@ -1,7 +1,8 @@
 require 'oats/util'
 require 'oats/oats_exceptions'
+
 # Need these set for OCC when this is required from OCC
-ENV['OATS_HOME'] ||= File.expand_path( '..', File.dirname(__FILE__) )
+ENV['OATS_HOME'] ||= File.expand_path( '../..', File.dirname(__FILE__) )
 ENV['OATS_TESTS'] ||= (ENV['OATS_HOME'] + '/oats_tests')
 
 module Oats

data/lib/oats/version.rb

@@ -1,3 +1,3 @@
 module Oats
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/oats.rb

@@ -32,5 +32,4 @@ require 'log4r'  # http://log4r.sourceforge.net/rdoc/index.html
 require 'oats/driver'
 require 'oats/oats_lock'
 
-#ENV['OATS_HOME'] ||= Oats::Util.expand_path( '..', File.dirname(__FILE__) )
-require 'oats/oats' #  Interface methods to user methods implemented in other modules
+require 'oats/user_api' #  Interface methods to user methods implemented in other modules

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oats
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Levent Atasoy
@@ -165,7 +165,6 @@ files:
 - lib/oats/keywords.rb
 - lib/oats/log4r_init.rb
 - lib/oats/mysql.rb
-- lib/oats/oats.rb
 - lib/oats/oats_data.rb
 - lib/oats/oats_exceptions.rb
 - lib/oats/oats_lock.rb
@@ -181,6 +180,7 @@ files:
 - lib/oats/test_data.rb
 - lib/oats/test_list.rb
 - lib/oats/unixdiff.rb
+- lib/oats/user_api.rb
 - lib/oats/util.rb
 - lib/oats/version.rb
 - nbproject/configs/agent-n.properties