Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
jasonnam committed Jul 1, 2018
2 parents b2b403c + bc1615b commit b89cf00
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
12 changes: 6 additions & 6 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
"repositoryURL": "https://github.com/flintbox/Bouncer",
"state": {
"branch": null,
"revision": "a24a3d616b78ed4a7756edc4999c515f3adfd0dd",
"version": "0.1.2"
"revision": "afc6b0cd73ec2e965fc0336fc65b5ca57686dba0",
"version": "0.1.3"
}
},
{
"package": "Motor",
"repositoryURL": "https://github.com/flintbox/Motor",
"state": {
"branch": null,
"revision": "8a203ff30aa38ab376a8da4390eb1c3d6519054b",
"version": "0.1.1"
"revision": "ec165db3be9046b956cc3a9b035d4134ab95998e",
"version": "0.1.2"
}
},
{
Expand All @@ -42,8 +42,8 @@
"repositoryURL": "https://github.com/flintbox/Work",
"state": {
"branch": null,
"revision": "dcfc835ade72e4de743b6a14d3f224ebf575eac5",
"version": "0.1.0"
"revision": "4a7a6ff7a87bac408cfc69382b8332f53f89e046",
"version": "0.1.1"
}
},
{
Expand Down
6 changes: 3 additions & 3 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ let package = Package(
targets: ["Flint"]),
],
dependencies: [
.package(url: "https://github.com/flintbox/Bouncer", from: "0.1.2"),
.package(url: "https://github.com/flintbox/Motor", from: "0.1.1"),
.package(url: "https://github.com/flintbox/Work", from: "0.1.0"),
.package(url: "https://github.com/flintbox/Bouncer", from: "0.1.3"),
.package(url: "https://github.com/flintbox/Motor", from: "0.1.2"),
.package(url: "https://github.com/flintbox/Work", from: "0.1.1"),
.package(url: "https://github.com/flintbox/ANSIEscapeCode", from: "0.1.1"),
.package(url: "https://github.com/jasonnam/PathFinder", .branch("develop")),
.package(url: "https://github.com/jpsim/Yams.git", from: "1.0.0"),
Expand Down
2 changes: 1 addition & 1 deletion Sources/Flint/help/helpCommandHandler.swift
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ let helpCommandHandler: CommandHandler = { _, _, _, _ in
│ template list │ t l │ List available templates under template home │
│ template remove │ t r │ Remove templates under template home │
├─────────────────┼───────┼─────────────────────────────────────────────────┤
│ spark │ s │ Generate project from template
│ spark │ s │ Generate project or files from template
├─────────────────┼───────┼─────────────────────────────────────────────────┤
│ input │ i │ Generate variable input file from template │
├─────────────────┼───────┼─────────────────────────────────────────────────┤
Expand Down
4 changes: 2 additions & 2 deletions Sources/Flint/spark/sparkCommandHandler.swift
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ let sparkCommandHandler: CommandHandler = { _, _, operandValues, optionValues in
outputPath = Path(fileURLWithPath: outputPathOptionValue)
} else {
print("Output Path [--output | -o]: ", terminator: "")
if let outputPathInput = readLine(), outputPathInput.count > 0 {
if let outputPathInput = readLine() {
outputPath = Path(fileURLWithPath: FileManager.default.currentDirectoryPath)[outputPathInput]
} else {
printError("Output path not specified")
Expand Down Expand Up @@ -253,5 +253,5 @@ let sparkCommandHandler: CommandHandler = { _, _, operandValues, optionValues in
}
}

print("".color(.green) + " Project Generated")
print("".color(.green) + " Generated")
}
2 changes: 1 addition & 1 deletion Sources/Flint/version/version.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@

import Foundation

let version = "0.1.7"
let version = "0.1.8"
2 changes: 1 addition & 1 deletion Version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.7
0.1.8

0 comments on commit b89cf00

Please sign in to comment.