Merge pull request #70 from toshi0383/refactor

Minor refactoring

Author: toshi0383

Sources/cmdshelf/Commands.swift

@@ -77,7 +77,7 @@ final class CatCommand: Command {
         let aliases = try VaradicAliasArgument().parse(parser)
 
         if aliases.isEmpty {
-            exit(shellOut(to: "cat"))
+            exit(shellOut("cat"))
 
         } else {
 
@@ -96,12 +96,12 @@ final class CatCommand: Command {
                 }
 
                 if context.location.hasPrefix("curl ") {
-                    if shellOut(to: context.location) > 0 {
+                    if shellOut(context.location) > 0 {
                         failure = true
                     }
 
                 } else {
-                    if shellOut(to: "cat \(context.location)") > 0 {
+                    if shellOut("cat \(context.location)") > 0 {
                         failure = true
                     }
                 }
@@ -153,9 +153,9 @@ final class RunCommand: Command {
 
         let singleQuoted = parameters.map { "\'\($0)\'" }.joined(separator: " ")
         if context.location.hasPrefix("curl ") {
-            exit(shellOut(to: "bash <(\(context.location))", argument: singleQuoted))
+            exit(shellOut("bash <(\(context.location))", argument: singleQuoted))
         } else {
-            exit(shellOut(to: context.location, argument: singleQuoted))
+            exit(shellOut(context.location, argument: singleQuoted))
         }
     }
 }

Sources/cmdshelf/Configuration.swift

@@ -90,7 +90,7 @@ class Configuration {
 
                 queuedPrint("[\(repo.name)] Cloning ... ")
 
-                let status = silentShellOut(to: "git clone \(repo.url) \(workspace)")
+                let status = silentShellOut("git clone \(repo.url) \(workspace)")
 
                 if status != 0 {
                     queuedPrintlnError("error")
@@ -110,7 +110,7 @@ class Configuration {
 
                 queuedPrint("[\(repo.name)] Updating ... ")
 
-                let status = silentShellOut(to: "cd \(workspace) && git fetch origin master && git checkout origin/master")
+                let status = silentShellOut("cd \(workspace) && git fetch origin master && git checkout origin/master")
 
                 if status != 0 {
                     queuedPrintlnError("error")

Sources/cmdshelf/Functions.swift

@@ -1,14 +1,12 @@
 import Foundation
-import Poxis
-import Reporter
 
 @discardableResult
-func silentShellOut(to: String, argument: String? = nil) -> Int32 {
-    return shellOut(to: to, argument: argument, shouldPrintStdout: false, shouldPrintError: false)
+func silentShellOut(_ to: String, argument: String? = nil) -> Int32 {
+    return shellOut(to, argument: argument, shouldPrintStdout: false, shouldPrintError: false)
 }
 
 @discardableResult
-func shellOut(to: String, argument: String? = nil, shouldPrintStdout: Bool = true, shouldPrintError: Bool = true) -> Int32 {
+func shellOut(_ to: String, argument: String? = nil, shouldPrintStdout: Bool = true, shouldPrintError: Bool = true) -> Int32 {
     let process = Process()
     process.launchPath = "/bin/bash"
     if let arg = argument {
@@ -43,21 +41,3 @@ func shellOut(to: String, argument: String? = nil, shouldPrintStdout: Bool = tru
     #endif
     return process.terminationStatus
 }
-
-/// TODO: improve error handling
-@discardableResult
-func spawnPager(cmdString: String) -> Int32 {
-    errno = 0
-    guard let fpin = poxis_popen(cmdString, "r") else {
-        return 1
-    }
-    guard let fpout = poxis_popen("${PAGER:-more}", "w") else {
-        return 1
-    }
-    var line: [Int8] = []
-    while fgets(&line, 4096, fpin) != nil {
-        fputs(&line, fpout)// == EOF then error
-    }
-    poxis_pclose(fpout)
-    return poxis_pclose(fpin)
-}

Sources/cmdshelf/SpawnPager.swift

@@ -0,0 +1,20 @@
+import Foundation
+import Poxis
+
+/// TODO: improve error handling
+@discardableResult
+func spawnPager(cmdString: String) -> Int32 {
+    errno = 0
+    guard let fpin = poxis_popen(cmdString, "r") else {
+        return 1
+    }
+    guard let fpout = poxis_popen("${PAGER:-more}", "w") else {
+        return 1
+    }
+    var line: [Int8] = []
+    while fgets(&line, 4096, fpin) != nil {
+        fputs(&line, fpout)// == EOF then error
+    }
+    poxis_pclose(fpout)
+    return poxis_pclose(fpin)
+}