Merge pull request #289 from TypedDevs/feat/improve-build

Improve build

Author: Chemaclass

build.sh

@@ -2,42 +2,117 @@
 
 source src/check_os.sh
 
+function build() {
+  local out=$1
+
+  generate_bin "$out"
+  generate_checksum "$out"
+
+  echo "⚡️Build completed⚡️"
+}
+
+function verify_build() {
+  local out=$1
+
+  echo "Verifying build ⏱️"
+
+  "$out" tests \
+    --simple \
+    --log-junit "bin/log-junit.xml" \
+    --report-html "bin/report.html" \
+    --stop-on-failure &
+
+  pid=$!
+
+  function cleanup() {
+    kill "$pid" 2>/dev/null
+    tput cnorm # Show the cursor
+    exit 1
+  }
+
+  trap cleanup SIGINT
+  spinner $pid
+  wait $pid
+  echo "✅ Build verified ✅ "
+}
+
 function generate_bin() {
-  local output_file=$1
-  echo '#!/usr/bin/env bash' > bin/temp.sh
-
-  echo "Generating bashunit in the 'bin' folder..."
-  cat src/*.sh >> bin/temp.sh
-  cat bashunit >> bin/temp.sh
-  grep -v '^source' bin/temp.sh > "$output_file"
-  rm bin/temp.sh
-  chmod u+x "$output_file"
+  local out=$1
+  local temp
+  temp="$(dirname "$out")/temp.sh"
+
+  echo '#!/bin/bash' > "$temp"
+  echo "Generating bashunit in the '$(dirname "$out")' folder..."
+  for file in src/*.sh; do
+    {
+      echo "# $file"
+      tail -n +2 "$file" >> "$temp"
+      echo ""
+    } >> "$temp"
+  done
+
+  cat bashunit >> "$temp"
+  grep -v '^source' "$temp" > "$out"
+  rm "$temp"
+  chmod u+x "$out"
 }
 
 function generate_checksum() {
+  local out=$1
+
   if [[ "$_OS" == "Windows" ]]; then
     return
   fi
 
-  local file=$1
   if [[ "$_OS" == "OSX" ]]; then
-    checksum=$(shasum -a 256 "$file")
+    checksum=$(shasum -a 256 "$out")
   elif [[ "$_OS" == "Linux" ]]; then
-    checksum=$(sha256sum "$file")
+    checksum=$(sha256sum "$out")
   fi
 
-  echo "$checksum" > bin/checksum
+  echo "$checksum" > "$(dirname "$out")/checksum"
   echo "$checksum"
 }
 
+function spinner() {
+    local pid=$1
+    local delay=0.1
+    local spinstr="|/-\\"
+    tput civis  # Hide the cursor
+    printf "\r[%c] " " "
+    while kill -0 "$pid" 2>/dev/null; do
+        local temp=${spinstr#?}
+        printf "\r [%c]  " "$spinstr"
+        local spinstr=$temp${spinstr%"$temp"}
+        sleep $delay
+    done
+    printf "\r    \r"  # Clear spinner
+    tput cnorm  # Show the cursor
+}
+
 ########################
 ######### MAIN #########
 ########################
 
-mkdir -p bin
-output_file="bin/bashunit"
+DIR="bin"
+SHOULD_VERIFY_BUILD=true
+
+for arg in "$@"; do
+  case $arg in
+    --ignore-verify)
+      SHOULD_VERIFY_BUILD=false
+      ;;
+    *)
+      DIR=$arg
+      ;;
+  esac
+done
+
+mkdir -p "$DIR"
+OUT="$DIR/bashunit"
 
-generate_bin "$output_file"
-generate_checksum "$output_file"
+build "$OUT"
 
-echo "⚡️Build completed⚡️"
+if [[ $SHOULD_VERIFY_BUILD == true ]]; then
+  verify_build "$OUT"
+fi

tests/acceptance/bashunit_upgrade_test.sh

@@ -1,57 +1,59 @@
 #!/bin/bash
 set -euo pipefail
 
+TMP_DIR="tmp"
+TMP_BIN="$TMP_DIR/bashunit"
+
 function set_up() {
-  ./build.sh >/dev/null
+  ./build.sh "$TMP_DIR" --ignore-verify >/dev/null
   LATEST_VERSION="$(helpers::get_latest_tag)"
   TEST_ENV_FILE="tests/acceptance/fixtures/.env.default"
 }
 
 function tear_down() {
-  rm -f ./bin/bashunit
+  rm -rf "$TMP_DIR"
 }
 
 function test_do_not_upgrade_when_latest() {
   local output
-  output="$(./bin/bashunit --upgrade)"
+  output="$($TMP_BIN --upgrade)"
 
   assert_equals "> You are already on latest version" "$output"
-  assert_string_ends_with "$LATEST_VERSION" "$(./bin/bashunit --version --env "$TEST_ENV_FILE")"
+  assert_string_ends_with "$LATEST_VERSION" "$($TMP_BIN --version --env "$TEST_ENV_FILE")"
 }
 
 function test_upgrade_when_a_new_version_found() {
   sed -i -e \
     's/declare -r BASHUNIT_VERSION="[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}"/declare -r BASHUNIT_VERSION="0.1.0"/' \
-    ./bin/bashunit
+    "$TMP_BIN"
 
   if [[ $_OS == "OSX" ]]; then
-    rm -f ./bin/bashunit-e
+    rm -f "${TMP_BIN}-e"
   fi
 
   local output
-  output="$(./bin/bashunit --upgrade)"
+  output="$($TMP_BIN --upgrade)"
 
   assert_contains "> Upgrading bashunit to latest version" "$output"
   assert_contains "> bashunit upgraded successfully to latest version $LATEST_VERSION" "$output"
-  assert_string_ends_with "$LATEST_VERSION" "$(./bin/bashunit --version --env "$TEST_ENV_FILE")"
+  assert_string_ends_with "$LATEST_VERSION" "$($TMP_BIN --version --env "$TEST_ENV_FILE")"
 }
 
 function test_do_not_update_on_consecutive_calls() {
-  todo "enable this test when --upgrade is released"
-#  sed -i -e \
-#    's/declare -r BASHUNIT_VERSION="[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}"/declare -r BASHUNIT_VERSION="0.1.0"/' \
-#    ./bin/bashunit
-#
-#  if [[ $_OS == "OSX" ]]; then
-#    rm ./bin/bashunit-e
-#  fi
-#
-#  ./bin/bashunit --upgrade
-#  ./bin/bashunit --version
-#
-#  local output
-#  output="$(./bin/bashunit --upgrade)"
-#
-#  assert_equals "> You are already on latest version" "$output"
-#  assert_string_ends_with "$LATEST_VERSION" "$(./bin/bashunit --version --env "$TEST_ENV_FILE")"
+  sed -i -e \
+    's/declare -r BASHUNIT_VERSION="[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}"/declare -r BASHUNIT_VERSION="0.1.0"/' \
+    $TMP_BIN
+
+  if [[ $_OS == "OSX" ]]; then
+    rm $TMP_BIN-e
+  fi
+
+  $TMP_BIN --upgrade
+  $TMP_BIN --version
+
+  local output
+  output="$($TMP_BIN --upgrade)"
+
+  assert_equals "> You are already on latest version" "$output"
+  assert_string_ends_with "$LATEST_VERSION" "$($TMP_BIN --version --env "$TEST_ENV_FILE")"
 }