Skip to content

feat: add dotfiles command #1723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 32 commits into from
May 25, 2022
Merged

feat: add dotfiles command #1723

Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
7235e3a
chore: propose coder dotfiles command
f0ssel May 23, 2022
6cd9f17
simplify example
f0ssel May 23, 2022
6a2bd87
add command skeleton
f0ssel May 24, 2022
3417628
Merge branch 'f0ssel/dotfiles-poc' of github.com:coder/coder into f0s…
f0ssel May 24, 2022
e127fe7
do clone/checkout
f0ssel May 24, 2022
17490a4
add install and symlinking
f0ssel May 24, 2022
2cf43d6
fix lint
f0ssel May 24, 2022
3302497
spruce
f0ssel May 24, 2022
250d10a
revert tf
f0ssel May 24, 2022
675f7e6
lint
f0ssel May 24, 2022
eae24d0
ignore git files
f0ssel May 24, 2022
8cf1c4f
pr comments
f0ssel May 24, 2022
42e9028
remove shorthand
f0ssel May 24, 2022
0b6480b
fixup
f0ssel May 24, 2022
2769e0a
Add tests
f0ssel May 24, 2022
051a361
lint
f0ssel May 24, 2022
23c950a
try removing parallel
f0ssel May 24, 2022
43c8b4f
formatting
f0ssel May 24, 2022
2197126
pr comments
f0ssel May 25, 2022
9e073ab
save dotfiles url config
f0ssel May 25, 2022
0467613
fixup
f0ssel May 25, 2022
3b505b0
%q
f0ssel May 25, 2022
fd9ba2a
testing
f0ssel May 25, 2022
624265f
testing
f0ssel May 25, 2022
44efa67
testing
f0ssel May 25, 2022
b059fdf
organize:
f0ssel May 25, 2022
b265149
add symlink backup test
f0ssel May 25, 2022
581d6b8
handle script for windows
f0ssel May 25, 2022
6dfc469
switch to require
f0ssel May 25, 2022
df5f6cd
pr comments
f0ssel May 25, 2022
b29ddf4
skip install script test on windows
f0ssel May 25, 2022
a435224
fix command
f0ssel May 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
switch to require
  • Loading branch information
@f0ssel
f0ssel committed May 25, 2022
commit 6dfc469e6c33cc3a8233a54d695eb11c233c0167
56 changes: 28 additions & 28 deletions cli/dotfiles_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"path/filepath"
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/coder/coder/cli/clitest"
"github.com/coder/coder/cli/config"
Expand All @@ -19,119 +19,119 @@ func TestDotfiles(t *testing.T) {
t.Run("MissingArg", func(t *testing.T) {
cmd, _ := clitest.New(t, "dotfiles")
err := cmd.Execute()
assert.Error(t, err)
require.Error(t, err)
})
t.Run("NoInstallScript", func(t *testing.T) {
_, root := clitest.New(t)
testRepo := testGitRepo(t, root)

// nolint:gosec
err := os.WriteFile(filepath.Join(testRepo, ".bashrc"), []byte("wow"), 0750)
assert.NoError(t, err)
require.NoError(t, err)

c := exec.Command("git", "add", ".bashrc")
c.Dir = testRepo
err = c.Run()
assert.NoError(t, err)
require.NoError(t, err)

c = exec.Command("git", "commit", "-m", `"add .bashrc"`)
c.Dir = testRepo
out, err := c.CombinedOutput()
assert.NoError(t, err, string(out))
require.NoError(t, err, string(out))

cmd, _ := clitest.New(t, "dotfiles", "--global-config", string(root), "--symlink-dir", string(root), "-y", testRepo)
err = cmd.Execute()
assert.NoError(t, err)
require.NoError(t, err)

b, err := os.ReadFile(filepath.Join(string(root), ".bashrc"))
assert.NoError(t, err)
assert.Equal(t, string(b), "wow")
require.NoError(t, err)
require.Equal(t, string(b), "wow")
})
t.Run("InstallScript", func(t *testing.T) {
_, root := clitest.New(t)
testRepo := testGitRepo(t, root)

// nolint:gosec
err := os.WriteFile(filepath.Join(testRepo, "install.sh"), []byte("#!/bin/bash\necho wow > "+filepath.Join(string(root), ".bashrc")), 0750)
assert.NoError(t, err)
require.NoError(t, err)

c := exec.Command("git", "add", "install.sh")
c.Dir = testRepo
err = c.Run()
assert.NoError(t, err)
require.NoError(t, err)

c = exec.Command("git", "commit", "-m", `"add install.sh"`)
c.Dir = testRepo
err = c.Run()
assert.NoError(t, err)
require.NoError(t, err)

cmd, _ := clitest.New(t, "dotfiles", "--global-config", string(root), "--symlink-dir", string(root), "-y", testRepo)
err = cmd.Execute()
assert.NoError(t, err)
require.NoError(t, err)

b, err := os.ReadFile(filepath.Join(string(root), ".bashrc"))
assert.NoError(t, err)
assert.Equal(t, string(b), "wow\n")
require.NoError(t, err)
require.Equal(t, string(b), "wow\n")
})
t.Run("SymlinkBackup", func(t *testing.T) {
_, root := clitest.New(t)
testRepo := testGitRepo(t, root)

// nolint:gosec
err := os.WriteFile(filepath.Join(testRepo, ".bashrc"), []byte("wow"), 0750)
assert.NoError(t, err)
require.NoError(t, err)

// add a conflicting file at destination
// nolint:gosec
err = os.WriteFile(filepath.Join(string(root), ".bashrc"), []byte("backup"), 0750)
assert.NoError(t, err)
require.NoError(t, err)

c := exec.Command("git", "add", ".bashrc")
c.Dir = testRepo
err = c.Run()
assert.NoError(t, err)
require.NoError(t, err)

c = exec.Command("git", "commit", "-m", `"add .bashrc"`)
c.Dir = testRepo
out, err := c.CombinedOutput()
assert.NoError(t, err, string(out))
require.NoError(t, err, string(out))

cmd, _ := clitest.New(t, "dotfiles", "--global-config", string(root), "--symlink-dir", string(root), "-y", testRepo)
err = cmd.Execute()
assert.NoError(t, err)
require.NoError(t, err)

b, err := os.ReadFile(filepath.Join(string(root), ".bashrc"))
assert.NoError(t, err)
assert.Equal(t, string(b), "wow")
require.NoError(t, err)
require.Equal(t, string(b), "wow")

// check for backup file
b, err = os.ReadFile(filepath.Join(string(root), ".bashrc.bak"))
assert.NoError(t, err)
assert.Equal(t, string(b), "backup")
require.NoError(t, err)
require.Equal(t, string(b), "backup")
})
}

func testGitRepo(t *testing.T, root config.Root) string {
r, err := cryptorand.String(8)
assert.NoError(t, err)
require.NoError(t, err)
dir := filepath.Join(string(root), fmt.Sprintf("test-repo-%s", r))
err = os.MkdirAll(dir, 0750)
assert.NoError(t, err)
require.NoError(t, err)

c := exec.Command("git", "init")
c.Dir = dir
err = c.Run()
assert.NoError(t, err)
require.NoError(t, err)

c = exec.Command("git", "config", "user.email", "ci@coder.com")
c.Dir = dir
err = c.Run()
assert.NoError(t, err)
require.NoError(t, err)

c = exec.Command("git", "config", "user.name", "C I")
c.Dir = dir
err = c.Run()
assert.NoError(t, err)
require.NoError(t, err)

return dir
}