Skip to content

Commit 513d15a

Browse files
twpaynetwpayne
authored
Merge pull request #63 from twpayne/internal-refactor
Internal refactor
2 parents 071a62e + bd27c36 commit 513d15a

29 files changed

+1235
-1195
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
dist/
1+
/dist

‎cmd/add.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,21 @@ func init() {
3333
}
3434

3535
func (c *Config) runAddCommand(fs vfs.FS, command *cobra.Command, args []string) error {
36-
targetState, err := c.getTargetState(fs)
36+
ts, err := c.getTargetState(fs)
3737
if err != nil {
3838
return err
3939
}
40-
actuator := c.getDefaultActuator(fs)
40+
mutator := c.getDefaultMutator(fs)
4141
info, err := fs.Stat(c.SourceDir)
4242
switch {
4343
case err == nil && info.Mode().IsDir():
4444
if info.Mode()&os.ModePerm != 0700 {
45-
if err := actuator.Chmod(c.SourceDir, 0700); err != nil {
45+
if err := mutator.Chmod(c.SourceDir, 0700); err != nil {
4646
return err
4747
}
4848
}
4949
case os.IsNotExist(err):
50-
if err := actuator.Mkdir(c.SourceDir, 0700); err != nil {
50+
if err := mutator.Mkdir(c.SourceDir, 0700); err != nil {
5151
return err
5252
}
5353
case err == nil:
@@ -65,12 +65,12 @@ func (c *Config) runAddCommand(fs vfs.FS, command *cobra.Command, args []string)
6565
if err != nil {
6666
return err
6767
}
68-
return targetState.Add(fs, path, info, c.add.empty, c.add.template, actuator)
68+
return ts.Add(fs, path, info, c.add.empty, c.add.template, mutator)
6969
}); err != nil {
7070
return err
7171
}
7272
} else {
73-
if err := targetState.Add(fs, path, nil, c.add.empty, c.add.template, actuator); err != nil {
73+
if err := ts.Add(fs, path, nil, c.add.empty, c.add.template, mutator); err != nil {
7474
return err
7575
}
7676
}

‎cmd/apply.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ func init() {
1616
}
1717

1818
func (c *Config) runApplyCommand(fs vfs.FS, command *cobra.Command, args []string) error {
19-
actuator := c.getDefaultActuator(fs)
20-
return c.applyArgs(fs, args, actuator)
19+
mutator := c.getDefaultMutator(fs)
20+
return c.applyArgs(fs, args, mutator)
2121
}

‎cmd/archive.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ func init() {
2020
}
2121

2222
func (c *Config) runArchiveCommand(fs vfs.FS, command *cobra.Command, args []string) error {
23-
targetState, err := c.getTargetState(fs)
23+
ts, err := c.getTargetState(fs)
2424
if err != nil {
2525
return err
2626
}
2727
w := tar.NewWriter(os.Stdout)
28-
if err := targetState.Archive(w, os.FileMode(c.Umask)); err != nil {
28+
if err := ts.Archive(w, os.FileMode(c.Umask)); err != nil {
2929
return err
3030
}
3131
return w.Close()

‎cmd/cat.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ func init() {
2121
}
2222

2323
func (c *Config) runCatCommand(fs vfs.FS, command *cobra.Command, args []string) error {
24-
targetState, err := c.getTargetState(fs)
24+
ts, err := c.getTargetState(fs)
2525
if err != nil {
2626
return err
2727
}
28-
entries, err := c.getEntries(targetState, args)
28+
entries, err := c.getEntries(ts, args)
2929
if err != nil {
3030
return err
3131
}

‎cmd/chattr.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ func (c *Config) runChattrCommand(fs vfs.FS, cmd *cobra.Command, args []string)
4242
if err != nil {
4343
return err
4444
}
45-
targetState, err := c.getTargetState(fs)
45+
ts, err := c.getTargetState(fs)
4646
if err != nil {
4747
return err
4848
}
49-
entries, err := c.getEntries(targetState, args[1:])
49+
entries, err := c.getEntries(ts, args[1:])
5050
if err != nil {
5151
return err
5252
}
@@ -80,11 +80,11 @@ func (c *Config) runChattrCommand(fs vfs.FS, cmd *cobra.Command, args []string)
8080
newSourceName = psfn.SourceFileName()
8181
}
8282
if newSourceName != oldSourceName {
83-
renames[filepath.Join(targetState.SourceDir, oldSourceName)] = filepath.Join(targetState.SourceDir, newSourceName)
83+
renames[filepath.Join(ts.SourceDir, oldSourceName)] = filepath.Join(ts.SourceDir, newSourceName)
8484
}
8585
}
8686

87-
actuator := c.getDefaultActuator(fs)
87+
mutator := c.getDefaultMutator(fs)
8888

8989
// Sort oldpaths in reverse so we rename files before their parent
9090
// directories.
@@ -94,7 +94,7 @@ func (c *Config) runChattrCommand(fs vfs.FS, cmd *cobra.Command, args []string)
9494
}
9595
sort.Sort(sort.Reverse(sort.StringSlice(oldpaths)))
9696
for _, oldpath := range oldpaths {
97-
if err := actuator.Rename(oldpath, renames[oldpath]); err != nil {
97+
if err := mutator.Rename(oldpath, renames[oldpath]); err != nil {
9898
return err
9999
}
100100
}

‎cmd/cmd.go‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -54,20 +54,20 @@ func (c *Config) addFunc(key string, value interface{}) {
5454
c.funcs[key] = value
5555
}
5656

57-
func (c *Config) applyArgs(fs vfs.FS, args []string, actuator chezmoi.Actuator) error {
58-
targetState, err := c.getTargetState(fs)
57+
func (c *Config) applyArgs(fs vfs.FS, args []string, mutator chezmoi.Mutator) error {
58+
ts, err := c.getTargetState(fs)
5959
if err != nil {
6060
return err
6161
}
6262
if len(args) == 0 {
63-
return targetState.Apply(fs, actuator)
63+
return ts.Apply(fs, mutator)
6464
}
65-
entries, err := c.getEntries(targetState, args)
65+
entries, err := c.getEntries(ts, args)
6666
if err != nil {
6767
return err
6868
}
6969
for _, entry := range entries {
70-
if err := entry.Apply(fs, targetState.TargetDir, targetState.Umask, actuator); err != nil {
70+
if err := entry.Apply(fs, ts.TargetDir, ts.Umask, mutator); err != nil {
7171
return err
7272
}
7373
}
@@ -88,17 +88,17 @@ func (c *Config) exec(argv []string) error {
8888
return syscall.Exec(path, argv, os.Environ())
8989
}
9090

91-
func (c *Config) getDefaultActuator(fs vfs.FS) chezmoi.Actuator {
92-
var actuator chezmoi.Actuator
91+
func (c *Config) getDefaultMutator(fs vfs.FS) chezmoi.Mutator {
92+
var mutator chezmoi.Mutator
9393
if c.DryRun {
94-
actuator = chezmoi.NullActuator
94+
mutator = chezmoi.NullMutator
9595
} else {
96-
actuator = chezmoi.NewFSActuator(fs, c.TargetDir)
96+
mutator = chezmoi.NewFSMutator(fs, c.TargetDir)
9797
}
9898
if c.Verbose {
99-
actuator = chezmoi.NewLoggingActuator(os.Stdout, actuator)
99+
mutator = chezmoi.NewLoggingMutator(os.Stdout, mutator)
100100
}
101-
return actuator
101+
return mutator
102102
}
103103

104104
func getDefaultData() (map[string]interface{}, error) {
@@ -134,14 +134,14 @@ func getDefaultData() (map[string]interface{}, error) {
134134
return data, nil
135135
}
136136

137-
func (c *Config) getEntries(targetState *chezmoi.TargetState, args []string) ([]chezmoi.Entry, error) {
137+
func (c *Config) getEntries(ts *chezmoi.TargetState, args []string) ([]chezmoi.Entry, error) {
138138
entries := []chezmoi.Entry{}
139139
for _, arg := range args {
140140
targetPath, err := filepath.Abs(arg)
141141
if err != nil {
142142
return nil, err
143143
}
144-
entry, err := targetState.Get(targetPath)
144+
entry, err := ts.Get(targetPath)
145145
if err != nil {
146146
return nil, err
147147
}
@@ -164,12 +164,12 @@ func (c *Config) getTargetState(fs vfs.FS) (*chezmoi.TargetState, error) {
164164
for key, value := range c.Data {
165165
data[key] = value
166166
}
167-
targetState := chezmoi.NewTargetState(c.TargetDir, os.FileMode(c.Umask), c.SourceDir, data, c.funcs)
167+
ts := chezmoi.NewTargetState(c.TargetDir, os.FileMode(c.Umask), c.SourceDir, data, c.funcs)
168168
readOnlyFS := vfs.NewReadOnlyFS(fs)
169-
if err := targetState.Populate(readOnlyFS); err != nil {
169+
if err := ts.Populate(readOnlyFS); err != nil {
170170
return nil, err
171171
}
172-
return targetState, nil
172+
return ts, nil
173173
}
174174

175175
func makeRunE(runCommand func(vfs.FS, *cobra.Command, []string) error) func(*cobra.Command, []string) error {

‎cmd/diff.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ func init() {
1919
}
2020

2121
func (c *Config) runDiffCommand(fs vfs.FS, command *cobra.Command, args []string) error {
22-
actuator := chezmoi.NewLoggingActuator(os.Stdout, chezmoi.NullActuator)
23-
return c.applyArgs(fs, args, actuator)
22+
mutator := chezmoi.NewLoggingMutator(os.Stdout, chezmoi.NullMutator)
23+
return c.applyArgs(fs, args, mutator)
2424
}

‎cmd/dump.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,24 +47,24 @@ func (c *Config) runDumpCommand(fs vfs.FS, command *cobra.Command, args []string
4747
if !ok {
4848
return fmt.Errorf("unknown format: %s", c.dump.format)
4949
}
50-
targetState, err := c.getTargetState(fs)
50+
ts, err := c.getTargetState(fs)
5151
if err != nil {
5252
return err
5353
}
5454
var concreteValue interface{}
5555
if len(args) == 0 {
56-
concreteValue, err = targetState.ConcreteValue(c.dump.recursive)
56+
concreteValue, err = ts.ConcreteValue(c.dump.recursive)
5757
if err != nil {
5858
return err
5959
}
6060
} else {
61-
entries, err := c.getEntries(targetState, args)
61+
entries, err := c.getEntries(ts, args)
6262
if err != nil {
6363
return err
6464
}
6565
var concreteValues []interface{}
6666
for _, entry := range entries {
67-
entryConcreteValue, err := entry.ConcreteValue(targetState.TargetDir, targetState.SourceDir, c.dump.recursive)
67+
entryConcreteValue, err := entry.ConcreteValue(ts.TargetDir, ts.SourceDir, c.dump.recursive)
6868
if err != nil {
6969
return err
7070
}

‎cmd/edit.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ func (c *Config) runEditCommand(fs vfs.FS, command *cobra.Command, args []string
3838
if c.edit.prompt {
3939
c.edit.diff = true
4040
}
41-
targetState, err := c.getTargetState(fs)
41+
ts, err := c.getTargetState(fs)
4242
if err != nil {
4343
return err
4444
}
45-
entries, err := c.getEntries(targetState, args)
45+
entries, err := c.getEntries(ts, args)
4646
if err != nil {
4747
return err
4848
}
@@ -71,17 +71,17 @@ func (c *Config) runEditCommand(fs vfs.FS, command *cobra.Command, args []string
7171
return err
7272
}
7373
readOnlyFS := vfs.NewReadOnlyFS(fs)
74-
applyActuator := c.getDefaultActuator(fs)
74+
applyMutator := c.getDefaultMutator(fs)
7575
for i, entry := range entries {
76-
anyActuator := chezmoi.NewAnyActuator(chezmoi.NullActuator)
77-
var actuator chezmoi.Actuator = anyActuator
76+
anyMutator := chezmoi.NewAnyMutator(chezmoi.NullMutator)
77+
var mutator chezmoi.Mutator = anyMutator
7878
if c.edit.diff {
79-
actuator = chezmoi.NewLoggingActuator(os.Stdout, actuator)
79+
mutator = chezmoi.NewLoggingMutator(os.Stdout, mutator)
8080
}
81-
if err := entry.Apply(readOnlyFS, targetState.TargetDir, targetState.Umask, actuator); err != nil {
81+
if err := entry.Apply(readOnlyFS, ts.TargetDir, ts.Umask, mutator); err != nil {
8282
return err
8383
}
84-
if c.edit.apply && anyActuator.Actuated() {
84+
if c.edit.apply && anyMutator.Mutated() {
8585
if c.edit.prompt {
8686
choice, err := prompt(fmt.Sprintf("Apply %s", args[i]), "ynqa")
8787
if err != nil {
@@ -97,7 +97,7 @@ func (c *Config) runEditCommand(fs vfs.FS, command *cobra.Command, args []string
9797
c.edit.prompt = false
9898
}
9999
}
100-
if err := entry.Apply(readOnlyFS, targetState.TargetDir, targetState.Umask, applyActuator); err != nil {
100+
if err := entry.Apply(readOnlyFS, ts.TargetDir, ts.Umask, applyMutator); err != nil {
101101
return err
102102
}
103103
}

0 commit comments

Comments
 (0)