Add folding argument to pwd()

hooman96 · JustinJiaDev · commit eb2cad30cdeb · 2016-08-09T17:45:47.000+08:00
diff --git a/SwiftShell.playground/Contents.swift b/SwiftShell.playground/Contents.swift
@@ -8,4 +8,4 @@
 
 import SwiftShell
 
-echo("Hello, SwiftShell!")
+echo("Hello, SwiftShell!")
diff --git a/SwiftShell.xcodeproj/project.pbxproj b/SwiftShell.xcodeproj/project.pbxproj
@@ -12,7 +12,7 @@
 		D078FC551D2CBE6A00706A2F /* Print.swift in Sources */ = {isa = PBXBuildFile; fileRef = D078FC541D2CBE6A00706A2F /* Print.swift */; };
 		D0997B651CC1C4B800D9BC6A /* List.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0997B641CC1C4B800D9BC6A /* List.swift */; };
 		D0997B671CC1C4CC00D9BC6A /* Run.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0997B661CC1C4CC00D9BC6A /* Run.swift */; };
-		D0997B691CC1CAC300D9BC6A /* OpenDirectory.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0997B681CC1CAC300D9BC6A /* OpenDirectory.swift */; };
+		D0997B691CC1CAC300D9BC6A /* ChangeDirectory.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0997B681CC1CAC300D9BC6A /* ChangeDirectory.swift */; };
 		D0997B6B1CC1CB8200D9BC6A /* PrintWorkingDirectory.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0997B6A1CC1CB8200D9BC6A /* PrintWorkingDirectory.swift */; };
 		D0997B6D1CC1CBCD00D9BC6A /* Echo.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0997B6C1CC1CBCD00D9BC6A /* Echo.swift */; };
 		D0ACE6831CF1317000DA5F2C /* Pipe.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0ACE6821CF1317000DA5F2C /* Pipe.swift */; };
