From 29f5b9bd10b025c8ceb32cfd8ddd8ecaf0b9a203 Mon Sep 17 00:00:00 2001 From: Andres Montero Date: Mon, 13 Apr 2026 13:54:31 +0200 Subject: [PATCH] Minor fix in output table and updated run_rsfc script --- run_rsfc.sh | 24 +++++++++++++++++++++--- src/rsfc/rsfc_core.py | 5 ++++- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/run_rsfc.sh b/run_rsfc.sh index 6c56d93..ace4021 100755 --- a/run_rsfc.sh +++ b/run_rsfc.sh @@ -5,6 +5,8 @@ REPO_URL="" TEST_ID="" FTR_FLAG=false TOKEN="" +BRANCH="" +TAG="" while [[ $# -gt 0 ]]; do case "$1" in @@ -24,9 +26,17 @@ while [[ $# -gt 0 ]]; do TOKEN="$2" shift 2 ;; + -b) + BRANCH="$2" + shift 2 + ;; + -v) + TAG="$2" + shift 2 + ;; *) echo "Unknown argument: $1" - echo "Usage: $0 --repo [--ftr] [--id ] [-t ]" + echo "Usage: $0 --repo [--ftr] [--id ] [-t ] [-b ] [-v ]" exit 1 ;; esac @@ -42,6 +52,14 @@ mkdir -p "$OUTPUT_DIR" DOCKER_ARGS="--repo $REPO_URL" +if [ -n "$BRANCH" ]; then + DOCKER_ARGS="$DOCKER_ARGS -b $BRANCH" +fi + +if [ -n "$TAG" ]; then + DOCKER_ARGS="$DOCKER_ARGS -v $TAG" +fi + if [ "$FTR_FLAG" = true ]; then DOCKER_ARGS="$DOCKER_ARGS --ftr" fi @@ -57,5 +75,5 @@ fi docker run --rm \ -v "$(pwd)/$OUTPUT_DIR:/rsfc/rsfc_output" \ -e PYTHONWARNINGS="ignore" \ - amonterodx/rsfc:0.1.3 \ - $DOCKER_ARGS + rsfc-docker \ + $DOCKER_ARGS \ No newline at end of file diff --git a/src/rsfc/rsfc_core.py b/src/rsfc/rsfc_core.py index 4bef8a8..bbd8926 100644 --- a/src/rsfc/rsfc_core.py +++ b/src/rsfc/rsfc_core.py @@ -29,6 +29,9 @@ def start_assessment(repo_url, branch, tag, ftr, test_id, token): table, info, badge = assess.to_terminal_table(test_id, badge_url) report = mdRep.MarkdownReportGenerator(rsfc_asmt, table) report.generate("./RSFC_REPORT.md") - table = table + info + badge + if test_id != None: + table = table + info + else: + table = table + info + badge return rsfc_asmt, table