Merge pull request #371 from abertelrud/master

Invoking `swift package` with no options should show help

Author: abertelrud

Sources/Basic/OptionParser.swift

@@ -18,6 +18,7 @@ public enum OptionParserError: ErrorProtocol {
     case expectedAssociatedValue(String)
     case unexpectedAssociatedValue(String, String)
     case invalidUsage(String)
+    case noCommandProvided(String)
 }
 
 extension OptionParserError: CustomStringConvertible {
@@ -33,6 +34,8 @@ extension OptionParserError: CustomStringConvertible {
             return "unknown command: \(cmd)"
         case .invalidUsage(let hint):
             return "invalid usage: \(hint)"
+        case .noCommandProvided(let hint):
+            return "no command provided: \(hint)"
         }
     }
 }

Sources/Commands/Error.swift

@@ -53,10 +53,17 @@ extension Error: CustomStringConvertible {
             print("", to: &stderr)
             usage { print($0, to: &stderr) }
         }
+    case OptionParserError.noCommandProvided(let hint):
+        if !hint.isEmpty {
+            print(error: error)
+        }
+        if isTTY(.stdErr) {
+            usage { print($0, to: &stderr) }
+        }
     case is OptionParserError:
         print(error: error)
         if isTTY(.stdErr) {
-            let argv0 = Process.arguments.first ?? "swift build"
+            let argv0 = Process.arguments.first ?? "swift package"
             print("enter `\(argv0) --help' for usage information", to: &stderr)
         }
     default:

Sources/Commands/SwiftPackageTool.swift

@@ -287,7 +287,8 @@ public struct SwiftPackageTool {
             return (mode, opts)
         }
         else {
-            throw OptionParserError.invalidUsage("no command provided: \(args)")
+            // FIXME: This needs to produce a properly quoted string, once we have such API.
+            throw OptionParserError.noCommandProvided(args.joined(separator: " "))
         }
     }
 }