Install Kahuna in a virtualenv

Now Kahuna is installed on a virtual environment
to isolate the libraries and dependencies it uses.

Also the setup script has been modified to allow to
install Kahuna in an existing Jython runtime.

Author: Ignasi Barrera

README.md

@@ -25,15 +25,16 @@ You can install Kahuna with the setup script:
 
     git clone git://github.com/nacx/kahuna.git
     cd kahuna
-    sudo sh setup.sh
+    chmod u+x setup.sh
+    sudo ./setup.sh
 
-**This will install Jython 2.5.2** on your system and configure it to be used by Kahuna.
+By default the setup script will install Jython 2.5.3. on your system. If you already have a
+Jython runtime and want to install Kahuna in it, you can execute the setup script as follows:
 
-If you have an existing Jython installation <= 2.5.2, Kahuna won't work. If you
-have a newer Jython version and you want to keep it, you can just remove the */opt/jython-2.5.2*
-directory and the link that the setup script will create in */usr/local/bin/jython* to
-make sure your version will be used. You may also need to manually install the *redis*
-egg in your Jython runtime.
+    sudo ./setup.sh -j /your/jython/install/directory
+
+If you are installing Kahuna in an already existing Jython runtime, you may need to install
+**easy_install** and **virtualenv** in it.
 
 
 Running

kahuna.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+[ -z "$KAHUNA_HOME" ] && export KAHUNA_HOME="/usr/local/lib/kahuna"
+
 # Exit code to be used when opening an interactive shell
 EXIT_OPEN_SHELL=10
 
@@ -13,17 +15,18 @@ fi
 
 # Enter the real directori before performing any operation
 cd $BASEDIR
+export JYTHONPATH=$BASEDIR
 
 # Ensure the classpath file exist
 CPFILE=kahuna/abiquo-jars.pth
 ! [ -f $CPFILE ] && mvn clean compile -U
 
 # Export the classpath and run the command line script
 export CLASSPATH=`cat $CPFILE`
-jython kahuna/cli.py $*
+${KAHUNA_HOME}/bin/jython kahuna/cli.py $*
 
 # Tricky: If the CLI returns this code, open an interactive shell 
 if [ $? -eq $EXIT_OPEN_SHELL ]; then
-    jython
+    ${KAHUNA_HOME}/bin/jython
 fi
 

setup.sh

@@ -1,38 +1,97 @@
 #!/bin/bash
 
