1 files changed, 14 insertions, 36 deletions
diff --git a/cli/source/main/scala/com/rockymadden/stringmetric/cli/similarity/jarowinklermetric.scala b/cli/source/main/scala/com/rockymadden/stringmetric/cli/similarity/jarowinklermetric.scala
index b925c2d..5cfcb1e 100755
--- a/cli/source/main/scala/com/rockymadden/stringmetric/cli/similarity/jarowinklermetric.scala
+++ b/cli/source/main/scala/com/rockymadden/stringmetric/cli/similarity/jarowinklermetric.scala
@@ -3,42 +3,20 @@ package com.rockymadden.stringmetric.cli.similarity
 import com.rockymadden.stringmetric.cli._
 import com.rockymadden.stringmetric.similarity.JaroWinklerMetric
 
-/**
- * The jarowinklermetric [[com.rockymadden.stringmetric.cli.Command]]. Compares two strings to calculate the
- * Jaro-Winkler distance.
- */
-object jarowinklermetric extends Command {
-	override def main(args: Array[String]): Unit = {
-		val opts: OptionMap = args
-
-		try
-			if (opts.contains('h) || opts.contains('help)) {
-				help()
-				exit(opts)
-			} else if (opts.contains('dashless) && (opts('dashless): Array[String]).length == 2) {
-				execute(opts)
-				exit(opts)
-			} else throw new IllegalArgumentException("Expected valid syntax. See --help.")
-		catch { case e: Throwable => error(e, opts) }
-	}
-
-	override def help(): Unit = {
-		val ls = sys.props("line.separator")
-		val tab = "  "
-
-		println(
-			"Compares two strings to calculate the Jaro-Winkler distance." + ls + ls +
-			"Syntax:" + ls +
-			tab + "jarowinklermetric [Options] string1 string2..." + ls + ls +
-			"Options:" + ls +
-			tab + "-h, --help" + ls +
-			tab + tab + "Outputs description, syntax, and opts."
-		)
-	}
-
-	override def execute(opts: OptionMap): Unit = {
+case object jarowinklermetric extends Command(
+	(opts) =>
+		"Compares two strings to calculate the Jaro-Winkler distance." + Ls + Ls +
+		"Syntax:" + Ls +
+		Tab + "jarowinklermetric [Options] string1 string2..." + Ls + Ls +
+		"Options:" + Ls +
+		Tab + "-h, --help" + Ls +
+		Tab + Tab + "Outputs description, syntax, and opts.",
+	(opts) => opts.contains('dashless) && (opts('dashless): Array[String]).length == 2,
+	(opts) => {
 		val strings: Array[String] = opts('dashless)
 
-		println(JaroWinklerMetric.compare(strings(0), strings(1)).getOrElse("not comparable"))
+		JaroWinklerMetric.compare(strings(0), strings(1))
+			.map(_.toString)
+			.getOrElse("not comparable")
 	}
-}
+)