Merge branch 'master' into js-IncludeFPinScalaExercises

Author: Javier de Silóniz Sandino

src/main/scala/org/scalaexercises/exercises/Evaluator.scala

@@ -7,18 +7,14 @@ package org.scalaexercises.runtime
 
 import org.scalaexercises.runtime.model._
 
-import scala.annotation.tailrec
 import scala.collection.immutable.List
-import scala.collection.JavaConversions._
 import scala.reflect.ClassTag
-
 import java.net.URLClassLoader
 import java.io.File
-import java.lang.ClassNotFoundException
 
 import cats.data.Xor
-
 import org.clapper.classutil.ClassFinder
+import org.scalaexercises.evaluator.Dependency
 
 object Exercises {
   val LIBRARIES_PACKAGE = "org.scalaexercises.content"
@@ -49,9 +45,9 @@ object Exercises {
 
     val (errors, libraries) = classNames.foldLeft((Nil: List[String], Nil: List[Library])) { (acc, name) ⇒
       val loadedLibrary = for {
-        loadedClass ← guard(Class.forName(name, true, cl), s"${name} not found")
-        loadedObject ← guard(loadedClass.getField("MODULE$").get(null), s"${name} must be defined as an object")
-        loadedLibrary ← guard(loadedObject.asInstanceOf[Library], s"${name} must extend Library")
+        loadedClass ← guard(Class.forName(name, true, cl), s"$name not found")
+        loadedObject ← guard(loadedClass.getField("MODULE$").get(null), s"$name must be defined as an object")
+        loadedLibrary ← guard(loadedObject.asInstanceOf[Library], s"$name must extend Library")
       } yield loadedLibrary
 
       // until a bifoldable exists in Cats...
@@ -67,4 +63,33 @@ object Exercises {
   private def guard[A](f: ⇒ A, message: ⇒ String) =
     Xor.catchNonFatal(f).leftMap(_ ⇒ message)
 
+  def buildEvaluatorRequest(
+    pkg:                 String,
+    qualifiedMethod:     String,
+    rawArgs:             List[String],
+    imports:             List[String] = Nil,
+    resolvers:           List[String],
+    libraryDependencies: List[String]
+  ): (List[String], List[Dependency], String) = {
+
+    val extractEvaluatorResolvers: List[String] = {
+      resolvers.filter(!_.isEmpty) map { resolver ⇒
+        resolver.substring(resolver.indexOf("http"))
+      }
+    }
+
+    val extractEvaluatorDependencies: List[Dependency] = {
+      libraryDependencies map { dep ⇒
+        val depArray = dep.split(":")
+        Dependency(groupId = depArray(0), artifactId = depArray(1), version = depArray(2))
+      }
+    }
+
+    val pre = (s"import $pkg._" :: imports).mkString("; ")
+    val code = s"""$qualifiedMethod(${rawArgs.mkString(", ")})"""
+
+    val allCode = s"{$pre; $code}"
+
+    (extractEvaluatorResolvers, extractEvaluatorDependencies, allCode)
+  }
 }

src/main/scala/org/scalaexercises/exercises/Exercises.scala

@@ -18,6 +18,14 @@ trait Library {
   def color: Option[String]
   def sections: List[Section]
   def timestamp: String
+  def buildMetaInfo: BuildInfo
+}
+
+/** Library Build Metadata Information
+  */
+trait BuildInfo {
+  def resolvers: List[String]
+  def libraryDependencies: List[String]
 }
 
 /** A section in a library.
@@ -57,13 +65,14 @@ trait Exercise {
 
 // default case class implementations
 case class DefaultLibrary(
-  owner:       String,
-  repository:  String,
-  name:        String,
-  description: String,
-  color:       Option[String],
-  sections:    List[Section]  = Nil,
-  timestamp:   String
+  owner:         String,
+  repository:    String,
+  name:          String,
+  description:   String,
+  color:         Option[String],
+  sections:      List[Section]  = Nil,
+  timestamp:     String,
+  buildMetaInfo: BuildInfo
 ) extends Library
 
 case class DefaultContribution(

src/main/scala/org/scalaexercises/exercises/MethodEval.scala

@@ -10,6 +10,7 @@ object LibraryA extends Library {
   override def name = ???
   override def sections = ???
   override def timestamp = ???
+  override def buildMetaInfo = ???
 }
 
 object LibraryB extends Library {
@@ -20,6 +21,7 @@ object LibraryB extends Library {
   override def name = ???
   override def sections = ???
   override def timestamp = ???
+  override def buildMetaInfo = ???
 }
 
 object LibraryC extends Library {
@@ -30,6 +32,7 @@ object LibraryC extends Library {
   override def name = ???
   override def sections = ???
   override def timestamp = ???
+  override def buildMetaInfo = ???
 }
 
 class ErrorLibrary extends Library {
@@ -40,4 +43,5 @@ class ErrorLibrary extends Library {
   override def name = ???
   override def sections = ???
   override def timestamp = ???
+  override def buildMetaInfo = ???
 }