Reverted fetch-cobolcheck and fetch-cobolcheck.ps1 scripts. (#158)

* Reverted fetch-cobolcheck and fetch-cobolcheck.ps1 scripts. * 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}. * fetch-cobolcheck-fixes: Restored the previous file permissions. * fetch-cobolcheck-fixes: Added command for the /home/simadovakin/cobolcheck/ creation in the fetch-cobolcheck,ps1
exercism · Aug 24, 2024 · 6c52fb9 · 6c52fb9
1 parent f2095c6
commit 6c52fb9
Show file tree

Hide file tree

Showing 189 changed files with 743 additions and 808 deletions.
diff --git a/bin/exercise_test.ps1 b/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
+}
diff --git a/bin/exercise_test.sh b/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
diff --git a/bin/fetch-cobolcheck b/bin/fetch-cobolcheck
@@ -4,7 +4,7 @@
 # It is only used in the cobol track, and a copy of it is placed in every exercise folder.
 # If you change something, make sure to upgrade all scripts in all exercises!
 
-set -eo pipefail
+# set -eo pipefail
 
 readonly LATEST='https://api.github.com/repos/0xE282B0/cobol-check/releases/latest'
 
@@ -45,10 +45,13 @@ get_download_url() {
 }
 
 main() {
-  output_path="/usr/local/bin/cobolcheck${ext}"
+  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
diff --git a/bin/fetch-cobolcheck.ps1 b/bin/fetch-cobolcheck.ps1
@@ -23,7 +23,7 @@ Function Get-DownloadUrl {
 }
 
 $downloadUrl = Get-DownloadUrl
-$outputDir = Join-Path -Path $HOME -ChildPath "cobolcheck"
-$outputFile = Join-Path -Path $outputDir -ChildPath "cobolcheck.exe"
-New-Item -ItemType Directory -Path $outputDir -Force | Out-Null
+$outputDir = Join-Path -Path "${HOME}" "cobolcheck"
+New-Item -Path "${outputDir}" -ItemType "directory"
+$outputFile = Join-Path -Path "${outputDir}" "cobolcheck.exe"
 Invoke-WebRequest -Uri $downloadUrl -OutFile $outputFile @requestOpts
diff --git a/bin/sync-fetch-cobolcheck-files → bin/sync-exercise-files b/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
diff --git a/exercises/practice/acronym/bin/fetch-cobolcheck b/exercises/practice/acronym/bin/fetch-cobolcheck
@@ -4,7 +4,7 @@
 # It is only used in the cobol track, and a copy of it is placed in every exercise folder.
 # If you change something, make sure to upgrade all scripts in all exercises!
 
-set -eo pipefail
+# set -eo pipefail
 
 readonly LATEST='https://api.github.com/repos/0xE282B0/cobol-check/releases/latest'
 
@@ -45,10 +45,13 @@ get_download_url() {
 }
 
 main() {
-  output_path="/usr/local/bin/cobolcheck${ext}"
+  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
diff --git a/exercises/practice/acronym/bin/fetch-cobolcheck.ps1 b/exercises/practice/acronym/bin/fetch-cobolcheck.ps1
@@ -23,7 +23,7 @@ Function Get-DownloadUrl {
 }
 
 $downloadUrl = Get-DownloadUrl
-$outputDir = Join-Path -Path $HOME -ChildPath "cobolcheck"
-$outputFile = Join-Path -Path $outputDir -ChildPath "cobolcheck.exe"
-New-Item -ItemType Directory -Path $outputDir -Force | Out-Null
+$outputDir = Join-Path -Path "${HOME}" "cobolcheck"
+New-Item -Path "${outputDir}" -ItemType "directory"
+$outputFile = Join-Path -Path "${outputDir}" "cobolcheck.exe"
 Invoke-WebRequest -Uri $downloadUrl -OutFile $outputFile @requestOpts
diff --git a/exercises/practice/acronym/test.ps1 b/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."

diff --git a/exercises/practice/acronym/test.sh b/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

diff --git a/exercises/practice/all-your-base/bin/fetch-cobolcheck b/exercises/practice/all-your-base/bin/fetch-cobolcheck
@@ -4,7 +4,7 @@
 # It is only used in the cobol track, and a copy of it is placed in every exercise folder.
 # If you change something, make sure to upgrade all scripts in all exercises!
 
-set -eo pipefail
+# set -eo pipefail
 
 readonly LATEST='https://api.github.com/repos/0xE282B0/cobol-check/releases/latest'
 
@@ -45,10 +45,13 @@ get_download_url() {
 }
 
 main() {
-  output_path="/usr/local/bin/cobolcheck${ext}"
+  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
diff --git a/exercises/practice/all-your-base/bin/fetch-cobolcheck.ps1 b/exercises/practice/all-your-base/bin/fetch-cobolcheck.ps1
@@ -23,7 +23,7 @@ Function Get-DownloadUrl {
 }
 
 $downloadUrl = Get-DownloadUrl
-$outputDir = Join-Path -Path $HOME -ChildPath "cobolcheck"
-$outputFile = Join-Path -Path $outputDir -ChildPath "cobolcheck.exe"
-New-Item -ItemType Directory -Path $outputDir -Force | Out-Null
+$outputDir = Join-Path -Path "${HOME}" "cobolcheck"
+New-Item -Path "${outputDir}" -ItemType "directory"
+$outputFile = Join-Path -Path "${outputDir}" "cobolcheck.exe"
 Invoke-WebRequest -Uri $downloadUrl -OutFile $outputFile @requestOpts
diff --git a/exercises/practice/all-your-base/test.ps1 b/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."

diff --git a/exercises/practice/all-your-base/test.sh b/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

diff --git a/exercises/practice/allergies/bin/fetch-cobolcheck b/exercises/practice/allergies/bin/fetch-cobolcheck
@@ -4,7 +4,7 @@
 # It is only used in the cobol track, and a copy of it is placed in every exercise folder.
 # If you change something, make sure to upgrade all scripts in all exercises!
 
-set -eo pipefail
+# set -eo pipefail
 
 readonly LATEST='https://api.github.com/repos/0xE282B0/cobol-check/releases/latest'
 
@@ -45,10 +45,13 @@ get_download_url() {
 }
 
 main() {
-  output_path="/usr/local/bin/cobolcheck${ext}"
+  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
diff --git a/exercises/practice/allergies/bin/fetch-cobolcheck.ps1 b/exercises/practice/allergies/bin/fetch-cobolcheck.ps1
@@ -23,7 +23,7 @@ Function Get-DownloadUrl {
 }
 
 $downloadUrl = Get-DownloadUrl
-$outputDir = Join-Path -Path $HOME -ChildPath "cobolcheck"
-$outputFile = Join-Path -Path $outputDir -ChildPath "cobolcheck.exe"
-New-Item -ItemType Directory -Path $outputDir -Force | Out-Null
+$outputDir = Join-Path -Path "${HOME}" "cobolcheck"
+New-Item -Path "${outputDir}" -ItemType "directory"
+$outputFile = Join-Path -Path "${outputDir}" "cobolcheck.exe"
 Invoke-WebRequest -Uri $downloadUrl -OutFile $outputFile @requestOpts
diff --git a/exercises/practice/allergies/test.ps1 b/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."

diff --git a/exercises/practice/allergies/test.sh b/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

diff --git a/exercises/practice/anagram/bin/fetch-cobolcheck b/exercises/practice/anagram/bin/fetch-cobolcheck
@@ -4,7 +4,7 @@
 # It is only used in the cobol track, and a copy of it is placed in every exercise folder.
 # If you change something, make sure to upgrade all scripts in all exercises!
 
-set -eo pipefail
+# set -eo pipefail
 
 readonly LATEST='https://api.github.com/repos/0xE282B0/cobol-check/releases/latest'
 
@@ -45,10 +45,13 @@ get_download_url() {
 }
 
 main() {
-  output_path="/usr/local/bin/cobolcheck${ext}"
+  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
diff --git a/exercises/practice/anagram/bin/fetch-cobolcheck.ps1 b/exercises/practice/anagram/bin/fetch-cobolcheck.ps1
@@ -23,7 +23,7 @@ Function Get-DownloadUrl {
 }
 
 $downloadUrl = Get-DownloadUrl
-$outputDir = Join-Path -Path $HOME -ChildPath "cobolcheck"
-$outputFile = Join-Path -Path $outputDir -ChildPath "cobolcheck.exe"
-New-Item -ItemType Directory -Path $outputDir -Force | Out-Null
+$outputDir = Join-Path -Path "${HOME}" "cobolcheck"
+New-Item -Path "${outputDir}" -ItemType "directory"
+$outputFile = Join-Path -Path "${outputDir}" "cobolcheck.exe"
 Invoke-WebRequest -Uri $downloadUrl -OutFile $outputFile @requestOpts
diff --git a/exercises/practice/anagram/test.ps1 b/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."

diff --git a/exercises/practice/anagram/test.sh b/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

diff --git a/exercises/practice/armstrong-numbers/bin/fetch-cobolcheck b/exercises/practice/armstrong-numbers/bin/fetch-cobolcheck
@@ -4,7 +4,7 @@
 # It is only used in the cobol track, and a copy of it is placed in every exercise folder.
 # If you change something, make sure to upgrade all scripts in all exercises!
 
-set -eo pipefail
+# set -eo pipefail
 
 readonly LATEST='https://api.github.com/repos/0xE282B0/cobol-check/releases/latest'
 
@@ -45,10 +45,13 @@ get_download_url() {
 }
 
 main() {
-  output_path="/usr/local/bin/cobolcheck${ext}"
+  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
diff --git a/exercises/practice/armstrong-numbers/bin/fetch-cobolcheck.ps1 b/exercises/practice/armstrong-numbers/bin/fetch-cobolcheck.ps1
@@ -23,7 +23,7 @@ Function Get-DownloadUrl {
 }
 
 $downloadUrl = Get-DownloadUrl
-$outputDir = Join-Path -Path $HOME -ChildPath "cobolcheck"
-$outputFile = Join-Path -Path $outputDir -ChildPath "cobolcheck.exe"
-New-Item -ItemType Directory -Path $outputDir -Force | Out-Null
+$outputDir = Join-Path -Path "${HOME}" "cobolcheck"
+New-Item -Path "${outputDir}" -ItemType "directory"
+$outputFile = Join-Path -Path "${outputDir}" "cobolcheck.exe"
 Invoke-WebRequest -Uri $downloadUrl -OutFile $outputFile @requestOpts