@@ -41,7 +41,7 @@
 		D078FC541D2CBE6A00706A2F /* Print.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Print.swift; sourceTree = "<group>"; };
 		D0997B641CC1C4B800D9BC6A /* List.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = List.swift; sourceTree = "<group>"; };
 		D0997B661CC1C4CC00D9BC6A /* Run.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Run.swift; sourceTree = "<group>"; };
-		D0997B681CC1CAC300D9BC6A /* OpenDirectory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenDirectory.swift; sourceTree = "<group>"; };
+		D0997B681CC1CAC300D9BC6A /* ChangeDirectory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChangeDirectory.swift; sourceTree = "<group>"; };
 		D0997B6A1CC1CB8200D9BC6A /* PrintWorkingDirectory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PrintWorkingDirectory.swift; sourceTree = "<group>"; };
 		D0997B6C1CC1CBCD00D9BC6A /* Echo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Echo.swift; sourceTree = "<group>"; };
 		D0ACE6821CF1317000DA5F2C /* Pipe.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Pipe.swift; sourceTree = "<group>"; };
@@ -110,7 +110,7 @@
 		D078FC4D1D2CB20300706A2F /* Command */ = {
 			isa = PBXGroup;
 			children = (
-				D0997B681CC1CAC300D9BC6A /* OpenDirectory.swift */,
+				D0997B681CC1CAC300D9BC6A /* ChangeDirectory.swift */,
 				D0997B6A1CC1CB8200D9BC6A /* PrintWorkingDirectory.swift */,
 				D0997B661CC1C4CC00D9BC6A /* Run.swift */,
 			);
@@ -271,7 +271,7 @@
 				D0ACE6831CF1317000DA5F2C /* Pipe.swift in Sources */,
 				D0997B651CC1C4B800D9BC6A /* List.swift in Sources */,
 				D0997B6B1CC1CB8200D9BC6A /* PrintWorkingDirectory.swift in Sources */,
-				D0997B691CC1CAC300D9BC6A /* OpenDirectory.swift in Sources */,
+				D0997B691CC1CAC300D9BC6A /* ChangeDirectory.swift in Sources */,
 				D0997B6D1CC1CBCD00D9BC6A /* Echo.swift in Sources */,
 				D0ACE6871CF13D1F00DA5F2C /* Git.swift in Sources */,
 				D078FC551D2CBE6A00706A2F /* Print.swift in Sources */,
diff --git a/SwiftShell.xcworkspace/contents.xcworkspacedata b/SwiftShell.xcworkspace/contents.xcworkspacedata
diff --git a/SwiftShell/ChangeDirectory.swift b/SwiftShell/ChangeDirectory.swift
@@ -1,5 +1,5 @@
 //
-//  OpenDirectory.swift
+//  ChangeDirectory.swift
 //  SwiftShell
 //
 //  Created by Justin Jia on 4/15/16.
diff --git a/SwiftShell/Git.swift b/SwiftShell/Git.swift
@@ -17,6 +17,7 @@ public enum GitCommand: String {
     case checkout = "checkout"
     case branch = "branch"
     case rebase = "rebase"
+    case log = "log"
 
 }
 
@@ -47,5 +48,12 @@ public enum Git {
     public static func commit(_ message: String, options: CommitOption...) -> String {
         return git(command: .commit, arguments: ["-m", message] + options.map { $0.rawValue })
     }
-
+    
+    public enum CheckOutOption: String {
+        case create = "-b"
+    }
+    
+    public static func log() -> String {
+        return git(command: .log)
+    }
 }
diff --git a/SwiftShell/PrintWorkingDirectory.swift b/SwiftShell/PrintWorkingDirectory.swift
@@ -8,11 +8,20 @@
 
 import Foundation
 
-public func pwd() -> String {
+let foldingLimit:Int = 15
+
+public func pwd(folding: Bool = false) -> String {
     print(command: "pwd")
     var buffer: [Int8] = Array(repeating: 0, count: Int(PATH_MAX))
     getcwd(&buffer, buffer.count)
-    let output = String(cString: buffer) ?? ""
+    var output = String(cString: buffer) ?? ""
+    
+    let pathComponents = output.characters.split{ $0 == "/" }.map(String.init)
+
+    if let firstPathComponents = pathComponents.first, let lastPathComponents = pathComponents.last, folding == true, output.characters.count > foldingLimit {
+        output = firstPathComponents + "/.../" + lastPathComponents
+    }
+    
     print(output)
     return output
 }
diff --git a/SwiftShell/Run.swift b/SwiftShell/Run.swift
@@ -17,7 +17,7 @@ public func run(_ command: String, with arguments: [String], input: String? = ni
 }
 
 func run(at path: String, with arguments: [String], input: String? = nil) -> String? {
-    return Task.run(path, arguments: arguments, input: Pipe(inputString: input)).outputString
+    return Task.run(path: path, arguments: arguments, input: Pipe(inputString: input)).outputString
 }
 
 func path(of command: String) -> String? {
diff --git a/SwiftShell/String.swift b/SwiftShell/String.swift
@@ -11,7 +11,7 @@ import Foundation
 extension String {
     
     func trimmedLastEndOfLine() -> String {
-        guard let lastCharacter = self.characters.last, lastCharacter == "\n" else { return self }
+        guard let lastCharacter = self.characters.last where lastCharacter == "\n" else { return self }
         return String(characters.dropLast())
     }
     
diff --git a/SwiftShell/Task.swift b/SwiftShell/Task.swift
@@ -10,7 +10,7 @@ import Foundation
 
 extension Task {
 
-    static func run(_ path: String, arguments: [String] = [], output: Pipe? = nil, input: Pipe? = nil) -> Pipe {
+    static func run(path: String, arguments: [String] = [], output: Pipe? = nil, input: Pipe? = nil) -> Pipe {
         let output = output ?? Pipe()
 
         let task = Task()

Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,4 @@`
`8`	`8`
`9`	`9`	`import SwiftShell`
`10`	`10`
`11`		`-echo("Hello, SwiftShell!")`
	`11`	`+echo("Hello, SwiftShell!")`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ public enum GitCommand: String {`
`17`	`17`	`case checkout = "checkout"`
`18`	`18`	`case branch = "branch"`
`19`	`19`	`case rebase = "rebase"`
	`20`	`+ case log = "log"`
`20`	`21`
`21`	`22`	`}`
`22`	`23`
`@@ -47,5 +48,12 @@ public enum Git {`
`47`	`48`	`public static func commit(_ message: String, options: CommitOption...) -> String {`
`48`	`49`	`return git(command: .commit, arguments: ["-m", message] + options.map { $0.rawValue })`
`49`	`50`	`}`
`50`		`-`
	`51`	`+`
	`52`	`+ public enum CheckOutOption: String {`
	`53`	`+ case create = "-b"`
	`54`	`+ }`
	`55`	`+`
	`56`	`+ public static func log() -> String {`
	`57`	`+ return git(command: .log)`
	`58`	`+ }`
`51`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public func run(_ command: String, with arguments: [String], input: String? = ni`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`func run(at path: String, with arguments: [String], input: String? = nil) -> String? {`
`20`		`- return Task.run(path, arguments: arguments, input: Pipe(inputString: input)).outputString`
	`20`	`+ return Task.run(path: path, arguments: arguments, input: Pipe(inputString: input)).outputString`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`func path(of command: String) -> String? {`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import Foundation`
`11`	`11`	`extension String {`
`12`	`12`
`13`	`13`	`func trimmedLastEndOfLine() -> String {`
`14`		`- guard let lastCharacter = self.characters.last, lastCharacter == "\n" else { return self }`
	`14`	`+ guard let lastCharacter = self.characters.last where lastCharacter == "\n" else { return self }`
`15`	`15`	`return String(characters.dropLast())`
`16`	`16`	`}`
`17`	`17`