-JYTHON_VERSION=2.5.2
-JYTHON_TARGET=/opt/jython-${JYTHON_VERSION}
-
-echo "Downloading Jython ${JYTHON_VERSION}..."
-JYTHON_URL=http://sourceforge.net/projects/jython/files/jython/${JYTHON_VERSION}/jython_installer-${JYTHON_VERSION}.jar/download
-JYTHON_TMP=/tmp/jython_installer-${JYTHON_VERSION}.jar
-wget -q ${JYTHON_URL} -O ${JYTHON_TMP}
-
-echo "Installing Jython ${JYTHON_VERSION} to ${JYTHON_TARGET}..."
-java -jar ${JYTHON_TMP} -s -t standard -d ${JYTHON_TARGET}
-ln -s ${JYTHON_TARGET}/jython /usr/local/bin/jython
-
-echo "Addind Easy Install for Jython..."
-wget -q http://peak.telecommunity.com/dist/ez_setup.py -O /tmp/ez_setup.py
-${JYTHON_TARGET}/jython /tmp/ez_setup.py
-
-echo "Installing Redis egg..."
-${JYTHON_TARGET}/bin/easy_install --quiet redis
-
-echo "Installing Kahuna..."
-chmod -R 777 ${JYTHON_TARGET}/cachedir
-chmod u+x kahuna.sh
-ln -s $(pwd)/kahuna.sh /usr/local/bin/kahuna
-export JYTHONPATH=$(pwd)
-
-echo "Done!"
-echo 
-echo "To finish the installation, add the following line to the end of your ~/.bashrc:"
-echo "export JYTHONPATH=$(pwd)"
-echo
-echo "Now you are ready to run 'kahuna'. This will print the available commands and copy"
-echo "all default configuration to ~/.kahuna/"
-echo "Feel free to edit those files to adapt them to your needs."
-echo
-echo "Have fun!"
+JYTHON_VERSION=2.5.3
+PREFIX=/usr/local
+
+JYTHON=${PREFIX}/lib/jython-${JYTHON_VERSION}
+KAHUNA_VERSION=$(git log -1 --format=format:%h)
+KAHUNA=${PREFIX}/lib/kahuna-${KAHUNA_VERSION}
+
+function install_jython() {
+    echo "Downloading Jython ${JYTHON_VERSION}..."
+    JYTHON_URL=http://repo1.maven.org/maven2/org/python/jython-installer/${JYTHON_VERSION}/jython-installer-${JYTHON_VERSION}.jar
+    JYTHON_TMP=/tmp/jython_installer-${JYTHON_VERSION}.jar
+    wget -q ${JYTHON_URL} -O ${JYTHON_TMP}
+
+    echo "Installing Jython ${JYTHON_VERSION} to ${JYTHON}..."
+    mkdir -p ${PREFIX}/lib
+    mkdir -p ${PREFIX}/bin
+    java -jar ${JYTHON_TMP} -s -t standard -d ${JYTHON}
+    ln -s ${JYTHON}/bin/jython ${PREFIX}/bin/jython
+    JYTHON_DIR=${JYTHON}
+}
+
+function install_packages() {
+    echo "Adding Easy Install for Jython..."
+    wget -q http://peak.telecommunity.com/dist/ez_setup.py -O /tmp/ez_setup.py
+    ${JYTHON}/bin/jython /tmp/ez_setup.py
+
+    echo "Installing virtualenv..."
+    ${JYTHON}/bin/easy_install --quiet virtualenv
+}
+
+function install_kahuna() {
+    echo "Creating the Kahuna virtual environment..."
+    
+    if ! [[ -f ${1}/bin/easy_install ]]; then
+        echo "Missing easy_install. Please install it to continue."
+        exit 1
+    fi
+    if ! [[ -f ${1}/bin/virtualenv ]]; then
+        echo "Missing virtualenv. Please install it to continue."
+        exit 1
+    fi
+
+    ${1}/bin/virtualenv ${KAHUNA}
+
+    echo "Installing Redis egg..."
+    ${KAHUNA}/bin/easy_install --quiet redis
+
+    echo "Installing Kahuna..."
+    chmod -R 777 ${KAHUNA}/cachedir
+    chmod u+x kahuna.sh
+    [[ -L ${KAHUNA}/../kahuna ]] && unlink ${KAHUNA}/../kahuna
+    [[ -L /usr/local/bin/kahuna ]] && unlink /usr/local/bin/kahuna
+    ln -s ${KAHUNA} ${KAHUNA}/../kahuna
+    ln -s $(pwd)/kahuna.sh /usr/local/bin/kahuna
+}
+
+function print_summary() {
+    echo "Done!"
+    echo 
+    echo "To finish the installation, add the following line to the end of your ~/.bashrc:"
+    echo "export KAHUNA_HOME=${PREFIX}/lib/kahuna"
+    echo
+    echo "Now you are ready to run 'kahuna'. This will print the available commands and copy"
+    echo "all default configuration to ~/.kahuna/"
+    echo "Feel free to edit those files to adapt them to your needs."
+    echo
+    echo "Have fun!"
+}
+
+function usage() {
+cat << EOF
+Usage: ${0} [-j <jython home>]
+Options:
+    -j: If set, Jython will not be installed and Kahuna will use
+        the provided Jython installation.
+EOF
+exit 1
+}
+
+
+while getopts "j:" OPT; do
+    case ${OPT} in
+        j) JYTHON_DIR=${OPTARG} ;;
+        ?) usage ;;
+    esac
+done
+
+if [[ -z ${JYTHON_DIR} ]]; then
+    install_jython
+    install_packages
+fi
+
+install_kahuna ${JYTHON_DIR}
+print_summary