uninstall: add -f option

README.md

@@ -14,7 +14,7 @@ $ dotsync changes
 
 $ dotsync pull [-n]
 
-$ dotsync uninstall path
+$ dotsync uninstall [-f] path
 
 $ dotsync export
 ```
@@ -23,7 +23,7 @@ $ dotsync export
 
 `dotsync install` links *source* to *dest* to manage changes. When *-f* option is passed, it overwrites *dest* even if file is already exists.
 
-`dotsync uninstall` unlink and remove *path*.
+`dotsync uninstall` unlink and remove *path*. When *-f* option is passed, it removes *path* even if file is locally modified.
 
 `dotsync changes` prints locally changed filenames.
 

testdata/uninstall/discard.script

@@ -0,0 +1,5 @@
+uninstall -f ~/out/.exrc
+-- out/.exrc --
+set ts=8
+-- .local/state/dotsync/store/.exrc --
+7970153163bfaaba0780d262461fb7b692380f6d249da3aef109f93ba2a7d643 644 $TEST_DIR/out/.exrc

testdata/uninstall/modified.script

@@ -0,0 +1,9 @@
+uninstall ~/out/.exrc // /\.exrc: locally modified; will not remove
+-- out/.exrc --
+set ts=8
+-- out/.exrc.golden --
+set ts=8
+-- .local/state/dotsync/store/.exrc --
+7970153163bfaaba0780d262461fb7b692380f6d249da3aef109f93ba2a7d643 644 $TEST_DIR/out/.exrc
+-- .local/state/dotsync/store/.exrc.golden --
+7970153163bfaaba0780d262461fb7b692380f6d249da3aef109f93ba2a7d643 644 $TEST_DIR/out/.exrc

uninstall.go

@@ -1,14 +1,15 @@
 package main
 
 import (
+ "fmt"
  "io"
- "log"
  "os"
  "path/filepath"
 )
 
 func runUninstall(r *Repository, args []string, w io.Writer) error {
  f := NewFlagSet("uninstall", "path")
+ force := f.Bool("f", false, "discard locally changes and remove")
 
  if err := f.Parse(args); err != nil {
  return err
@@ -46,9 +47,8 @@ func runUninstall(r *Repository, args []string, w io.Writer) error {
  if err != nil {
  return err
  }
- if !ok || h != state.Hash {
- log.Printf("%s: locally modified; will not remove", state.Target)
- return &alreadyShownError{err: err}
+ if !*force && (!ok || h != state.Hash) {
+ return fmt.Errorf("%s: locally modified; will not remove", state.Target)
  }
  if err := remove(p); err != nil {
  return err

uninstall_test.go

@@ -19,6 +19,18 @@ func TestRunUninstall(t *testing.T) {
  "~/.local/state/dotsync/store/.exrc",
  },
  },
+ {
+ script: "testdata/uninstall/modified.script",
+ label: "occurs an error if file is modified",
+ },
+ {
+ script: "testdata/uninstall/discard.script",
+ label: "remove a target file and its state if modified",
+ files: []string{
+ "~/out/.exrc",
+ "~/.local/state/dotsync/store/.exrc",
+ },
+ },
  }
  for _, tt := range tests {
  t.Run(tt.label, func(t *testing.T) {