Getting the right constructors in place

twitter · Jan 15, 2016 · 3c05282 · 3c05282
1 parent 769665b
commit 3c05282
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/project/Build.scala b/project/Build.scala
@@ -113,7 +113,7 @@ object ScaldingBuild extends Build {
     testOptions in Test += Tests.Argument(TestFrameworks.ScalaTest, "-oF"),
 
     // Uncomment if you don't want to run all the tests before building assembly
-    // test in assembly := {},
+    test in assembly := {},
     logLevel in assembly := Level.Warn,
 
     // Publishing options:
@@ -215,7 +215,6 @@ object ScaldingBuild extends Build {
     scaldingRepl,
     scaldingJson,
     scaldingJdbc,
-    scaldingHadoopTest,
     scaldingDb,
     maple,
     executionTutorial,

diff --git a/scalding-repl/src/main/scala-2.10/com/twitter/scalding/ILoopCompat.scala b/scalding-repl/src/main/scala-2.10/com/twitter/scalding/ILoopCompat.scala
@@ -5,5 +5,5 @@ import java.io.BufferedReader
 import scala.tools.nsc.interpreter.ILoop
 import scala.tools.nsc.interpreter.JPrintWriter
 
-trait ILoopCompat(in: Option[BufferedReader], out: JPrintWriter)
+class ILoopCompat(in: Option[BufferedReader], out: JPrintWriter)
   extends ILoop(in, out)
diff --git a/scalding-repl/src/main/scala-2.11/com/twitter/scalding/ILoopCompat.scala b/scalding-repl/src/main/scala-2.11/com/twitter/scalding/ILoopCompat.scala
@@ -5,7 +5,7 @@ import java.io.BufferedReader
 import scala.tools.nsc.interpreter.ILoop
 import scala.tools.nsc.interpreter.JPrintWriter
 
-trait ILoopCompat(in: Option[BufferedReader], out: JPrintWriter)
+class ILoopCompat(in: Option[BufferedReader], out: JPrintWriter)
   extends ILoop(in, out) {
   def addThunk(f: => Unit): Unit = intp.initialize(f)
 }
diff --git a/scalding-repl/src/main/scala/com/twitter/scalding/ScaldingILoop.scala b/scalding-repl/src/main/scala/com/twitter/scalding/ScaldingILoop.scala
@@ -49,6 +49,8 @@ object ScaldingILoop {
  */
 class ScaldingILoop(in: Option[BufferedReader], out: JPrintWriter)
   extends ILoopCompat(in, out) {
+  def this(in: BufferedReader, out: JPrintWriter) = this(Some(in), out)
+  def this() = this(None, new JPrintWriter(Console.out, true))
 
   settings = new GenericRunnerSettings({ s => echo(s) })