getoptx.sh @@ -1,7 +1,7 @@ -"The contents of this file and software package (the "Application") are subject -to the Mozilla Public License Version 1.1 (the "License"); you may not use -this file or the Application except in compliance with the License. You may -obtain a copy of the License at +"The contents of this file and software package (the "Application") are +subject to the Mozilla Public License Version 1.1 (the "License"); you may not +use this file or the Application except in compliance with the License. You +may obtain a copy of the License at http://www.mozilla.org/MPL/ Software distributed under the License is distributed on an "AS IS" @@ -11,5 +11,11 @@ under the License. The Original Code is Snaptest 0.0.1 [no formal release yet]. -The Initial Developer of the Original Code is Jakob Heuser <jakob@felocity.org>. -Copyright (C) 2007. All Rights Reserved. \ No newline at end of file +The Initial Developer of the Original Code is Jakob Heuser +<jakob@felocity.org>. +Copyright (C) 2007. All Rights Reserved. + +--- + +getoptx.sh is licensed under the Public Domain and may be distributed on its +own, independent of this software package. \ No newline at end of file LICENSE @@ -1,5 +1,31 @@ <?php +function SNAP_usage() { + echo "\n"; + echo "Usage: snaptest.sh [--out=outmode] [--php=phppath] [--help] <path>\n"; + echo "Usage: php snaptest.php [--out=outmode] [--php=phppath] [--help] <path>\n"; + echo "\n"; + echo "<path> :: The path to the test you want to run. Should be a file\n"; + echo "ending in .test.php or a directory.\n"; + echo "\n"; + echo "--out=outmode :: sets the output handler to 'outmode'. The\n"; + echo "output mode must be located in <snaptest>/outmode.php.\n"; + echo "\n"; + echo "--php=phppath :: set the php path for recursion. If not specified,\n"; + echo "the call 'php' will be used, using whatever is in the current env\n"; + echo "variable.\n"; + echo "\n"; + echo "--match=regex :: Specifies a PCRE regular expression to match. Files\n"; + echo "that match this regular expression will be included by the test\n"; + echo "harness.\n"; + exit; +} + +// requires PHP 5.2+ +if (version_compare(phpversion(), '5.2.0') < 0) { + SNAP_usage(); +} + require_once 'snap.php'; require_once 'functions.php'; @@ -18,40 +44,13 @@ $out_mode = (isset($options['out']) && $options['out']) ? $options['out'] : 'tex $php = (isset($options['php']) && $options['php']) ? $options['php'] : 'php'; $ofile = (isset($options['ofile']) && $options['ofile']) ? $options['ofile'] : tempnam('/tmp', 'SNAP'); $xtn = (isset($options['match']) && $options['match']) ? $options['match'] : '^.*\.stest\.php'; -$help = (isset($options['help']) && $options['help']) ? true : false; +$help = (isset($options['help'])) ? true : false; $path = (isset($options[0]) && $options[0]) ? $options[0] : ''; // help output if no path is specified if ($path == '' || $help) { - echo "\n"; - echo "Usage: snaptest.sh <path>\n"; - echo "Usage: php snaptest.php [--out=outmode] [--php=phppath]\n"; - echo " [--ofile=filepath] [--help] <path>\n"; - echo "\n"; - echo "<path> :: The path to the test you want to run. Should be a file\n"; - echo "ending in .test.php or a directory.\n"; - echo "\n"; - echo "--out=outmode :: sets the output handler to 'outmode'. The\n"; - echo "output mode must be located in <snaptest>/outmode.php.\n"; - echo "This is specific to snaptest.php only\n"; - echo "\n"; - echo "--php=phppath :: set the php path for recursion. If not specified,\n"; - echo "the call 'php' will be used, using whatever is in the current env\n"; - echo "variable.\n"; - echo "This is specific to snaptest.php only\n"; - echo "\n"; - echo "--ofile=filepath :: Declare a file you want to write to. This is\n"; - echo "especially useful if you plan to fork and want all reports to go\n"; - echo "to a single location. If ofile is not specified, a file in /tmp\n"; - echo "from tempnam() will be used.\n"; - echo "This is specific to snaptest.php only\n"; - echo "\n"; - echo "--match=regex :: Specifies a regular expression to match. Files\n"; - echo "that match this regular expression will be included by the test\n"; - echo "harness.\n"; - echo "This is specific to snaptest.php only\n"; - exit; + SNAP_usage(); } snaptest.php @@ -1,17 +1,58 @@ #!/bin/bash -#$> ./snaptest.sh <path> -# runs snaptest/bootstrap.php --mode=directory --path=<path> -# +# load options +. getoptx.sh -# Debian / STD Linux -# phppath=/usr/local/bin/php +# Auto Locate PHP +PHP=`which php` +if [[ ! -x "$PHP" ]] ; then + PHP="" + if [ -z $PHP ] ; then + if [ -x "/usr/local/bin/php" ] ; then + PHP="/usr/local/bin/php" + fi + if [ -x "/usr/bin/php" ] ; then + PHP="/usr/bin/php" + fi + if [ -x "/opt/local/bin/php" ] ; then + PHP="/opt/local/bin/php" + fi + fi +fi -# OSX / Darwin -phppath=/opt/local/bin/php +# choke and die if we couldn't auto-find PHP +if [ -z $PHP ] ; then + echo "PHP was not found in any common location. You will need to" + echo "supply the --php=<path> switch." + exit 0 +fi -# END CONFIG -filepath=`dirname "$0"` -cd $filepath; +# parse the options +CMD="" +while getoptex "out. php. match. help;" "$@" +do + if [ "$OPTOPT" = "php" ] ; then + if [ -n PHP ] ; then + echo "OHSHITNOPHPLAWL" + fi + PHP=$OPTARG + fi + if [ "$OPTOPT" = "help" ] ; then + CMD="$CMD --help" + else + CMD="$CMD --$OPTOPT=$OPTARG" + fi +done +shift $[OPTIND-1] +for arg in "$@" +do + CMD="$CMD $arg" +done -$phppath $filepath/snaptest.php --out=text --php=$phppath $1 \ No newline at end of file +# change to shell script real location +FPATH=`dirname "$0"` +cd $FPATH; + +# run php on the snaptest.php file with the commands +CMD="$PHP snaptest.php $CMD" +$CMD snaptest.sh 7db4664b4f39dddc6c864f23692f4e0672ac8ac1 rjheuser rjheuser@85759191-e132-0410-920c-21c98535aa7c http://github.com/Jakobo/snaptest/commit/21f361e04e32a7b35f6ed0001437aff78afe00a3 21f361e04e32a7b35f6ed0001437aff78afe00a3 2008-01-16T15:56:26-08:00 2008-01-16T15:56:26-08:00 command line option improvement the shell script now attempts to auto locate PHP, followed by running a PHP version check before starting. getoptx has been added for simplicity in handling long options, until it has been changed over to getopt native git-svn-id: https://snaptest.googlecode.com/svn/trunk@49 85759191-e132-0410-920c-21c98535aa7c b01ab38e8e0a635c7b8c1015153c312e8653983f rjheuser rjheuser@85759191-e132-0410-920c-21c98535aa7c