diff options
24 files changed, 39 insertions, 22 deletions
diff --git a/cli/src/main/scala/com/rockymadden/stringmetric/cli/package.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/package.scala index 617f4a5..8292d02 100755 --- a/cli/src/main/scala/com/rockymadden/stringmetric/cli/package.scala +++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/package.scala @@ -77,7 +77,7 @@ package object cli { protected val predicate: (OptionMap => Boolean), protected val execute: (OptionMap => String) ) { - final def main(args: Array[String]): Unit = { + def main(args: Array[String]): Unit = { val opts: OptionMap = args try diff --git a/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/metaphonealgorithm.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/metaphonealgorithm.scala index 95f14b6..c204050 100755 --- a/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/metaphonealgorithm.scala +++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/metaphonealgorithm.scala @@ -13,4 +13,4 @@ case object metaphonealgorithm extends Command( Tab + Tab + "Outputs description, syntax, and opts.", (opts) => opts.contains('dashless) && (opts('dashless): Array[String]).length == 1, (opts) => MetaphoneAlgorithm.compute(opts('dashless)).getOrElse("not computable") -) +) { override def main(args: Array[String]): Unit = super.main(args) } diff --git a/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/metaphonemetric.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/metaphonemetric.scala index 1249723..723168e 100755 --- a/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/metaphonemetric.scala +++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/metaphonemetric.scala @@ -18,4 +18,4 @@ case object metaphonemetric extends Command( .map(_.toString) .getOrElse("not comparable") } -) +) { override def main(args: Array[String]): Unit = super.main(args) } diff --git a/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/nysiisalgorithm.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/nysiisalgorithm.scala index bef2bc5..be81cfe 100755 --- a/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/nysiisalgorithm.scala +++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/nysiisalgorithm.scala @@ -13,4 +13,4 @@ case object nysiisalgorithm extends Command( Tab + Tab + "Outputs description, syntax, and options.", (opts) => opts.contains('dashless) && (opts('dashless): Array[String]).length == 1, (opts) => NysiisAlgorithm.compute(opts('dashless)).getOrElse("not computable") -) +) { override def main(args: Array[String]): Unit = super.main(args) } diff --git a/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/nysiismetric.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/nysiismetric.scala index 7857c21..a5fd3d0 100755 --- a/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/nysiismetric.scala +++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/nysiismetric.scala @@ -18,4 +18,4 @@ case object nysiismetric extends Command( .map(_.toString) .getOrElse("not comparable") } -) +) { override def main(args: Array[String]): Unit = super.main(args) } diff --git a/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/refinednysiisalgorithm.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/refinednysiisalgorithm.scala index 3fc9f25..9f83c55 100755 --- a/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/refinednysiisalgorithm.scala +++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/refinednysiisalgorithm.scala @@ -13,4 +13,4 @@ case object refinednysiisalgorithm extends Command( Tab + Tab + "Outputs description, syntax, and opts.", (opts) => opts.contains('dashless) && (opts('dashless): Array[String]).length == 1, (opts) => RefinedNysiisAlgorithm.compute(opts('dashless)).getOrElse("not computable") -) +) { override def main(args: Array[String]): Unit = super.main(args) } diff --git a/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/refinednysiismetric.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/refinednysiismetric.scala index 2566fa8..4c9ab82 100755 --- a/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/refinednysiismetric.scala +++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/refinednysiismetric.scala @@ -18,4 +18,4 @@ case object refinednysiismetric extends Command( .map(_.toString) .getOrElse("not comparable") } -) +) { override def main(args: Array[String]): Unit = super.main(args) } diff --git a/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/refinedsoundexalgorithm.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/refinedsoundexalgorithm.scala index 12ac8e0..8868478 100755 --- a/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/refinedsoundexalgorithm.scala +++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/refinedsoundexalgorithm.scala @@ -13,4 +13,4 @@ case object refinedsoundexalgorithm extends Command( Tab + Tab + "Outputs description, syntax, and opts.", (opts) => opts.contains('dashless) && (opts('dashless): Array[String]).length == 1, (opts) => RefinedSoundexAlgorithm.compute(opts('dashless)).getOrElse("not computable") -) +) { override def main(args: Array[String]): Unit = super.main(args) } diff --git a/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/refinedsoundexmetric.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/refinedsoundexmetric.scala index 370bd71..072a1a2 100755 --- a/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/refinedsoundexmetric.scala +++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/refinedsoundexmetric.scala @@ -18,4 +18,4 @@ case object refinedsoundexmetric extends Command( .map(_.toString) .getOrElse("not comparable") } -) +) { override def main(args: Array[String]): Unit = super.main(args) } diff --git a/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/soundexalgorithm.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/soundexalgorithm.scala index 56cf068..6972cd3 100755 --- a/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/soundexalgorithm.scala +++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/soundexalgorithm.scala @@ -13,4 +13,4 @@ case object soundexalgorithm extends Command( Tab + Tab + "Outputs description, syntax, and opts.", (opts) => opts.contains('dashless) && (opts('dashless): Array[String]).length == 1, (opts) => SoundexAlgorithm.compute(opts('dashless)).getOrElse("not computable") -) +) { override def main(args: Array[String]): Unit = super.main(args) } diff --git a/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/soundexmetric.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/soundexmetric.scala index c7ec0cd..04dbf02 100755 --- a/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/soundexmetric.scala +++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/phonetic/soundexmetric.scala @@ -18,4 +18,4 @@ case object soundexmetric extends Command( .map(_.toString) .getOrElse("not comparable") } -) +) { override def main(args: Array[String]): Unit = super.main(args) } diff --git a/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/dicesorensenmetric.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/dicesorensenmetric.scala index bb7ac0b..6048b5a 100755 --- a/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/dicesorensenmetric.scala +++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/dicesorensenmetric.scala @@ -23,4 +23,4 @@ case object dicesorensenmetric extends Command( .map(_.toString) .getOrElse("not comparable") } -) +) { override def main(args: Array[String]): Unit = super.main(args) } diff --git a/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/hammingmetric.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/hammingmetric.scala index e3db059..58129bc 100755 --- a/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/hammingmetric.scala +++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/hammingmetric.scala @@ -19,4 +19,4 @@ case object hammingmetric extends Command( .map(_.toString) .getOrElse("not comparable") } -) +) { override def main(args: Array[String]): Unit = super.main(args) } diff --git a/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/jaccardmetric.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/jaccardmetric.scala index 8301158..d61d5c5 100755 --- a/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/jaccardmetric.scala +++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/jaccardmetric.scala @@ -23,4 +23,4 @@ case object jaccardmetric extends Command( .map(_.toString) .getOrElse("not comparable") } -) +) { override def main(args: Array[String]): Unit = super.main(args) } diff --git a/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/jarometric.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/jarometric.scala index cb7e188..d4b1fb2 100755 --- a/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/jarometric.scala +++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/jarometric.scala @@ -19,4 +19,4 @@ case object jarometric extends Command( .map(_.toString) .getOrElse("not comparable") } -) +) { override def main(args: Array[String]): Unit = super.main(args) } diff --git a/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/jarowinklermetric.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/jarowinklermetric.scala index 5cfcb1e..17cadaf 100755 --- a/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/jarowinklermetric.scala +++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/jarowinklermetric.scala @@ -19,4 +19,4 @@ case object jarowinklermetric extends Command( .map(_.toString) .getOrElse("not comparable") } -) +) { override def main(args: Array[String]): Unit = super.main(args) } diff --git a/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/levenshteinmetric.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/levenshteinmetric.scala index 9cfb021..24caadf 100755 --- a/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/levenshteinmetric.scala +++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/levenshteinmetric.scala @@ -20,4 +20,4 @@ case object levenshteinmetric extends Command( .map(_.toString) .getOrElse("not comparable") } -) +) { override def main(args: Array[String]): Unit = super.main(args) } diff --git a/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/ngrammetric.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/ngrammetric.scala index 26914c8..1789cc0 100755 --- a/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/ngrammetric.scala +++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/ngrammetric.scala @@ -23,4 +23,4 @@ case object ngrammetric extends Command( .map(_.toString) .getOrElse("not comparable") } -) +) { override def main(args: Array[String]): Unit = super.main(args) } diff --git a/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/overlapmetric.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/overlapmetric.scala index a045b49..71f9c66 100755 --- a/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/overlapmetric.scala +++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/overlapmetric.scala @@ -23,4 +23,4 @@ case object overlapmetric extends Command( .map(_.toString) .getOrElse("not comparable") } -) +) { override def main(args: Array[String]): Unit = super.main(args) } diff --git a/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/ratcliffobershelpmetric.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/ratcliffobershelpmetric.scala index 08804b6..3cc347d 100755 --- a/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/ratcliffobershelpmetric.scala +++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/ratcliffobershelpmetric.scala @@ -19,4 +19,4 @@ case object ratcliffobershelpmetric extends Command( .map(_.toString) .getOrElse("not comparable") } -) +) { override def main(args: Array[String]): Unit = super.main(args) } diff --git a/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/weightedlevenshteinmetric.scala b/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/weightedlevenshteinmetric.scala index c74f80a..72c2367 100755 --- a/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/weightedlevenshteinmetric.scala +++ b/cli/src/main/scala/com/rockymadden/stringmetric/cli/similarity/weightedlevenshteinmetric.scala @@ -30,4 +30,4 @@ case object weightedlevenshteinmetric extends Command( .map(_.toString) .getOrElse("not comparable") } -) +) { override def main(args: Array[String]): Unit = super.main(args) } diff --git a/project/build.scala b/project/build.scala index 1e11e54..de4f28a 100644 --- a/project/build.scala +++ b/project/build.scala @@ -1,4 +1,3 @@ -import com.typesafe.sbt.pgp.PgpKeys._ import sbt._ import Keys._ diff --git a/project/build.sh b/project/build.sh new file mode 100644 index 0000000..f7d074c --- /dev/null +++ b/project/build.sh @@ -0,0 +1,11 @@ +#!/bin/sh +mkdir ../target/cli + +cp ../cli/src/main/scala/com/rockymadden/stringmetric/cli/**/*.scala ../target/cli/ +cp ../cli/target/scala-2.10/*.jar ../target/cli/ +cp ../core/target/scala-2.10/*.jar ../target/cli/ + +for f in ../target/cli/*.scala; do cat scala.sh "$f" > "${f%.*}"; done + +rm ../target/cli/*.scala +chmod +x ../target/cli/* diff --git a/project/scala.sh b/project/scala.sh new file mode 100644 index 0000000..5aa0e4e --- /dev/null +++ b/project/scala.sh @@ -0,0 +1,7 @@ +#!/bin/bash +dir="`dirname \"$0\"`" +dir="`( cd \"$dir\" && pwd )`" +cp=`echo $dir/*.jar|sed 's/ /:/g'` +exec scala -classpath "$cp" -savecompiled "$0" "$@" +!# +//
\ No newline at end of file |