fetch-cobolcheck-fixes:

- Renamed bin/sync-fetch-cobolcheck-files to bin/sync-exercise-files and
  added synchronization for test.sh and test.ps1 files.
- Added bin/exercise_test.sh and bin/exercise_test.ps1 as templates for
  test.sh and test.ps1 respectively.
- Changed cobolcheck location to $HOME/cobolcheck/cobolcheck{,exe}.

bin/exercise_test.ps1

@@ -0,0 +1,19 @@
+$slug=Split-Path $PSScriptRoot -Leaf
+$cobolcheck = Join-Path -Path "${HOME}" "cobolcheck" "cobolcheck.exe"
+
+if (![System.IO.File]::Exists("$cobolcheck")){
+  $fetchCobolcheckPath = Join-Path -Path "${PSScriptRoot}" "bin" "fetch-cobolcheck.ps1"
+  echo $fetchCobolcheckPath
+  Write-Output "Cobolcheck not found. Trying to fetch it."
+  & "${fetchCobolcheckPath}"
+}
+
+Write-Output "Run cobolcheck."
+Set-Location $PSScriptRoot
+
+Invoke-Expression "$cobolcheck -p $slug"
+Invoke-Expression "cobc -xj test.cob"
+
+if ($Lastexitcode -ne 0) {
+  exit $Lastexitcode
+}

bin/exercise_test.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )/
+SLUG=${1:-$(basename "${SCRIPT_DIR}")}
+COBOLCHECK="${HOME}/cobolcheck/cobolcheck"
+
+if [ ! -f "${COBOLCHECK}" ]; then
+    echo "Cobolcheck not found, try to fetch it."
+    cd $SCRIPT_DIR/bin/
+    bash fetch-cobolcheck
+fi
+cd $SCRIPT_DIR
+$COBOLCHECK -p $SLUG
+
+# compile and run
+echo "COMPILE AND RUN TEST"
+cobc -xj test.cob

bin/fetch-cobolcheck

@@ -45,19 +45,13 @@ get_download_url() {
 }
 
 main() {
-  if [[ -d ./bin ]]; then
-    output_dir="./bin"
-  elif [[ $PWD == */bin ]]; then
-    output_dir="$PWD"
-  else
-    echo "Error: no ./bin directory found. This script should be ran from a repo root." >&2
-    return 1
-  fi
-
+  output_dir="${HOME}/cobolcheck"
+  mkdir -p "${output_dir}"
   output_path="${output_dir}/cobolcheck${ext}"
   download_url="$(get_download_url)"
   curl "${curlopts[@]}" --output "${output_path}" "${download_url}"
   chmod +x "${output_path}"
+  echo "Cobolcheck has been downloaded to ${output_path}"
 }
 
 main

bin/fetch-cobolcheck.ps1

@@ -23,5 +23,5 @@ Function Get-DownloadUrl {
 }
 
 $downloadUrl = Get-DownloadUrl
-$outputFile = Join-Path -Path $PSScriptRoot -ChildPath "cobolcheck.exe"
+$outputFile = Join-Path -Path "${HOME}" "cobolcheck" "cobolcheck.exe"
 Invoke-WebRequest -Uri $downloadUrl -OutFile $outputFile @requestOpts

bin/sync-fetch-cobolcheck-files → bin/sync-exercise-files

@@ -7,4 +7,6 @@ for test_dir in exercises/{concept,practice}/*; do
     for file in fetch-cobolcheck fetch-cobolcheck.ps1; do
         cp "bin/${file}" "${test_dir}/bin/${file}"
     done
+    cp "bin/exercise_test.sh" "${test_dir}/test.sh"
+    cp "bin/exercise_test.ps1" "${test_dir}/test.ps1"
 done

exercises/practice/acronym/bin/fetch-cobolcheck

@@ -45,19 +45,13 @@ get_download_url() {
 }
 
 main() {
-  if [[ -d ./bin ]]; then
-    output_dir="./bin"
-  elif [[ $PWD == */bin ]]; then
-    output_dir="$PWD"
-  else
-    echo "Error: no ./bin directory found. This script should be ran from a repo root." >&2
-    return 1
-  fi
-
+  output_dir="${HOME}/cobolcheck"
+  mkdir -p "${output_dir}"
   output_path="${output_dir}/cobolcheck${ext}"
   download_url="$(get_download_url)"
   curl "${curlopts[@]}" --output "${output_path}" "${download_url}"
   chmod +x "${output_path}"
