Fixing generateCI & sanity check (renamed) scripts. Added comments. E…

…nhanced README.

.travis.yml

@@ -3,6 +3,6 @@ language: generic
 sudo: required
 
 script:
-    - chmod 777 ./sanityCheck.sh ./runTests.sh ./runPrograms.sh
-    - ./sanityCheck.sh
+    - chmod 777 ./wsanity-check.sh ./runTests.sh ./runPrograms.sh
+    - ./wsanity-check.sh
 

README.md

@@ -121,10 +121,16 @@ This is the way you should call the script:
 generateCI.sh ../wollok-dev/wollok
 ```
 
+Or, if you are in `wollok-dev/wollok` folder, simply run
+
+```bash
+generateCI.sh .
+```
+
 Don't add the trailing `/` character for wollok root folder. After running the script, you can tests if everything went smooth:
 
 ```bash
-sanityCheck.sh
+wsanity-check.sh
 ```
 
 ## Another useful scripts

generateCI.sh

@@ -15,19 +15,21 @@ if [ -z $1 ]
     echo -e "https://github.com/uqbar-project/wollok/wiki/Development---Environment-Setup"
     echo -e "and make sure you run 'mvn clean install' first."
     echo -e "Example: if you have a sibling folder wollok-dev and inside you have a wollok directory, call it"
-    echo -e "$ ./generateCI.sh ../wollok-dev/wollok"
+    echo -e "$ generateCI.sh ../wollok-dev/wollok"
     echo -e "(without the trailing /)"
     exit 1
 fi
 
-JARS_FOLDER=./jars/
-
+# Folders initialization
+CLI_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+JARS_FOLDER=$CLI_DIR/jars/
 mkdir -p $JARS_FOLDER
 
 LAUNCH_FOLDER="$1/org.uqbar.project.wollok.launch"
-LIB="./$LAUNCH_FOLDER/lib"
-SRC="./$LAUNCH_FOLDER/target"
+LIB="$LAUNCH_FOLDER/lib"
+SRC="$LAUNCH_FOLDER/target"
 
+# List of .jar dependencies
 JARS=(
  "com.google.inject"
  "com.google.guava"
@@ -58,17 +60,17 @@ JARS=(
  "org.uqbar.project.wollok.launch"
 )
 
-#WCLASS_PATH="echo $(for i in `find $SRC -name "*.jar"`; do echo $i; done) $(for i in `find $DIR/$LIB -name "*.jar"`; do echo $i; done)"
+# Copying all .jars into wollok-cli jars folder
+# Step 1 => from target folder
 for i in "${JARS[@]}"
 do
   echo "Copying $i*.jar" 
-  #find $SRC -name "$i*.jar" | xargs cp -t jars/
   find $SRC -name "$i*.jar" | xargs cp -t $JARS_FOLDER
 done
 
+# Step 2 => from lib folder
 for i in `find $LIB -type f -name "*.jar"`
 do
   echo "Copying $i"
-  #cp $i jars/
   cp $i $JARS_FOLDER
 done

includes/commons.sh

@@ -1,6 +1,5 @@
 function interpret() {
-    rm -f $CLI_DIR/examples/*
-    for i in `find $SRC -name $1 ! -path "./.history*" ! -path "./bin/**"`
+    for i in `find $SRC -name $1 ! -path "./.history*" ! -path "./bin/**" ! -path "$CLI_DIR/examples/*"`
         do
             echo "   ==>  $i"
             $CLI_DIR/winterpreter.sh $i

runPrograms.sh

@@ -5,6 +5,7 @@
 #
 set -e 
 
+# Setting relative folder to this script file
 CLI_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 source $CLI_DIR/includes/commons.sh
 
@@ -13,7 +14,7 @@ interpret "*.wlk"
 if [ $? -gt 0 ] ; then
     exit 1
 fi
-echo "********************************************"
+echo "==========================================================="
 echo "Ejecutando programas..."
 interpret "*.wpgm"
 if [ $? -gt 0 ] ; then

runTests.sh

@@ -6,7 +6,7 @@
 
 set -e 
 
-CURR_DIR=./
+# Setting relative folder to this script file
 CLI_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 source $CLI_DIR/includes/commons.sh
 
@@ -15,7 +15,7 @@ interpret "*.wlk"
 if [ $? -gt 0 ] ; then
     exit 1
 fi
-echo "********************************************"
+echo "==========================================================="
 echo "Ejecutando tests..."
 interpret "*.wtest"
 if [ $? -gt 0 ] ; then

sanityCheck.sh → wsanity-check.sh

@@ -3,14 +3,18 @@
 # Sanity check for Wollok CLI project
 # Author: Dodain
 #
+
+# Setting relative folder to this script file
+CLI_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+
 function testFailingFile() {
-    echo "*******************************************************************************"
+    echo "=========================================================================================="
     echo "Testeando archivo $1"
-    if [ ! -s ./examples/$1 ] ; then
+    if [ ! -s $CLI_DIR/examples/$1 ] ; then
         echo "Archivo $1 no existe"
         return 1
     fi
-    ./winterpreter.sh ./examples/$1
+    $CLI_DIR/winterpreter.sh $CLI_DIR/examples/$1
     if [ $? -ne 1 ] ; then
         echo "$1 no debería haber compilado"
         return 1
@@ -28,7 +32,9 @@ if [ $? -ne 0 ] ; then
     exit 1
 fi
 
-echo "*******************************************************************************"
+echo "=========================================================================================="
 echo "Testing happy path for pepita test and program"
-./winterpreter.sh ./examples/pepita.warnings.wlk && ./winterpreter.sh ./examples/pepita.wtest && ./winterpreter.sh ./examples/pepita.wpgm
+$CLI_DIR/winterpreter.sh $CLI_DIR/examples/pepita.warnings.wlk \
+    && $CLI_DIR/winterpreter.sh $CLI_DIR/examples/pepita.wtest \
+    && $CLI_DIR/winterpreter.sh $CLI_DIR/examples/pepita.wpgm
 exit $?