package: simplify parameter of NewPackage

4 files changed, 12 insertions, 13 deletions

diff --git a/beku_test.go b/beku_test.go
index 987264f..9b463c5 100644
--- a/beku_test.go
+++ b/beku_test.go
@@ -57,9 +57,9 @@ func TestMain(m *testing.M) {
 		log.Fatal(err)
 	}
 
-	testGitPkgCur, _ = NewPackage(testEnv, testGitRepo, testGitRepo)
-	testGitPkgNew, _ = NewPackage(testEnv, testGitRepo, testGitRepo)
-	testGitPkgInstall, _ = NewPackage(testEnv, testGitRepo, testGitRepo)
+	testGitPkgCur, _ = NewPackage(testEnv.dirSrc, testGitRepo)
+	testGitPkgNew, _ = NewPackage(testEnv.dirSrc, testGitRepo)
+	testGitPkgInstall, _ = NewPackage(testEnv.dirSrc, testGitRepo)
 
 	wd, err := os.Getwd()
 	if err != nil {
diff --git a/env.go b/env.go
index eea7c80..6e8a14d 100644
--- a/env.go
+++ b/env.go
@@ -266,7 +266,7 @@ func (env *Env) GetLocalPackage(importPath string) (pkg *Package, err error) {
 		return
 	}
 
-	pkg, err = NewPackage(env, importPath, importPath)
+	pkg, err = NewPackage(env.dirSrc, importPath)
 	if err != nil {
 		return
 	}
@@ -338,7 +338,7 @@ func (env *Env) GetUnused(srcPath string) (err error) {
 			continue
 		}
 
-		pkg, err = NewPackage(env, importPath, importPath)
+		pkg, err = NewPackage(env.dirSrc, importPath)
 		if err != nil {
 			return
 		}
@@ -502,7 +502,7 @@ func (env *Env) newPackage(fullPath string) (err error) {
 		return
 	}
 
-	pkg, err := NewPackage(env, pkgName, pkgName)
+	pkg, err := NewPackage(env.dirSrc, pkgName)
 	if err != nil {
 		return
 	}
@@ -1202,7 +1202,7 @@ func (env *Env) Sync(pkgName, importPath string) (err error) {
 		return
 	}
 
-	newPkg, err := NewPackage(env, pkgName, importPath)
+	newPkg, err := NewPackage(env.dirSrc, importPath)
 	if err != nil {
 		return
 	}
diff --git a/package.go b/package.go
index db043ff..51c656d 100644
--- a/package.go
+++ b/package.go
@@ -50,13 +50,12 @@ type Package struct {
 // NewPackage create a package set the package version, tag status, and
 // dependencies.
 //
-func NewPackage(env *Env, pkgName, importPath string) (
+func NewPackage(gopathSrc, importPath string) (
 	pkg *Package, err error,
 ) {
-	repoRoot, err := vcs.RepoRootForImportPath(importPath, debug.Value >= 2)
+	repoRoot, err := vcs.RepoRootForImportPath(importPath, debug.Value >= 1)
 	if err != nil {
 		fmt.Fprintf(defStderr, "[PKG] NewPackage >>> error: %s\n", err.Error())
-		fmt.Fprintf(defStderr, "[PKG] NewPackage >>> skip %s\n", pkgName)
 		return
 	}
 
@@ -71,7 +70,7 @@ func NewPackage(env *Env, pkgName, importPath string) (
 
 	pkg = &Package{
 		ImportPath: repoRoot.Root,
-		FullPath:   filepath.Join(env.dirSrc, importPath),
+		FullPath:   filepath.Join(gopathSrc, repoRoot.Root),
 		RemoteName: gitDefRemoteName,
 		RemoteURL:  repoRoot.Repo,
 		vcsMode:    repoRoot.VCS.Cmd,
diff --git a/package_test.go b/package_test.go
index c118114..6bca340 100644
--- a/package_test.go
+++ b/package_test.go
@@ -34,7 +34,7 @@ func testPackageRemove(t *testing.T) {
 		t.Log(c.desc)
 
 		if len(c.pkgName) > 0 {
-			c.pkg, _ = NewPackage(testEnv, c.pkgName, c.pkgName)
+			c.pkg, _ = NewPackage(testEnv.dirSrc, c.pkgName)
 		}
 
 		err := c.pkg.Remove()
@@ -743,7 +743,7 @@ func testPackageGoClean(t *testing.T) {
 		t.Log(c.desc)
 
 		if len(c.pkgName) > 0 {
-			c.pkg, _ = NewPackage(testEnv, c.pkgName, c.pkgName)
+			c.pkg, _ = NewPackage(testEnv.dirSrc, c.pkgName)
 		}
 
 		err = c.pkg.GoClean()