Merge pull request #1 from gwynforthewyn/templ-new

Templ refactor

.github/workflows/go_test.yaml

@@ -12,6 +12,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: ${{ env.GITHUB_REF }}
+          submodules: true
       - name: "run tests"
         run: |
           go test -v ./...
@@ -28,4 +29,4 @@ jobs:
           pwd >> $GITHUB_PATH
       - name: "run integration tests"
         run: |
-          ./bin/cicd_integration.sh
+          ./bin/cicd-integration.sh

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "testing-files"]
+	path = testing-files
+	url = https://github.com/PlayTechnique/templ-testing-files.git

README.md

@@ -1 +1,22 @@
-Templates dir - either TEMPL_DIR or the default $HOME/.config/templ/
+#Templ
+A tool to render templates, and download and update repositories of templates.
+
+![logo](.github/images/templ-logo-smaller.png)
+
+# Environment variables
+TEMPL_DIR - Defaults to ~/.config/templ. Directory that stores template git repositories. You run lists against this dir.
+
+# Uses
+`templ -fetch https://github.com/PlayTechniuque/templ-templates.git` - download a github repository to your templates directory
+
+`templ -list` - list all available templates
+
+`templ templatename` - display the contents of a template file to stdout.
+
+`templ templatename=variablesfile.yaml` - hydrate a template file using variablesfile.yaml. 
+
+```variablesfile.yaml
+---
+Variable: value
+OtherVariable: othervalue
+```

bin/cicd_integration.sh → bin/cicd-integration.sh

@@ -2,18 +2,19 @@
 
 cd "${GITHUB_WORKSPACE}"
 
-templ repo https://github.com/playtechnique/templ_templates
+templ -fetch https://github.com/playtechnique/templ_templates
 
 echo "Catting the fetch charts script..."
-templ cat fetch
+# This is a partial name match for a file in templ_templates
+templ fetch_
 
 cat > release-from-tag-config.yaml << EOF
 ---
 OutputBinary: "roflcopter"
 EOF
 
 echo "Rendering release-from-tag.yaml"
-OUTPUT=$(templ render templ_templates/github_workflows/go/release-from-tag.yaml=release-from-tag-config.yaml)
+OUTPUT=$(templ templ_templates/github_workflows/go/release-from-tag.yaml=release-from-tag-config.yaml)
 
 echo "Validating render..."
 echo "${OUTPUT}" | grep "roflcopter"

bin/integration.sh → bin/render-integration.sh

@@ -25,8 +25,6 @@ name: "World"
 EOF
 
 
-
-
 #echo "Setting logs to debug..."
 #export TEMPL_LOG_LEVEL="debug"
 export TEMPL_DEBUG_BREAK="true"