+  echo "Cobolcheck has been downloaded to ${output_path}"
 }
 
 main

exercises/practice/acronym/bin/fetch-cobolcheck.ps1

@@ -23,5 +23,5 @@ Function Get-DownloadUrl {
 }
 
 $downloadUrl = Get-DownloadUrl
-$outputFile = Join-Path -Path $PSScriptRoot -ChildPath "cobolcheck.exe"
+$outputFile = Join-Path -Path "${HOME}" "cobolcheck" "cobolcheck.exe"
 Invoke-WebRequest -Uri $downloadUrl -OutFile $outputFile @requestOpts

exercises/practice/acronym/test.ps1

@@ -1,13 +1,11 @@
 $slug=Split-Path $PSScriptRoot -Leaf
-$cobolcheck = "$PSScriptRoot\bin\cobolcheck.exe"
-$cobolcheckCmd = Get-Command "cobolcheck.exe" -ErrorAction SilentlyContinue
+$cobolcheck = Join-Path -Path "${HOME}" "cobolcheck" "cobolcheck.exe"
 
-if ($cobolcheckCmd) {
-  $cobolcheck = $cobolcheckCmd.Path
-  Write-Output "Found cobolcheck, using $cobolcheck"
-} elseif (![System.IO.File]::Exists("$cobolcheck")){
+if (![System.IO.File]::Exists("$cobolcheck")){
+  $fetchCobolcheckPath = Join-Path -Path "${PSScriptRoot}" "bin" "fetch-cobolcheck.ps1"
+  echo $fetchCobolcheckPath
   Write-Output "Cobolcheck not found. Trying to fetch it."
-  & "$PSScriptRoot\bin\fetch-cobolcheck.ps1"
+  & "${fetchCobolcheckPath}"
 }
 
 Write-Output "Run cobolcheck."

exercises/practice/acronym/test.sh

@@ -1,13 +1,9 @@
 #!/usr/bin/env bash
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )/
 SLUG=${1:-$(basename "${SCRIPT_DIR}")}
-COBOLCHECK=./bin/cobolcheck
+COBOLCHECK="${HOME}/cobolcheck/cobolcheck"
 
-WHICH_COBOLCHECK=$(which cobolcheck)
-if [[ $? -eq 0 ]] ; then
-    echo "Found cobolcheck, using $COBOLCHECK"
-    COBOLCHECK=$WHICH_COBOLCHECK
-elif [ ! -f $SCRIPT_DIR/bin/cobolcheck ]; then
+if [ ! -f "${COBOLCHECK}" ]; then
     echo "Cobolcheck not found, try to fetch it."
     cd $SCRIPT_DIR/bin/
     bash fetch-cobolcheck

exercises/practice/all-your-base/bin/fetch-cobolcheck

@@ -45,19 +45,13 @@ get_download_url() {
 }
 
 main() {
-  if [[ -d ./bin ]]; then
-    output_dir="./bin"
-  elif [[ $PWD == */bin ]]; then
-    output_dir="$PWD"
-  else
-    echo "Error: no ./bin directory found. This script should be ran from a repo root." >&2
-    return 1
-  fi
-
+  output_dir="${HOME}/cobolcheck"
+  mkdir -p "${output_dir}"
   output_path="${output_dir}/cobolcheck${ext}"
   download_url="$(get_download_url)"
   curl "${curlopts[@]}" --output "${output_path}" "${download_url}"
   chmod +x "${output_path}"
+  echo "Cobolcheck has been downloaded to ${output_path}"
 }
 
 main

exercises/practice/all-your-base/bin/fetch-cobolcheck.ps1

@@ -23,5 +23,5 @@ Function Get-DownloadUrl {
 }
 
 $downloadUrl = Get-DownloadUrl
-$outputFile = Join-Path -Path $PSScriptRoot -ChildPath "cobolcheck.exe"
+$outputFile = Join-Path -Path "${HOME}" "cobolcheck" "cobolcheck.exe"
 Invoke-WebRequest -Uri $downloadUrl -OutFile $outputFile @requestOpts

