From 14b604bea2501022d3d828f746a6fa2b2055a00a Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Sun, 30 Jun 2013 21:23:07 +0200 Subject: [PATCH] source tree re-arrangement --- README.md | 8 +- bin/btr | 9 +- lib/btr/btr.mk | 9 - lib/btr/btr.sh | 314 +++++++++++++++++------------------ lib/btr/{ => build}/pecl.mk | 0 lib/btr/{ => build}/php.mk | 0 lib/btr/{ => report}/mail.mk | 0 lib/btr/{ => source}/git.mk | 0 lib/btr/{ => source}/svn.mk | 0 9 files changed, 167 insertions(+), 173 deletions(-) delete mode 100644 lib/btr/btr.mk rename lib/btr/{ => build}/pecl.mk (100%) rename lib/btr/{ => build}/php.mk (100%) rename lib/btr/{ => report}/mail.mk (100%) rename lib/btr/{ => source}/git.mk (100%) rename lib/btr/{ => source}/svn.mk (100%) diff --git a/README.md b/README.md index a2d16ac..e0a929e 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,16 @@ # btr +A poor man's CI tool. + ## BUILD TEST REPORT A simple tool to automate reporting of build and test results. ### Currently supported rulesets: -* source: git, svn -* build: php, pecl -* report: mail +* ***source:*** git, svn +* ***build:*** php, pecl +* ***report:*** mail #### Usage ``` diff --git a/bin/btr b/bin/btr index 2eaeac8..5a6e190 100755 --- a/bin/btr +++ b/bin/btr @@ -15,11 +15,12 @@ setup if $VERBOSE then - show_conf - confirm "Do you want to continue?" || exit + show_conf + confirm "Do you want to continue?" || exit fi -REPORT="$(make -s -C $BTRDIR -f $LIBDIR/$SOURCE_RULES.mk && make -s -C $BTRDIR -f $LIBDIR/$BUILD_RULES.mk)" -make -s -C $BTRDIR -f $LIBDIR/$REPORT_RULES.mk REPORT="$REPORT" +REPORT="$(make -s -C $BTRDIR -f $LIBDIR/source/$SOURCE_RULES.mk && \ + make -s -C $BTRDIR -f $LIBDIR/build/$BUILD_RULES.mk)" +make -s -C $BTRDIR -f $LIBDIR/report/$REPORT_RULES.mk REPORT="$REPORT" # vim: set noet diff --git a/lib/btr/btr.mk b/lib/btr/btr.mk deleted file mode 100644 index e461176..0000000 --- a/lib/btr/btr.mk +++ /dev/null @@ -1,9 +0,0 @@ -.PHONY: all source build report -.SUFFIXES: -export - -all: report - -source: - -# vim: set noet diff --git a/lib/btr/btr.sh b/lib/btr/btr.sh index 16c9d6b..75bb7cd 100755 --- a/lib/btr/btr.sh +++ b/lib/btr/btr.sh @@ -1,184 +1,184 @@ #!/bin/sh function help { - echo "btr v0.2.0, (c) Michael Wallner " - echo - echo "Usage: $(basename $0) [-hv] [] " - echo - echo " -h, --help Display this help" - echo " -v, --verbose Be more verbose" - echo - echo " Options:" - echo " -s, --source= Use the specified source ruleset" - echo " -b, --build= Use the specified build ruleset" - echo " -r, --report= Use the specifued report ruleset" - echo " -B, --branch= Checkout this branch" - echo " -D, --directory= Use this directory as work root" - echo " -S, --suffix= Append suffix to the build name" - echo " -C, --configure= Define \$CONFIGURE options" - echo - echo " Rulesets:" - echo " source: git, svn" - echo " build: php, pecl" - echo " report: mail" - echo - exit + echo "btr v0.2.0, (c) Michael Wallner " + echo + echo "Usage: $(basename $0) [-hv] [] " + echo + echo " -h, --help Display this help" + echo " -v, --verbose Be more verbose" + echo + echo " Options:" + echo " -s, --source= Use the specified source ruleset" + echo " -b, --build= Use the specified build ruleset" + echo " -r, --report= Use the specifued report ruleset" + echo " -B, --branch= Checkout this branch" + echo " -D, --directory= Use this directory as work root" + echo " -S, --suffix= Append suffix to the build name" + echo " -C, --configure= Define \$CONFIGURE options" + echo + echo " Rulesets:" + echo " source: git, svn" + echo " build: php, pecl" + echo " report: mail" + echo + exit } function parseopts { - local shortoptions="hvB:D:S:C:s:b:r:" - local longoptions="help,verbose,branch:,directory:,suffix:,configure:,source:,build:,report:" - local options=$(getopt \ - --options "$shortoptions" \ - --longoptions "$longoptions" \ - -- "$@" \ - ) + local shortoptions="hvB:D:S:C:s:b:r:" + local longoptions="help,verbose,branch:,directory:,suffix:,configure:,source:,build:,report:" + local options=$(getopt \ + --options "$shortoptions" \ + --longoptions "$longoptions" \ + -- "$@" \ + ) - if test $? -ne 0 ; then - help - fi - - eval set -- "$options" - - while test $# -gt 0 - do - case "$1" in - -h|--help) - help - ;; - -v|--verbose) - VERBOSE=true - ;; - #### - -B|--branch) - BRANCH="$2" - shift - ;; - -D|--directory) - BTRDIR="$2" - shift - ;; - -S|--suffix) - SUFFIX="$2" - shift - ;; - -C|--configure) - CONFIGURE="$2" - shift - ;; - #### - -s|--source) - case "$2" in - git) - SOURCE_RULES="git" - test -z "$BRANCH" && BRANCH="master" - ;; - svn) - SOURCE_RULES="svn" - test -z "$BRANCH" && BRANCH="trunk" - ;; - esac - shift - ;; - -b|--build) - case "$2" in - php|pecl) - BUILD_RULES="$2" - ;; - esac - shift - ;; - -r|--report) - case "$2" in - mail) - REPORT_RULES="$2" - ;; - esac - shift - ;; - #### - --) - SOURCE_URL="$2" - shift - ;; - esac - shift - done + if test $? -ne 0 ; then + help + fi + + eval set -- "$options" + + while test $# -gt 0 + do + case "$1" in + -h|--help) + help + ;; + -v|--verbose) + VERBOSE=true + ;; + #### + -B|--branch) + BRANCH="$2" + shift + ;; + -D|--directory) + BTRDIR="$2" + shift + ;; + -S|--suffix) + SUFFIX="$2" + shift + ;; + -C|--configure) + CONFIGURE="$2" + shift + ;; + #### + -s|--source) + case "$2" in + git) + SOURCE_RULES="git" + test -z "$BRANCH" && BRANCH="master" + ;; + svn) + SOURCE_RULES="svn" + test -z "$BRANCH" && BRANCH="trunk" + ;; + esac + shift + ;; + -b|--build) + case "$2" in + php|pecl) + BUILD_RULES="$2" + ;; + esac + shift + ;; + -r|--report) + case "$2" in + mail) + REPORT_RULES="$2" + ;; + esac + shift + ;; + #### + --) + SOURCE_URL="$2" + shift + ;; + esac + shift + done } function error { - echo "$@" >&2 - exit + echo "$@" >&2 + exit } function setup { - if test -z "$SOURCE_URL" -o -z "$SOURCE_RULES" -o -z "$BUILD_RULES" -o -z "$REPORT_RULES" - then - help - fi + if test -z "$SOURCE_URL" -o -z "$SOURCE_RULES" -o -z "$BUILD_RULES" -o -z "$REPORT_RULES" + then + help + fi - export SOURCE_URL BRANCH SOURCE_RULES BUILD_RULES REPORT_RULES + export SOURCE_URL BRANCH SOURCE_RULES BUILD_RULES REPORT_RULES - if test -z "$BTRDIR" - then - export BTRDIR="/tmp/btr" - else - export BTRDIR=$(realpath "$BTRDIR") - fi + if test -z "$BTRDIR" + then + export BTRDIR="/tmp/btr" + else + export BTRDIR=$(realpath "$BTRDIR") + fi - export REPO=$(basename $(sed -re 's~^.*[/:]~~' <<<"$SOURCE_URL") .git) - export SAFE_BRANCH=$(tr ":" "_" <<<$(basename "$BRANCH")) + export REPO=$(basename $(sed -re 's~^.*[/:]~~' <<<"$SOURCE_URL") .git) + export SAFE_BRANCH=$(tr ":" "_" <<<$(basename "$BRANCH")) - if test -z "$SUFFIX" - then - export BUILD="$REPO@$SAFE_BRANCH" - else - export BUILD="$REPO@$SAFE_BRANCH-$SUFFIX" - fi + if test -z "$SUFFIX" + then + export BUILD="$REPO@$SAFE_BRANCH" + else + export BUILD="$REPO@$SAFE_BRANCH-$SUFFIX" + fi - export CLEAN_DIR="btr+clean-$REPO" - export BRANCH_DIR="btr+branch-$REPO@$SAFE_BRANCH" - export BUILD_DIR="btr+build-$BUILD" - export CONFIG_REPORT="btr+config-$BUILD-$DATE" - export BUILD_REPORT="btr+build-$BUILD-$DATE" - export TEST_REPORT="btr+tests-$BUILD-$DATE" - export LAST_REPORT=$(basename $(ls -t "$BTRDIR/btr+tests-$BUILD"* | tail -n1)) - export REPORT="" + export CLEAN_DIR="btr+clean-$REPO" + export BRANCH_DIR="btr+branch-$REPO@$SAFE_BRANCH" + export BUILD_DIR="btr+build-$BUILD" + export CONFIG_REPORT="btr+config-$BUILD-$DATE" + export BUILD_REPORT="btr+build-$BUILD-$DATE" + export TEST_REPORT="btr+tests-$BUILD-$DATE" + export LAST_REPORT=$(basename $(ls -t "$BTRDIR/btr+tests-$BUILD"* | tail -n1)) + export REPORT="" } function show_conf { - echo - echo "BTRDIR = $BTRDIR" - echo "BINDIR = $BINDIR" - echo "LIBDIR = $LIBDIR" - echo "SOURCE_URL = $SOURCE_URL" - echo "SOURCE_RULES = $SOURCE_RULES" - echo "BUILD_RULES = $BUILD_RULES" - echo "REPORT_RULES = $REPORT_RULES" - echo "BRANCH = $BRANCH" - echo "SAFE_BRANCH = $SAFE_BRANCH" - echo "CLEAN_DIR = $CLEAN_DIR" - echo "BRANCH_DIR = $BRANCH_DIR" - echo "BUILD_DIR = $BUILD_DIR" - echo "CONFIG_REPORT = $CONFIG_REPORT" - echo "BUILD_REPORT = $BUILD_REPORT" - echo "TEST_REPORT = $TEST_REPORT" - echo "LAST_REPORT = $LAST_REPORT" - echo + echo + echo "BTRDIR = $BTRDIR" + echo "BINDIR = $BINDIR" + echo "LIBDIR = $LIBDIR" + echo "SOURCE_URL = $SOURCE_URL" + echo "SOURCE_RULES = $SOURCE_RULES" + echo "BUILD_RULES = $BUILD_RULES" + echo "REPORT_RULES = $REPORT_RULES" + echo "BRANCH = $BRANCH" + echo "SAFE_BRANCH = $SAFE_BRANCH" + echo "CLEAN_DIR = $CLEAN_DIR" + echo "BRANCH_DIR = $BRANCH_DIR" + echo "BUILD_DIR = $BUILD_DIR" + echo "CONFIG_REPORT = $CONFIG_REPORT" + echo "BUILD_REPORT = $BUILD_REPORT" + echo "TEST_REPORT = $TEST_REPORT" + echo "LAST_REPORT = $LAST_REPORT" + echo } function confirm { - local CONTINUE - echo -n "$1 (y/N) " - read -r CONTINUE - case $CONTINUE in - y*|Y*) - echo - ;; - *) - exit -1 - ;; - esac + local CONTINUE + echo -n "$1 (y/N) " + read -r CONTINUE + case $CONTINUE in + y*|Y*) + echo + ;; + *) + exit -1 + ;; + esac } # vim: set noet diff --git a/lib/btr/pecl.mk b/lib/btr/build/pecl.mk similarity index 100% rename from lib/btr/pecl.mk rename to lib/btr/build/pecl.mk diff --git a/lib/btr/php.mk b/lib/btr/build/php.mk similarity index 100% rename from lib/btr/php.mk rename to lib/btr/build/php.mk diff --git a/lib/btr/mail.mk b/lib/btr/report/mail.mk similarity index 100% rename from lib/btr/mail.mk rename to lib/btr/report/mail.mk diff --git a/lib/btr/git.mk b/lib/btr/source/git.mk similarity index 100% rename from lib/btr/git.mk rename to lib/btr/source/git.mk diff --git a/lib/btr/svn.mk b/lib/btr/source/svn.mk similarity index 100% rename from lib/btr/svn.mk rename to lib/btr/source/svn.mk -- 2.30.2