Commit before moving analyses

README.md

@@ -9,7 +9,11 @@ Maker is a scala build tool, written out of frustration with the complexity of S
 Installation
 ------------
 Download and run the script [maker.py](maker.py) in the directory in which your project will live. You will be prompted for the name of your project, and a minimal config file 
-will be created at ./maker/Project.scala. This specifies for each module its dependencies, 
+will be created at ./maker/Project.scala. 
+
+Configuration
+-------------
+This specifies for each module its dependencies, 
 both external and on other modules. 
 
 Projects and modules

maker/src/maker/project/Continuously.scala

@@ -31,11 +31,6 @@ object Continuously {
 
     def lastSrcModificationTime : Option[Long] = {
       FileUtils.lastModifiedFileTime(allSourceFiles)
-      //allSourceFiles.map(FileUtils.lastModifiedFileTime(watchedFiles)).max
-      //allUpstreamTestModules.map(proj => {
-          //val watchedFiles = proj.compilePhase.sourceFiles ++ proj.testCompilePhase.sourceFiles
-          //FileUtils.lastModifiedFileTime(watchedFiles)
-        //}).max
     }
     printWaitingMessage
     while (true) {

maker/src/maker/project/Module.scala

@@ -18,14 +18,13 @@ import org.apache.commons.io.output.TeeOutputStream
 /**
   * Corresponds to a module in IntelliJ
   */
-
 class Module(
     val root : File,
     val name : String,
     val immediateUpstreamModules : Seq[Module] = Nil,
     val testModuleDependencies : Seq[Module] = Nil,
-    val analyses : ConcurrentHashMap[File, Analysis] = Module.analyses,
-    val scalaVersion: ScalaVersion = ScalaVersion.TWO_ELEVEN_DEFAULT
+    val scalaVersion: ScalaVersion = ScalaVersion.TWO_ELEVEN_DEFAULT,
+    val analyses : ConcurrentHashMap[File, Analysis] = Module.analyses
 )
   extends ProjectTrait
   with DependencyPimps

maker/src/maker/project/TmuxIntegration.scala

@@ -13,7 +13,7 @@ trait TmuxIntegration extends ProjectTrait{
     private lazy val hasTmux = Command("which", "tmux").withNoOutput.run == 0
     def tmux(args : String*){
       if (hasTmux)
-        Command(("tmux"::args.toList) : _*).withNoOutput.runAsync
+        Command(("tmux"::args.toList) : _*).withNoOutput.runAsync()
     }
 
     private def tmuxReportTaskFailed(msg : String){

maker/src/maker/utils/os/Command.scala

@@ -11,8 +11,10 @@ import maker.utils.Int
 case class Command(
   overrideOutput : Option[OutputStream],
   timeout : Option[Duration],
+  overrideInput: Option[InputStream] = None,
   overrideWorkingDirectory : Option[File] = None,
   overrideExitValues : Option[Seq[Int]] = None,
+  overrideStreamHandler: Option[ExecuteStreamHandler] = None,
   args : Seq[String]
 ) 
   extends Log
@@ -40,9 +42,10 @@ case class Command(
     new ExecuteWatchdog(timeoutMillis)
   }
   def executor = {
-    val streamHandler = overrideOutput match {
-      case Some(os) => new PumpStreamHandler(os)
-      case None => new PumpStreamHandler()
+    val streamHandler = overrideStreamHandler.getOrElse {
+      val out = overrideOutput.getOrElse(null)
+      val in = overrideInput.getOrElse(null)
+      new PumpStreamHandler(out, out, in)
     }
 
     val executor_ = new DefaultExecutor()
@@ -59,26 +62,28 @@ case class Command(
     result
   }
 
-  def runAsync() = {
-    val resultHandler = new ExecuteResultHandler(){
-      def onProcessComplete(exitValue : Int) = {
-        // do nothing
-      }
-      def onProcessFailed(e : ExecuteException) = {
-        // do nothing
-      }
-    }
+  def runAsync(resultHandler: ExecuteResultHandler = new Command.DoNothingResultHandler()) = {
     logger.info(s"running command '${toString}' asynchronously")
     executor.execute(commandLine, resultHandler)
   }
 }
 
 object Command {
+  class DoNothingResultHandler extends ExecuteResultHandler {
+    def onProcessComplete(exitValue : Int) = {
+      // do nothing
+    }
+    def onProcessFailed(e : ExecuteException) = {
+      // do nothing
+    }
+  }
   def apply(args : String*) : Command = Command(
     overrideOutput = None, 
     timeout = None,
+    overrideInput = None,
     overrideWorkingDirectory = None,
     overrideExitValues = None,
+    overrideStreamHandler = None,
     args 
   )
 

maker/tests/maker/project/TestModule.scala

@@ -21,8 +21,8 @@ class TestModule(
   name,
   upstreamProjects, 
   upstreamTestProjects,
-  analyses,
-  scalaVersion
+  scalaVersion,
+  analyses
 ) with ClassicLayout with DependencyPimps {
 
   override def constructorCodeAsString : String = {

maker/tests/maker/task/compile/CompileTaskTests.scala

@@ -13,9 +13,19 @@ import java.util.concurrent.ConcurrentHashMap
 import sbt.inc.Analysis
 import com.typesafe.zinc.Compiler
 import maker.utils.FileUtils
+import maker.TestMaker
 
 class CompileTaskTests extends FunSuite with TestUtils with Matchers with ModuleTestPimps{
 
+  ignore("Can compile a single module project") {
+    withTempDir{
+      rootDirectory => 
+        val testMaker = TestMaker(
+          rootDirectory
+        ).withModule("a")(rootDirectory)
+    }
+  }
+
   ignore("Can compile 2.10 and 2.11 scala versions"){
     withTempDir{
       moduleRoot => 
@@ -127,7 +137,7 @@ class CompileTaskTests extends FunSuite with TestUtils with Matchers with Module
     (proj, module, files)
   }
 
-  test("Compilation makes class files, writes dependencies, and package makes jar"){
+  ignore("Compilation makes class files, writes dependencies, and package makes jar"){
     withTempDir {
       dir => 
         val (proj, module, _) = simpleProject(dir)