From 5e18828bdb0233af5f73fa03c1f57a0e63771f5c Mon Sep 17 00:00:00 2001 From: Zander Hill Date: Wed, 7 Aug 2024 06:05:00 -0700 Subject: [PATCH 1/2] Switch to using .tomeignore file --- README.md | 2 +- cmd/struct.go | 2 +- examples/.tome_ignore | 1 - examples/.tomeignore | 3 +++ examples/folder/.ignored/executable | 0 5 files changed, 5 insertions(+), 3 deletions(-) delete mode 100644 examples/.tome_ignore create mode 100644 examples/.tomeignore create mode 100755 examples/folder/.ignored/executable diff --git a/README.md b/README.md index 08dd6fe..5c2cefc 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ See [docs](./docs/tome-cli.md) for expanded instructions - root folder's folder names - root folder's scripts - root script's flags and arguments (when they satisfy the --complete and TOME_COMPLETION interface) -- Gitignore like syntax for ignoring scripts by using a `.tome_ignore` file at base of root folder +- Gitignore like syntax for ignoring scripts by using a `.tomeignore` file at base of root folder # Capabilities diff --git a/cmd/struct.go b/cmd/struct.go index bf9fc4f..bffae2e 100644 --- a/cmd/struct.go +++ b/cmd/struct.go @@ -138,7 +138,7 @@ func NewConfig() *Config { } func (c *Config) IgnorePatterns() *gitignore.GitIgnore { - tomeIgnore := ".tome_ignore" + tomeIgnore := ".tomeignore" tomeIgnorePath := filepath.Join(c.RootDir(), tomeIgnore) _, err := os.Stat(tomeIgnorePath) if err == nil { diff --git a/examples/.tome_ignore b/examples/.tome_ignore deleted file mode 100644 index 9180cf0..0000000 --- a/examples/.tome_ignore +++ /dev/null @@ -1 +0,0 @@ -folder/executable-ignored diff --git a/examples/.tomeignore b/examples/.tomeignore new file mode 100644 index 0000000..1ac0c47 --- /dev/null +++ b/examples/.tomeignore @@ -0,0 +1,3 @@ +folder/executable-ignored +# Ignore any files starting with leading period to respect "hidden" files +.* diff --git a/examples/folder/.ignored/executable b/examples/folder/.ignored/executable new file mode 100755 index 0000000..e69de29 From 2dc251a21bda7fee1c03a8912eae40d32ec5065b Mon Sep 17 00:00:00 2001 From: Zander Hill Date: Wed, 7 Aug 2024 06:16:05 -0700 Subject: [PATCH 2/2] Include a .tomeignore file in repo --- README.md | 2 +- cmd/alias.go | 5 +++-- cmd/embeds/.tomeignore | 2 ++ cmd/{ => embeds}/tome-wrapper.sh.tmpl | 0 4 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 cmd/embeds/.tomeignore rename cmd/{ => embeds}/tome-wrapper.sh.tmpl (100%) diff --git a/README.md b/README.md index 5c2cefc..5c33cad 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ See [docs](./docs/tome-cli.md) for expanded instructions - root folder's folder names - root folder's scripts - root script's flags and arguments (when they satisfy the --complete and TOME_COMPLETION interface) -- Gitignore like syntax for ignoring scripts by using a `.tomeignore` file at base of root folder +- Gitignore like syntax for ignoring scripts by using a `.tomeignore` file at base of root folder [example](./cmd/embeds/.tomeignore) # Capabilities diff --git a/cmd/alias.go b/cmd/alias.go index 9205508..20d7044 100644 --- a/cmd/alias.go +++ b/cmd/alias.go @@ -18,7 +18,8 @@ type ScriptTemplate struct { Root string } -//go:embed tome-wrapper.sh.tmpl +//go:embed embeds/tome-wrapper.sh.tmpl +//go:embed embeds/.tomeignore var content embed.FS var writePath string @@ -52,7 +53,7 @@ Read the template script 'tome-wrapper.sh.tmpl' for more information on how the ExecutableAlias: config.ExecutableName(), Root: config.RootDir(), } - t, err := template.ParseFS(content, "tome-wrapper.sh.tmpl") + t, err := template.ParseFS(content, "embeds/tome-wrapper.sh.tmpl") // Capture any error if err != nil { log.Fatalln(err) diff --git a/cmd/embeds/.tomeignore b/cmd/embeds/.tomeignore new file mode 100644 index 0000000..f307a33 --- /dev/null +++ b/cmd/embeds/.tomeignore @@ -0,0 +1,2 @@ +# Ignore 'hidden' files +.* diff --git a/cmd/tome-wrapper.sh.tmpl b/cmd/embeds/tome-wrapper.sh.tmpl similarity index 100% rename from cmd/tome-wrapper.sh.tmpl rename to cmd/embeds/tome-wrapper.sh.tmpl