exercises/practice/all-your-base/test.ps1

@@ -1,13 +1,11 @@
 $slug=Split-Path $PSScriptRoot -Leaf
-$cobolcheck = "$PSScriptRoot\bin\cobolcheck.exe"
-$cobolcheckCmd = Get-Command "cobolcheck.exe" -ErrorAction SilentlyContinue
+$cobolcheck = Join-Path -Path "${HOME}" "cobolcheck" "cobolcheck.exe"
 
-if ($cobolcheckCmd) {
-  $cobolcheck = $cobolcheckCmd.Path
-  Write-Output "Found cobolcheck, using $cobolcheck"
-} elseif (![System.IO.File]::Exists("$cobolcheck")){
+if (![System.IO.File]::Exists("$cobolcheck")){
+  $fetchCobolcheckPath = Join-Path -Path "${PSScriptRoot}" "bin" "fetch-cobolcheck.ps1"
+  echo $fetchCobolcheckPath
   Write-Output "Cobolcheck not found. Trying to fetch it."
-  & "$PSScriptRoot\bin\fetch-cobolcheck.ps1"
+  & "${fetchCobolcheckPath}"
 }
 
 Write-Output "Run cobolcheck."

exercises/practice/all-your-base/test.sh

@@ -1,13 +1,9 @@
 #!/usr/bin/env bash
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )/
 SLUG=${1:-$(basename "${SCRIPT_DIR}")}
-COBOLCHECK=./bin/cobolcheck
+COBOLCHECK="${HOME}/cobolcheck/cobolcheck"
 
-WHICH_COBOLCHECK=$(which cobolcheck)
-if [[ $? -eq 0 ]] ; then
-    echo "Found cobolcheck, using $COBOLCHECK"
-    COBOLCHECK=$WHICH_COBOLCHECK
-elif [ ! -f $SCRIPT_DIR/bin/cobolcheck ]; then
+if [ ! -f "${COBOLCHECK}" ]; then
     echo "Cobolcheck not found, try to fetch it."
     cd $SCRIPT_DIR/bin/
     bash fetch-cobolcheck

exercises/practice/allergies/bin/fetch-cobolcheck

@@ -45,19 +45,13 @@ get_download_url() {
 }
 
 main() {
-  if [[ -d ./bin ]]; then
-    output_dir="./bin"
-  elif [[ $PWD == */bin ]]; then
-    output_dir="$PWD"
-  else
-    echo "Error: no ./bin directory found. This script should be ran from a repo root." >&2
-    return 1
-  fi
-
+  output_dir="${HOME}/cobolcheck"
+  mkdir -p "${output_dir}"
   output_path="${output_dir}/cobolcheck${ext}"
   download_url="$(get_download_url)"
   curl "${curlopts[@]}" --output "${output_path}" "${download_url}"
   chmod +x "${output_path}"
+  echo "Cobolcheck has been downloaded to ${output_path}"
 }
 
 main

exercises/practice/allergies/bin/fetch-cobolcheck.ps1

@@ -23,5 +23,5 @@ Function Get-DownloadUrl {
 }
 
 $downloadUrl = Get-DownloadUrl
-$outputFile = Join-Path -Path $PSScriptRoot -ChildPath "cobolcheck.exe"
+$outputFile = Join-Path -Path "${HOME}" "cobolcheck" "cobolcheck.exe"
 Invoke-WebRequest -Uri $downloadUrl -OutFile $outputFile @requestOpts

exercises/practice/allergies/test.ps1

@@ -1,13 +1,11 @@
 $slug=Split-Path $PSScriptRoot -Leaf
-$cobolcheck = "$PSScriptRoot\bin\cobolcheck.exe"
-$cobolcheckCmd = Get-Command "cobolcheck.exe" -ErrorAction SilentlyContinue
+$cobolcheck = Join-Path -Path "${HOME}" "cobolcheck" "cobolcheck.exe"
 
