add tests and address some PR comments

hairyhenderson · Jan 23, 2024 · 19caa0d · 19caa0d
1 parent 099fb08
commit 19caa0d
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 2 deletions.
diff --git a/internal/cmd/main.go b/internal/cmd/main.go
@@ -138,7 +138,7 @@ func InitFlags(command *cobra.Command) {
 	command.Flags().StringP("in", "i", "", "Template `string` to process (alternative to --file and --input-dir)")
 	command.Flags().String("input-dir", "", "`directory` which is examined recursively for templates (alternative to --file and --in)")
 
-	command.Flags().StringSlice("exclude", []string{}, "glob of files to ignore")
+	command.Flags().StringSlice("exclude", []string{}, "glob of files to not parse")
 	command.Flags().StringSlice("exclude-processing", []string{}, "glob of files to be copied without parsing")
 	command.Flags().StringSlice("include", []string{}, "glob of files to parse")
 

diff --git a/internal/tests/integration/gomplateignore_test.go b/internal/tests/integration/gomplateignore_test.go
@@ -279,3 +279,34 @@ func TestGomplateignore_WithIncludes(t *testing.T) {
 	require.NoError(t, err)
 	assert.Equal(t, fromSlashes("rules/index.csv"), files)
 }
+
+func TestGomplateignore_WithExcludeProcessing(t *testing.T) {
+	files, err := executeOpts(t, `.gomplateignore
+*.log
+`, []string{
+		"--exclude-processing", "crash.bin",
+		"--exclude-processing", "log/*.zip",
+		"--exclude", "rules/*.txt",
+		"--exclude", "sprites/*.ini",
+	},
+		tfs.WithDir("logs",
+			tfs.WithFile("archive.zip", ""),
+			tfs.WithFile("engine.log", ""),
+			tfs.WithFile("skills.log", "")),
+		tfs.WithDir("rules",
+			tfs.WithFile("index.csv", ""),
+			tfs.WithFile("fire.txt", ""),
+			tfs.WithFile("earth.txt", "")),
+		tfs.WithDir("sprites",
+			tfs.WithFile("human.csv", ""),
+			tfs.WithFile("demon.xml", ""),
+			tfs.WithFile("alien.ini", "")),
+		tfs.WithFile("manifest.json", ""),
+		tfs.WithFile("crash.bin", ""),
+	)
+
+	require.NoError(t, err)
+	assert.Equal(t, fromSlashes(
+		"crash.bin", "logs/archive.zip", "manifest.json", "rules/index.csv",
+		"sprites/demon.xml", "sprites/human.csv"), files)
+}
diff --git a/template.go b/template.go
@@ -358,7 +358,7 @@ func readInFile(ctx context.Context, cfg *config.Config, inFile string, mode os.
 
 		source = string(b)
 	}
-	return
+	return source, newmode, err
 }
 
 func getOutfileHandler(ctx context.Context, cfg *config.Config, outFile string, mode os.FileMode, modeOverride bool) (io.Writer, error) {
-Original file line number
+Diff line change
@@ Expand Up @@
     		source = string(b)
     	}
-    	return
+    	return source, newmode, err
     }
     func getOutfileHandler(ctx context.Context, cfg *config.Config, outFile string, mode os.FileMode, modeOverride bool) (io.Writer, error) {
@@ Expand Down @@