luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow running whatDependsOn without version

This commit is contained in:
TzeKei Lee 2016-12-15 02:25:47 +08:00
parent 546e8e2e05
commit 75a5398404
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/scala/net/virtualvoid/sbt/graph/DependencyGraphSettings.scala
View File

@ -98,7 +98,10 @@ object DependencyGraphSettings {
}, },
whatDependsOn <<= InputTask(artifactIdParser) { module ⇒ whatDependsOn <<= InputTask(artifactIdParser) { module ⇒
(module, streams, moduleGraph) map { (module, streams, graph) ⇒ (module, streams, moduleGraph) map { (module, streams, graph) ⇒
streams.log.info(rendering.AsciiTree.asciiTree(GraphTransformations.reverseGraphStartingAt(graph, module))) if (module.version.isEmpty) {
val modules = graph.reverseDependencyMap.filter(m ⇒ m._1.copy(version = "") == module).keys
modules.foreach(m ⇒ streams.log.info(rendering.AsciiTree.asciiTree(GraphTransformations.reverseGraphStartingAt(graph, m))))
} else streams.log.info(rendering.AsciiTree.asciiTree(GraphTransformations.reverseGraphStartingAt(graph, module)))
} }
}, },
licenseInfo <<= (moduleGraph, streams) map showLicenseInfo)) licenseInfo <<= (moduleGraph, streams) map showLicenseInfo))
@ -188,11 +191,14 @@ object DependencyGraphSettings {
import sbt.complete.DefaultParsers._ import sbt.complete.DefaultParsers._
graph.nodes.map(_.id).map { graph.nodes.map(_.id).map {
case id @ ModuleId(org, name, version) ⇒ case id @ ModuleId(org, name, version) ⇒
(Space ~ token(org) ~ token(Space ~ name) ~ token(Space ~ version)).map(_ ⇒ id) (Space ~ token(org) ~ token(Space ~ name) ~ token(Space ~ version).?).map(_._2 match {
case Some(_) ⇒ id
case None ⇒ id.copy(version = "")
})
}.reduceOption(_ | _).getOrElse { }.reduceOption(_ | _).getOrElse {
(Space ~> token(StringBasic, "organization") ~ Space ~ token(StringBasic, "module") ~ Space ~ token(StringBasic, "version")).map { (Space ~> token(StringBasic, "organization") ~ Space ~ token(StringBasic, "module") ~ (Space ~ token(StringBasic, "version")).?).map {
case ((((org, _), mod), _), version) ⇒ case (((org, _), mod), version) ⇒
ModuleId(org, mod, version) ModuleId(org, mod, version.map(_._2).getOrElse(""))
} }
} }
} }