From 8237dd5af30175cbc45d815abdee4eac8ff2ae7b Mon Sep 17 00:00:00 2001 From: Evan Harmon Date: Sun, 15 Sep 2024 10:23:20 -0500 Subject: [PATCH 1/2] Convert from cookiecutter to copier --- cookiecutter.json | 90 --------- copier.yml | 187 ++++++++++++++++++ hooks/post_gen_project.py | 42 ---- hooks/pre_gen_project.py | 38 ---- .../.env/.env.local | 4 - .../.env/.env.prod | 4 - ...ct - {{ cookiecutter.project_name }}.bunch | 9 - .../requirements.txt | 3 - .../.ansible-lint-ignore | 0 .../.devcontainer/bash_history | 0 .../.devcontainer/bashrc.override.sh | 0 .../.devcontainer/devcontainer.json.jinja | 2 +- .../.github/ISSUE_TEMPLATE/bug_report.md | 0 .../.github/ISSUE_TEMPLATE/config.yml | 0 .../.github/ISSUE_TEMPLATE/feature_request.md | 0 .../.github/ISSUE_TEMPLATE/general_issue.md | 0 .../.github/ISSUE_TEMPLATE/task.md | 0 .../.github/PULL_REQUEST_TEMPLATE.md | 0 .../.github/workflows/security.yaml | 0 .../.github/workflows/validate.yaml | 0 .../.gitignore | 0 .../.markdownlint.json | 0 .../.pre-commit-config.yaml | 0 .../.shellcheckrc | 0 .../.vscode/settings.json | 0 .../Brewfile.jinja | 2 +- .../CONTRIBUTING.md | 0 .../LICENSE.jinja | 22 +-- .../README.md.jinja | 6 +- .../Taskfile.yml.jinja | 1 + .../automationTemplates/ansible/touch | 0 .../automationTemplates/ci/touch | 0 .../automationTemplates/kestra/touch | 0 .../scriptTemplates/goScriptTemplate.go | 0 .../scriptTemplates/pythonScriptTemplate.py | 0 .../scriptTemplates/shellScriptTemplate.sh | 0 .../serverlessFunctionTemplates/touch | 0 .../codeTemplates/webTemplates/netlifyForm | 0 .../data/touch | 0 .../design/archHomeNetwork.graphml | 0 .../design/archTemplate.md | 0 .../design/archUseCase.graphml | 0 .../design/colors | 0 .../design/favicon | 0 .../design/heroImage | 0 .../design/icon | 0 .../design/image1 | 0 .../design/image2 | 0 .../design/image3 | 0 .../design/logo | 0 .../design/profileImage | 0 .../design/wireframeTemplate.konty | 0 .../docs/CHECKLIST.md.jinja | 4 +- .../docs/howzit.md.jinja | 2 +- .../infra/docker/docker-compose-db.yml | 0 .../infra/docker/docker-compose.yml | 0 .../infra/docker/dockerVol/a | 0 .../justfile.jinja | 2 +- .../netlify.toml | 0 {{ project_slug }}/requirements.txt.jinja | 3 + .../test/whisperConfig.yml | 0 .../todo.md.jinja | 2 +- .../{{ project_slug}}.code-workspace.jinja | 0 {{_copier_conf.answers_file}}.jinja | 2 + 64 files changed, 214 insertions(+), 211 deletions(-) delete mode 100644 cookiecutter.json create mode 100644 copier.yml delete mode 100644 hooks/post_gen_project.py delete mode 100644 hooks/pre_gen_project.py delete mode 100644 {{ cookiecutter.project_slug }}/.env/.env.local delete mode 100644 {{ cookiecutter.project_slug }}/.env/.env.prod delete mode 100644 {{ cookiecutter.project_slug }}/.meta/Code Project - {{ cookiecutter.project_name }}.bunch delete mode 100644 {{ cookiecutter.project_slug }}/requirements.txt rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/.ansible-lint-ignore (100%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/.devcontainer/bash_history (100%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/.devcontainer/bashrc.override.sh (100%) rename {{ cookiecutter.project_slug }}/.devcontainer/devcontainer.json => {{ project_slug }}/.devcontainer/devcontainer.json.jinja (98%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/.github/ISSUE_TEMPLATE/bug_report.md (100%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/.github/ISSUE_TEMPLATE/config.yml (100%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/.github/ISSUE_TEMPLATE/feature_request.md (100%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/.github/ISSUE_TEMPLATE/general_issue.md (100%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/.github/ISSUE_TEMPLATE/task.md (100%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/.github/PULL_REQUEST_TEMPLATE.md (100%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/.github/workflows/security.yaml (100%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/.github/workflows/validate.yaml (100%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/.gitignore (100%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/.markdownlint.json (100%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/.pre-commit-config.yaml (100%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/.shellcheckrc (100%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/.vscode/settings.json (100%) rename {{ cookiecutter.project_slug }}/Brewfile => {{ project_slug }}/Brewfile.jinja (98%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/CONTRIBUTING.md (100%) rename {{ cookiecutter.project_slug }}/LICENSE => {{ project_slug }}/LICENSE.jinja (73%) rename {{ cookiecutter.project_slug }}/README.md => {{ project_slug }}/README.md.jinja (82%) rename {{ cookiecutter.project_slug }}/Taskfile.yml => {{ project_slug }}/Taskfile.yml.jinja (96%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/codeTemplates/automationTemplates/ansible/touch (100%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/codeTemplates/automationTemplates/ci/touch (100%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/codeTemplates/automationTemplates/kestra/touch (100%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/codeTemplates/scriptTemplates/goScriptTemplate.go (100%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/codeTemplates/scriptTemplates/pythonScriptTemplate.py (100%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/codeTemplates/scriptTemplates/shellScriptTemplate.sh (100%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/codeTemplates/serverlessFunctionTemplates/touch (100%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/codeTemplates/webTemplates/netlifyForm (100%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/data/touch (100%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/design/archHomeNetwork.graphml (100%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/design/archTemplate.md (100%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/design/archUseCase.graphml (100%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/design/colors (100%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/design/favicon (100%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/design/heroImage (100%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/design/icon (100%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/design/image1 (100%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/design/image2 (100%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/design/image3 (100%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/design/logo (100%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/design/profileImage (100%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/design/wireframeTemplate.konty (100%) rename {{ cookiecutter.project_slug }}/docs/CHECKLIST.md => {{ project_slug }}/docs/CHECKLIST.md.jinja (93%) rename {{ cookiecutter.project_slug }}/docs/howzit.md => {{ project_slug }}/docs/howzit.md.jinja (72%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/infra/docker/docker-compose-db.yml (100%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/infra/docker/docker-compose.yml (100%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/infra/docker/dockerVol/a (100%) rename {{ cookiecutter.project_slug }}/justfile => {{ project_slug }}/justfile.jinja (78%) rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/netlify.toml (100%) create mode 100644 {{ project_slug }}/requirements.txt.jinja rename {{{ cookiecutter.project_slug }} => {{ project_slug }}}/test/whisperConfig.yml (100%) rename {{ cookiecutter.project_slug }}/todo.md => {{ project_slug }}/todo.md.jinja (80%) rename {{ cookiecutter.project_slug }}/{{ cookiecutter.project_slug}}.code-workspace => {{ project_slug }}/{{ project_slug}}.code-workspace.jinja (100%) create mode 100644 {{_copier_conf.answers_file}}.jinja diff --git a/cookiecutter.json b/cookiecutter.json deleted file mode 100644 index be66367..0000000 --- a/cookiecutter.json +++ /dev/null @@ -1,90 +0,0 @@ -{ - "_meta_description": "This file controls the cookiecutter project creation. Run it with: 'cookiecutter /Users/evan/git/harmon-ops/dev/newProjectTemplate'.", - "_meta_potential_types": [ - "astro", - "astrowind", - "nextjs", - "t3", - "wdc", - "sst", - "python", - "fastapi", - "flask", - "django", - "dashboard", - "control panel", - "go", - "terraform", - "pulumi", - "automattion / pipeline", - "ansible", - "kestra", - "datascience", - "java" - ], - "project_name": "TODO: project_name", - "project_slug": "{{ cookiecutter.project_name.lower().replace(' ', '-') }}", - "project_description": "TODO: project_description", - "project_type": [ - "basic", - "project", - "business", - "script", - "infrastructure", - "docker-compose" - ], - "project_deployment": [ - "netlify", - "vercel", - "gcp", - "firebase", - "supabase", - "aws", - "do", - "azure", - "cloudflare", - "github_pages", - "cloudflare_pages" - ], - "git_init": "no", - "git_provider": ["github", "gitlab"], - "include_github_workflows": "yes", - "include_github_issue_templates": "yes", - "create_github_remote": "no", - "ai_tool": ["openai", "anthropic", "perplexity", "gemini"], - "include_code_templates": "yes", - "include_design_files": "yes", - "include_devcontainer": "no", - "project_url": "TODO: project_url", - "repo_url": "TODO: repo_url - generate from author_github_username", - "organization": "TODO: organization", - "organization_url": "TODO: organization_url", - "organization_email": "TODO: organization_email - generate from info@organization_url", - "author_first_name": "Evan", - "author_last_name": "Harmon", - "author_email": "evan@evanharmon.com", - "author_url": "https://evanharmon.com", - "author_github_username": "evanharmon1", - "license": ["mit", "private"], - "add_obsidian_project": "no", - "run_task_bootstrap": "no", - "run_task_install": "no", - "docker_hub_username": "evanharmon1", - "docker_image": "TODO: docker_image", - "data": { - "author_full_name": "{{ cookiecutter.author_first_name ~ ' ' ~ cookiecutter.author_last_name }}", - "country": "United States", - "state": "Kansas", - "year": "TODO: year", - "datestamp": "TODO: datestamp", - "timestamp": "TODO: timestamp", - "project_color": "TODO: cookiecutter.random_color", - "projects_directory": "~/git", - "projects_directory_full": "/Users/{{ cookiecutter.author_first_name }}/git", - "opanapi_key": "TODO: opanapi_key", - "anthropic_key": "TODO: anthropic_key", - "perplexity_key": "TODO: perplexity_key", - "gemini_key": "TODO: gemini_key" - }, - "_copy_without_render": ["*.html", "*.github", "*scriptTemplates"] -} diff --git a/copier.yml b/copier.yml new file mode 100644 index 0000000..c6c316e --- /dev/null +++ b/copier.yml @@ -0,0 +1,187 @@ +# questions for Copier new project template +# This file controls the Copier new project utilty. +# Run it with: `copier path/to/template path/to/destination` E.g, `copier harmon-stack .`. + +# Potential types: astro, astrowind, nextjs, t3, wdc, sst, python, fastapi, flask, django, dashboard, control panel, go, terraform, pulumi, automattion / pipeline, ansible, kestra, datascience, java + +# "_copy_without_render": ["*.html", "*.github", "*scriptTemplates"] + +project_name: + type: str + default: + +project_slug: + type: str + default: + # "{{ project_name.lower().replace(' ', '-') }}" + +project_description: + type: str + default: "TODO: project_description" + +project_type: + type: str + choices: + - basic + - project + - business + - script + - infrastructure + - docker-compose + +project_deployment: + type: str + choices: + - netlify + - vercel + - gcp + - firebase + - supabase + - aws + - do + - azure + - cloudflare + - github_pages + - cloudflare_pages + +git_init: + type: bool + default: no + +git_provider: + type: str + choices: + - github + - gitlab + +include_github_workflows: + type: bool + default: yes + +include_github_issue_templates: + type: bool + default: yes + +create_github_remote: + type: bool + default: no + +ai_tool: + type: str + choices: + - openai + - anthropic + - perplexity + - gemini + +include_code_templates: + type: bool + default: yes + +include_design_files: + type: bool + default: yes + +include_devcontainer: + type: bool + default: no + +repo_url: + type: str + default: "https://{{ git_provider }}.com/{{ author_git_provider_username }}/{{ project_slug }}" + +project_url: + type: str + default: "TODO: project_url" + +organization: + type: str + default: "TODO: organization" + +organization_url: + type: str + default: "TODO: organization_url" + +organization_email: + type: str + default: "info@{{ organization_url }}" + +author_first_name: + type: str + default: Evan + +author_last_name: + type: str + default: Harmon + +author_full_name: + type: str + default: "{{ author_first_name }} + {{ last name }}" + +author_email: + type: str + default: "evan@evanharmon.com" + +author_url: + type: str + default: "https://evanharmon.com" + +author_git_provider_username: + type: str + default: evanharmon1 + +license: + type: str + choices: + - mit + - private + +add_obsidian_project: + type: bool + default: no + +run_task_bootstrap: + type: bool + default: no + +run_task_install: + type: bool + default: no + +docker_hub_username: + type: str + default: evanharmon1 + +docker_image: + type: str + default: "TODO: docker_image" + +projects_directory: ~/git + +projects_directory_full: "/Users/{{ author_first_name }}/git" + +country: United States + +state: Kansas + +year: "TODO: year" + +datestamp: "TODO: datestamp" + +timestamp: "TODO: timestamp" + +project_color: "TODO: cookiecutter.random_color" + +opanapi_key: "TODO: opanapi_key" + +anthropic_key: "TODO: anthropic_key" + +perplexity_key: "TODO: perplexity_key" + +gemini_key: "TODO: gemini_key" + +tasks: + - before: + - command: echo "Starting project generation..." + - after: + - command: echo "Project generated successfully." diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py deleted file mode 100644 index 1e2d75a..0000000 --- a/hooks/post_gen_project.py +++ /dev/null @@ -1,42 +0,0 @@ -import os -import shutil - -def remove_folder_if_not_needed(root_path, folder_name, condition): - """ - Remove the specified folder if the condition is met. - - :param root_path: The root path of the generated project. - :param folder_name: The name of the folder to remove (relative to the root path). - :param condition: The condition that must be met to remove the folder. - """ - folder_path = os.path.join(root_path, folder_name) # Construct the full path - - if condition == 'no': - # Check if the folder exists before trying to remove it - if os.path.isdir(folder_path): - shutil.rmtree(folder_path, ignore_errors=True) - print(f"Removed folder: {folder_path}") - else: - print(f"Folder {folder_path} does not exist, skipping.") - -def main(): - # Get the root directory of the generated project (where the script is running) - root_path = os.getcwd() - print(f"root_path: {root_path}") - - # The cookiecutter context - devcontainer_condition = '{{ cookiecutter.include_devcontainer }}' - code_templates_condition = '{{ cookiecutter.include_code_templates }}' - design_files_condition = '{{ cookiecutter.include_design_files }}' - github_workflows_condition = '{{ cookiecutter.include_github_workflows }}' - github_issue_templates_condition = '{{ cookiecutter.include_github_issue_templates }}' - - # Use the reusable function for different folders - remove_folder_if_not_needed(root_path, '.devcontainer', devcontainer_condition) - remove_folder_if_not_needed(root_path, 'codeTemplates', code_templates_condition) - remove_folder_if_not_needed(root_path, 'design', design_files_condition) - remove_folder_if_not_needed(root_path, '.github/workflows', github_workflows_condition) - remove_folder_if_not_needed(root_path, '.github/ISSUE_TEMPLATE', github_issue_templates_condition) - -if __name__ == "__main__": - main() diff --git a/hooks/pre_gen_project.py b/hooks/pre_gen_project.py deleted file mode 100644 index ebc6a6f..0000000 --- a/hooks/pre_gen_project.py +++ /dev/null @@ -1,38 +0,0 @@ -# import os -# import datetime -# import json - -# # OPEN AI False solution - use jinja extensions instead - -# # Function to update the context in the cookiecutter configuration -# def update_cookiecutter_context(context_file, context_updates): -# with open(context_file, 'r') as f: -# context = json.load(f) - -# # Update context with the new variables -# context.update(context_updates) - -# with open(context_file, 'w') as f: -# json.dump(context, f, indent=4) - -# def main(): -# # Get current time, date, and directory -# current_time = datetime.datetime.now().strftime("%H:%M:%S") -# current_date = datetime.datetime.now().strftime("%Y-%m-%d") -# current_directory = os.getcwd() - -# # Path to the cookiecutter context file -# context_file = 'cookiecutter.json' - -# # Dictionary of new context variables -# context_updates = { -# "current_time": current_time, -# "current_date": current_date, -# "current_directory": current_directory -# } - -# # Update the cookiecutter.json context -# update_cookiecutter_context(context_file, context_updates) - -# if __name__ == "__main__": -# main() diff --git a/{{ cookiecutter.project_slug }}/.env/.env.local b/{{ cookiecutter.project_slug }}/.env/.env.local deleted file mode 100644 index fb96d2d..0000000 --- a/{{ cookiecutter.project_slug }}/.env/.env.local +++ /dev/null @@ -1,4 +0,0 @@ -#============================================================================== -# .env.local -#============================================================================== -isProd=False diff --git a/{{ cookiecutter.project_slug }}/.env/.env.prod b/{{ cookiecutter.project_slug }}/.env/.env.prod deleted file mode 100644 index 469def4..0000000 --- a/{{ cookiecutter.project_slug }}/.env/.env.prod +++ /dev/null @@ -1,4 +0,0 @@ -#============================================================================== -# .env.prod -#============================================================================== -isProd=True diff --git a/{{ cookiecutter.project_slug }}/.meta/Code Project - {{ cookiecutter.project_name }}.bunch b/{{ cookiecutter.project_slug }}/.meta/Code Project - {{ cookiecutter.project_name }}.bunch deleted file mode 100644 index 7b871bb..0000000 --- a/{{ cookiecutter.project_slug }}/.meta/Code Project - {{ cookiecutter.project_name }}.bunch +++ /dev/null @@ -1,9 +0,0 @@ ---- -title: Code Project - {{ cookiecutter.project_name }} 🪛 ---- -< snippet.code - -$ open -a 'Visual Studio Code' {{ cookiecutter.data.projects_directory }}/{{ cookiecutter.project_slug }}/{{ cookiecutter.project_slug }}.code-workspace -%Visual Studio Code^ - -< snippet.maximize diff --git a/{{ cookiecutter.project_slug }}/requirements.txt b/{{ cookiecutter.project_slug }}/requirements.txt deleted file mode 100644 index 1244581..0000000 --- a/{{ cookiecutter.project_slug }}/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Python requirements for {{ cookiecutter.project_name }} - -whispers diff --git a/{{ cookiecutter.project_slug }}/.ansible-lint-ignore b/{{ project_slug }}/.ansible-lint-ignore similarity index 100% rename from {{ cookiecutter.project_slug }}/.ansible-lint-ignore rename to {{ project_slug }}/.ansible-lint-ignore diff --git a/{{ cookiecutter.project_slug }}/.devcontainer/bash_history b/{{ project_slug }}/.devcontainer/bash_history similarity index 100% rename from {{ cookiecutter.project_slug }}/.devcontainer/bash_history rename to {{ project_slug }}/.devcontainer/bash_history diff --git a/{{ cookiecutter.project_slug }}/.devcontainer/bashrc.override.sh b/{{ project_slug }}/.devcontainer/bashrc.override.sh similarity index 100% rename from {{ cookiecutter.project_slug }}/.devcontainer/bashrc.override.sh rename to {{ project_slug }}/.devcontainer/bashrc.override.sh diff --git a/{{ cookiecutter.project_slug }}/.devcontainer/devcontainer.json b/{{ project_slug }}/.devcontainer/devcontainer.json.jinja similarity index 98% rename from {{ cookiecutter.project_slug }}/.devcontainer/devcontainer.json rename to {{ project_slug }}/.devcontainer/devcontainer.json.jinja index 76ed71f..4de2d7b 100644 --- a/{{ cookiecutter.project_slug }}/.devcontainer/devcontainer.json +++ b/{{ project_slug }}/.devcontainer/devcontainer.json.jinja @@ -1,6 +1,6 @@ // For format details, see https://containers.dev/implementors/json_reference/ { - "name": "{{ cookiecutter.project_name }}", + "name": "{{ project_name }}", "dockerComposeFile": [ "../docker-compose.local.yml" ], diff --git a/{{ cookiecutter.project_slug }}/.github/ISSUE_TEMPLATE/bug_report.md b/{{ project_slug }}/.github/ISSUE_TEMPLATE/bug_report.md similarity index 100% rename from {{ cookiecutter.project_slug }}/.github/ISSUE_TEMPLATE/bug_report.md rename to {{ project_slug }}/.github/ISSUE_TEMPLATE/bug_report.md diff --git a/{{ cookiecutter.project_slug }}/.github/ISSUE_TEMPLATE/config.yml b/{{ project_slug }}/.github/ISSUE_TEMPLATE/config.yml similarity index 100% rename from {{ cookiecutter.project_slug }}/.github/ISSUE_TEMPLATE/config.yml rename to {{ project_slug }}/.github/ISSUE_TEMPLATE/config.yml diff --git a/{{ cookiecutter.project_slug }}/.github/ISSUE_TEMPLATE/feature_request.md b/{{ project_slug }}/.github/ISSUE_TEMPLATE/feature_request.md similarity index 100% rename from {{ cookiecutter.project_slug }}/.github/ISSUE_TEMPLATE/feature_request.md rename to {{ project_slug }}/.github/ISSUE_TEMPLATE/feature_request.md diff --git a/{{ cookiecutter.project_slug }}/.github/ISSUE_TEMPLATE/general_issue.md b/{{ project_slug }}/.github/ISSUE_TEMPLATE/general_issue.md similarity index 100% rename from {{ cookiecutter.project_slug }}/.github/ISSUE_TEMPLATE/general_issue.md rename to {{ project_slug }}/.github/ISSUE_TEMPLATE/general_issue.md diff --git a/{{ cookiecutter.project_slug }}/.github/ISSUE_TEMPLATE/task.md b/{{ project_slug }}/.github/ISSUE_TEMPLATE/task.md similarity index 100% rename from {{ cookiecutter.project_slug }}/.github/ISSUE_TEMPLATE/task.md rename to {{ project_slug }}/.github/ISSUE_TEMPLATE/task.md diff --git a/{{ cookiecutter.project_slug }}/.github/PULL_REQUEST_TEMPLATE.md b/{{ project_slug }}/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from {{ cookiecutter.project_slug }}/.github/PULL_REQUEST_TEMPLATE.md rename to {{ project_slug }}/.github/PULL_REQUEST_TEMPLATE.md diff --git a/{{ cookiecutter.project_slug }}/.github/workflows/security.yaml b/{{ project_slug }}/.github/workflows/security.yaml similarity index 100% rename from {{ cookiecutter.project_slug }}/.github/workflows/security.yaml rename to {{ project_slug }}/.github/workflows/security.yaml diff --git a/{{ cookiecutter.project_slug }}/.github/workflows/validate.yaml b/{{ project_slug }}/.github/workflows/validate.yaml similarity index 100% rename from {{ cookiecutter.project_slug }}/.github/workflows/validate.yaml rename to {{ project_slug }}/.github/workflows/validate.yaml diff --git a/{{ cookiecutter.project_slug }}/.gitignore b/{{ project_slug }}/.gitignore similarity index 100% rename from {{ cookiecutter.project_slug }}/.gitignore rename to {{ project_slug }}/.gitignore diff --git a/{{ cookiecutter.project_slug }}/.markdownlint.json b/{{ project_slug }}/.markdownlint.json similarity index 100% rename from {{ cookiecutter.project_slug }}/.markdownlint.json rename to {{ project_slug }}/.markdownlint.json diff --git a/{{ cookiecutter.project_slug }}/.pre-commit-config.yaml b/{{ project_slug }}/.pre-commit-config.yaml similarity index 100% rename from {{ cookiecutter.project_slug }}/.pre-commit-config.yaml rename to {{ project_slug }}/.pre-commit-config.yaml diff --git a/{{ cookiecutter.project_slug }}/.shellcheckrc b/{{ project_slug }}/.shellcheckrc similarity index 100% rename from {{ cookiecutter.project_slug }}/.shellcheckrc rename to {{ project_slug }}/.shellcheckrc diff --git a/{{ cookiecutter.project_slug }}/.vscode/settings.json b/{{ project_slug }}/.vscode/settings.json similarity index 100% rename from {{ cookiecutter.project_slug }}/.vscode/settings.json rename to {{ project_slug }}/.vscode/settings.json diff --git a/{{ cookiecutter.project_slug }}/Brewfile b/{{ project_slug }}/Brewfile.jinja similarity index 98% rename from {{ cookiecutter.project_slug }}/Brewfile rename to {{ project_slug }}/Brewfile.jinja index a5205f0..0f8cbea 100644 --- a/{{ cookiecutter.project_slug }}/Brewfile +++ b/{{ project_slug }}/Brewfile.jinja @@ -1,5 +1,5 @@ #============================================================================== -# Brewfile - {{ cookiecutter.project_name }} +# Brewfile - {{ project_name }} #============================================================================== # Core #------------------------------------------------------------------------------ diff --git a/{{ cookiecutter.project_slug }}/CONTRIBUTING.md b/{{ project_slug }}/CONTRIBUTING.md similarity index 100% rename from {{ cookiecutter.project_slug }}/CONTRIBUTING.md rename to {{ project_slug }}/CONTRIBUTING.md diff --git a/{{ cookiecutter.project_slug }}/LICENSE b/{{ project_slug }}/LICENSE.jinja similarity index 73% rename from {{ cookiecutter.project_slug }}/LICENSE rename to {{ project_slug }}/LICENSE.jinja index f22d224..5d9d68e 100644 --- a/{{ cookiecutter.project_slug }}/LICENSE +++ b/{{ project_slug }}/LICENSE.jinja @@ -1,7 +1,7 @@ -{%- if cookiecutter.license == "mit" -%} +{%- if license == "mit" -%} MIT License -Copyright (c) 2024 {{ cookiecutter.data.author_full_name }} +Copyright (c) 2024 {{ author_full_name }} Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -21,23 +21,23 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -{%- elif cookiecutter.license == "private" -%} -{{ cookiecutter.project_name }} License Agreement +{%- elif license == "private" -%} +{{ project_name }} License Agreement -Version 1.0, {{ cookiecutter.data.year }} +Version 1.0, {{ year }} 1. Grant of License -This software and associated documentation files (the “Software”) are licensed, not sold, to you by {{ cookiecutter.organization }} (“Licensor”) for use strictly in accordance with the terms of this License Agreement. Subject to your compliance with the terms of this License, Licensor grants you a limited, non-exclusive, non-transferable, and revocable license to use the Software solely for your personal or internal business purposes. +This software and associated documentation files (the “Software”) are licensed, not sold, to you by {{ organization }} (“Licensor”) for use strictly in accordance with the terms of this License Agreement. Subject to your compliance with the terms of this License, Licensor grants you a limited, non-exclusive, non-transferable, and revocable license to use the Software solely for your personal or internal business purposes. 2. Restrictions You may not: - • Copy, modify, distribute, or create derivative works of the Software. - • Sublicense, rent, lease, or lend the Software. - • Reverse engineer, decompile, or disassemble the Software, except where such restriction is prohibited by applicable law. - • Use the Software for any commercial or public use without explicit written permission from Licensor. + • Copy, modify, distribute, or create derivative works of the Software. + • Sublicense, rent, lease, or lend the Software. + • Reverse engineer, decompile, or disassemble the Software, except where such restriction is prohibited by applicable law. + • Use the Software for any commercial or public use without explicit written permission from Licensor. 3. Ownership @@ -57,7 +57,7 @@ TO THE EXTENT PERMITTED BY APPLICABLE LAW, LICENSOR SHALL NOT BE LIABLE FOR ANY 7. Governing Law -This License shall be governed by and construed in accordance with the laws of {{ cookiecutter.data.country }}. Any legal action or proceeding arising under this License shall be brought exclusively in the courts located in {{ cookiecutter.data.country }}. +This License shall be governed by and construed in accordance with the laws of {{ country }}. Any legal action or proceeding arising under this License shall be brought exclusively in the courts located in {{ country }}. 8. Entire Agreement diff --git a/{{ cookiecutter.project_slug }}/README.md b/{{ project_slug }}/README.md.jinja similarity index 82% rename from {{ cookiecutter.project_slug }}/README.md rename to {{ project_slug }}/README.md.jinja index 10410d8..3e299aa 100644 --- a/{{ cookiecutter.project_slug }}/README.md +++ b/{{ project_slug }}/README.md.jinja @@ -1,5 +1,5 @@ -# {{ cookiecutter.project_name }} -Author: {{ cookiecutter.data.author_full_name }} +# {{ project_name }} +Author: {{ author_full_name }} ## Setup & Installation @@ -43,4 +43,4 @@ Alternatively, you can use `just` via the `justfile` ### Building, Deploying, & CI/CD ## Todo -[todo.md](<{{ cookiecutter.project_slug }}/todo.md>) +[todo.md]({{ project_slug }}/todo.md) diff --git a/{{ cookiecutter.project_slug }}/Taskfile.yml b/{{ project_slug }}/Taskfile.yml.jinja similarity index 96% rename from {{ cookiecutter.project_slug }}/Taskfile.yml rename to {{ project_slug }}/Taskfile.yml.jinja index 4ee7c40..38cbabc 100644 --- a/{{ cookiecutter.project_slug }}/Taskfile.yml +++ b/{{ project_slug }}/Taskfile.yml.jinja @@ -1,3 +1,4 @@ +# Taskfile for {{ project_name }} version: "3" tasks: boostrap: diff --git a/{{ cookiecutter.project_slug }}/codeTemplates/automationTemplates/ansible/touch b/{{ project_slug }}/codeTemplates/automationTemplates/ansible/touch similarity index 100% rename from {{ cookiecutter.project_slug }}/codeTemplates/automationTemplates/ansible/touch rename to {{ project_slug }}/codeTemplates/automationTemplates/ansible/touch diff --git a/{{ cookiecutter.project_slug }}/codeTemplates/automationTemplates/ci/touch b/{{ project_slug }}/codeTemplates/automationTemplates/ci/touch similarity index 100% rename from {{ cookiecutter.project_slug }}/codeTemplates/automationTemplates/ci/touch rename to {{ project_slug }}/codeTemplates/automationTemplates/ci/touch diff --git a/{{ cookiecutter.project_slug }}/codeTemplates/automationTemplates/kestra/touch b/{{ project_slug }}/codeTemplates/automationTemplates/kestra/touch similarity index 100% rename from {{ cookiecutter.project_slug }}/codeTemplates/automationTemplates/kestra/touch rename to {{ project_slug }}/codeTemplates/automationTemplates/kestra/touch diff --git a/{{ cookiecutter.project_slug }}/codeTemplates/scriptTemplates/goScriptTemplate.go b/{{ project_slug }}/codeTemplates/scriptTemplates/goScriptTemplate.go similarity index 100% rename from {{ cookiecutter.project_slug }}/codeTemplates/scriptTemplates/goScriptTemplate.go rename to {{ project_slug }}/codeTemplates/scriptTemplates/goScriptTemplate.go diff --git a/{{ cookiecutter.project_slug }}/codeTemplates/scriptTemplates/pythonScriptTemplate.py b/{{ project_slug }}/codeTemplates/scriptTemplates/pythonScriptTemplate.py similarity index 100% rename from {{ cookiecutter.project_slug }}/codeTemplates/scriptTemplates/pythonScriptTemplate.py rename to {{ project_slug }}/codeTemplates/scriptTemplates/pythonScriptTemplate.py diff --git a/{{ cookiecutter.project_slug }}/codeTemplates/scriptTemplates/shellScriptTemplate.sh b/{{ project_slug }}/codeTemplates/scriptTemplates/shellScriptTemplate.sh similarity index 100% rename from {{ cookiecutter.project_slug }}/codeTemplates/scriptTemplates/shellScriptTemplate.sh rename to {{ project_slug }}/codeTemplates/scriptTemplates/shellScriptTemplate.sh diff --git a/{{ cookiecutter.project_slug }}/codeTemplates/serverlessFunctionTemplates/touch b/{{ project_slug }}/codeTemplates/serverlessFunctionTemplates/touch similarity index 100% rename from {{ cookiecutter.project_slug }}/codeTemplates/serverlessFunctionTemplates/touch rename to {{ project_slug }}/codeTemplates/serverlessFunctionTemplates/touch diff --git a/{{ cookiecutter.project_slug }}/codeTemplates/webTemplates/netlifyForm b/{{ project_slug }}/codeTemplates/webTemplates/netlifyForm similarity index 100% rename from {{ cookiecutter.project_slug }}/codeTemplates/webTemplates/netlifyForm rename to {{ project_slug }}/codeTemplates/webTemplates/netlifyForm diff --git a/{{ cookiecutter.project_slug }}/data/touch b/{{ project_slug }}/data/touch similarity index 100% rename from {{ cookiecutter.project_slug }}/data/touch rename to {{ project_slug }}/data/touch diff --git a/{{ cookiecutter.project_slug }}/design/archHomeNetwork.graphml b/{{ project_slug }}/design/archHomeNetwork.graphml similarity index 100% rename from {{ cookiecutter.project_slug }}/design/archHomeNetwork.graphml rename to {{ project_slug }}/design/archHomeNetwork.graphml diff --git a/{{ cookiecutter.project_slug }}/design/archTemplate.md b/{{ project_slug }}/design/archTemplate.md similarity index 100% rename from {{ cookiecutter.project_slug }}/design/archTemplate.md rename to {{ project_slug }}/design/archTemplate.md diff --git a/{{ cookiecutter.project_slug }}/design/archUseCase.graphml b/{{ project_slug }}/design/archUseCase.graphml similarity index 100% rename from {{ cookiecutter.project_slug }}/design/archUseCase.graphml rename to {{ project_slug }}/design/archUseCase.graphml diff --git a/{{ cookiecutter.project_slug }}/design/colors b/{{ project_slug }}/design/colors similarity index 100% rename from {{ cookiecutter.project_slug }}/design/colors rename to {{ project_slug }}/design/colors diff --git a/{{ cookiecutter.project_slug }}/design/favicon b/{{ project_slug }}/design/favicon similarity index 100% rename from {{ cookiecutter.project_slug }}/design/favicon rename to {{ project_slug }}/design/favicon diff --git a/{{ cookiecutter.project_slug }}/design/heroImage b/{{ project_slug }}/design/heroImage similarity index 100% rename from {{ cookiecutter.project_slug }}/design/heroImage rename to {{ project_slug }}/design/heroImage diff --git a/{{ cookiecutter.project_slug }}/design/icon b/{{ project_slug }}/design/icon similarity index 100% rename from {{ cookiecutter.project_slug }}/design/icon rename to {{ project_slug }}/design/icon diff --git a/{{ cookiecutter.project_slug }}/design/image1 b/{{ project_slug }}/design/image1 similarity index 100% rename from {{ cookiecutter.project_slug }}/design/image1 rename to {{ project_slug }}/design/image1 diff --git a/{{ cookiecutter.project_slug }}/design/image2 b/{{ project_slug }}/design/image2 similarity index 100% rename from {{ cookiecutter.project_slug }}/design/image2 rename to {{ project_slug }}/design/image2 diff --git a/{{ cookiecutter.project_slug }}/design/image3 b/{{ project_slug }}/design/image3 similarity index 100% rename from {{ cookiecutter.project_slug }}/design/image3 rename to {{ project_slug }}/design/image3 diff --git a/{{ cookiecutter.project_slug }}/design/logo b/{{ project_slug }}/design/logo similarity index 100% rename from {{ cookiecutter.project_slug }}/design/logo rename to {{ project_slug }}/design/logo diff --git a/{{ cookiecutter.project_slug }}/design/profileImage b/{{ project_slug }}/design/profileImage similarity index 100% rename from {{ cookiecutter.project_slug }}/design/profileImage rename to {{ project_slug }}/design/profileImage diff --git a/{{ cookiecutter.project_slug }}/design/wireframeTemplate.konty b/{{ project_slug }}/design/wireframeTemplate.konty similarity index 100% rename from {{ cookiecutter.project_slug }}/design/wireframeTemplate.konty rename to {{ project_slug }}/design/wireframeTemplate.konty diff --git a/{{ cookiecutter.project_slug }}/docs/CHECKLIST.md b/{{ project_slug }}/docs/CHECKLIST.md.jinja similarity index 93% rename from {{ cookiecutter.project_slug }}/docs/CHECKLIST.md rename to {{ project_slug }}/docs/CHECKLIST.md.jinja index 6c61b43..097fbf1 100644 --- a/{{ cookiecutter.project_slug }}/docs/CHECKLIST.md +++ b/{{ project_slug }}/docs/CHECKLIST.md.jinja @@ -1,6 +1,6 @@ -# Checklist - {{ cookiecutter.project_name }} +# Checklist - {{ project_name }} -- [ ] cd {{ cookiecutter.data.projects_directory }}/{{ cookiecutter.project_slug }} +- [ ] cd {{ projects_directory }}/{{ project_slug }} - [ ] git init or import template, etc. - [ ] create initial release - `git tag -a v0.0.1 -m "Initial release version 0.0.1"` - [ ] Create releast in GitHub (Or gh cli - gh relase create) diff --git a/{{ cookiecutter.project_slug }}/docs/howzit.md b/{{ project_slug }}/docs/howzit.md.jinja similarity index 72% rename from {{ cookiecutter.project_slug }}/docs/howzit.md rename to {{ project_slug }}/docs/howzit.md.jinja index 9c762b1..bf4b8c0 100644 --- a/{{ cookiecutter.project_slug }}/docs/howzit.md +++ b/{{ project_slug }}/docs/howzit.md.jinja @@ -1,4 +1,4 @@ -# Howzit - {{ cookiecutter.project_name }} +# Howzit - {{ project_name }} [howzit - BrettTerpstra.com](https://brettterpstra.com/projects/howzit/) ## Dev diff --git a/{{ cookiecutter.project_slug }}/infra/docker/docker-compose-db.yml b/{{ project_slug }}/infra/docker/docker-compose-db.yml similarity index 100% rename from {{ cookiecutter.project_slug }}/infra/docker/docker-compose-db.yml rename to {{ project_slug }}/infra/docker/docker-compose-db.yml diff --git a/{{ cookiecutter.project_slug }}/infra/docker/docker-compose.yml b/{{ project_slug }}/infra/docker/docker-compose.yml similarity index 100% rename from {{ cookiecutter.project_slug }}/infra/docker/docker-compose.yml rename to {{ project_slug }}/infra/docker/docker-compose.yml diff --git a/{{ cookiecutter.project_slug }}/infra/docker/dockerVol/a b/{{ project_slug }}/infra/docker/dockerVol/a similarity index 100% rename from {{ cookiecutter.project_slug }}/infra/docker/dockerVol/a rename to {{ project_slug }}/infra/docker/dockerVol/a diff --git a/{{ cookiecutter.project_slug }}/justfile b/{{ project_slug }}/justfile.jinja similarity index 78% rename from {{ cookiecutter.project_slug }}/justfile rename to {{ project_slug }}/justfile.jinja index 29491f9..65ccae2 100644 --- a/{{ cookiecutter.project_slug }}/justfile +++ b/{{ project_slug }}/justfile.jinja @@ -1,4 +1,4 @@ -# Example Justfile - {{ cookiecutter.project_name }} +# Example Justfile - {{ project_name }} alias b := build diff --git a/{{ cookiecutter.project_slug }}/netlify.toml b/{{ project_slug }}/netlify.toml similarity index 100% rename from {{ cookiecutter.project_slug }}/netlify.toml rename to {{ project_slug }}/netlify.toml diff --git a/{{ project_slug }}/requirements.txt.jinja b/{{ project_slug }}/requirements.txt.jinja new file mode 100644 index 0000000..9d7c45f --- /dev/null +++ b/{{ project_slug }}/requirements.txt.jinja @@ -0,0 +1,3 @@ +# Python requirements for {{ project_name }} + +whispers diff --git a/{{ cookiecutter.project_slug }}/test/whisperConfig.yml b/{{ project_slug }}/test/whisperConfig.yml similarity index 100% rename from {{ cookiecutter.project_slug }}/test/whisperConfig.yml rename to {{ project_slug }}/test/whisperConfig.yml diff --git a/{{ cookiecutter.project_slug }}/todo.md b/{{ project_slug }}/todo.md.jinja similarity index 80% rename from {{ cookiecutter.project_slug }}/todo.md rename to {{ project_slug }}/todo.md.jinja index 59ac25f..a9966f7 100644 --- a/{{ cookiecutter.project_slug }}/todo.md +++ b/{{ project_slug }}/todo.md.jinja @@ -1,4 +1,4 @@ -# Todo - {{ cookiecutter.project_name }} +# Todo - {{ project_name }} Use with [na by BrettTerpstra.com](https://brettterpstra.com/projects/na/) Also putting todos inline with VS Code Tree Extesion diff --git a/{{ cookiecutter.project_slug }}/{{ cookiecutter.project_slug}}.code-workspace b/{{ project_slug }}/{{ project_slug}}.code-workspace.jinja similarity index 100% rename from {{ cookiecutter.project_slug }}/{{ cookiecutter.project_slug}}.code-workspace rename to {{ project_slug }}/{{ project_slug}}.code-workspace.jinja diff --git a/{{_copier_conf.answers_file}}.jinja b/{{_copier_conf.answers_file}}.jinja new file mode 100644 index 0000000..ea97bd4 --- /dev/null +++ b/{{_copier_conf.answers_file}}.jinja @@ -0,0 +1,2 @@ +# Changes here will be overwritten by Copier +{{ _copier_answers|to_nice_yaml -}} \ No newline at end of file From 0c4f5e0f2cfa7817389affcb4bf183440f04e6e1 Mon Sep 17 00:00:00 2001 From: Evan Harmon Date: Sun, 15 Sep 2024 11:17:53 -0500 Subject: [PATCH 2/2] Finish migration to copier --- {{{ project_slug }} => cp}/.ansible-lint-ignore | 0 {{{ project_slug }} => cp}/.devcontainer/bash_history | 0 .../.devcontainer/bashrc.override.sh | 0 .../.devcontainer/devcontainer.json.jinja | 0 .../.github/ISSUE_TEMPLATE/bug_report.md | 0 .../.github/ISSUE_TEMPLATE/config.yml | 0 .../.github/ISSUE_TEMPLATE/feature_request.md | 0 .../.github/ISSUE_TEMPLATE/general_issue.md | 0 .../.github/ISSUE_TEMPLATE/task.md | 0 .../.github/PULL_REQUEST_TEMPLATE.md | 0 .../.github/workflows/security.yaml | 0 .../.github/workflows/validate.yaml | 0 {{{ project_slug }} => cp}/.gitignore | 0 {{{ project_slug }} => cp}/.markdownlint.json | 0 {{{ project_slug }} => cp}/.pre-commit-config.yaml | 0 {{{ project_slug }} => cp}/.shellcheckrc | 0 {{{ project_slug }} => cp}/.vscode/settings.json | 0 {{{ project_slug }} => cp}/Brewfile.jinja | 0 {{{ project_slug }} => cp}/CONTRIBUTING.md | 0 {{{ project_slug }} => cp}/LICENSE.jinja | 0 {{{ project_slug }} => cp}/README.md.jinja | 0 {{{ project_slug }} => cp}/Taskfile.yml.jinja | 0 .../codeTemplates/automationTemplates/ansible/touch | 0 .../codeTemplates/automationTemplates/ci/touch | 0 .../codeTemplates/automationTemplates/kestra/touch | 0 .../codeTemplates/scriptTemplates/goScriptTemplate.go | 0 .../scriptTemplates/pythonScriptTemplate.py | 0 .../codeTemplates/scriptTemplates/shellScriptTemplate.sh | 0 .../codeTemplates/serverlessFunctionTemplates/touch | 0 .../codeTemplates/webTemplates/netlifyForm | 0 copier.yml => cp/copier.yml | 9 +++++---- {{{ project_slug }} => cp}/data/touch | 0 .../design/archHomeNetwork.graphml | 0 {{{ project_slug }} => cp}/design/archTemplate.md | 0 {{{ project_slug }} => cp}/design/archUseCase.graphml | 0 {{{ project_slug }} => cp}/design/colors | 0 {{{ project_slug }} => cp}/design/favicon | 0 {{{ project_slug }} => cp}/design/heroImage | 0 {{{ project_slug }} => cp}/design/icon | 0 {{{ project_slug }} => cp}/design/image1 | 0 {{{ project_slug }} => cp}/design/image2 | 0 {{{ project_slug }} => cp}/design/image3 | 0 {{{ project_slug }} => cp}/design/logo | 0 {{{ project_slug }} => cp}/design/profileImage | 0 .../design/wireframeTemplate.konty | 0 {{{ project_slug }} => cp}/docs/CHECKLIST.md.jinja | 0 {{{ project_slug }} => cp}/docs/howzit.md.jinja | 0 .../infra/docker/docker-compose-db.yml | 0 .../infra/docker/docker-compose.yml | 0 {{{ project_slug }} => cp}/infra/docker/dockerVol/a | 0 {{{ project_slug }} => cp}/justfile.jinja | 0 {{{ project_slug }} => cp}/netlify.toml | 0 {{{ project_slug }} => cp}/requirements.txt.jinja | 0 {{{ project_slug }} => cp}/test/whisperConfig.yml | 0 {{{ project_slug }} => cp}/todo.md.jinja | 0 .../{{ project_slug}}.code-workspace.jinja | 0 .../{{_copier_conf.answers_file}}.jinja | 0 57 files changed, 5 insertions(+), 4 deletions(-) rename {{{ project_slug }} => cp}/.ansible-lint-ignore (100%) rename {{{ project_slug }} => cp}/.devcontainer/bash_history (100%) rename {{{ project_slug }} => cp}/.devcontainer/bashrc.override.sh (100%) rename {{{ project_slug }} => cp}/.devcontainer/devcontainer.json.jinja (100%) rename {{{ project_slug }} => cp}/.github/ISSUE_TEMPLATE/bug_report.md (100%) rename {{{ project_slug }} => cp}/.github/ISSUE_TEMPLATE/config.yml (100%) rename {{{ project_slug }} => cp}/.github/ISSUE_TEMPLATE/feature_request.md (100%) rename {{{ project_slug }} => cp}/.github/ISSUE_TEMPLATE/general_issue.md (100%) rename {{{ project_slug }} => cp}/.github/ISSUE_TEMPLATE/task.md (100%) rename {{{ project_slug }} => cp}/.github/PULL_REQUEST_TEMPLATE.md (100%) rename {{{ project_slug }} => cp}/.github/workflows/security.yaml (100%) rename {{{ project_slug }} => cp}/.github/workflows/validate.yaml (100%) rename {{{ project_slug }} => cp}/.gitignore (100%) rename {{{ project_slug }} => cp}/.markdownlint.json (100%) rename {{{ project_slug }} => cp}/.pre-commit-config.yaml (100%) rename {{{ project_slug }} => cp}/.shellcheckrc (100%) rename {{{ project_slug }} => cp}/.vscode/settings.json (100%) rename {{{ project_slug }} => cp}/Brewfile.jinja (100%) rename {{{ project_slug }} => cp}/CONTRIBUTING.md (100%) rename {{{ project_slug }} => cp}/LICENSE.jinja (100%) rename {{{ project_slug }} => cp}/README.md.jinja (100%) rename {{{ project_slug }} => cp}/Taskfile.yml.jinja (100%) rename {{{ project_slug }} => cp}/codeTemplates/automationTemplates/ansible/touch (100%) rename {{{ project_slug }} => cp}/codeTemplates/automationTemplates/ci/touch (100%) rename {{{ project_slug }} => cp}/codeTemplates/automationTemplates/kestra/touch (100%) rename {{{ project_slug }} => cp}/codeTemplates/scriptTemplates/goScriptTemplate.go (100%) rename {{{ project_slug }} => cp}/codeTemplates/scriptTemplates/pythonScriptTemplate.py (100%) rename {{{ project_slug }} => cp}/codeTemplates/scriptTemplates/shellScriptTemplate.sh (100%) rename {{{ project_slug }} => cp}/codeTemplates/serverlessFunctionTemplates/touch (100%) rename {{{ project_slug }} => cp}/codeTemplates/webTemplates/netlifyForm (100%) rename copier.yml => cp/copier.yml (94%) rename {{{ project_slug }} => cp}/data/touch (100%) rename {{{ project_slug }} => cp}/design/archHomeNetwork.graphml (100%) rename {{{ project_slug }} => cp}/design/archTemplate.md (100%) rename {{{ project_slug }} => cp}/design/archUseCase.graphml (100%) rename {{{ project_slug }} => cp}/design/colors (100%) rename {{{ project_slug }} => cp}/design/favicon (100%) rename {{{ project_slug }} => cp}/design/heroImage (100%) rename {{{ project_slug }} => cp}/design/icon (100%) rename {{{ project_slug }} => cp}/design/image1 (100%) rename {{{ project_slug }} => cp}/design/image2 (100%) rename {{{ project_slug }} => cp}/design/image3 (100%) rename {{{ project_slug }} => cp}/design/logo (100%) rename {{{ project_slug }} => cp}/design/profileImage (100%) rename {{{ project_slug }} => cp}/design/wireframeTemplate.konty (100%) rename {{{ project_slug }} => cp}/docs/CHECKLIST.md.jinja (100%) rename {{{ project_slug }} => cp}/docs/howzit.md.jinja (100%) rename {{{ project_slug }} => cp}/infra/docker/docker-compose-db.yml (100%) rename {{{ project_slug }} => cp}/infra/docker/docker-compose.yml (100%) rename {{{ project_slug }} => cp}/infra/docker/dockerVol/a (100%) rename {{{ project_slug }} => cp}/justfile.jinja (100%) rename {{{ project_slug }} => cp}/netlify.toml (100%) rename {{{ project_slug }} => cp}/requirements.txt.jinja (100%) rename {{{ project_slug }} => cp}/test/whisperConfig.yml (100%) rename {{{ project_slug }} => cp}/todo.md.jinja (100%) rename {{{ project_slug }} => cp}/{{ project_slug}}.code-workspace.jinja (100%) rename {{_copier_conf.answers_file}}.jinja => cp/{{_copier_conf.answers_file}}.jinja (100%) diff --git a/{{ project_slug }}/.ansible-lint-ignore b/cp/.ansible-lint-ignore similarity index 100% rename from {{ project_slug }}/.ansible-lint-ignore rename to cp/.ansible-lint-ignore diff --git a/{{ project_slug }}/.devcontainer/bash_history b/cp/.devcontainer/bash_history similarity index 100% rename from {{ project_slug }}/.devcontainer/bash_history rename to cp/.devcontainer/bash_history diff --git a/{{ project_slug }}/.devcontainer/bashrc.override.sh b/cp/.devcontainer/bashrc.override.sh similarity index 100% rename from {{ project_slug }}/.devcontainer/bashrc.override.sh rename to cp/.devcontainer/bashrc.override.sh diff --git a/{{ project_slug }}/.devcontainer/devcontainer.json.jinja b/cp/.devcontainer/devcontainer.json.jinja similarity index 100% rename from {{ project_slug }}/.devcontainer/devcontainer.json.jinja rename to cp/.devcontainer/devcontainer.json.jinja diff --git a/{{ project_slug }}/.github/ISSUE_TEMPLATE/bug_report.md b/cp/.github/ISSUE_TEMPLATE/bug_report.md similarity index 100% rename from {{ project_slug }}/.github/ISSUE_TEMPLATE/bug_report.md rename to cp/.github/ISSUE_TEMPLATE/bug_report.md diff --git a/{{ project_slug }}/.github/ISSUE_TEMPLATE/config.yml b/cp/.github/ISSUE_TEMPLATE/config.yml similarity index 100% rename from {{ project_slug }}/.github/ISSUE_TEMPLATE/config.yml rename to cp/.github/ISSUE_TEMPLATE/config.yml diff --git a/{{ project_slug }}/.github/ISSUE_TEMPLATE/feature_request.md b/cp/.github/ISSUE_TEMPLATE/feature_request.md similarity index 100% rename from {{ project_slug }}/.github/ISSUE_TEMPLATE/feature_request.md rename to cp/.github/ISSUE_TEMPLATE/feature_request.md diff --git a/{{ project_slug }}/.github/ISSUE_TEMPLATE/general_issue.md b/cp/.github/ISSUE_TEMPLATE/general_issue.md similarity index 100% rename from {{ project_slug }}/.github/ISSUE_TEMPLATE/general_issue.md rename to cp/.github/ISSUE_TEMPLATE/general_issue.md diff --git a/{{ project_slug }}/.github/ISSUE_TEMPLATE/task.md b/cp/.github/ISSUE_TEMPLATE/task.md similarity index 100% rename from {{ project_slug }}/.github/ISSUE_TEMPLATE/task.md rename to cp/.github/ISSUE_TEMPLATE/task.md diff --git a/{{ project_slug }}/.github/PULL_REQUEST_TEMPLATE.md b/cp/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from {{ project_slug }}/.github/PULL_REQUEST_TEMPLATE.md rename to cp/.github/PULL_REQUEST_TEMPLATE.md diff --git a/{{ project_slug }}/.github/workflows/security.yaml b/cp/.github/workflows/security.yaml similarity index 100% rename from {{ project_slug }}/.github/workflows/security.yaml rename to cp/.github/workflows/security.yaml diff --git a/{{ project_slug }}/.github/workflows/validate.yaml b/cp/.github/workflows/validate.yaml similarity index 100% rename from {{ project_slug }}/.github/workflows/validate.yaml rename to cp/.github/workflows/validate.yaml diff --git a/{{ project_slug }}/.gitignore b/cp/.gitignore similarity index 100% rename from {{ project_slug }}/.gitignore rename to cp/.gitignore diff --git a/{{ project_slug }}/.markdownlint.json b/cp/.markdownlint.json similarity index 100% rename from {{ project_slug }}/.markdownlint.json rename to cp/.markdownlint.json diff --git a/{{ project_slug }}/.pre-commit-config.yaml b/cp/.pre-commit-config.yaml similarity index 100% rename from {{ project_slug }}/.pre-commit-config.yaml rename to cp/.pre-commit-config.yaml diff --git a/{{ project_slug }}/.shellcheckrc b/cp/.shellcheckrc similarity index 100% rename from {{ project_slug }}/.shellcheckrc rename to cp/.shellcheckrc diff --git a/{{ project_slug }}/.vscode/settings.json b/cp/.vscode/settings.json similarity index 100% rename from {{ project_slug }}/.vscode/settings.json rename to cp/.vscode/settings.json diff --git a/{{ project_slug }}/Brewfile.jinja b/cp/Brewfile.jinja similarity index 100% rename from {{ project_slug }}/Brewfile.jinja rename to cp/Brewfile.jinja diff --git a/{{ project_slug }}/CONTRIBUTING.md b/cp/CONTRIBUTING.md similarity index 100% rename from {{ project_slug }}/CONTRIBUTING.md rename to cp/CONTRIBUTING.md diff --git a/{{ project_slug }}/LICENSE.jinja b/cp/LICENSE.jinja similarity index 100% rename from {{ project_slug }}/LICENSE.jinja rename to cp/LICENSE.jinja diff --git a/{{ project_slug }}/README.md.jinja b/cp/README.md.jinja similarity index 100% rename from {{ project_slug }}/README.md.jinja rename to cp/README.md.jinja diff --git a/{{ project_slug }}/Taskfile.yml.jinja b/cp/Taskfile.yml.jinja similarity index 100% rename from {{ project_slug }}/Taskfile.yml.jinja rename to cp/Taskfile.yml.jinja diff --git a/{{ project_slug }}/codeTemplates/automationTemplates/ansible/touch b/cp/codeTemplates/automationTemplates/ansible/touch similarity index 100% rename from {{ project_slug }}/codeTemplates/automationTemplates/ansible/touch rename to cp/codeTemplates/automationTemplates/ansible/touch diff --git a/{{ project_slug }}/codeTemplates/automationTemplates/ci/touch b/cp/codeTemplates/automationTemplates/ci/touch similarity index 100% rename from {{ project_slug }}/codeTemplates/automationTemplates/ci/touch rename to cp/codeTemplates/automationTemplates/ci/touch diff --git a/{{ project_slug }}/codeTemplates/automationTemplates/kestra/touch b/cp/codeTemplates/automationTemplates/kestra/touch similarity index 100% rename from {{ project_slug }}/codeTemplates/automationTemplates/kestra/touch rename to cp/codeTemplates/automationTemplates/kestra/touch diff --git a/{{ project_slug }}/codeTemplates/scriptTemplates/goScriptTemplate.go b/cp/codeTemplates/scriptTemplates/goScriptTemplate.go similarity index 100% rename from {{ project_slug }}/codeTemplates/scriptTemplates/goScriptTemplate.go rename to cp/codeTemplates/scriptTemplates/goScriptTemplate.go diff --git a/{{ project_slug }}/codeTemplates/scriptTemplates/pythonScriptTemplate.py b/cp/codeTemplates/scriptTemplates/pythonScriptTemplate.py similarity index 100% rename from {{ project_slug }}/codeTemplates/scriptTemplates/pythonScriptTemplate.py rename to cp/codeTemplates/scriptTemplates/pythonScriptTemplate.py diff --git a/{{ project_slug }}/codeTemplates/scriptTemplates/shellScriptTemplate.sh b/cp/codeTemplates/scriptTemplates/shellScriptTemplate.sh similarity index 100% rename from {{ project_slug }}/codeTemplates/scriptTemplates/shellScriptTemplate.sh rename to cp/codeTemplates/scriptTemplates/shellScriptTemplate.sh diff --git a/{{ project_slug }}/codeTemplates/serverlessFunctionTemplates/touch b/cp/codeTemplates/serverlessFunctionTemplates/touch similarity index 100% rename from {{ project_slug }}/codeTemplates/serverlessFunctionTemplates/touch rename to cp/codeTemplates/serverlessFunctionTemplates/touch diff --git a/{{ project_slug }}/codeTemplates/webTemplates/netlifyForm b/cp/codeTemplates/webTemplates/netlifyForm similarity index 100% rename from {{ project_slug }}/codeTemplates/webTemplates/netlifyForm rename to cp/codeTemplates/webTemplates/netlifyForm diff --git a/copier.yml b/cp/copier.yml similarity index 94% rename from copier.yml rename to cp/copier.yml index c6c316e..403f17a 100644 --- a/copier.yml +++ b/cp/copier.yml @@ -8,11 +8,11 @@ project_name: type: str - default: + default: "Project Name" project_slug: type: str - default: + default: "project-slug" # "{{ project_name.lower().replace(' ', '-') }}" project_description: @@ -116,7 +116,8 @@ author_last_name: author_full_name: type: str - default: "{{ author_first_name }} + {{ last name }}" + default: "Evan Harmon" + # "{{ author_first_name }} + {{ author_last name }}" author_email: type: str @@ -170,7 +171,7 @@ datestamp: "TODO: datestamp" timestamp: "TODO: timestamp" -project_color: "TODO: cookiecutter.random_color" +project_color: "TODO: random_color" opanapi_key: "TODO: opanapi_key" diff --git a/{{ project_slug }}/data/touch b/cp/data/touch similarity index 100% rename from {{ project_slug }}/data/touch rename to cp/data/touch diff --git a/{{ project_slug }}/design/archHomeNetwork.graphml b/cp/design/archHomeNetwork.graphml similarity index 100% rename from {{ project_slug }}/design/archHomeNetwork.graphml rename to cp/design/archHomeNetwork.graphml diff --git a/{{ project_slug }}/design/archTemplate.md b/cp/design/archTemplate.md similarity index 100% rename from {{ project_slug }}/design/archTemplate.md rename to cp/design/archTemplate.md diff --git a/{{ project_slug }}/design/archUseCase.graphml b/cp/design/archUseCase.graphml similarity index 100% rename from {{ project_slug }}/design/archUseCase.graphml rename to cp/design/archUseCase.graphml diff --git a/{{ project_slug }}/design/colors b/cp/design/colors similarity index 100% rename from {{ project_slug }}/design/colors rename to cp/design/colors diff --git a/{{ project_slug }}/design/favicon b/cp/design/favicon similarity index 100% rename from {{ project_slug }}/design/favicon rename to cp/design/favicon diff --git a/{{ project_slug }}/design/heroImage b/cp/design/heroImage similarity index 100% rename from {{ project_slug }}/design/heroImage rename to cp/design/heroImage diff --git a/{{ project_slug }}/design/icon b/cp/design/icon similarity index 100% rename from {{ project_slug }}/design/icon rename to cp/design/icon diff --git a/{{ project_slug }}/design/image1 b/cp/design/image1 similarity index 100% rename from {{ project_slug }}/design/image1 rename to cp/design/image1 diff --git a/{{ project_slug }}/design/image2 b/cp/design/image2 similarity index 100% rename from {{ project_slug }}/design/image2 rename to cp/design/image2 diff --git a/{{ project_slug }}/design/image3 b/cp/design/image3 similarity index 100% rename from {{ project_slug }}/design/image3 rename to cp/design/image3 diff --git a/{{ project_slug }}/design/logo b/cp/design/logo similarity index 100% rename from {{ project_slug }}/design/logo rename to cp/design/logo diff --git a/{{ project_slug }}/design/profileImage b/cp/design/profileImage similarity index 100% rename from {{ project_slug }}/design/profileImage rename to cp/design/profileImage diff --git a/{{ project_slug }}/design/wireframeTemplate.konty b/cp/design/wireframeTemplate.konty similarity index 100% rename from {{ project_slug }}/design/wireframeTemplate.konty rename to cp/design/wireframeTemplate.konty diff --git a/{{ project_slug }}/docs/CHECKLIST.md.jinja b/cp/docs/CHECKLIST.md.jinja similarity index 100% rename from {{ project_slug }}/docs/CHECKLIST.md.jinja rename to cp/docs/CHECKLIST.md.jinja diff --git a/{{ project_slug }}/docs/howzit.md.jinja b/cp/docs/howzit.md.jinja similarity index 100% rename from {{ project_slug }}/docs/howzit.md.jinja rename to cp/docs/howzit.md.jinja diff --git a/{{ project_slug }}/infra/docker/docker-compose-db.yml b/cp/infra/docker/docker-compose-db.yml similarity index 100% rename from {{ project_slug }}/infra/docker/docker-compose-db.yml rename to cp/infra/docker/docker-compose-db.yml diff --git a/{{ project_slug }}/infra/docker/docker-compose.yml b/cp/infra/docker/docker-compose.yml similarity index 100% rename from {{ project_slug }}/infra/docker/docker-compose.yml rename to cp/infra/docker/docker-compose.yml diff --git a/{{ project_slug }}/infra/docker/dockerVol/a b/cp/infra/docker/dockerVol/a similarity index 100% rename from {{ project_slug }}/infra/docker/dockerVol/a rename to cp/infra/docker/dockerVol/a diff --git a/{{ project_slug }}/justfile.jinja b/cp/justfile.jinja similarity index 100% rename from {{ project_slug }}/justfile.jinja rename to cp/justfile.jinja diff --git a/{{ project_slug }}/netlify.toml b/cp/netlify.toml similarity index 100% rename from {{ project_slug }}/netlify.toml rename to cp/netlify.toml diff --git a/{{ project_slug }}/requirements.txt.jinja b/cp/requirements.txt.jinja similarity index 100% rename from {{ project_slug }}/requirements.txt.jinja rename to cp/requirements.txt.jinja diff --git a/{{ project_slug }}/test/whisperConfig.yml b/cp/test/whisperConfig.yml similarity index 100% rename from {{ project_slug }}/test/whisperConfig.yml rename to cp/test/whisperConfig.yml diff --git a/{{ project_slug }}/todo.md.jinja b/cp/todo.md.jinja similarity index 100% rename from {{ project_slug }}/todo.md.jinja rename to cp/todo.md.jinja diff --git a/{{ project_slug }}/{{ project_slug}}.code-workspace.jinja b/cp/{{ project_slug}}.code-workspace.jinja similarity index 100% rename from {{ project_slug }}/{{ project_slug}}.code-workspace.jinja rename to cp/{{ project_slug}}.code-workspace.jinja diff --git a/{{_copier_conf.answers_file}}.jinja b/cp/{{_copier_conf.answers_file}}.jinja similarity index 100% rename from {{_copier_conf.answers_file}}.jinja rename to cp/{{_copier_conf.answers_file}}.jinja