Refactor configuration of cache dir and repository

cache.go

@@ -18,11 +18,17 @@ type Cache struct {
 	base string
 }
 
-func NewCache(repo *repository.Repository) (*Cache, error) {
+// NewCache returns a new cache at cacheDir. If it is the empty string, the
-	cacheDir, err := getCacheDir()
+// default cache location is chosen.
+func NewCache(repo *repository.Repository, cacheDir string) (*Cache, error) {
+	var err error
+
+	if cacheDir == "" {
+		cacheDir, err = getCacheDir()
 		if err != nil {
 			return nil, err
 		}
+	}
 
 	basedir := filepath.Join(cacheDir, repo.Config.ID)
 	debug.Log("Cache.New", "opened cache at %v", basedir)

cache_test.go

@@ -11,7 +11,7 @@ func TestCache(t *testing.T) {
 	repo := SetupRepo(t)
 	defer TeardownRepo(t, repo)
 
-	_, err := restic.NewCache(repo)
+	_, err := restic.NewCache(repo, "")
 	OK(t, err)
 
 	arch := restic.NewArchiver(repo)

cmd/restic/cmd_cache.go

@@ -32,7 +32,7 @@ func (cmd CmdCache) Execute(args []string) error {
 		return err
 	}
 
-	cache, err := restic.NewCache(s)
+	cache, err := restic.NewCache(s, opts.CacheDir)
 	if err != nil {
 		return err
 	}

cmd/restic/cmd_key.go

@@ -56,15 +56,28 @@ func listKeys(s *repository.Repository) error {
 	return nil
 }
 
-func addKey(s *repository.Repository) error {
+func getNewPassword() (string, error) {
-	pw := readPassword("RESTIC_NEWPASSWORD", "enter password for new key: ")
+	newPassword := os.Getenv("RESTIC_NEWPASSWORD")
-	pw2 := readPassword("RESTIC_NEWPASSWORD", "enter password again: ")
 
-	if pw != pw2 {
+	if newPassword == "" {
-		return errors.New("passwords do not match")
+		newPassword = readPassword("enter password for new key: ")
+		newPassword2 := readPassword("enter password again: ")
+
+		if newPassword != newPassword2 {
+			return "", errors.New("passwords do not match")
+		}
 	}
 
-	id, err := repository.AddKey(s, pw, s.Key())
+	return newPassword, nil
+}
+
+func addKey(repo *repository.Repository) error {
+	newPassword, err := getNewPassword()
+	if err != nil {
+		return err
+	}
+
+	id, err := repository.AddKey(repo, newPassword, repo.Key())
 	if err != nil {
 		return fmt.Errorf("creating new key failed: %v\n", err)
 	}
@@ -88,22 +101,18 @@ func deleteKey(repo *repository.Repository, name string) error {
 	return nil
 }
 
-func changePassword(s *repository.Repository) error {
+func changePassword(repo *repository.Repository) error {
-	pw := readPassword("RESTIC_NEWPASSWORD", "enter password for new key: ")
+	newPassword, err := getNewPassword()
-	pw2 := readPassword("RESTIC_NEWPASSWORD", "enter password again: ")
+	if err != nil {
-
+		return err
-	if pw != pw2 {
-		return errors.New("passwords do not match")
 	}
 
-	// add new key
+	id, err := repository.AddKey(repo, newPassword, repo.Key())
-	id, err := repository.AddKey(s, pw, s.Key())
 	if err != nil {
 		return fmt.Errorf("creating new key failed: %v\n", err)
 	}
 
-	// remove old key
+	err = repo.Backend().Remove(backend.Key, repo.KeyName())
-	err = s.Backend().Remove(backend.Key, s.KeyName())
 	if err != nil {
 		return err
 	}

cmd/restic/main.go

@@ -21,6 +21,9 @@ var version = "compiled manually"
 
 var opts struct {
 	Repo     string `short:"r" long:"repo"      description:"Repository directory to backup to/restore from"`
+	CacheDir string `          long:"cache-dir" description:"Directory to use as a local cache"`
+
+	password string
 }
 
 var parser = flags.NewParser(&opts, flags.Default)
@@ -33,15 +36,7 @@ func errx(code int, format string, data ...interface{}) {
 	os.Exit(code)
 }
 
-func readPassword(env string, prompt string) string {
+func readPassword(prompt string) string {
-	if env != "" {
-		p := os.Getenv(env)
-
-		if p != "" {
-			return p
-		}
-	}
-
 	fmt.Fprint(os.Stderr, prompt)
 	pw, err := terminal.ReadPassword(int(os.Stdin.Fd()))
 	if err != nil {
@@ -59,13 +54,17 @@ func (cmd CmdInit) Execute(args []string) error {
 		return errors.New("Please specify repository location (-r)")
 	}
 
-	pw := readPassword("RESTIC_PASSWORD", "enter password for new backend: ")
+	if opts.password == "" {
-	pw2 := readPassword("RESTIC_PASSWORD", "enter password again: ")
+		pw := readPassword("enter password for new backend: ")
+		pw2 := readPassword("enter password again: ")
 
 		if pw != pw2 {
 			errx(1, "passwords do not match")
 		}
 
+		opts.password = pw
+	}
+
 	be, err := create(opts.Repo)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "creating backend at %s failed: %v\n", opts.Repo, err)
@@ -73,7 +72,7 @@ func (cmd CmdInit) Execute(args []string) error {
 	}
 
 	s := repository.New(be)
-	err = s.Init(pw)
+	err = s.Init(opts.password)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "creating key in backend at %s failed: %v\n", opts.Repo, err)
 		os.Exit(1)
@@ -145,7 +144,11 @@ func OpenRepo() (*repository.Repository, error) {
 
 	s := repository.New(be)
 
-	err = s.SearchKey(readPassword("RESTIC_PASSWORD", "enter password for repository: "))
+	if opts.password == "" {
+		opts.password = readPassword("enter password for repository: ")
+	}
+
+	err = s.SearchKey(opts.password)
 	if err != nil {
 		return nil, fmt.Errorf("unable to open repo: %v", err)
 	}
@@ -170,6 +173,7 @@ func main() {
 	// defer profile.Start(profile.MemProfileRate(100000), profile.ProfilePath(".")).Stop()
 	// defer profile.Start(profile.CPUProfile, profile.ProfilePath(".")).Stop()
 	opts.Repo = os.Getenv("RESTIC_REPOSITORY")
+	opts.password = os.Getenv("RESTIC_PASSWORD")
 
 	debug.Log("restic", "main %#v", os.Args)
 

test/backend.go

@@ -3,7 +3,6 @@ package test_helper
 import (
 	"flag"
 	"io/ioutil"
-	"os"
 	"path/filepath"
 	"testing"
 
@@ -25,10 +24,6 @@ func SetupRepo(t testing.TB) *repository.Repository {
 	b, err := local.Create(filepath.Join(tempdir, "repo"))
 	OK(t, err)
 
-	// set cache dir below temp dir
-	err = os.Setenv("RESTIC_CACHE", filepath.Join(tempdir, "cache"))
-	OK(t, err)
-
 	repo := repository.New(b)
 	OK(t, repo.Init(*TestPassword))
 	return repo