Merge pull request #3 from qutheory/preview-2

swift 3 preview 2

.swift-version

@@ -1 +1,2 @@
-DEVELOPMENT-SNAPSHOT-2016-06-20-a
+3.0-PREVIEW-2
+

.travis.yml

@@ -6,11 +6,10 @@ sudo: required
 dist: trusty
 osx_image: xcode8
 install:
- - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/02090c7ede5a637b76e6df1710e83cd0bbe7dcdf/swiftenv-install.sh)"
+ - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/02090c7ede5a637b76e6df1710e83cd0bbe7dcdf/swiftenv-install.sh)"; fi
 script:
  # Build Console 
- - swift build;
- - swift build --configuration release;
+ - swift build -Xswiftc -DSimple
+ - swift build --configuration release -Xswiftc -DSimple
  # Test Console
  - swift test
-

Sources/Console/Bar/Bar.swift

@@ -45,7 +45,13 @@ public class Bar {
 
  let message = message ?? "Done"
 
- collapseBar(message: message, style: .success)
+ #if Simple
+ prepareLine()
+ console.output(title, style: titleStyle, newLine: false)
+ console.output(" [\(message)]", style: .success)
+ #else
+ collapseBar(message: message, style: .success)
+ #endif
  }
 
  func collapseBar(message: String, style: ConsoleStyle) {

Sources/Console/Bar/Loading/LoadingBar.swift

@@ -89,15 +89,17 @@ public class LoadingBar: Bar {
  }
 
  public func start() {
- do {
- thread = try Strand { [weak self] in
- while true {
- self?.update()
+ #if !Simple
+ do {
+ thread = try Strand { [weak self] in
+ while true {
+ self?.update()
+ }
  }
+ } catch {
+ console.info("[Loading]")
  }
- } catch {
- console.info("Loading...")
- }
+ #endif
  }
 
  deinit {

Sources/Console/Bar/Progress/ProgressBar.swift

@@ -13,7 +13,9 @@
 public class ProgressBar: Bar {
  public var progress: Double {
  didSet {
+ #if !Simple
  update()
+ #endif
  }
  }
 

Sources/Console/Terminal/Terminal.swift

@@ -59,9 +59,9 @@ public class Terminal: Console {
  }
 
  public func execute(_ command: String) throws {
- let input = FileHandle.standardInput()
- let output = FileHandle.standardOutput()
- let error = FileHandle.standardError()
+ let input = FileHandle.withStandardInput
+ let output = FileHandle.withStandardOutput
+ let error = FileHandle.withStandardError
 
  try execute(command, input: input, output: output, error: error)
  }

Sources/Console/Utilities/LinuxFixes.swift

@@ -22,15 +22,15 @@ extension Data {
 }
 
 extension FileHandle {
- static func standardError() -> FileHandle {
+ static var withStandardError: FileHandle {
  return fileHandleWithStandardError()
  }
 
- static func standardOutput() -> FileHandle {
+ static var withStandardOutput: FileHandle {
  return fileHandleWithStandardOutput()
  }
 
- static func standardInput() -> FileHandle {
+ static var withStandardInput: FileHandle {
  return fileHandleWithStandardInput()
  }
 }