Add more integration tests

cmd/archive_test.go

@@ -30,7 +30,7 @@ func TestArchiveCmd(t *testing.T) {
 
 	h, err := r.Next()
 	assert.NoError(t, err)
-	assert.Equal(t, "dir", h.Name)
+	assert.Equal(t, "dir/", h.Name)
 
 	h, err = r.Next()
 	assert.NoError(t, err)

cmd/managed.go

@@ -76,7 +76,7 @@ func (c *Config) runManagedCmd(cmd *cobra.Command, args []string) error {
 		if ts.TargetIgnore.Match(targetName) {
 			continue
 		}
-		fmt.Fprintln(c.Stdout, filepath.Join(ts.DestDir, targetName))
+		fmt.Fprintln(c.Stdout, filepath.FromSlash(filepath.Join(ts.DestDir, targetName)))
 	}
 
 	return nil

cmd/managed_test.go

@@ -85,33 +85,26 @@ func TestManagedCmd(t *testing.T) {
 				}),
 			)
 			assert.NoError(t, c.runManagedCmd(nil, nil))
-			posixTargetNames, err := extractPOSIXTargetNames(stdout.Bytes())
 			require.NoError(t, err)
-			assert.Equal(t, tc.expectedTargetNames, posixTargetNames)
+			actualTargetNames, err := extractTargetNames(stdout.Bytes())
+			require.NoError(t, err)
+			assert.Equal(t, tc.expectedTargetNames, actualTargetNames)
 		})
 	}
 }
 
