Move libc runner on it's own

Author: kylef

Commander.xcodeproj/project.pbxproj

@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
 		2714C5591BB5403400E0EB6A /* Commands.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2714C5581BB5403300E0EB6A /* Commands.swift */; settings = {ASSET_TAGS = (); }; };
 		2720BDED1BB348BC00C09984 /* ArgumentDescription.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2720BDEC1BB348BC00C09984 /* ArgumentDescription.swift */; settings = {ASSET_TAGS = (); }; };
+		275C0E8F1BBC5D5900F92D73 /* CommandDarwin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 275C0E8E1BBC5D5900F92D73 /* CommandDarwin.swift */; settings = {ASSET_TAGS = (); }; };
 		2768A2241BACC38C00F994EE /* Commander.h in Headers */ = {isa = PBXBuildFile; fileRef = 2768A2231BACC38C00F994EE /* Commander.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		2768A22B1BACC38C00F994EE /* Commander.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2768A2201BACC38C00F994EE /* Commander.framework */; settings = {ASSET_TAGS = (); }; };
 		2768A23B1BACC3B600F994EE /* ArgumentParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2768A23A1BACC3B600F994EE /* ArgumentParser.swift */; settings = {ASSET_TAGS = (); }; };
@@ -40,6 +41,7 @@
 		27593EE51BB335590018278E /* UniversalFramework_Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = UniversalFramework_Base.xcconfig; sourceTree = "<group>"; };
 		27593EE61BB335590018278E /* UniversalFramework_Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = UniversalFramework_Framework.xcconfig; sourceTree = "<group>"; };
 		27593EE71BB335590018278E /* UniversalFramework_Test.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = UniversalFramework_Test.xcconfig; sourceTree = "<group>"; };
+		275C0E8E1BBC5D5900F92D73 /* CommandDarwin.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CommandDarwin.swift; sourceTree = "<group>"; };
 		2768A2201BACC38C00F994EE /* Commander.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Commander.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		2768A2231BACC38C00F994EE /* Commander.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Commander.h; sourceTree = "<group>"; };
 		2768A2251BACC38C00F994EE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -117,6 +119,7 @@
 				2720BDEC1BB348BC00C09984 /* ArgumentDescription.swift */,
 				279256A91BB3226E00E66B9E /* CommandType.swift */,
 				279256AB1BB322FA00E66B9E /* Command.swift */,
+				275C0E8E1BBC5D5900F92D73 /* CommandDarwin.swift */,
 				2714C5581BB5403300E0EB6A /* Commands.swift */,
 				279256B31BB3260D00E66B9E /* Group.swift */,
 				2768A2251BACC38C00F994EE /* Info.plist */,
@@ -248,6 +251,7 @@
 			files = (
 				2768A23B1BACC3B600F994EE /* ArgumentParser.swift in Sources */,
 				2720BDED1BB348BC00C09984 /* ArgumentDescription.swift in Sources */,
+				275C0E8F1BBC5D5900F92D73 /* CommandDarwin.swift in Sources */,
 				2714C5591BB5403400E0EB6A /* Commands.swift in Sources */,
 				279256AA1BB3226E00E66B9E /* CommandType.swift in Sources */,
 				279256AC1BB322FA00E66B9E /* Command.swift in Sources */,

Commander/CommandDarwin.swift

@@ -0,0 +1,39 @@
+import Darwin.libc
+
+/// Extensions to CommandType to provide convinience running methods for CLI tools
+extension CommandType {
+  /// Run the command using the `Process.argument`, removing the executable name
+  @noreturn public func run(version:String? = nil) {
+    let parser = ArgumentParser(arguments: Process.arguments)
+
+    if parser.hasOption("version") && !parser.hasOption("help") {
+      if let version = version {
+        print(version)
+        exit(0)
+      }
+    }
+
+    let executableName = parser.shift()!  // Executable Name
+
+    do {
+      try run(parser)
+    } catch let error as Help {
+      let help = error.reraise("$ \(executableName)")
+      fputs("\(help)\n", stderr)
+      exit(1)
+    } catch GroupError.NoCommand(let path, let group) {
+      var usage = "$ \(executableName)"
+      if let path = path {
+        usage += " \(path)"
+      }
+      let help = Help([], command: usage, group: group)
+      fputs("\(help)\n", stderr)
+      exit(1)
+    } catch {
+      fputs("\(error)\n", stderr)
+      exit(1)
+    }
+
+    exit(0)
+  }
+}

Commander/CommandType.swift

@@ -10,39 +10,5 @@ extension CommandType {
   public func run(arguments:[String]) throws {
     try run(ArgumentParser(arguments: arguments))
   }
-
-  /// Run the command using the `Process.argument`, removing the executable name
-  @noreturn public func run(version:String? = nil) {
-    let parser = ArgumentParser(arguments: Process.arguments)
-
-    if parser.hasOption("version") && !parser.hasOption("help") {
-      if let version = version {
-        print(version)
-        exit(0)
-      }
-    }
-
-    let executableName = parser.shift()!  // Executable Name
-
-    do {
-      try run(parser)
-    } catch let error as Help {
-      let help = error.reraise("$ \(executableName)")
-      fputs("\(help)\n", stderr)
-      exit(1)
-    } catch GroupError.NoCommand(let path, let group) {
-      var usage = "$ \(executableName)"
-      if let path = path {
-        usage += " \(path)"
-      }
-      let help = Help([], command: usage, group: group)
-      fputs("\(help)\n", stderr)
-      exit(1)
-    } catch {
-      fputs("\(error)\n", stderr)
-      exit(1)
-    }
-
-    exit(0)
-  }
 }
+