luke/sbt
1
0
Fork 0
mirror of https://github.com/sbt/sbt.git synced 2026-08-22 06:07:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Expose RichUpdateReport & DependencyFilter

Browse Source 
Fixes #42
This commit is contained in:
Dale Wijnand
2017-04-03 12:39:39 +01:00
parent 9cf41bbf36
commit cbdbf23127
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
librarymanagement/src/main/scala/sbt/internal/librarymanagement/DependencyFilter.scala → librarymanagement/src/main/scala/sbt/librarymanagement/DependencyFilter.scala
+1 -2
View File
@@ -1,10 +1,9 @@
/* sbt -- Simple Build Tool /* sbt -- Simple Build Tool
* Copyright 2011 Mark Harrah * Copyright 2011 Mark Harrah
*/ */
package sbt.internal.librarymanagement package sbt.librarymanagement
import sbt.io.{ AllPassFilter, NameFilter } import sbt.io.{ AllPassFilter, NameFilter }
import sbt.librarymanagement._
trait DependencyFilterExtra { trait DependencyFilterExtra {
def moduleFilter(organization: NameFilter = AllPassFilter, name: NameFilter = AllPassFilter, revision: NameFilter = AllPassFilter): ModuleFilter = def moduleFilter(organization: NameFilter = AllPassFilter, name: NameFilter = AllPassFilter, revision: NameFilter = AllPassFilter): ModuleFilter =
librarymanagement/src/main/scala/sbt/internal/librarymanagement/RichUpdateReport.scala → librarymanagement/src/main/scala/sbt/librarymanagement/RichUpdateReport.scala
+14 -11
View File
@@ -1,13 +1,11 @@
package sbt package sbt
package internal
package librarymanagement package librarymanagement
import java.io.File import java.io.File
import sbt.librarymanagement._
/** Provides extra methods for filtering the contents of an `UpdateReport` and for obtaining references to a selected subset of the underlying files. */ /** Provides extra methods for filtering the contents of an `UpdateReport` and for obtaining references to a selected subset of the underlying files. */
final class RichUpdateReport(report: UpdateReport) { final class RichUpdateReport(report: UpdateReport) {
def recomputeStamps(): UpdateReport = private[sbt] def recomputeStamps(): UpdateReport =
{ {
val files = report.cachedDescriptor +: allFiles val files = report.cachedDescriptor +: allFiles
val stamps = files.map(f => (f, f.lastModified)).toMap val stamps = files.map(f => (f, f.lastModified)).toMap
@@ -17,13 +15,17 @@ final class RichUpdateReport(report: UpdateReport) {
import DependencyFilter._ import DependencyFilter._
/** Obtains all successfully retrieved files in all configurations and modules. */ /** Obtains all successfully retrieved files in all configurations and modules. */
def allFiles: Seq[File] = matching(DependencyFilter.allPass) private[sbt] def allFiles: Seq[File] = matching(DependencyFilter.allPass)
/** Obtains all successfully retrieved files in configurations, modules, and artifacts matching the specified filter. */ /** Obtains all successfully retrieved files in configurations, modules, and artifacts matching the specified filter. */
def matching(f: DependencyFilter): Seq[File] = select0(f).distinct private[sbt] def matching(f: DependencyFilter): Seq[File] = select0(f).distinct
/** Obtains all successfully retrieved files matching all provided filters. An unspecified argument matches all files. */ /** Obtains all successfully retrieved files matching all provided filters. An unspecified argument matches all files. */
def select(configuration: ConfigurationFilter = configurationFilter(), module: ModuleFilter = moduleFilter(), artifact: ArtifactFilter = artifactFilter()): Seq[File] = def select(
configuration: ConfigurationFilter = configurationFilter(),
module: ModuleFilter = moduleFilter(),
artifact: ArtifactFilter = artifactFilter()
): Seq[File] =
matching(DependencyFilter.make(configuration, module, artifact)) matching(DependencyFilter.make(configuration, module, artifact))
private[this] def select0(f: DependencyFilter): Seq[File] = private[this] def select0(f: DependencyFilter): Seq[File] =
@@ -39,7 +41,8 @@ final class RichUpdateReport(report: UpdateReport) {
.withArtifacts(modReport.artifacts filter { case (art, file) => f(configuration, modReport.module, art) }) .withArtifacts(modReport.artifacts filter { case (art, file) => f(configuration, modReport.module, art) })
.withMissingArtifacts(modReport.missingArtifacts filter { art => f(configuration, modReport.module, art) }) .withMissingArtifacts(modReport.missingArtifacts filter { art => f(configuration, modReport.module, art) })
} }
def substitute(f: (String, ModuleID, Vector[(Artifact, File)]) => Vector[(Artifact, File)]): UpdateReport =
private[sbt] def substitute(f: (String, ModuleID, Vector[(Artifact, File)]) => Vector[(Artifact, File)]): UpdateReport =
moduleReportMap { (configuration, modReport) => moduleReportMap { (configuration, modReport) =>
val newArtifacts = f(configuration, modReport.module, modReport.artifacts) val newArtifacts = f(configuration, modReport.module, modReport.artifacts)
modReport modReport
@@ -47,19 +50,19 @@ final class RichUpdateReport(report: UpdateReport) {
.withMissingArtifacts(modReport.missingArtifacts) .withMissingArtifacts(modReport.missingArtifacts)
} }
def toSeq: Seq[(String, ModuleID, Artifact, File)] = private[sbt] def toSeq: Seq[(String, ModuleID, Artifact, File)] =
for (confReport <- report.configurations; modReport <- confReport.modules; (artifact, file) <- modReport.artifacts) yield (confReport.configuration, modReport.module, artifact, file) for (confReport <- report.configurations; modReport <- confReport.modules; (artifact, file) <- modReport.artifacts) yield (confReport.configuration, modReport.module, artifact, file)
def allMissing: Seq[(String, ModuleID, Artifact)] = private[sbt] def allMissing: Seq[(String, ModuleID, Artifact)] =
for (confReport <- report.configurations; modReport <- confReport.modules; artifact <- modReport.missingArtifacts) yield (confReport.configuration, modReport.module, artifact) for (confReport <- report.configurations; modReport <- confReport.modules; artifact <- modReport.missingArtifacts) yield (confReport.configuration, modReport.module, artifact)
def addMissing(f: ModuleID => Seq[Artifact]): UpdateReport = private[sbt] def addMissing(f: ModuleID => Seq[Artifact]): UpdateReport =
moduleReportMap { (configuration, modReport) => moduleReportMap { (configuration, modReport) =>
modReport modReport
.withMissingArtifacts((modReport.missingArtifacts ++ f(modReport.module)).distinct) .withMissingArtifacts((modReport.missingArtifacts ++ f(modReport.module)).distinct)
} }
def moduleReportMap(f: (String, ModuleReport) => ModuleReport): UpdateReport = private[sbt] def moduleReportMap(f: (String, ModuleReport) => ModuleReport): UpdateReport =
{ {
val newConfigurations = report.configurations.map { confReport => val newConfigurations = report.configurations.map { confReport =>
import confReport._ import confReport._