move ModuleGraph et al to model package

Author: ryan-williams

src/main/scala-sbt-0.13/net/virtualvoid/sbt/graph/rendering/AsciiGraph.scala

@@ -19,6 +19,7 @@ package rendering
 
 import com.github.mdr.ascii.layout._
 import net.virtualvoid.sbt.graph.DependencyGraphKeys._
+import net.virtualvoid.sbt.graph.model.{ Module, ModuleGraph }
 import sbt.Keys._
 
 object AsciiGraph {

src/main/scala/net/virtualvoid/sbt/graph/DependencyGraphKeys.scala

@@ -16,6 +16,7 @@
 
 package net.virtualvoid.sbt.graph
 
+import net.virtualvoid.sbt.graph.model.ModuleGraph
 import sbt._
 
 trait DependencyGraphKeys {

src/main/scala/net/virtualvoid/sbt/graph/DependencyGraphSettings.scala

@@ -18,6 +18,7 @@ package net.virtualvoid.sbt.graph
 
 import net.virtualvoid.sbt.graph.GraphTransformations.reverseGraphStartingAt
 import net.virtualvoid.sbt.graph.backend.{ IvyReport, SbtUpdateReport }
+import net.virtualvoid.sbt.graph.model.{ ModuleGraph, ModuleId }
 import net.virtualvoid.sbt.graph.rendering.{ AsciiGraph, AsciiTree, DagreHTML }
 import net.virtualvoid.sbt.graph.util.IOUtil
 import sbt.Keys._
@@ -31,7 +32,7 @@ import scala.language.reflectiveCalls
 
 object DependencyGraphSettings {
   import DependencyGraphKeys._
-  import ModuleGraphProtocol._
+  import net.virtualvoid.sbt.graph.model.ModuleGraphProtocol._
 
   def graphSettings = baseSettings ++ reportSettings
 

src/main/scala/net/virtualvoid/sbt/graph/GraphTransformations.scala

@@ -16,6 +16,8 @@
 
 package net.virtualvoid.sbt.graph
 
+import net.virtualvoid.sbt.graph.model.{ Module, ModuleGraph, ModuleId }
+
 object GraphTransformations {
   def reverseGraphStartingAt(graph: ModuleGraph, root: ModuleId): ModuleGraph = {
     val deps = graph.reverseDependencyMap

src/main/scala/net/virtualvoid/sbt/graph/backend/IvyReport.scala

@@ -17,7 +17,9 @@
 package net.virtualvoid.sbt.graph
 package backend
 
-import scala.xml.{ NodeSeq, Document, Node }
+import net.virtualvoid.sbt.graph.model.{ Module, ModuleGraph, ModuleId }
+
+import scala.xml.{ Document, Node, NodeSeq }
 import scala.xml.parsing.ConstructingParser
 
 object IvyReport {

src/main/scala/net/virtualvoid/sbt/graph/backend/SbtUpdateReport.scala

@@ -17,9 +17,10 @@
 package net.virtualvoid.sbt.graph
 package backend
 
+import net.virtualvoid.sbt.graph.model.{ Module, ModuleGraph, ModuleId }
+
 import scala.language.implicitConversions
 import scala.language.reflectiveCalls
-
 import sbt._
 
 object SbtUpdateReport {

src/main/scala/net/virtualvoid/sbt/graph/model.scala renamed to src/main/scala/net/virtualvoid/sbt/graph/model/ModuleGraph.scala

@@ -14,13 +14,15 @@
  *    limitations under the License.
  */
 
-package net.virtualvoid.sbt.graph
+package net.virtualvoid.sbt.graph.model
 
 import java.io.File
 
-import net.virtualvoid.sbt.graph.ModuleGraph.DepMap
+import net.virtualvoid.sbt.graph.model.ModuleGraph.DepMap
+import net.virtualvoid.sbt.graph.{ Edge, ModuleGraphProtocolCompat }
 import sbinary.Format
 
+import scala.collection.mutable
 import scala.collection.mutable.{ HashMap, MultiMap, Set }
 
 case class ModuleId(organisation: String,
@@ -68,6 +70,64 @@ case class ModuleGraph(nodes: Seq[Module], edges: Seq[Edge]) {
 
   def roots: Seq[Module] =
     nodes.filter(n ⇒ !edges.exists(_._2 == n.id)).sortBy(_.id.idString)
+
+  def filter(rules: FilterRule*): DepMap = {
+    val map = mutable.Map[ModuleId, Option[Seq[Module]]]()
+
+    // Are any include- (resp. exclude-) rules present in `rules`?
+    var (hasIncludes, hasExcludes) = (false, false)
+    rules foreach {
+      case _: Include ⇒ hasIncludes = true
+      case _: Exclude ⇒ hasExcludes = true
+    }
+
+    // Does a given ID satisfy at least one include (if any are present?)
+    def matchesInclude(id: ModuleId): Boolean =
+      !hasIncludes ||
+        rules.exists {
+          case inc: Include if inc(id) ⇒ true
+          case _                       ⇒ false
+        }
+
+    // Is a given ID excluded? 
+    def matchesExcludes(id: ModuleId): Boolean =
+      !hasExcludes ||
+        !rules.exists {
+          case exc: Exclude if exc(id) ⇒ true
+          case _                       ⇒ false
+        }
+
+    // Keep an ID iff it satisfies at least one include (if any have been provided), and is not excluded
+    def keep(id: ModuleId): Boolean = matchesInclude(id) && matchesExcludes(id)
+
+    def filtered(id: ModuleId): Option[Seq[Module]] =
+      map.getOrElseUpdate(
+        id,
+        dependencyMap(id)
+          .filter {
+            dep ⇒
+              filtered(dep.id).isDefined
+          } match {
+            case Seq() if !keep(id) ⇒
+              // none of this module's deps passed all rules (or depend on anything that does), nor did this module
+              // itself; drop it
+              None
+            case filteredDeps ⇒
+              // Keep this module and its valid deps (which may be empty
+              Some(filteredDeps)
+          })
+
+    dependencyMap foreach {
+      case (id, _) ⇒ filtered(id)
+    }
+
+    map
+      .flatMap {
+        case (id, Some(deps)) ⇒ Some(id → deps)
+        case _                ⇒ None
+      }
+      .toMap
+  }
 }
 
 object ModuleGraphProtocol extends ModuleGraphProtocolCompat {

src/main/scala/net/virtualvoid/sbt/graph/package.scala

@@ -16,6 +16,8 @@
 
 package net.virtualvoid.sbt
 
+import net.virtualvoid.sbt.graph.model.ModuleId
+
 package object graph {
   type Edge = (ModuleId, ModuleId)
   def Edge(from: ModuleId, to: ModuleId): Edge = from -> to

src/main/scala/net/virtualvoid/sbt/graph/rendering/AsciiTree.scala

@@ -17,6 +17,7 @@
 package net.virtualvoid.sbt.graph
 package rendering
 
+import net.virtualvoid.sbt.graph.model.{ Module, ModuleGraph }
 import util.AsciiTreeLayout.toAscii
 import util.ConsoleUtils._
 

src/main/scala/net/virtualvoid/sbt/graph/rendering/DOT.scala

@@ -17,6 +17,8 @@
 package net.virtualvoid.sbt.graph
 package rendering
 
+import net.virtualvoid.sbt.graph.model.ModuleGraph
+
 object DOT {
   val EvictedStyle = "stroke-dasharray: 5,5"