all: more Camlistore to Perkeep renamings

Updates #981

Change-Id: I7fd4958bceaa4ada63d07aacf08af11cc03f32d7

cmd/camtool/env.go

@@ -31,7 +31,7 @@ var envMap = map[string]func() string{
 	"configdir":    osutil.CamliConfigDir,
 	"clientconfig": osutil.UserClientConfigPath,
 	"serverconfig": osutil.UserServerConfigPath,
-	"camsrcroot":   envSrcRoot,
+	"srcroot":      envSrcRoot,
 	"secretring":   envSecretRingFile,
 }
 

dev/local.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
-export CAMLI_CONFENV_SECRET_RING=$(camtool env camsrcroot)/pkg/jsonsign/testdata/test-secring.gpg
-export CAMLI_CONFIG_DIR=$(camtool env camsrcroot)/dev/config-dir-local
+export CAMLI_CONFENV_SECRET_RING=$(camtool env srcroot)/pkg/jsonsign/testdata/test-secring.gpg
+export CAMLI_CONFIG_DIR=$(camtool env srcroot)/dev/config-dir-local
 
 # Redundant, but:
 export CAMLI_DEFAULT_SERVER=dev

pkg/test/integration/diskpacked_test.go

@@ -44,7 +44,7 @@ func benchmarkWrite(b *testing.B, cfg string) {
 	if err != nil {
 		b.Fatalf("could not create server for config: %v\nError: %v", cfg, err)
 	}
-	testFile := filepath.Join(w.CamliSourceRoot(), testFileRel)
+	testFile := filepath.Join(w.SourceRoot(), testFileRel)
 	createTestFile(b, testFile, testFileSize)
 	defer os.Remove(testFile)
 	b.ResetTimer()

pkg/test/world.go

@@ -44,7 +44,7 @@ import (
 // camput, camget, camtool, etc) together in large tests, including
 // building them, finding them, and wiring them up in an isolated way.
 type World struct {
-	camRoot  string // typically $GOPATH[0]/src/perkeep.org
+	srcRoot  string // typically $GOPATH[0]/src/perkeep.org
 	config   string // server config file relative to pkg/test/testdata
 	tempDir  string
 	listener net.Listener // randomly chosen 127.0.0.1 port for the server
@@ -55,8 +55,8 @@ type World struct {
 	serverErr error
 }
 
-// CamliSourceRoot returns the root of the source tree, or an error.
-func camliSourceRoot() (string, error) {
+// pkSourceRoot returns the root of the source tree, or an error.
+func pkSourceRoot() (string, error) {
 	if os.Getenv("GOPATH") == "" {
 		return "", errors.New("GOPATH environment variable isn't set; required to run Perkeep integration tests")
 	}
@@ -77,7 +77,7 @@ func NewWorld() (*World, error) {
 // This cfg is the server config relative to pkg/test/testdata.
 // It requires that GOPATH is set to find the "perkeep.org" root.
 func WorldFromConfig(cfg string) (*World, error) {
-	root, err := camliSourceRoot()
+	root, err := pkSourceRoot()
 	if err != nil {
 		return nil, err
 	}
@@ -87,7 +87,7 @@ func WorldFromConfig(cfg string) (*World, error) {
 	}
 
 	return &World{
-		camRoot:  root,
+		srcRoot:  root,
 		config:   cfg,
 		listener: ln,
 		port:     ln.Addr().(*net.TCPAddr).Port,
@@ -98,9 +98,9 @@ func (w *World) Addr() string {
 	return w.listener.Addr().String()
 }
 
-// CamliSourceRoot returns the root of the source tree.
-func (w *World) CamliSourceRoot() string {
-	return w.camRoot
+// SourceRoot returns the root of the source tree.
+func (w *World) SourceRoot() string {
+	return w.srcRoot
 }
 
 // Build builds the Perkeep binaries.
@@ -120,7 +120,7 @@ func (w *World) Build() error {
 		}
 		var latestModtime time.Time
 		for _, target := range targs {
-			binPath := filepath.Join(w.camRoot, "bin", target)
+			binPath := filepath.Join(w.srcRoot, "bin", target)
 			fi, err := os.Stat(binPath)
 			if err != nil {
 				if !os.IsNotExist(err) {
@@ -141,7 +141,7 @@ func (w *World) Build() error {
 			// can be made true if devcam test -verbose ?
 			cmd.Args = append(cmd.Args, "-v=true")
 		}
-		cmd.Dir = w.camRoot
+		cmd.Dir = w.srcRoot
 		log.Print("Running make.go to build perkeep binaries for testing...")
 		out, err := cmd.CombinedOutput()
 		if err != nil {
@@ -162,7 +162,7 @@ func (w *World) Help() ([]byte, error) {
 	}
 	// Run camlistored -help.
 	cmd := exec.Command(
-		filepath.Join(w.camRoot, "bin", "camlistored"),
+		filepath.Join(w.srcRoot, "bin", "camlistored"),
 		"-help",
 	)
 	return cmd.CombinedOutput()
@@ -176,9 +176,9 @@ func (w *World) Start() error {
 	// Start camlistored.
 	{
 		w.server = exec.Command(
-			filepath.Join(w.camRoot, "bin", "camlistored"),
+			filepath.Join(w.srcRoot, "bin", "camlistored"),
 			"--openbrowser=false",
-			"--configfile="+filepath.Join(w.camRoot, "pkg", "test", "testdata", w.config),
+			"--configfile="+filepath.Join(w.srcRoot, "pkg", "test", "testdata", w.config),
 			"--listen=FD:3",
 			"--pollparent=true",
 		)
@@ -194,7 +194,7 @@ func (w *World) Start() error {
 		w.server.Env = append(os.Environ(),
 			"CAMLI_DEBUG=1",
 			"CAMLI_ROOT="+w.tempDir,
-			"CAMLI_SECRET_RING="+filepath.Join(w.camRoot, filepath.FromSlash("pkg/jsonsign/testdata/test-secring.gpg")),
+			"CAMLI_SECRET_RING="+filepath.Join(w.srcRoot, filepath.FromSlash("pkg/jsonsign/testdata/test-secring.gpg")),
 			"CAMLI_BASE_URL=http://127.0.0.1:"+strconv.Itoa(w.port),
 		)
 		listenerFD, err := w.listener.(*net.TCPListener).File()
@@ -302,8 +302,8 @@ func (w *World) CmdWithEnv(binary string, env []string, args ...string) *exec.Cm
 			// but camtool is never used. (and pk-mount does not even have a -verbose).
 			args = append([]string{"-verbose"}, args...)
 		}
-		cmd = exec.Command(filepath.Join(w.camRoot, "bin", binary), args...)
-		clientConfigDir := filepath.Join(w.camRoot, "config", "dev-client-dir")
+		cmd = exec.Command(filepath.Join(w.srcRoot, "bin", binary), args...)
+		clientConfigDir := filepath.Join(w.srcRoot, "config", "dev-client-dir")
 		cmd.Env = append([]string{
 			"CAMLI_CONFIG_DIR=" + clientConfigDir,
 			// Respected by env expansions in config/dev-client-dir/client-config.json:
@@ -387,7 +387,7 @@ func (w *World) ClientIdentity() string {
 // SecretRingFile returns the GnuPG secret ring, suitable for setting
 // in CAMLI_SECRET_RING.
 func (w *World) SecretRingFile() string {
-	return filepath.Join(w.camRoot, "pkg", "jsonsign", "testdata", "test-secring.gpg")
+	return filepath.Join(w.srcRoot, "pkg", "jsonsign", "testdata", "test-secring.gpg")
 }
 
 // SearchHandlerPath returns the path to the search handler, with trailing slash.
@@ -395,5 +395,5 @@ func (w *World) SearchHandlerPath() string { return "/my-search/" }
 
 // ServerBinary returns the location of the camlistored binary running for this World.
 func (w *World) ServerBinary() string {
-	return filepath.Join(w.camRoot, "bin", "camlistored")
+	return filepath.Join(w.srcRoot, "bin", "camlistored")
 }

server/camnetdns/camnetdns.go

@@ -19,6 +19,7 @@ limitations under the License.
 package main
 
 import (
+	"context"
 	"crypto/rand"
 	"crypto/tls"
 	"errors"
@@ -35,8 +36,6 @@ import (
 	"perkeep.org/pkg/gpgchallenge"
 	"perkeep.org/pkg/sorted"
 
-	"context"
-
 	"cloud.google.com/go/compute/metadata"
 	"cloud.google.com/go/datastore"
 	"cloud.google.com/go/logging"

website/camweb.go

@@ -696,7 +696,7 @@ func runDemoBlobServerContainer(name string) error {
 		"--name="+name,
 		"-e", "CAMLI_ROOT="+prodSrcDir+"/website/blobserver-example/root",
 		"-e", "CAMLI_PASSWORD="+randHex(20),
-		"-v", camSrcDir()+":"+prodSrcDir,
+		"-v", pkSrcDir()+":"+prodSrcDir,
 		"--net=host",
 		"--workdir="+prodSrcDir,
 		"camlistore/demoblobserver",
@@ -1174,7 +1174,7 @@ func errHandler(w http.ResponseWriter, r *http.Request) {
 	})
 }
 
-func camSrcDir() string {
+func pkSrcDir() string {
 	if inProd {
 		return prodSrcDir
 	}

website/email.go

@@ -170,7 +170,7 @@ func commitEmailLoop() error {
 		}
 	}()
 
-	dir := camSrcDir()
+	dir := pkSrcDir()
 
 	http.HandleFunc("/latesthash", latestHashHandler)
 	http.HandleFunc("/debug/email", func(w http.ResponseWriter, r *http.Request) {