-// extractPOSIXTargetNames extracts all target names from b and coverts them to
-// POSIX-like names.
-func extractPOSIXTargetNames(b []byte) ([]string, error) {
+func extractTargetNames(b []byte) ([]string, error) {
 	var targetNames []string
 	s := bufio.NewScanner(bytes.NewBuffer(b))
 	for s.Scan() {
-		targetNames = append(targetNames, posixify(s.Text()))
+		targetNames = append(targetNames, filepath.ToSlash(s.Text()))
 	}
 	if err := s.Err(); err != nil {
 		return nil, err
 	}
 	return targetNames, nil
 }
 
-// posixify returns a POSIX-like path based on path, stripping any volume name
-// and converting backward slashes.
-func posixify(path string) string {
-	return filepath.ToSlash(strings.TrimPrefix(path, filepath.VolumeName(path)))
-}
-
 func withManaged(managed managedCmdConfig) configOption {
 	return func(c *Config) {
 		c.managed = managed

cmd/sourcepath.go

@@ -36,7 +36,7 @@ func (c *Config) runSourcePathCmd(cmd *cobra.Command, args []string) error {
 		return err
 	}
 	for _, entry := range entries {
-		if _, err := fmt.Println(filepath.Join(ts.SourceDir, entry.SourceName())); err != nil {
+		if _, err := fmt.Println(filepath.FromSlash(filepath.Join(ts.SourceDir, entry.SourceName()))); err != nil {
 			return err
 		}
 	}

internal/chezmoi/dir.go

@@ -213,7 +213,7 @@ func (d *Dir) archive(w *tar.Writer, ignore func(string) bool, headerTemplate *t
 	}
 	header := *headerTemplate
 	header.Typeflag = tar.TypeDir
-	header.Name = d.targetName
+	header.Name = d.targetName + "/"
 	header.Mode = int64(d.Perm &^ umask)
 	if err := w.WriteHeader(&header); err != nil {
 		return err

main_test.go

@@ -39,7 +39,8 @@ func TestChezmoi(t *testing.T) {
 				return false, fmt.Errorf("unknown condition: %s", cond)
 			}
 		},
-		Setup: setup,
+		Setup:         setup,
+		UpdateScripts: os.Getenv("CHEZMOIUPDATESCRIPTS") != "",
 	})
 }
 
@@ -69,6 +70,7 @@ func chHome(ts *testscript.TestScript, neg bool, args []string) {
 	}
 	ts.Check(os.MkdirAll(homeDir, 0o777))
 	ts.Setenv("HOME", homeDir)
+	ts.Setenv("HOMESLASH", filepath.ToSlash(homeDir))
 	if runtime.GOOS == "windows" {
 		ts.Setenv("USERPROFILE", homeDir)
 	}
@@ -102,18 +104,21 @@ func setup(env *testscript.Env) error {
 	)
 
 	env.Setenv("HOME", homeDir)
+	env.Setenv("HOMESLASH", filepath.ToSlash(homeDir))
 	env.Setenv("PATH", prependDirToPath(binDir, env.Getenv("PATH")))
 	env.Setenv("CHEZMOICONFIGDIR", chezmoiConfigDir)
 	env.Setenv("CHEZMOISOURCEDIR", chezmoiSourceDir)
 	switch runtime.GOOS {
 	case "windows":
 		env.Setenv("EDITOR", filepath.Join(binDir, "editor.cmd"))
 		env.Setenv("USERPROFILE", homeDir)
+		env.Setenv("WORKSLASH", filepath.ToSlash(env.WorkDir))
 		// There is not currently a convenient way to override the shell on
 		// Windows.
 	default:
 		env.Setenv("EDITOR", filepath.Join(binDir, "editor"))
 		env.Setenv("SHELL", filepath.Join(binDir, "shell"))
+		env.Setenv("WORKSLASH", env.WorkDir)
 	}
 
 	// Fix permissions on the source directory, if it exists.

testdata/scripts/applyremove.txt

@@ -1,8 +1,8 @@
-exists $HOME${/}.bashrc
-exists $HOME${/}.inputrc
+exists $HOME/.bashrc
+exists $HOME/.inputrc
 chezmoi apply --remove
-! exists $HOME${/}.bashrc
-exists $HOME${/}.inputrc
+! exists $HOME/.bashrc
+exists $HOME/.inputrc
 
 -- home/user/.bashrc --
 # contents of .bashrc

testdata/scripts/archive.txt

@@ -1,15 +1,15 @@
 [windows] stop 'https://github.com/twpayne/chezmoi/issues/745'
 [!exec:tar] stop
 
-chezmoi archive --output=user.tar
-exec tar -tf user.tar
+chezmoi archive --output=archive.tar
+exec tar -tf archive.tar
 cmp stdout golden/archive
 
 -- golden/archive --
 .bashrc
-.ssh
+.ssh/
 .ssh/config
 -- home/user/.local/share/chezmoi/dot_bashrc --
 # contents of .bashrc
 -- home/user/.local/share/chezmoi/private_dot_ssh/config --
-# contents .ssh/config
+# contents of .ssh/config

testdata/scripts/cat.txt

@@ -1,5 +1,29 @@
 chezmoi cat $HOME${/}.bashrc
-stdout '# contents of .bashrc'
+cmp stdout ${CHEZMOISOURCEDIR}/dot_bashrc
 
+chezmoi cat $HOME${/}.gitconfig
+cmp stdout golden/.gitconfig
+
+chezmoi cat $HOME${/}.symlink
+stdout 'target'
+
+! chezmoi cat $HOME${/}.ssh
+stdout 'not a file or symlink'
+
+-- golden/.gitconfig --
+[user]
+  email = user@home.org
+-- home/user/.bashrc --
+# contents of .bashrc
+-- home/user/.config/chezmoi/chezmoi.toml --
+[data]
+  email = "user@home.org"
 -- home/user/.local/share/chezmoi/dot_bashrc --
 # contents of .bashrc
+-- home/user/.local/share/chezmoi/dot_gitconfig.tmpl --
+[user]
+  email = {{ .email }}
+-- home/user/.local/share/chezmoi/private_dot_ssh/config --
+# contents of .ssh/config
+-- home/user/.local/share/chezmoi/symlink_dot_symlink --
+target

testdata/scripts/cd.txt

@@ -7,7 +7,7 @@ grep -count=1 ${CHEZMOISOURCEDIR@R} shell.log
 
 # test chezmoi cd with command with args
 [!exec:bash] stop
-chhome home2${/}user
+chhome home2/user
 chezmoi cd
 stdout version
 

testdata/scripts/chattr.txt

@@ -1,20 +1,20 @@
 chezmoi chattr +empty $HOME${/}.bashrc
-exists ${CHEZMOISOURCEDIR}${/}empty_dot_bashrc
+exists ${CHEZMOISOURCEDIR}/empty_dot_bashrc
 
 chezmoi chattr +template $HOME${/}.bashrc
-exists ${CHEZMOISOURCEDIR}${/}empty_dot_bashrc.tmpl
+exists ${CHEZMOISOURCEDIR}/empty_dot_bashrc.tmpl
 
 chezmoi chattr +private $HOME${/}.bashrc
-exists ${CHEZMOISOURCEDIR}${/}private_empty_dot_bashrc.tmpl
+exists ${CHEZMOISOURCEDIR}/private_empty_dot_bashrc.tmpl
 
 chezmoi chattr noempty $HOME${/}.bashrc
-exists ${CHEZMOISOURCEDIR}${/}private_dot_bashrc.tmpl
+exists ${CHEZMOISOURCEDIR}/private_dot_bashrc.tmpl
 
 chezmoi chattr -- -template $HOME${/}.bashrc
-exists ${CHEZMOISOURCEDIR}${/}private_dot_bashrc
+exists ${CHEZMOISOURCEDIR}/private_dot_bashrc
 
 chezmoi chattr nop $HOME${/}.bashrc
-exists ${CHEZMOISOURCEDIR}${/}dot_bashrc
+exists ${CHEZMOISOURCEDIR}/dot_bashrc
 
 -- home/user/.local/share/chezmoi/dot_bashrc --
 # contents of .bashrc

testdata/scripts/completion.txt

@@ -0,0 +1,11 @@
+chezmoi completion bash
+stdout '# bash completion for chezmoi'
+
+chezmoi completion fish
+stdout '# fish completion for chezmoi'
+
+chezmoi completion zsh
+stdout '#compdef _chezmoi chezmoi'
+
+! chezmoi completion ksh
+stdout 'unsupported shell'

testdata/scripts/data.txt

@@ -0,0 +1,11 @@
+chezmoi data
+stdout '"chezmoi":'
+
+chezmoi data --format=json
+stdout '"chezmoi":'
+
+chezmoi data --format=toml
+stdout '[chezmoi]'
+
+chezmoi data --format=yaml
+stdout 'chezmoi:'

testdata/scripts/diff.txt

@@ -0,0 +1,85 @@
+chmod 700 $HOME/.ssh
+
+# test that chezmoi diff generates no output when the source and destination states are equal
+chezmoi diff
+! stdout .
+
+# test that chezmoi diff generates a diff when a file is added to the source state
+cp golden/dot_inputrc ${CHEZMOISOURCEDIR}/dot_inputrc
+chezmoi diff
+cmpenv stdout golden/add-file-diff
+rm ${CHEZMOISOURCEDIR}/dot_inputrc
+
+# test that chezmoi diff generates a diff when a file is edited
+edit $HOME/.bashrc
+chezmoi diff
+cmpenv stdout golden/modify-file-diff
+chezmoi apply
+
+# test that chezmoi diff generates a diff when a file is removed from the destination directory
+rm $HOME/.bashrc
+chezmoi diff
+cmpenv stdout golden/remove-file-diff
+chezmoi apply
+
+# test that chezmoi diff generates a diff when a directory is removed from the destination directory
+rm $HOME/.ssh
+chezmoi diff
+cmpenv stdout golden/remove-dir-diff
+chezmoi apply
+
+[windows] stop 'remaining tests use POSIX file modes'
+
+# test that chezmoi diff generates a diff when a file's permissions are changed
+chmod 755 $HOME/.bashrc
+chezmoi diff
+cmpenv stdout golden/chmod-file-diff
+chezmoi apply
+
+# test that chezmoi diff generates a diff when a dir's permissions are changed
+# FIXME show changes to permissions in diff
+chmod 755 $HOME/.ssh
+chezmoi diff
+cmpenv stdout golden/chmod-dir-diff
+chezmoi apply
+
+-- golden/add-file-diff --
+install -m 644 /dev/null $WORK/home/user/.inputrc
+--- a$WORK/home/user/.inputrc
++++ b$WORK/home/user/.inputrc
+@@ -0,0 +1,1 @@
++# contents of .inputrc
+-- golden/modify-file-diff --
+install -m 644 /dev/null $WORK/home/user/.bashrc
+--- a$WORK/home/user/.bashrc
++++ b$WORK/home/user/.bashrc
+@@ -1,2 +1,1 @@
+ # contents of .bashrc
+-# edited
+-- golden/remove-file-diff --
+install -m 644 /dev/null $WORK/home/user/.bashrc
+--- a$WORK/home/user/.bashrc
++++ b$WORK/home/user/.bashrc
+@@ -0,0 +1,1 @@
++# contents of .bashrc
+-- golden/remove-dir-diff --
+mkdir -m 700 $WORK/home/user/.ssh
+install -m 644 /dev/null $WORK/home/user/.ssh/config
+--- a$WORK/home/user/.ssh/config
++++ b$WORK/home/user/.ssh/config
+@@ -0,0 +1,1 @@
++# contents of .ssh/config
+-- golden/chmod-file-diff --
+chmod 644 $WORK/home/user/.bashrc
+-- golden/chmod-dir-diff --
+chmod 700 $WORK/home/user/.ssh
+-- golden/dot_inputrc --
+# contents of .inputrc
+-- home/user/.bashrc --
+# contents of .bashrc
+-- home/user/.ssh/config --
+# contents of .ssh/config
+-- home/user/.local/share/chezmoi/dot_bashrc --
+# contents of .bashrc
+-- home/user/.local/share/chezmoi/private_dot_ssh/config --
+# contents of .ssh/config