From ab5c1cddb59e018ea6f80352cc702f8bfd5f11e9 Mon Sep 17 00:00:00 2001 From: Leo Zhang Date: Mon, 6 Aug 2018 19:32:22 -0700 Subject: [PATCH] refactor(vcs): Shorten names --- analyzers/golang/project.go | 2 +- vcs/vcs.go | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/analyzers/golang/project.go b/analyzers/golang/project.go index 375146b784..3c6f307f57 100644 --- a/analyzers/golang/project.go +++ b/analyzers/golang/project.go @@ -70,7 +70,7 @@ func (a *Analyzer) Project(pkg string) (Project, error) { tool, manifestDir, err := NearestLockfile(dir) // Find the nearest VCS repository. - _, repoRoot, err := vcs.NearestVCS(dir) + _, repoRoot, err := vcs.Nearest(dir) if err != nil { return Project{}, err } diff --git a/vcs/vcs.go b/vcs/vcs.go index 7a31bb465c..ca15b64815 100644 --- a/vcs/vcs.go +++ b/vcs/vcs.go @@ -16,9 +16,9 @@ var ( ErrNoNearestVCS = errors.New("could not find nearest VCS repository in directory") ) -// VCSIn returns the type of VCS repository rooted at a directory, or +// In returns the type of VCS repository rooted at a directory, or // ErrNoVCSInDir if none is found. -func vcsIn(dirname string) (VCS, error) { +func In(dirname string) (VCS, error) { for _, vcs := range Types { ok, err := files.ExistsFolder(filepath.Join(dirname, MetadataFolder(vcs))) if err != nil { @@ -31,12 +31,12 @@ func vcsIn(dirname string) (VCS, error) { return 0, ErrNoVCSInDir } -// NearestVCS returns the type and directory of the nearest VCS repository +// Nearest returns the type and directory of the nearest VCS repository // containing the directory, or ErrNoNearestVCS if none is found. -func NearestVCS(dirname string) (VCS, string, error) { +func Nearest(dirname string) (VCS, string, error) { var vcs VCS dir, err := files.WalkUp(dirname, func(d string) error { - tool, err := vcsIn(d) + tool, err := In(d) if err == ErrNoVCSInDir { return nil } @@ -56,7 +56,7 @@ func NearestVCS(dirname string) (VCS, string, error) { // errutil.ErrRepositoryNotFound if none is found, or errutil.ErrNotImplemented // if an unsupported VCS is found. func GetRepository(dirname string) (string, error) { - vcs, dir, err := NearestVCS(dirname) + vcs, dir, err := Nearest(dirname) if err == ErrNoNearestVCS { return "", errutil.ErrRepositoryNotFound }