Start turning example into something useful.

Author: markhibberd

bin/ivory

@@ -47,6 +47,10 @@
   "service-name" : "generate-dictionary",
   "class-name"   : "com.ambiata.ivory.cli.generateDictionary"
 },
+{
+  "service-name" : "generate-facts",
+  "class-name"   : "com.ambiata.ivory.cli.generateFacts"
+},
 {
   "service-name" : "cat-facts",
   "class-name"   : "com.ambiata.ivory.cli.catFacts"

ivory-cli/src/main/resources/mainclasses.json

@@ -1,4 +1,4 @@
-package com.ambiata.ivory.generate
+package com.ambiata.ivory.cli
 
 import com.nicta.scoobi.Scoobi._
 import scalaz.{DList => _, _}, Scalaz._, effect._
@@ -10,13 +10,14 @@ import com.ambiata.mundane.control._
 import com.ambiata.mundane.io._
 
 import com.ambiata.ivory.core._
+import com.ambiata.ivory.generate._
 import com.ambiata.ivory.alien.hdfs._
 
-object GenerateFactsCli extends ScoobiApp {
+object generateFacts extends IvoryApp {
 
   case class CliArguments(dictionary: String, flags: String, entities: Int, start: LocalDate, end: LocalDate, output: String)
 
-  val parser = new scopt.OptionParser[CliArguments]("GenerateDictionaryCli"){
+  val parser = new scopt.OptionParser[CliArguments]("generate-facts"){
     head("""
 |Random Fact Generator.
 |
@@ -32,12 +33,9 @@ object GenerateFactsCli extends ScoobiApp {
     opt[String]('o', "output")     action { (x, c) => c.copy(output = x) }      required() text s"Hdfs path to write facts to."
   }
 
-  def run() {
-    parser.parse(args, CliArguments("", "", 0, LocalDate.now(), LocalDate.now(), "")).map(c =>
-      GenerateFacts.onHdfs(c.entities, new Path(c.dictionary), new Path(c.flags), c.start, c.end, new Path(c.output))(configuration).run(configuration).run.unsafePerformIO() match {
-        case Ok(v)    => println(s"Dictionary successfully written to ${c.output}.")
-        case Error(e) => println(s"Failed to generate dictionary: ${Result.asString(e)}")
-      }
-    )
-  }
+  val cmd = IvoryCmd[CliArguments](parser, CliArguments("", "", 0, LocalDate.now(), LocalDate.now(), ""), ScoobiCmd { configuration => c =>
+      GenerateFacts.onHdfs(c.entities, new Path(c.dictionary), new Path(c.flags), c.start, c.end, new Path(c.output))(configuration).run(configuration).
+        mapError(e => { println(s"Failed to generate dictionary: ${Result.asString(e)}"); e }).
+                                                                                     map(v => List(s"Dictionary successfully written to ${c.output}."))
+  })
 }

ivory-generate/src/main/scala/com/ambiata/ivory/generate/GenerateFactsCli.scala ivory-cli/src/main/scala/com/ambiata/ivory/cli/generateFacts.scala

@@ -19,6 +19,7 @@ object main {
     createRepository,
     factDiff,
     generateDictionary,
+    generateFacts,
     importFacts,
     importFeatureStore,
     ingest,
@@ -80,7 +81,7 @@ case class IvoryCmd[A](parser: scopt.OptionParser[A], initial: A, runner: IvoryR
  * Represents the different types of runners in an Ivory program,
  * so that any required setup can be handled in a single place
  */
-sealed trait IvoryRunner[A] 
+sealed trait IvoryRunner[A]
 case class ActionCmd[A](f: A => IOAction[Unit]) extends IvoryRunner[A]
 case class HadoopCmd[A](f: Configuration => A => ResultTIO[List[String]]) extends IvoryRunner[A]
 case class ScoobiCmd[A](f: ScoobiConfiguration => A => ResultTIO[List[String]]) extends IvoryRunner[A]

ivory-cli/src/main/scala/com/ambiata/ivory/cli/main.scala

@@ -0,0 +1,14 @@
+#!/bin/sh -eu
+
+IVORY=$(dirname $0)/../..
+EXAMPLE=$IVORY/ivory-example
+TARGET=${1:-$OJ_ARTEFACT_ROOT}
+
+mkdir -p ${TARGET}/bin
+cp ${EXAMPLE}/bin/run ${EXAMPLE}/bin/ivory ${TARGET}/bin
+
+(
+    cd $IVORY
+    ./sbt ";project cli; clean; assembly"
+    cp $IVORY/ivory-cli/target/scala-2.10/ivory-cli-assembly-*.jar ${TARGET}/bin/ivory.jar
+) || exit $?

ivory-example/bin/build

@@ -0,0 +1,5 @@
+#!/bin/sh -eu
+
+JAR="$(dirname $0)/ivory.jar"
+
+hadoop jar $JAR com.ambiata.ivory.cli.main "$@"

ivory-example/bin/extract-latest-fatrepo

@@ -0,0 +1,12 @@
+#!/bin/sh -eu
+
+TARGET=${1:-/tmp/test-$RANDOM}
+IVORY=$TARGET/ivory
+DICT=$TARGET/dictionary
+FACTS=$TARGET/facts
+FLAGS=$TARGET/flags
+
+PATH=$(dirname $0):$PATH; export PATH
+
+ivory generate-dictionary -n 5 -f 100 -o $TARGET
+ivory generate-facts -d $DICT -f $FLAGS -n 1000 -s 2012-01-01 -e 2012-02-01 -o $FACTS