Minor refactor of options

iainsmith · Apr 24, 2020 · f8a31ee · f8a31ee
1 parent 8dc1a97
commit f8a31ee
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 23 deletions.
diff --git a/Sources/SwiftDockerLib/CLIOptions.swift b/Sources/SwiftDockerLib/CLIOptions.swift
@@ -15,9 +15,6 @@ public struct CLIOptions: ParsableArguments {
   @Flag(name: .shortAndLong, help: "Increase the level of output")
   var verbose: Bool
 
-  @Flag(name: .customLong("skip-validation"), help: .hidden)
-  var skipValidation: Bool
-
   var absolutePath: AbsolutePath {
     try! AbsolutePath(validating: url.path)
   }
@@ -44,9 +41,15 @@ public struct CLIOptions: ParsableArguments {
 
   public init() {}
 
-  public func validate() throws {
-    if skipValidation { return }
+  public init(swift: String = "latest", image: String? = nil, path: String = ".", verbose: Bool) {
+    self.swift = swift
+    self.image = image
+    let expanded = NSString(string: path).expandingTildeInPath
+    self.url = URL(fileURLWithPath: expanded)
+    self.verbose = verbose
+  }
 
+  public func validate() throws {
     if swift != "latest", image != nil {
       throw ValidationError("--swift and --image are exclusive options")
     }

diff --git a/Sources/SwiftDockerLib/Process.swift b/Sources/SwiftDockerLib/Process.swift
diff --git a/Tests/SwiftDockerLibTests/BuildCommandUnitTests.swift b/Tests/SwiftDockerLibTests/BuildCommandUnitTests.swift
@@ -5,7 +5,7 @@ import XCTest
 
 class TestCommandUnitTests: XCTestCase {
   func testSuccessfullBuildAndTest() throws {
-    let options = try CLIOptions.parse(["--swift", "5.2", "--path", "/hello/my-project", "-v", "--skip-validation"])
+    let options = CLIOptions(swift: "5.2", path: "/hello/my-project", verbose: true)
     let output = MockOutput()
     let shell = MockShell.self
     shell.clear()

diff --git a/Tests/SwiftDockerLibTests/CLIOptionTests.swift b/Tests/SwiftDockerLibTests/CLIOptionTests.swift
@@ -7,44 +7,44 @@ import XCTest
 extension CLIOptions {
   static func parseWithoutValidation(_ args: [String]? = nil) throws -> CLIOptions {
     let fullArgs = args ?? []
-    return try parse(fullArgs + ["--skip-validation"])
+    return try parse(fullArgs)
   }
 }
 
 class CLIOptionTests: XCTestCase {
   func testDefaultDockerTag() throws {
-    let options = try CLIOptions.parseWithoutValidation()
+    let options = CLIOptions(path: ".", verbose: true)
     XCTAssertEqual(options.dockerBaseImage, DockerTag.officialSwiftVersion("latest"))
   }
 
   func testCustomSwiftVersion() throws {
-    let options = try CLIOptions.parseWithoutValidation(["--swift", "5.1"])
+    let options = CLIOptions(swift: "5.1", verbose: true)
     XCTAssertEqual(options.dockerBaseImage, DockerTag.officialSwiftVersion("5.1"))
   }
 
   func testCustomImage() throws {
-    let options = try CLIOptions.parseWithoutValidation(["--image", "vapor/ubuntu:latest"])
+    let options = CLIOptions(image: "vapor/ubuntu:latest", verbose: true)
     XCTAssertEqual(options.dockerBaseImage, DockerTag.image("vapor/ubuntu:latest"))
   }
 
   func testCustomAbsolutePath() throws {
-    let options = try CLIOptions.parseWithoutValidation(["--path", "/tmp/hello/world"])
+    let options = CLIOptions(path: "/tmp/hello/world", verbose: true)
     XCTAssertEqual(options.absolutePath, AbsolutePath("/tmp/hello/world"))
   }
 
   func testCustomTildaPath() throws {
-    let options = try CLIOptions.parseWithoutValidation(["--path", "~/hello/world"])
+    let options = CLIOptions(path: "~/hello/world", verbose: true)
     XCTAssertEqual(options.absolutePath, AbsolutePath("hello/world", relativeTo: localFileSystem.homeDirectory))
   }
 
   func testRelativePath() throws {
-    let options = try CLIOptions.parseWithoutValidation(["--path", "../../hello/world"])
+    let options = CLIOptions(path: "../../hello/world", verbose: true)
     let currentDir = localFileSystem.currentWorkingDirectory!
     XCTAssertEqual(options.absolutePath, AbsolutePath("hello/world", relativeTo: currentDir.parentDirectory.parentDirectory))
   }
 
   func testProjectName() throws {
-    let options = try CLIOptions.parseWithoutValidation(["--path", "../../hello/world"])
+    let options = CLIOptions(path: "../../hello/world", verbose: true)
     XCTAssertEqual(options.projectName, "world")
   }
 

diff --git a/Tests/SwiftDockerLibTests/TestCommandUnitTests.swift b/Tests/SwiftDockerLibTests/TestCommandUnitTests.swift
@@ -5,7 +5,7 @@ import XCTest
 
 class BuiildCommandUnitTests: XCTestCase {
   func testSuccessfullBuild() throws {
-    let options = try CLIOptions.parse(["--swift", "5.2", "--path", "/hello/my-Project", "-v", "--skip-validation"])
+    let options = CLIOptions(swift: "5.2", path: "/hello/my-Project", verbose: true)
     let fileSystem = InMemoryFileSystem()
     try fileSystem.createDirectory(AbsolutePath("/tmp"))
     let output = MockOutput()