-if ($cobolcheckCmd) {
-  $cobolcheck = $cobolcheckCmd.Path
-  Write-Output "Found cobolcheck, using $cobolcheck"
-} elseif (![System.IO.File]::Exists("$cobolcheck")){
+if (![System.IO.File]::Exists("$cobolcheck")){
+  $fetchCobolcheckPath = Join-Path -Path "${PSScriptRoot}" "bin" "fetch-cobolcheck.ps1"
+  echo $fetchCobolcheckPath
   Write-Output "Cobolcheck not found. Trying to fetch it."
-  & "$PSScriptRoot\bin\fetch-cobolcheck.ps1"
+  & "${fetchCobolcheckPath}"
 }
 
 Write-Output "Run cobolcheck."

exercises/practice/allergies/test.sh

@@ -1,13 +1,9 @@
 #!/usr/bin/env bash
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )/
 SLUG=${1:-$(basename "${SCRIPT_DIR}")}
-COBOLCHECK=./bin/cobolcheck
+COBOLCHECK="${HOME}/cobolcheck/cobolcheck"
 
-WHICH_COBOLCHECK=$(which cobolcheck)
-if [[ $? -eq 0 ]] ; then
-    echo "Found cobolcheck, using $COBOLCHECK"
-    COBOLCHECK=$WHICH_COBOLCHECK
-elif [ ! -f $SCRIPT_DIR/bin/cobolcheck ]; then
+if [ ! -f "${COBOLCHECK}" ]; then
     echo "Cobolcheck not found, try to fetch it."
     cd $SCRIPT_DIR/bin/
     bash fetch-cobolcheck

exercises/practice/anagram/bin/fetch-cobolcheck

@@ -45,19 +45,13 @@ get_download_url() {
 }
 
 main() {
-  if [[ -d ./bin ]]; then
-    output_dir="./bin"
-  elif [[ $PWD == */bin ]]; then
-    output_dir="$PWD"
-  else
-    echo "Error: no ./bin directory found. This script should be ran from a repo root." >&2
-    return 1
-  fi
-
+  output_dir="${HOME}/cobolcheck"
+  mkdir -p "${output_dir}"
   output_path="${output_dir}/cobolcheck${ext}"
   download_url="$(get_download_url)"
   curl "${curlopts[@]}" --output "${output_path}" "${download_url}"
   chmod +x "${output_path}"
+  echo "Cobolcheck has been downloaded to ${output_path}"
 }
 
 main

exercises/practice/anagram/bin/fetch-cobolcheck.ps1

@@ -23,5 +23,5 @@ Function Get-DownloadUrl {
 }
 
 $downloadUrl = Get-DownloadUrl
-$outputFile = Join-Path -Path $PSScriptRoot -ChildPath "cobolcheck.exe"
+$outputFile = Join-Path -Path "${HOME}" "cobolcheck" "cobolcheck.exe"
 Invoke-WebRequest -Uri $downloadUrl -OutFile $outputFile @requestOpts

exercises/practice/anagram/test.ps1

@@ -1,13 +1,11 @@
 $slug=Split-Path $PSScriptRoot -Leaf
-$cobolcheck = "$PSScriptRoot\bin\cobolcheck.exe"
-$cobolcheckCmd = Get-Command "cobolcheck.exe" -ErrorAction SilentlyContinue
+$cobolcheck = Join-Path -Path "${HOME}" "cobolcheck" "cobolcheck.exe"
 
-if ($cobolcheckCmd) {
-  $cobolcheck = $cobolcheckCmd.Path
-  Write-Output "Found cobolcheck, using $cobolcheck"
-} elseif (![System.IO.File]::Exists("$cobolcheck")){
+if (![System.IO.File]::Exists("$cobolcheck")){
+  $fetchCobolcheckPath = Join-Path -Path "${PSScriptRoot}" "bin" "fetch-cobolcheck.ps1"
+  echo $fetchCobolcheckPath
   Write-Output "Cobolcheck not found. Trying to fetch it."
-  & "$PSScriptRoot\bin\fetch-cobolcheck.ps1"
+  & "${fetchCobolcheckPath}"
 }
 
 Write-Output "Run cobolcheck."

exercises/practice/anagram/test.sh

@@ -1,13 +1,9 @@
 #!/usr/bin/env bash
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )/
 SLUG=${1:-$(basename "${SCRIPT_DIR}")}
