Merge pull request #363 from twpayne/remove

Add initial remove functionality

.gitignore

@@ -1,4 +1,5 @@
 /*coverage.out
+/bin
 /chezmoi
 /dist
 /goreleaser/goreleaser.host.yaml

cmd/apply_test.go

@@ -121,6 +121,124 @@ func TestApplyCommand(t *testing.T) {
 	}
 }
 
+func TestApplyRemove(t *testing.T) {
+	for _, tc := range []struct {
+		name     string
+		noRemove bool
+		root     interface{}
+		data     map[string]interface{}
+		tests    []vfst.Test
+	}{
+		{
+			name: "simple",
+			root: map[string]interface{}{
+				"/home/user/.local/share/chezmoi/.chezmoiremove": "foo",
+				"/home/user/foo": "# contents of foo\n",
+			},
+			tests: []vfst.Test{
+				vfst.TestPath("/home/user/foo",
+					vfst.TestDoesNotExist,
+				),
+			},
+		},
+		{
+			name:     "no_remove",
+			noRemove: true,
+			root: map[string]interface{}{
+				"/home/user/.local/share/chezmoi/.chezmoiremove": "foo",
+				"/home/user/foo": "# contents of foo\n",
+			},
+			tests: []vfst.Test{
+				vfst.TestPath("/home/user/foo",
+					vfst.TestModeIsRegular,
+					vfst.TestContentsString("# contents of foo\n"),
+				),
+			},
+		},
+		{
+			name: "pattern",
+			root: map[string]interface{}{
+				"/home/user/.local/share/chezmoi/.chezmoiremove": "f*",
+				"/home/user/foo": "# contents of foo\n",
+			},
+			tests: []vfst.Test{
+				vfst.TestPath("/home/user/foo",
+					vfst.TestDoesNotExist,
+				),
+			},
+		},
+		{
+			name: "template",
+			root: map[string]interface{}{
+				"/home/user/.local/share/chezmoi/.chezmoiremove": "{{ .bar }}",
+				"/home/user/foo": "# contents of foo\n",
+			},
+			data: map[string]interface{}{
+				"bar": "foo",
+			},
+			tests: []vfst.Test{
+				vfst.TestPath("/home/user/foo",
+					vfst.TestDoesNotExist,
+				),
+			},
+		},
+		{
+			name: "dont_remove_negative_pattern",
+			root: map[string]interface{}{
+				"/home/user/.local/share/chezmoi/.chezmoiremove": "f*\n!foo\n",
+				"/home/user/foo": "# contents of foo\n",
+			},
+			tests: []vfst.Test{
+				vfst.TestPath("/home/user/foo",
+					vfst.TestModeIsRegular,
+					vfst.TestContentsString("# contents of foo\n"),
+				),
+			},
+		},
+		{
+			name: "dont_remove_ignored",
+			root: map[string]interface{}{
+				"/home/user/.local/share/chezmoi/.chezmoiignore": "foo",
+				"/home/user/.local/share/chezmoi/.chezmoiremove": "f*",
+				"/home/user/foo": "# contents of foo\n",
+			},
+			tests: []vfst.Test{
+				vfst.TestPath("/home/user/foo",
+					vfst.TestModeIsRegular,
+					vfst.TestContentsString("# contents of foo\n"),
+				),
+			},
+		},
+		{
+			name: "remove_subdirectory_first",
+			root: map[string]interface{}{
+				"/home/user/.local/share/chezmoi/.chezmoiremove": "foo\nfoo/bar\n",
+				"/home/user/foo/bar":                             "# contents of bar\n",
+			},
+			tests: []vfst.Test{
+				vfst.TestPath("/home/user/foo",
+					vfst.TestDoesNotExist,
+				),
+			},
+		},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			fs, cleanup, err := vfst.NewTestFS(tc.root)
+			require.NoError(t, err)
+			defer cleanup()
+			c := &Config{
+				SourceDir: "/home/user/.local/share/chezmoi",
+				DestDir:   "/home/user",
+				Data:      tc.data,
+				Remove:    !tc.noRemove,
+				Umask:     022,
+			}
+			assert.NoError(t, c.runApplyCmd(fs, nil))
+			vfst.RunTests(t, fs, "", tc.tests)
+		})
+	}
+}
+
 func TestApplyScript(t *testing.T) {
 	tempDir, err := ioutil.TempDir("", "chezmoi")
 	require.NoError(t, err)

cmd/config.go

@@ -39,6 +39,7 @@ type Config struct {
 	DestDir           string
 	Umask             permValue
 	DryRun            bool
+	Remove            bool
 	Verbose           bool
 	Color             string
 	GPG               chezmoi.GPG
@@ -130,6 +131,7 @@ func (c *Config) addTemplateFunc(key string, value interface{}) {
 }
 
 func (c *Config) applyArgs(fs vfs.FS, args []string, mutator chezmoi.Mutator) error {
+	fs = vfs.NewReadOnlyFS(fs)
 	ts, err := c.getTargetState(fs)
 	if err != nil {
 		return err
@@ -139,6 +141,7 @@ func (c *Config) applyArgs(fs vfs.FS, args []string, mutator chezmoi.Mutator) er
 		DryRun:            c.DryRun,
 		Ignore:            ts.TargetIgnore.Match,
 		PersistentState:   c.persistentState,
+		Remove:            c.Remove,
 		ScriptStateBucket: c.scriptStateBucket,
 		Stdout:            c.Stdout(),
 		Umask:             ts.Umask,
@@ -250,6 +253,7 @@ func (c *Config) getEntries(fs vfs.Stater, ts *chezmoi.TargetState, args []strin
 }
 
 func (c *Config) getTargetState(fs vfs.FS) (*chezmoi.TargetState, error) {
+	fs = vfs.NewReadOnlyFS(fs)
 	defaultData, err := getDefaultData(fs)
 	if err != nil {
 		return nil, err
@@ -265,8 +269,7 @@ func (c *Config) getTargetState(fs vfs.FS) (*chezmoi.TargetState, error) {
 		c.GPG.Recipient = c.GPGRecipient
 	}
 	ts := chezmoi.NewTargetState(c.DestDir, os.FileMode(c.Umask), c.SourceDir, data, c.templateFuncs, &c.GPG)
-	readOnlyFS := vfs.NewReadOnlyFS(fs)
-	if err := ts.Populate(readOnlyFS); err != nil {
+	if err := ts.Populate(fs); err != nil {
 		return nil, err
 	}
 	if Version != nil && ts.MinVersion != nil && Version.LessThan(*ts.MinVersion) {

cmd/root.go

@@ -74,6 +74,9 @@ func init() {
 	persistentFlags.BoolVarP(&config.DryRun, "dry-run", "n", false, "dry run")
 	_ = viper.BindPFlag("dry-run", persistentFlags.Lookup("dry-run"))
 
+	persistentFlags.BoolVar(&config.Remove, "remove", false, "remove targets")
+	_ = viper.BindPFlag("remove", persistentFlags.Lookup("remove"))
+
 	persistentFlags.StringVarP(&config.SourceDir, "source", "S", getDefaultSourceDir(config.bds), "source directory")
 	_ = viper.BindPFlag("source", persistentFlags.Lookup("source"))