Merge branch 'package-init-empty' of https://github.com/ddunbar/swift-package-manager

Author: ddunbar

Sources/Commands/SwiftPackageTool.swift

@@ -243,12 +243,12 @@ public struct SwiftPackageTool: SwiftTool {
         print("")
         print("COMMANDS:")
         print("  init [--type <type>]                   Initialize a new package")
-        print("                                         (type: library|executable|system-module)")
+        print("      (type: empty|library|executable|system-module)")
         print("  fetch                                  Fetch package dependencies")
         print("  update                                 Update package dependencies")
         print("  generate-xcodeproj [--output <path>]   Generates an Xcode project")
         print("  show-dependencies [--format <format>]  Print the resolved dependency graph")
-        print("                                         (format: text|dot|json)")
+        print("      (format: text|dot|json)")
         print("  dump-package [--input <path>]          Print parsed Package.swift as JSON")
         print("")
         print("OPTIONS:")

Sources/Commands/init.swift

@@ -117,7 +117,11 @@ final class InitPackage {
         }
         print("Creating \(sources.relative(to: rootd).asString)/")
         try makeDirectories(sources)
-    
+
+        if mode == .empty {
+            return
+        }
+
         let sourceFileName = (mode == .executable) ? "main.swift" : "\(typeName).swift"
         let sourceFile = sources.appending(RelativePath(sourceFileName))
 
@@ -129,8 +133,8 @@ final class InitPackage {
                 stream <<< "}\n"
             case .executable:
                 stream <<< "print(\"Hello, world!\")\n"
-            case .systemModule:
-                break
+            case .systemModule, .empty:
+                fatalError("invalid")
             }
         }
     }
@@ -210,10 +214,12 @@ final class InitPackage {
 
 /// Represents a package type for the purposes of initialization.
 enum InitMode: CustomStringConvertible {
-    case library, executable, systemModule
+    case empty, library, executable, systemModule
 
     init(_ rawValue: String) throws {
         switch rawValue.lowercased() {
+        case "empty":
+            self = .empty
         case "library":
             self = .library
         case "executable":
@@ -227,6 +233,7 @@ enum InitMode: CustomStringConvertible {
 
     var description: String {
         switch self {
+            case .empty: return "empty"
             case .library: return "library"
             case .executable: return "executable"
             case .systemModule: return "system-module"

Tests/CommandsTests/PackageToolTests.swift

@@ -82,13 +82,54 @@ final class PackageToolTests: XCTestCase {
             XCTAssertEqual(resolveSymlinks(AbsolutePath(path)), resolveSymlinks(packageRoot))
         }
     }
-    
+
+    func testInitEmpty() throws {
+        mktmpdir { tmpPath in
+            var fs = localFileSystem
+            let path = tmpPath.appending(component: "Foo")
+            try fs.createDirectory(path)
+            _ = try execute(["-C", path.asString, "init", "--type", "empty"])
+            XCTAssert(fs.exists(path.appending(component: "Package.swift")))
+            XCTAssertEqual(try fs.getDirectoryContents(path.appending(component: "Sources")), [])
+            XCTAssertEqual(try fs.getDirectoryContents(path.appending(component: "Tests")), [])
+        }
+    }
+
+    func testInitExecutable() throws {
+        mktmpdir { tmpPath in
+            var fs = localFileSystem
+            let path = tmpPath.appending(component: "Foo")
+            try fs.createDirectory(path)
+            _ = try execute(["-C", path.asString, "init", "--type", "executable"])
+            XCTAssert(fs.exists(path.appending(component: "Package.swift")))
+            XCTAssertEqual(try fs.getDirectoryContents(path.appending(component: "Sources")), ["main.swift"])
+            XCTAssertEqual(try fs.getDirectoryContents(path.appending(component: "Tests")), [])
+        }
+    }
+
+    func testInitLibrary() throws {
+        mktmpdir { tmpPath in
+            var fs = localFileSystem
+            let path = tmpPath.appending(component: "Foo")
+            try fs.createDirectory(path)
+            _ = try execute(["-C", path.asString, "init"])
+            XCTAssert(fs.exists(path.appending(component: "Package.swift")))
+            XCTAssertEqual(try fs.getDirectoryContents(path.appending(component: "Sources")), ["Foo.swift"])
+            XCTAssertEqual(
+                try fs.getDirectoryContents(path.appending(component: "Tests")).sorted(),
+                ["FooTests", "LinuxMain.swift"])
+        }
+    }
+
     static var allTests = [
         ("testUsage", testUsage),
         ("testVersion", testVersion),
         ("testFetch", testFetch),
         ("testUpdate", testUpdate),
         ("testDumpPackage", testDumpPackage),
         ("testShowDependencies", testShowDependencies),
+        ("testInitEmpty", testInitEmpty),
+        ("testInitExecutable", testInitExecutable),
+        ("testInitLibrary", testInitLibrary),
     ]
 }