Swift 4 2 (#7)

* made init of Command public.

* updated for swift 4.2

* added discardable result.

* moved createTable to Help class.

* fixed config to runt with Swift 4.0 as well.

* updated xcode build image for travis.

Author: dastrobu

.travis.yml

@@ -3,7 +3,7 @@ sudo: required
 # do not use swift as language, since otherwise the build always runs on a macOS VM.
 language: generic
 dist: trusty # Ubuntu 14.04 LTS
-osx_image: xcode9.3beta
+osx_image: xcode10.1
 
 compiler:
   - clang
@@ -17,6 +17,7 @@ os:
 env:
   -  SWIFT_VERSION=4.0
   -  SWIFT_VERSION=4.1
+  -  SWIFT_VERSION=4.2
 
 before_install:
   - uname -a

README.md

@@ -1,6 +1,6 @@
 # argtree
 
-[![Swift Version](https://img.shields.io/badge/swift-4.1-blue.svg)](https://swift.org) 
+[![Swift Version](https://img.shields.io/badge/swift-4.2-blue.svg)](https://swift.org) 
 ![Platform](https://img.shields.io/badge/platform-osx--64|linux--64-lightgrey.svg)
 [![Build Travis-CI Status](https://travis-ci.org/dastrobu/argtree.svg?branch=master)](https://travis-ci.org/dastrobu/argtree) 
 
@@ -343,7 +343,7 @@ Instead of defining separate Flag instances, different actions can also be perfo
 ```swift
 let help = Flag(longName: "help", shortName: "h")
 let foo = Command(name: "foo", parsers: [help])
-help.parsed = { _, path in
+help.parsed = { path in
     switch path.last {
         case let cmd as Command where cmd === foo:
             print("foo help")

Sources/ArgTree.swift

@@ -116,7 +116,7 @@ public class ArgTree: ParserNode {
                     rows.append(["   ", argument, description])
                 })
             self.writeToOutStream(
-                "\(description)\n\(createTable(rows))")
+                "\(description)\n\(Help.createTable(rows))")
             helpPrinted()
         }
         // add help as first parse, to play together with the var arg parser
@@ -217,6 +217,7 @@ public extension ArgTree {
         self.parsers.insert(parsers, at: i)
     }
 
+    @discardableResult
     public func remove(at i: Int) -> Parser {
         return parsers.remove(at: i)
     }
@@ -225,6 +226,7 @@ public extension ArgTree {
         parsers.removeSubrange(bounds)
     }
 
+    @discardableResult
     public func removeFirst() -> Parser {
         return parsers.removeFirst()
     }

Sources/parsers/Help.swift

@@ -1,40 +1,40 @@
-/** create a simple ascii table */
-internal func createTable(_ rows: [[String]]) -> String {
-    var colMaxCount: [Int] = []
-    // determine the widths of the columns
-    rows.forEach { row in
-        row.enumerated().forEach { i, col in
-            if colMaxCount.count <= i {
-                colMaxCount.append(col.count)
+/**
+ * Flag to show a help text
+ */
+public class Help: Flag {
+
+    /** create a simple ascii table */
+    public static func createTable(_ rows: [[String]]) -> String {
+        var colMaxCount: [Int] = []
+        // determine the widths of the columns
+        rows.forEach { row in
+            row.enumerated().forEach { i, col in
+                if colMaxCount.count <= i {
+                    colMaxCount.append(col.count)
+                }
+                colMaxCount[i] = max(colMaxCount[i], col.count)
             }
-            colMaxCount[i] = max(colMaxCount[i], col.count)
         }
-    }
 
-    // set the last col count to zero, to avoid padding the last col
-    if colMaxCount.popLast() != nil {
-        colMaxCount.append(0)
-    }
+        // set the last col count to zero, to avoid padding the last col
+        if colMaxCount.popLast() != nil {
+            colMaxCount.append(0)
+        }
 
-    // format the columns
-    let r = rows.map { row in
-        return row
-            .enumerated()
-            .map({ i, col in
-                if col.count < colMaxCount[i] {
-                    // right pad texts with whitespace
-                    return col + String(repeating: " ", count: colMaxCount[i] - col.count)
-                }
-                return col
-            }).joined(separator: " ")
+        // format the columns
+        let r = rows.map { row in
+            return row
+                .enumerated()
+                .map({ i, col in
+                    if col.count < colMaxCount[i] {
+                        // right pad texts with whitespace
+                        return col + String(repeating: " ", count: colMaxCount[i] - col.count)
+                    }
+                    return col
+                }).joined(separator: " ")
+        }
+        return r.joined(separator: "\n")
     }
-    return r.joined(separator: "\n")
-}
-
-/**
- * Flag to show a help text
- */
-public class Help: Flag {
 
     public init(longName: String? = "help",
                 shortName: Character? = "h",