From cecdb1476341ed4160ac95a0736fbbe58a187a27 Mon Sep 17 00:00:00 2001
From: Jakob Odersky <jakob@odersky.com>
Date: Sat, 28 Apr 2018 17:13:25 -0700
Subject: Rename package

---
 src/main/scala/completion/Bash.scala |  2 +-
 src/main/scala/definitions.scala     |  4 ++--
 src/main/scala/package.scala         |  2 +-
 src/main/scala/parsing.scala         |  4 ++--
 src/test/scala/CmdTest.scala         | 40 ++++++++++++++++++------------------
 5 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/main/scala/completion/Bash.scala b/src/main/scala/completion/Bash.scala
index 0ba3440..e049fe1 100644
--- a/src/main/scala/completion/Bash.scala
+++ b/src/main/scala/completion/Bash.scala
@@ -1,4 +1,4 @@
-package cmd
+package commando
 package completion
 
 object Bash {
diff --git a/src/main/scala/definitions.scala b/src/main/scala/definitions.scala
index 5878b47..cb05532 100644
--- a/src/main/scala/definitions.scala
+++ b/src/main/scala/definitions.scala
@@ -1,4 +1,4 @@
-package cmd
+package commando
 
 import scala.{Option => Maybe}
 
@@ -56,7 +56,7 @@ case class Command(
 
   def usage: String = "Usage: " + subusage(0)
 
-  def completion: String = cmd.completion.Bash.completion(this)
+  def completion: String = commando.completion.Bash.completion(this)
 
 }
 object Command {
diff --git a/src/main/scala/package.scala b/src/main/scala/package.scala
index 97d366c..b35740c 100644
--- a/src/main/scala/package.scala
+++ b/src/main/scala/package.scala
@@ -1,4 +1,4 @@
-package cmd
+package commando
 
 object `package` {
   def parse(command: Command,
diff --git a/src/main/scala/parsing.scala b/src/main/scala/parsing.scala
index 05c5c51..44a8872 100644
--- a/src/main/scala/parsing.scala
+++ b/src/main/scala/parsing.scala
@@ -1,4 +1,4 @@
-package cmd
+package commando
 import scala.collection.mutable
 import scala.{Option => Maybe}
 
@@ -148,7 +148,7 @@ object Parser {
           } else if (!subcommands.isEmpty && subline.isEmpty) {
             val missing = command.commands.map(c => s"'${c.name}'")
             fatal(
-              s"subcommand not specified (must be either one of ${missing.mkString(", ")})")
+              s"command not specified (must be one of ${missing.mkString(", ")})")
           } else {
             CommandLine(command.name,
                         parsedOptions.toMap ++ parsedParameters.toMap,
diff --git a/src/test/scala/CmdTest.scala b/src/test/scala/CmdTest.scala
index d049812..7370010 100644
--- a/src/test/scala/CmdTest.scala
+++ b/src/test/scala/CmdTest.scala
@@ -1,37 +1,37 @@
-package cmd
+package commando
 
 import utest._
 
 object CmdTests extends TestSuite {
 
-  val cbx = cmd.Command(
+  val cbx = commando.Command(
     "cbx",
-    cmd.Option("server", Some('s'), Some(cmd.Parameter("name"))),
-    cmd.Command(
+    commando.Option("server", Some('s'), Some(commando.Parameter("name"))),
+    commando.Command(
       "version",
-      cmd.Option("verbose", Some('v'), Some(cmd.Parameter("k=v", false)))),
-    cmd.Command("login",
-                cmd.Parameter("server_url"),
-                cmd.Parameter("username", false),
-                cmd.Parameter("password", false)),
-    cmd.Command("run",
-                cmd.Option("file", Some('f'), Some(cmd.Parameter("file_name"))),
-                cmd.Option("force", None),
-                cmd.Parameter("pipeline", false)),
-    cmd.Command("level1",
-                cmd.Command("level2-1",
-                            cmd.Parameter("p2"),
-                            cmd.Command("level3", cmd.Parameter("p3"))),
-                cmd.Command("level2-2"))
+      commando.Option("verbose", Some('v'), Some(commando.Parameter("k=v", false)))),
+    commando.Command("login",
+                commando.Parameter("server_url"),
+                commando.Parameter("username", false),
+                commando.Parameter("password", false)),
+    commando.Command("run",
+                commando.Option("file", Some('f'), Some(commando.Parameter("file_name"))),
+                commando.Option("force", None),
+                commando.Parameter("pipeline", false)),
+    commando.Command("level1",
+                commando.Command("level2-1",
+                            commando.Parameter("p2"),
+                            commando.Command("level3", commando.Parameter("p3"))),
+                commando.Command("level2-2"))
   )
 
-  def parse(in: String): CommandLine = cmd.parse(cbx, in.split(" ").tail) match {
+  def parse(in: String): CommandLine = commando.parse(cbx, in.split(" ").tail) match {
     case Left(ex) => throw ex
     case Right(res) => res
   }
 
   def shouldFail(in: String) =
-    assert(cmd.parse(cbx, in.split(" ").tail).isLeft)
+    assert(commando.parse(cbx, in.split(" ").tail).isLeft)
 
   val tests = Tests {
     "printUsage" - {
-- 
cgit v1.2.3