Merge pull request #461 from Masterminds/feat/resolve-test-imports
Resolve Test Imports
diff --git a/action/config_wizard.go b/action/config_wizard.go
index bcf8f14..1257980 100644
--- a/action/config_wizard.go
+++ b/action/config_wizard.go
@@ -43,7 +43,7 @@
}
msg.Info("Looking for dependencies to make suggestions on")
- msg.Info("--> Scanning for dependencies not using verion ranges")
+ msg.Info("--> Scanning for dependencies not using version ranges")
msg.Info("--> Scanning for dependencies using commit ids")
var deps []*cfg.Dependency
for _, dep := range conf.Imports {
@@ -210,7 +210,7 @@
func wizardAskRange(ver *semver.Version, d *cfg.Dependency) string {
vstr := ver.String()
msg.Info("The package %s appears to use semantic versions (http://semver.org).", d.Name)
- msg.Info("Would you like to track the latest minor or patch releases (major.minor.path)?")
+ msg.Info("Would you like to track the latest minor or patch releases (major.minor.patch)?")
msg.Info("Tracking minor version releases would use '>= %s, < %d.0.0' ('^%s'). Tracking patch version", vstr, ver.Major()+1, vstr)
msg.Info("releases would use '>= %s, < %d.%d.0' ('~%s'). For more information on Glide versions", vstr, ver.Major(), ver.Minor()+1, vstr)
msg.Info("and ranges see https://glide.sh/docs/versions")
@@ -237,7 +237,7 @@
func wizardAskLatest(latest string, d *cfg.Dependency) bool {
msg.Info("The package %s appears to have Semantic Version releases (http://semver.org). ", d.Name)
- msg.Info("The latestrelease is %s. You are currently not using a release. Would you like", latest)
+ msg.Info("The latest release is %s. You are currently not using a release. Would you like", latest)
msg.Info("to use this release? Yes (Y) or No (N)")
return msg.PromptUntilYorN()
}
diff --git a/dependency/resolver.go b/dependency/resolver.go
index c967ee7..06dd2dc 100644
--- a/dependency/resolver.go
+++ b/dependency/resolver.go
@@ -295,6 +295,9 @@
// We are only looking for dependencies in vendor. No root, cgo, etc.
for _, imp := range imps {
+ if r.Config.HasIgnore(imp) {
+ continue
+ }
if alreadySeen[imp] {
continue
}
diff --git a/docs/glide.yaml.md b/docs/glide.yaml.md
index f0173ac..1b87990 100644
--- a/docs/glide.yaml.md
+++ b/docs/glide.yaml.md
@@ -9,9 +9,9 @@
- name: Matt Butcher
email: technosophos@gmail.com
homepage: http://technosophos.com
- - name: Matt Farina
- email: matt@mattfarina.com
- homepage: https://www.mattfarina.com
+ - name: Matt Farina
+ email: matt@mattfarina.com
+ homepage: https://www.mattfarina.com
ignore:
- appengine
excludeDirs:
