diff --git a/.circleci/config.yml b/.circleci/config.yml index 2c492ff14..70c49b5c5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -392,7 +392,7 @@ jobs: - *step_setup_docker_network - run: name: Run CircleCI tests (long) - command: DREVOPS_DEV_VOLUMES_MOUNTED=0 DREVOPS_DEV_TEST_COVERAGE_DIR=/tmp/artifacts/coverage .drevops/tests/test.postbuild.sh + command: DREVOPS_DEV_VOLUMES_MOUNTED=0 DREVOPS_DEV_TEST_COVERAGE_DIR=/tmp/artifacts/coverage .scaffold/tests/test.postbuild.sh - store_test_results: path: *test_results - store_artifacts: diff --git a/.gitattributes b/.gitattributes index d9e99809b..3aa8344fa 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,5 +4,5 @@ # Drupal provides its own .gitattributes so git normalisations are handled there. /.gitattributes export-ignore -/.drevops export-ignore +/.scaffold export-ignore /.github/FUNDING.yml export-ignore diff --git a/.github/workflows/drevops-publish-docs.yml b/.github/workflows/drevops-publish-docs.yml index 515a14d5d..60fd28f3b 100644 --- a/.github/workflows/drevops-publish-docs.yml +++ b/.github/workflows/drevops-publish-docs.yml @@ -29,15 +29,15 @@ jobs: uses: shivammathur/setup-php@v2 - name: Build site - working-directory: .drevops/docs + working-directory: .scaffold/docs run: ahoy build - name: Check spelling - working-directory: .drevops/docs + working-directory: .scaffold/docs run: ahoy lint - name: Run tests - working-directory: .drevops/docs + working-directory: .scaffold/docs run: ahoy test - name: Setup SSH private key @@ -47,7 +47,7 @@ jobs: - name: Publish docs run: | - cd .drevops/docs + cd .scaffold/docs export DOCS_PUBLISH_REMOTE_URL=git@github.com:drevops/docs.git export DOCS_PUBLISH_SRC_TAG=${{ github.ref_type == 'tag' && github.ref_name || '' }} export DOCS_PUBLISH_SRC_BRANCH=${{ github.ref_type == 'branch' && github.ref_name || '' }} diff --git a/.github/workflows/drevops-test-common.yml b/.github/workflows/drevops-test-common.yml index 334432cea..30ea52fc2 100644 --- a/.github/workflows/drevops-test-common.yml +++ b/.github/workflows/drevops-test-common.yml @@ -28,7 +28,7 @@ jobs: TEST_DOCKER_USER: ${{ secrets.TEST_DOCKER_USER }} TEST_DOCKER_PASS: ${{ secrets.TEST_DOCKER_PASS }} DREVOPS_DEV_VOLUMES_MOUNTED: 0 - DREVOPS_DEV_TEST_COVERAGE_DIR: /tmp/.drevops-coverage-html + DREVOPS_DEV_TEST_COVERAGE_DIR: /tmp/.scaffold-coverage-html steps: - name: Checkout code @@ -54,29 +54,29 @@ jobs: - name: Install dependencies run: npm ci - working-directory: .drevops/tests + working-directory: .scaffold/tests - name: Lint code run: | ./tests/lint.scripts.sh ./tests/lint.dockerfiles.sh ./tests/lint.spelling.sh - working-directory: .drevops + working-directory: .scaffold - name: Run tests run: ./tests/test.common.sh - working-directory: .drevops + working-directory: .scaffold - name: Upload coverage report as an artifact uses: actions/upload-artifact@v4 with: name: ${{github.job}}-code-coverage-report - path: /tmp/.drevops-coverage-html + path: /tmp/.scaffold-coverage-html - name: Upload coverage report to Codecov uses: codecov/codecov-action@v4 with: - directory: /tmp/.drevops-coverage-html + directory: /tmp/.scaffold-coverage-html fail_ci_if_error: true token: ${{ secrets.CODECOV_TOKEN }} @@ -97,7 +97,7 @@ jobs: TEST_DOCKER_USER: ${{ secrets.TEST_DOCKER_USER }} TEST_DOCKER_PASS: ${{ secrets.TEST_DOCKER_PASS }} DREVOPS_DEV_VOLUMES_MOUNTED: 0 - DREVOPS_DEV_TEST_COVERAGE_DIR: /tmp/.drevops-coverage-html + DREVOPS_DEV_TEST_COVERAGE_DIR: /tmp/.scaffold-coverage-html TEST_NODE_INDEX: ${{ matrix.batch }} steps: @@ -112,22 +112,22 @@ jobs: - name: Install dependencies run: npm ci - working-directory: .drevops/tests + working-directory: .scaffold/tests - name: Run tests run: ./tests/test.workflow.sh - working-directory: .drevops + working-directory: .scaffold - name: Upload coverage report as an artifact uses: actions/upload-artifact@v4 with: name: ${{github.job}}-${{ matrix.batch }}-code-coverage-report - path: /tmp/.drevops-coverage-html + path: /tmp/.scaffold-coverage-html - name: Upload coverage report to Codecov uses: codecov/codecov-action@v4 with: - directory: /tmp/.drevops-coverage-html + directory: /tmp/.scaffold-coverage-html fail_ci_if_error: true token: ${{ secrets.CODECOV_TOKEN }} @@ -148,7 +148,7 @@ jobs: TEST_DOCKER_USER: ${{ secrets.TEST_DOCKER_USER }} TEST_DOCKER_PASS: ${{ secrets.TEST_DOCKER_PASS }} DREVOPS_DEV_VOLUMES_MOUNTED: 0 - DREVOPS_DEV_TEST_COVERAGE_DIR: /tmp/.drevops-coverage-html + DREVOPS_DEV_TEST_COVERAGE_DIR: /tmp/.scaffold-coverage-html TEST_NODE_INDEX: ${{ matrix.batch }} steps: @@ -172,21 +172,21 @@ jobs: - name: Install dependencies run: npm ci - working-directory: .drevops/tests + working-directory: .scaffold/tests - name: Run tests run: ./tests/test.deployment.sh - working-directory: .drevops + working-directory: .scaffold - name: Upload coverage report as an artifact uses: actions/upload-artifact@v4 with: name: ${{github.job}}-${{ matrix.batch }}-code-coverage-report - path: /tmp/.drevops-coverage-html + path: /tmp/.scaffold-coverage-html - name: Upload coverage report to Codecov uses: codecov/codecov-action@v4 with: - directory: /tmp/.drevops-coverage-html + directory: /tmp/.scaffold-coverage-html fail_ci_if_error: true token: ${{ secrets.CODECOV_TOKEN }} diff --git a/.github/workflows/drevops-test-docs.yml b/.github/workflows/drevops-test-docs.yml index 2be30584c..d4a6779cb 100644 --- a/.github/workflows/drevops-test-docs.yml +++ b/.github/workflows/drevops-test-docs.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest env: - DREVOPS_DEV_TEST_COVERAGE_DIR: /tmp/.drevops-coverage-html + DREVOPS_DEV_TEST_COVERAGE_DIR: /tmp/.scaffold-coverage-html steps: - name: Checkout code @@ -37,30 +37,30 @@ jobs: uses: shivammathur/setup-php@v2 - name: Build site - working-directory: .drevops/docs + working-directory: .scaffold/docs run: ahoy build - name: Check spelling - working-directory: .drevops/docs + working-directory: .scaffold/docs run: ahoy lint - name: Run tests - working-directory: .drevops/docs + working-directory: .scaffold/docs run: ahoy test-site - name: Run tests run: ./docs/.utils/test.sh - working-directory: .drevops + working-directory: .scaffold - name: Upload coverage report as an artifact uses: actions/upload-artifact@v4 with: name: ${{github.job}}-code-coverage-report - path: /tmp/.drevops-coverage-html + path: /tmp/.scaffold-coverage-html - name: Upload coverage report to Codecov uses: codecov/codecov-action@v4 with: - directory: /tmp/.drevops-coverage-html + directory: /tmp/.scaffold-coverage-html fail_ci_if_error: true token: ${{ secrets.CODECOV_TOKEN }} diff --git a/.scaffold/README.md b/.scaffold/README.md new file mode 100644 index 000000000..d822b02f8 --- /dev/null +++ b/.scaffold/README.md @@ -0,0 +1,4 @@ +# Scaffold development + +This directory contains development files for the scaffold itself. +This directory is removed by the installer or can be deleted manually. diff --git a/.scaffold/docs/.utils/tests/bats/_helper.bash b/.scaffold/docs/.utils/tests/bats/_helper.bash index 0dc9a4ed8..746babcab 100644 --- a/.scaffold/docs/.utils/tests/bats/_helper.bash +++ b/.scaffold/docs/.utils/tests/bats/_helper.bash @@ -16,7 +16,7 @@ setup() { # The root directory of the project. export ROOT_DIR="$(dirname "$(cd "$(dirname "${BATS_TEST_DIRNAME}")/../../.." && pwd)")" - [ ! -d "${ROOT_DIR}/.drevops" ] && echo 'ERROR: The test should be run from the ".drevops" directory.' && exit 1 + [ ! -d "${ROOT_DIR}/.scaffold" ] && echo 'ERROR: The test should be run from the ".scaffold" directory.' && exit 1 # Register a path to libraries. export BATS_LIB_PATH="${BATS_TEST_DIRNAME}/../node_modules" diff --git a/.scaffold/docs/.utils/tests/bats/docs.bats b/.scaffold/docs/.utils/tests/bats/docs.bats index 110389e15..82713fa79 100644 --- a/.scaffold/docs/.utils/tests/bats/docs.bats +++ b/.scaffold/docs/.utils/tests/bats/docs.bats @@ -16,7 +16,7 @@ export BATS_FIXTURE_EXPORT_CODEBASE_ENABLED=1 prepare_remote_docs_repo # The test itself. - pushd "${LOCAL_REPO_DIR}/.drevops/docs" >/dev/null || exit 1 + pushd "${LOCAL_REPO_DIR}/.scaffold/docs" >/dev/null || exit 1 substep "Test 1: Publish from branch." export DOCS_PUBLISH_SRC_BRANCH="feature/test-branch-first" @@ -89,10 +89,10 @@ assert_version() { } update_local_repo() { - # Need to do this as '.drevops' dir is excluded in .gitattributes. + # Need to do this as '.scaffold' dir is excluded in .gitattributes. substep "Copying docs to ${LOCAL_REPO_DIR}." - mkdir -p "${LOCAL_REPO_DIR}/.drevops/docs" - cp -r "${ROOT_DIR}/.drevops/docs/." "${LOCAL_REPO_DIR}/.drevops/docs" + mkdir -p "${LOCAL_REPO_DIR}/.scaffold/docs" + cp -r "${ROOT_DIR}/.scaffold/docs/." "${LOCAL_REPO_DIR}/.scaffold/docs" } prepare_remote_docs_repo() { diff --git a/.scaffold/docs/.utils/update-docs.sh b/.scaffold/docs/.utils/update-docs.sh index 73106b93f..1f355b7ac 100755 --- a/.scaffold/docs/.utils/update-docs.sh +++ b/.scaffold/docs/.utils/update-docs.sh @@ -3,7 +3,7 @@ # Update docs. # # @usage -# cd .drevops/docs && ./update-docs.sh +# cd .scaffold/docs && ./update-docs.sh # # shellcheck disable=SC2129 @@ -42,9 +42,9 @@ echo >>"${OUTPUT_FILE}" ../../scripts/custom \ >>"${OUTPUT_FILE}" -sed "${sed_opts[@]}" "s/.drevops\/docs\/.utils\/variables\/extra\/environment.variables.sh/ENVIRONMENT/g" "${OUTPUT_FILE}" -sed "${sed_opts[@]}" "s/.drevops\/docs\/.utils\/variables\/extra\/acquia.variables.sh/ACQUIA ENVIRONMENT/g" "${OUTPUT_FILE}" -sed "${sed_opts[@]}" "s/.drevops\/docs\/.utils\/variables\/extra\/lagoon.variables.sh/LAGOON ENVIRONMENT/g" "${OUTPUT_FILE}" -sed "${sed_opts[@]}" "s/.drevops\/docs\/.utils\/variables\/extra\/.env.local.default.variables.sh/.env.local.default/g" "${OUTPUT_FILE}" -sed "${sed_opts[@]}" "s/.drevops\/docs\/.utils\/variables\/extra\/.env.variables.sh/.env/g" "${OUTPUT_FILE}" -sed "${sed_opts[@]}" "s/.drevops\/docs\/.utils\/variables\/extra\/ci.variables.sh/CI config/g" "${OUTPUT_FILE}" +sed "${sed_opts[@]}" "s/.scaffold\/docs\/.utils\/variables\/extra\/environment.variables.sh/ENVIRONMENT/g" "${OUTPUT_FILE}" +sed "${sed_opts[@]}" "s/.scaffold\/docs\/.utils\/variables\/extra\/acquia.variables.sh/ACQUIA ENVIRONMENT/g" "${OUTPUT_FILE}" +sed "${sed_opts[@]}" "s/.scaffold\/docs\/.utils\/variables\/extra\/lagoon.variables.sh/LAGOON ENVIRONMENT/g" "${OUTPUT_FILE}" +sed "${sed_opts[@]}" "s/.scaffold\/docs\/.utils\/variables\/extra\/.env.local.default.variables.sh/.env.local.default/g" "${OUTPUT_FILE}" +sed "${sed_opts[@]}" "s/.scaffold\/docs\/.utils\/variables\/extra\/.env.variables.sh/.env/g" "${OUTPUT_FILE}" +sed "${sed_opts[@]}" "s/.scaffold\/docs\/.utils\/variables\/extra\/ci.variables.sh/CI config/g" "${OUTPUT_FILE}" diff --git a/.scaffold/docs/content/contributing/maintenance/documentation.md b/.scaffold/docs/content/contributing/maintenance/documentation.md index 8ed3f71c3..5c279eccb 100644 --- a/.scaffold/docs/content/contributing/maintenance/documentation.md +++ b/.scaffold/docs/content/contributing/maintenance/documentation.md @@ -9,14 +9,14 @@ There are 2 types of the documentation that DrevOps provides: ## docs.drevops.com The Documentation (this site) is written in Markdown and located in -[`.drevops/docs`](../../../../.drevops/docs) directory. This is +[`.scaffold/docs`](../../../../.scaffold/docs) directory. This is removed when you install DrevOps for a consumer site. ### Local build ```bash -cd .drevops/docs +cd .scaffold/docs ahoy build ``` @@ -24,8 +24,8 @@ Parts of the documentation is generated automatically from the codebase. To update it, run: ```bash -composer -d .drevops/docs/.utils install -cd .drevops/docs +composer -d .scaffold/docs/.utils install +cd .scaffold/docs ahoy update ``` @@ -35,11 +35,11 @@ immediately. ### Check spelling and links ```bash -cd .drevops/docs +cd .scaffold/docs ahoy test ``` -If required, add spelling exclusions to `.drevops/tests/.aspell.en.pws` +If required, add spelling exclusions to `.scaffold/tests/.aspell.en.pws` file. ### Publishing diff --git a/.scaffold/docs/content/contributing/maintenance/tests.md b/.scaffold/docs/content/contributing/maintenance/tests.md index 6e2f8eebb..e34839c57 100644 --- a/.scaffold/docs/content/contributing/maintenance/tests.md +++ b/.scaffold/docs/content/contributing/maintenance/tests.md @@ -9,31 +9,31 @@ See [Bats documentation](https://bats-core.readthedocs.io/) for more information ## Installation ```bash -npm install --prefix .drevops/tests +npm install --prefix .scaffold/tests ``` ## Usage ```bash # Run a single test. -bats .drevops/tests/bats/helpers.bats +bats .scaffold/tests/bats/helpers.bats # Some tests require Composer and Docker Hub tokens. -TEST_GITHUB_TOKEN= TEST_DOCKER_USER= TEST_DOCKER_PASS= bats .drevops/tests/bats/workflow.smoke.bats +TEST_GITHUB_TOKEN= TEST_DOCKER_USER= TEST_DOCKER_PASS= bats .scaffold/tests/bats/workflow.smoke.bats # To preserve test run directory. -bats --no-tempdir-cleanup .drevops/tests/bats/helpers.bats +bats --no-tempdir-cleanup .scaffold/tests/bats/helpers.bats # To override Bats temporary directory where tests are ran (required for Docker tests). mkdir -p $HOME/.bats-tmp # run once -TMPDIR=$HOME/.bats-tmp bats .drevops/tests/bats/helpers.bats +TMPDIR=$HOME/.bats-tmp bats .scaffold/tests/bats/helpers.bats # Run all tests, preserving the temporary directory. TEST_GITHUB_TOKEN= \ TEST_DOCKER_USER= \ TEST_DOCKER_PASS= \ TMPDIR=$HOME/.bats-tmp \ -bats --no-tempdir-cleanup .drevops/tests/bats/*.bats +bats --no-tempdir-cleanup .scaffold/tests/bats/*.bats ``` ## Updating test assets diff --git a/.scaffold/docs/mkdocs.yml b/.scaffold/docs/mkdocs.yml index 7e93bed82..41aa2fd62 100644 --- a/.scaffold/docs/mkdocs.yml +++ b/.scaffold/docs/mkdocs.yml @@ -20,7 +20,7 @@ site_url: https://docs.drevops.com # Repository repo_name: drevops/scaffold repo_url: https://github.com/drevops/scaffold -edit_uri: edit/main/.drevops/docs/content +edit_uri: edit/main/.scaffold/docs/content # Copyright copyright: 'Copyright ©2023 DrevOps®
Drupal is a registered trademark of Dries Buytaert' diff --git a/.scaffold/tests/bats/_helper.bash b/.scaffold/tests/bats/_helper.bash index 798dc2f1a..912c14f1f 100644 --- a/.scaffold/tests/bats/_helper.bash +++ b/.scaffold/tests/bats/_helper.bash @@ -16,7 +16,7 @@ setup() { # The root directory of the project. export ROOT_DIR="$(dirname "$(cd "$(dirname "${BATS_TEST_DIRNAME}")/.." && pwd)")" - [ ! -d "${ROOT_DIR}/.drevops" ] && echo 'ERROR: The test should be run from the ".drevops" directory.' && exit 1 + [ ! -d "${ROOT_DIR}/.scaffold" ] && echo 'ERROR: The test should be run from the ".scaffold" directory.' && exit 1 ## ## Phase 1: Framework setup. @@ -411,7 +411,7 @@ assert_files_present_drevops() { assert_file_exists "docs/testing.md" # Assert that DrevOps files removed. - assert_dir_not_exists ".drevops" + assert_dir_not_exists ".scaffold" assert_file_not_exists "LICENSE" assert_file_not_exists "CODE_OF_CONDUCT.md" assert_file_not_exists ".github/FUNDING.yml" @@ -435,7 +435,7 @@ assert_files_present_drevops() { # Assert that documentation was processed correctly. assert_file_not_contains README.md "# DrevOps" - assert_dir_not_contains_string "${dir}" "/\.drevops" + assert_dir_not_contains_string "${dir}" "/\.scaffold" popd >/dev/null || exit 1 } @@ -1033,7 +1033,7 @@ install_dependencies_stub() { pushd "${dir}" >/dev/null || exit 1 - mktouch "${webroot}/core/.drevops/installer/install" + mktouch "${webroot}/core/.scaffold/installer/install" mktouch "${webroot}/modules/contrib/somemodule/somemodule.info.yml" mktouch "${webroot}/themes/contrib/sometheme/sometheme.info.yml" mktouch "${webroot}/profiles/contrib/someprofile/someprofile.info.yml" @@ -1248,7 +1248,7 @@ sync_to_container() { # Special treatment for cases where volumes are not mounted from the host. fix_host_dependencies() { - # Replicate behaviour of .drevops/installer/install script to extract destination directory + # Replicate behaviour of .scaffold/installer/install script to extract destination directory # passed as an argument. # shellcheck disable=SC2235 ([ "${1:-}" = "--quiet" ] || [ "${1:-}" = "-q" ]) && shift diff --git a/.scaffold/tests/bats/docker-compose.bats b/.scaffold/tests/bats/docker-compose.bats index cae38d319..6318ea384 100644 --- a/.scaffold/tests/bats/docker-compose.bats +++ b/.scaffold/tests/bats/docker-compose.bats @@ -109,10 +109,10 @@ prepare_docker_compose() { # Prepare fixtures docker-compose for testing. prepare_docker_compose_fixtures() { - cp "${ROOT_DIR}/.drevops/tests/bats/fixtures/docker-compose.env.json" docker-compose.env.json - cp "${ROOT_DIR}/.drevops/tests/bats/fixtures/docker-compose.env_mod.json" docker-compose.env_mod.json - cp "${ROOT_DIR}/.drevops/tests/bats/fixtures/docker-compose.noenv.json" docker-compose.noenv.json - cp "${ROOT_DIR}/.drevops/tests/bats/fixtures/docker-compose.env_local.json" docker-compose.env_local.json + cp "${ROOT_DIR}/.scaffold/tests/bats/fixtures/docker-compose.env.json" docker-compose.env.json + cp "${ROOT_DIR}/.scaffold/tests/bats/fixtures/docker-compose.env_mod.json" docker-compose.env_mod.json + cp "${ROOT_DIR}/.scaffold/tests/bats/fixtures/docker-compose.noenv.json" docker-compose.noenv.json + cp "${ROOT_DIR}/.scaffold/tests/bats/fixtures/docker-compose.env_local.json" docker-compose.env_local.json replace_string_content "FIXTURE_CUR_DIR" "${CURRENT_PROJECT_DIR}" "${CURRENT_PROJECT_DIR}" # Replace symlink /private paths in MacOS. @@ -169,6 +169,6 @@ update_docker_compose_fixture() { if [ -n "${UPDATE_FIXTURES:-}" ]; then step "Updating fixtures" replace_string_content "${CURRENT_PROJECT_DIR}" "FIXTURE_CUR_DIR" "${CURRENT_PROJECT_DIR}" - cp -Rf "${1}" "${ROOT_DIR}/.drevops/tests/bats/fixtures/${2}" + cp -Rf "${1}" "${ROOT_DIR}/.scaffold/tests/bats/fixtures/${2}" fi } diff --git a/.scaffold/tests/bats/update-drevops.bats b/.scaffold/tests/bats/update-drevops.bats index b64913356..19c0c7189 100644 --- a/.scaffold/tests/bats/update-drevops.bats +++ b/.scaffold/tests/bats/update-drevops.bats @@ -36,7 +36,7 @@ load _helper.bash assert_git_clean # Releasing new version of DrevOps (note that installing from the local tag - # is not supported in .drevops/installer/install; only commit is supported). + # is not supported in .scaffold/installer/install; only commit is supported). echo "# Some change to docker-compose.yml" >>"${LOCAL_REPO_DIR}/docker-compose.yml" git_add "docker-compose.yml" "${LOCAL_REPO_DIR}" echo "# Some change to non-required file" >>"${LOCAL_REPO_DIR}/web/themes/custom/your_site_theme/.eslintrc.json" diff --git a/.scaffold/tests/lint.dockerfiles.sh b/.scaffold/tests/lint.dockerfiles.sh index 3fe226d7e..b2a3d7994 100755 --- a/.scaffold/tests/lint.dockerfiles.sh +++ b/.scaffold/tests/lint.dockerfiles.sh @@ -9,7 +9,7 @@ set -eu ROOT_DIR="$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)")" -[ ! -f "${ROOT_DIR}/.drevops/tests/vendor/bin/shellvar" ] && composer --working-dir="${ROOT_DIR}/.drevops/tests" install +[ ! -f "${ROOT_DIR}/.scaffold/tests/vendor/bin/shellvar" ] && composer --working-dir="${ROOT_DIR}/.scaffold/tests" install targets=() while IFS= read -r -d $'\0'; do @@ -27,7 +27,7 @@ echo "==> Linting DrevOps Dockerfiles in ${ROOT_DIR}." for file in "${targets[@]}"; do # Temp script until shfmt implement the support for formatting variables. # @see https://github.com/mvdan/sh/issues/1029 - if ! "${ROOT_DIR}/.drevops/tests/vendor/bin/shellvar" lint "${file}"; then + if ! "${ROOT_DIR}/.scaffold/tests/vendor/bin/shellvar" lint "${file}"; then exit 1 fi diff --git a/.scaffold/tests/lint.scripts.sh b/.scaffold/tests/lint.scripts.sh index 3c4ab048b..a7159c8d6 100755 --- a/.scaffold/tests/lint.scripts.sh +++ b/.scaffold/tests/lint.scripts.sh @@ -9,7 +9,7 @@ set -eu ROOT_DIR="$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)")" -[ ! -f "${ROOT_DIR}/.drevops/tests/vendor/bin/shellvar" ] && composer --working-dir="${ROOT_DIR}/.drevops/tests" install +[ ! -f "${ROOT_DIR}/.scaffold/tests/vendor/bin/shellvar" ] && composer --working-dir="${ROOT_DIR}/.scaffold/tests" install targets=() while IFS= read -r -d $'\0'; do @@ -19,7 +19,7 @@ done < <( "${ROOT_DIR}"/scripts \ "${ROOT_DIR}"/.circleci \ "${ROOT_DIR}"/hooks/library \ - "${ROOT_DIR}"/.drevops/docs \ + "${ROOT_DIR}"/.scaffold/docs \ -type f \ \( -name "*.sh" -or -name "*.bash" -or -name "*.bats" \) \ -not -path "*vendor*" -not -path "*node_modules*" -not -path "*fixtures*" \ @@ -32,7 +32,7 @@ for file in "${targets[@]}"; do if [ -f "${file}" ]; then echo "Checking file ${file}" - if ! "${ROOT_DIR}/.drevops/tests/vendor/bin/shellvar" lint "${file}"; then + if ! "${ROOT_DIR}/.scaffold/tests/vendor/bin/shellvar" lint "${file}"; then exit 1 fi diff --git a/.scaffold/tests/lint.spelling.sh b/.scaffold/tests/lint.spelling.sh index 4520e2674..25a422d03 100755 --- a/.scaffold/tests/lint.spelling.sh +++ b/.scaffold/tests/lint.spelling.sh @@ -11,7 +11,7 @@ set -eu ROOT_DIR="$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)")" # Using dictionary from docs to manage it centrally. -DICTIONARY="${ROOT_DIR}/.drevops/docs/.utils/.aspell.en.pws" +DICTIONARY="${ROOT_DIR}/.scaffold/docs/.utils/.aspell.en.pws" targets=() while IFS= read -r -d $'\0'; do diff --git a/.scaffold/tests/test.common.sh b/.scaffold/tests/test.common.sh index 7a48b4500..4f08f548c 100755 --- a/.scaffold/tests/test.common.sh +++ b/.scaffold/tests/test.common.sh @@ -11,7 +11,7 @@ ROOT_DIR="$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)")" SCRIPTS_DIR="${ROOT_DIR}/scripts/drevops" -TEST_DIR="${ROOT_DIR}/.drevops/tests" +TEST_DIR="${ROOT_DIR}/.scaffold/tests" # ------------------------------------------------------------------------------ diff --git a/.scaffold/tests/test.deployment.sh b/.scaffold/tests/test.deployment.sh index 0bc583169..d2cd9f17a 100755 --- a/.scaffold/tests/test.deployment.sh +++ b/.scaffold/tests/test.deployment.sh @@ -11,7 +11,7 @@ ROOT_DIR="$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)")" SCRIPTS_DIR="${ROOT_DIR}/scripts/drevops" -TEST_DIR="${ROOT_DIR}/.drevops/tests" +TEST_DIR="${ROOT_DIR}/.scaffold/tests" # ------------------------------------------------------------------------------ diff --git a/.scaffold/tests/test.postbuild.sh b/.scaffold/tests/test.postbuild.sh index 90a6edd78..aea2fef75 100755 --- a/.scaffold/tests/test.postbuild.sh +++ b/.scaffold/tests/test.postbuild.sh @@ -11,7 +11,7 @@ ROOT_DIR="$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)")" SCRIPTS_DIR="${ROOT_DIR}/scripts/drevops" -TEST_DIR="${ROOT_DIR}/.drevops/tests" +TEST_DIR="${ROOT_DIR}/.scaffold/tests" # ------------------------------------------------------------------------------ diff --git a/.scaffold/tests/test.workflow.sh b/.scaffold/tests/test.workflow.sh index 3200b9c4f..e687e13b8 100755 --- a/.scaffold/tests/test.workflow.sh +++ b/.scaffold/tests/test.workflow.sh @@ -11,7 +11,7 @@ ROOT_DIR="$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)")" SCRIPTS_DIR="${ROOT_DIR}/scripts/drevops" -TEST_DIR="${ROOT_DIR}/.drevops/tests" +TEST_DIR="${ROOT_DIR}/.scaffold/tests" # ------------------------------------------------------------------------------ diff --git a/README.md b/README.md index 9d8831769..b1d060c45 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@
- - DrevOps Logo + + DrevOps Logo
diff --git a/phpmd.xml b/phpmd.xml index 18dc842ae..d1d3e88ae 100644 --- a/phpmd.xml +++ b/phpmd.xml @@ -21,7 +21,7 @@ */web/modules/custom/*/*.install - */.drevops/* + */.scaffold/*