Fixed line reader to handle buffered output.

Author: objecthub

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.3.2 (2020-02-01)
+- Fixed line reader to handle buffered output
+- Migrated project to Xcode 11.3
+
 ## 0.3.1 (2019-09-23)
 - Migrated project to Xcode 11.0
 - Ported code to Swift 5.1

CommandLineKit.xcodeproj/project.pbxproj

@@ -276,7 +276,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0930;
-				LastUpgradeCheck = 1100;
+				LastUpgradeCheck = 1130;
 				ORGANIZATIONNAME = "Matthias Zenger";
 				TargetAttributes = {
 					CC7A60E6207A62A5007376A0 = {
@@ -494,6 +494,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = C72Z63N8M5;
 				INFOPLIST_FILE = "$(SRCROOT)/Sources/CommandLineKitDemo/Info.plist";
@@ -512,6 +513,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = C72Z63N8M5;
 				INFOPLIST_FILE = "$(SRCROOT)/Sources/CommandLineKitDemo/Info.plist";

CommandLineKit.xcodeproj/xcshareddata/xcschemes/CommandLineKit.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1130"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

CommandLineKit.xcodeproj/xcshareddata/xcschemes/CommandLineKitDemo.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1130"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

README.md

@@ -3,7 +3,7 @@
 [![Platform: macOS](https://img.shields.io/badge/Platform-macOS-blue.svg?style=flat)](https://developer.apple.com/osx/)
 [![Platform: Linux](https://img.shields.io/badge/Platform-Linux-blue.svg?style=flat)](https://www.ubuntu.com/)
 [![Language: Swift 5.1](https://img.shields.io/badge/Language-Swift%205.1-green.svg?style=flat)](https://developer.apple.com/swift/)
-[![IDE: Xcode 11.0](https://img.shields.io/badge/IDE-Xcode%2011.0-orange.svg?style=flat)](https://developer.apple.com/xcode/)
+[![IDE: Xcode 11.3](https://img.shields.io/badge/IDE-Xcode%2011.3-orange.svg?style=flat)](https://developer.apple.com/xcode/)
 [![Carthage: compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
 [![License: BSD](https://img.shields.io/badge/License-BSD-lightgrey.svg?style=flat)](https://developers.google.com/open-source/licenses/bsd)
 
@@ -231,13 +231,13 @@ if let ln = LineReader() {
 
 ## Requirements
 
-- [Xcode 11.0](https://developer.apple.com/xcode/)
+- [Xcode 11.3](https://developer.apple.com/xcode/)
 - [Swift 5.1](https://developer.apple.com/swift/)
 - [Carthage](https://github.com/Carthage/Carthage)
 - [Swift Package Manager](https://swift.org/package-manager/)
 
 ## Copyright
 
 Author: Matthias Zenger (<matthias@objecthub.net>)  
-Copyright © 2018-2019 Google LLC.  
+Copyright © 2018-2020 Google LLC.  
 _Please note: This is not an official Google product._

Sources/CommandLineKit/Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.3.1</string>
+	<string>0.3.2</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2018-2019 Google LLC</string>
+	<string>Copyright © 2018-2020 Google LLC</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

Sources/CommandLineKit/LineReader.swift

@@ -169,11 +169,11 @@ public class LineReader {
                                           strippingNewline: strippingNewline)
     }
   }
-  
+
   private func readLineUnsupported(prompt: String,
                                    maxCount: Int?,
                                    strippingNewline: Bool) throws -> String {
-    print(prompt, terminator: "")
+    Swift.print(prompt, terminator: "")
     if let line = Swift.readLine(strippingNewline: strippingNewline) {
       return maxCount != nil ? String(line.prefix(maxCount!)) : line
     } else {
@@ -188,7 +188,13 @@ public class LineReader {
                                  readProperties: TextProperties,
                                  parenProperties: TextProperties) throws -> String {
     var line: String = ""
+    if fileno(stdout) == self.outputFile {
+      fflush(stdout)
+    }
     try self.withRawMode {
+      if let col = self.cursorColumn, col > 1 {
+        try self.output(text: "\n" + AnsiCodes.setCursorColumn(0))
+      }
       try self.output(text: promptProperties.apply(to: prompt))
       let editState = EditState(prompt: prompt,
                                 maxCount: maxCount,
@@ -459,30 +465,22 @@ public class LineReader {
       return nil
     }
     var buf = [UInt8]()
-    var i = 0
     while true {
       if let c = self.readByte() {
-        buf[i] = c
+        if c == 82 { // "R"
+          break
+        }
+        buf.append(c)
       } else {
         return nil
       }
-      if buf[i] == 82 { // "R"
-        break
-      }
-      i += 1
-    }
-    // Check the first characters are the escape code
-    if buf[0] != 0x1B || buf[1] != 0x5B {
-      return nil
-    }
-    let positionText = String(bytes: buf[2..<buf.count], encoding: .utf8)
-    guard let rowCol = positionText?.split(separator: ";") else {
-      return nil
     }
-    if rowCol.count != 2 {
+    guard buf[0] == 0x1B && buf[1] == 0x5B,
+          let cursor = String(bytes: buf[2..<buf.count], encoding: .utf8)?.split(separator: ";"),
+          cursor.count == 2 else {
       return nil
     }
-    return Int(String(rowCol[1]))
+    return Int(String(cursor[1]))
   }
 
   private var numColumns: Int {
@@ -593,7 +591,7 @@ public class LineReader {
   }
 
   private func output(text: String) throws {
-    if write(outputFile, text, text.utf8.count) == -1 {
+    if write(self.outputFile, text, text.utf8.count) == -1 {
       throw LineReaderError.generalError("Unable to write to output")
     }
   }

Tests/CommandLineKitTests/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.3.1</string>
+	<string>0.3.2</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>