From c24627b45c525fc52584bab840fccfdaaf572407 Mon Sep 17 00:00:00 2001 From: Dominik Picheta Date: Sat, 14 Dec 2013 23:24:06 +0000 Subject: [PATCH] List command supports --ver now. --- babel.nim | 6 ++++-- packageinfo.nim | 1 - version.nim | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/babel.nim b/babel.nim index 07da2b4..4d7a43e 100644 --- a/babel.nim +++ b/babel.nim @@ -391,12 +391,14 @@ proc search(options: TOptions) = if not found: echo("No package found.") -proc list = +proc list(options: TOptions) = if not existsFile(babelDir / "packages.json"): raise newException(EBabel, "Please run babel update.") let pkgList = getPackageList(babelDir / "packages.json") for pkg in pkgList: echoPackage(pkg) + if options.queryVersions: + echoPackageVersions(pkg) echo(" ") type VersionAndPath = tuple[version: TVersion, path: string] @@ -450,7 +452,7 @@ proc doAction(options: TOptions) = of ActionSearch: search(options) of ActionList: - list() + list(options) of ActionPath: listPaths(options.action.optionalName) of ActionBuild: diff --git a/packageinfo.nim b/packageinfo.nim index a42a673..88c1d71 100644 --- a/packageinfo.nim +++ b/packageinfo.nim @@ -98,7 +98,6 @@ proc multiSplit(s: string): seq[string] = if len(result) < 1: return @[s] - proc readPackageInfo*(path: string): TPackageInfo = result = initPackageInfo() result.mypath = path diff --git a/version.nim b/version.nim index ffecae5..9f9b8ac 100644 --- a/version.nim +++ b/version.nim @@ -253,7 +253,7 @@ when isMainModule: var versions = toTable[TVersion, string]({newVersion("0.1.1"): "v0.1.1", newVersion("0.2.3"): "v0.2.3", newVersion("0.5"): "v0.5"}) doAssert findLatest(parseVersionRange(">= 0.1 & <= 0.4"), versions) == (newVersion("0.2.3"), "v0.2.3") - # TODO: These fail. + # TODO: Allow these in later versions? #doAssert newVersion("0.1-rc1") < newVersion("0.2") #doAssert newVersion("0.1-rc1") < newVersion("0.1")