-COBOLCHECK=./bin/cobolcheck
+COBOLCHECK="${HOME}/cobolcheck/cobolcheck"
 
-WHICH_COBOLCHECK=$(which cobolcheck)
-if [[ $? -eq 0 ]] ; then
-    echo "Found cobolcheck, using $COBOLCHECK"
-    COBOLCHECK=$WHICH_COBOLCHECK
-elif [ ! -f $SCRIPT_DIR/bin/cobolcheck ]; then
+if [ ! -f "${COBOLCHECK}" ]; then
     echo "Cobolcheck not found, try to fetch it."
     cd $SCRIPT_DIR/bin/
     bash fetch-cobolcheck

exercises/practice/armstrong-numbers/bin/fetch-cobolcheck

@@ -45,19 +45,13 @@ get_download_url() {
 }
 
 main() {
-  if [[ -d ./bin ]]; then
-    output_dir="./bin"
-  elif [[ $PWD == */bin ]]; then
-    output_dir="$PWD"
-  else
-    echo "Error: no ./bin directory found. This script should be ran from a repo root." >&2
-    return 1
-  fi
-
+  output_dir="${HOME}/cobolcheck"
+  mkdir -p "${output_dir}"
   output_path="${output_dir}/cobolcheck${ext}"
   download_url="$(get_download_url)"
   curl "${curlopts[@]}" --output "${output_path}" "${download_url}"
   chmod +x "${output_path}"
+  echo "Cobolcheck has been downloaded to ${output_path}"
 }
 
 main

exercises/practice/armstrong-numbers/bin/fetch-cobolcheck.ps1

@@ -23,5 +23,5 @@ Function Get-DownloadUrl {
 }
 
 $downloadUrl = Get-DownloadUrl
-$outputFile = Join-Path -Path $PSScriptRoot -ChildPath "cobolcheck.exe"
+$outputFile = Join-Path -Path "${HOME}" "cobolcheck" "cobolcheck.exe"
 Invoke-WebRequest -Uri $downloadUrl -OutFile $outputFile @requestOpts

exercises/practice/armstrong-numbers/test.ps1

@@ -1,13 +1,11 @@
 $slug=Split-Path $PSScriptRoot -Leaf
-$cobolcheck = "$PSScriptRoot\bin\cobolcheck.exe"
-$cobolcheckCmd = Get-Command "cobolcheck.exe" -ErrorAction SilentlyContinue
+$cobolcheck = Join-Path -Path "${HOME}" "cobolcheck" "cobolcheck.exe"
 
-if ($cobolcheckCmd) {
-  $cobolcheck = $cobolcheckCmd.Path
-  Write-Output "Found cobolcheck, using $cobolcheck"
-} elseif (![System.IO.File]::Exists("$cobolcheck")){
+if (![System.IO.File]::Exists("$cobolcheck")){
+  $fetchCobolcheckPath = Join-Path -Path "${PSScriptRoot}" "bin" "fetch-cobolcheck.ps1"
+  echo $fetchCobolcheckPath
   Write-Output "Cobolcheck not found. Trying to fetch it."
-  & "$PSScriptRoot\bin\fetch-cobolcheck.ps1"
+  & "${fetchCobolcheckPath}"
 }
 
 Write-Output "Run cobolcheck."

exercises/practice/armstrong-numbers/test.sh

@@ -1,13 +1,9 @@
 #!/usr/bin/env bash
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )/
 SLUG=${1:-$(basename "${SCRIPT_DIR}")}
-COBOLCHECK=./bin/cobolcheck
+COBOLCHECK="${HOME}/cobolcheck/cobolcheck"
 
-WHICH_COBOLCHECK=$(which cobolcheck)
-if [[ $? -eq 0 ]] ; then
-    echo "Found cobolcheck, using $COBOLCHECK"
-    COBOLCHECK=$WHICH_COBOLCHECK
-elif [ ! -f $SCRIPT_DIR/bin/cobolcheck ]; then
+if [ ! -f "${COBOLCHECK}" ]; then
     echo "Cobolcheck not found, try to fetch it."
     cd $SCRIPT_DIR/bin/
     bash fetch-cobolcheck