Updated for new Nim

Göran Krampe
1 parent 33f6041b
Showing 3 changed files with 11 additions and 11 deletions
blimp.nim
blimp.nimble
lapp.nim
@@ -14,7 +14,7 @@ import md5, os, osproc, parseopt2, strutils, parsecfg, streams, lapp, subexes, t
 const
   versionMajor* = 0
-  versionMinor* = 4
+  versionMinor* = 5
   versionPatch* = 0
   versionAsString* = $versionMajor & "." & $versionMinor & "." & $versionPatch
@@ -307,14 +307,14 @@ proc deflate(filename: string) =
     if verbose: echo("\t" & filename & " deflated.")
 # Iterator over all deflated files in the git clone
-iterator allDeflated() =
+iterator allDeflated(): string =
   let filenames = cmd("git ls-files " & gitRootDir).split({'\l', '\c'})
   for fn in filenames:
     if not blimpFilename(fn).isNil:
       yield fn
 # Iterator over all files matching the blimp filter in the git clone
-iterator allFiltered() =
+iterator allFiltered(): string =
   let lines = cmd("git ls-files | git check-attr --stdin filter").split({'\l', '\c'})
   for line in lines:
     let status = line.split(':')
 [Package]
 name          = "blimp"
-version       = "0.4"
+version       = "0.5"
 author        = "Göran Krampe"
 description   = "Utility that helps with big files in git, very similar to git-fat, s3annnex etc."
 license       = "MIT"
@@ -8,5 +8,5 @@ license       = &quot;MIT&quot;
 bin           = blimp
 [Deps]
-Requires: "nimrod >= 0.10"
-Requires: "lapp >= 0.1.0"
+Requires: "nimrod >= 0.15"
+#Requires: "lapp >= 0.1.0"
@@ -134,7 +134,7 @@ var
   parm_spec =  initTable[string,PSpec]()
 proc fail(msg: string)  =
-  stderr.writeln(progname & ": " & msg)
+  stderr.writeLine(progname & ": " & msg)
   quit(usage)
 proc parseSpec(u: string) =
@@ -254,7 +254,7 @@ proc parseArguments*(usage: string, args: seq[string]): Table[string,PValue] =
         fail("no such option: " & c)
   proc get_spec(name: string): PSpec =
-    result = parm_spec[name]
+    result = parm_spec.getOrDefault(name)
     if result == nil:
       fail("no such option: " & name)
@@ -374,7 +374,7 @@ proc parseArguments*(usage: string, args: seq[string]): Table[string,PValue] =
       pval = fileValue(f,value)
     else: discard
-    var oval = vars[flag]
+    var oval = vars.getOrDefault(flag)
     if info.multiple: # multiple flags are sequence values
       if oval == nil: # first value!
         pval = seqValue(@[pval])
@@ -440,11 +440,11 @@ when isMainModule:
   let v = verbosityLevel(args)
   echo "Lines to show: " & $n
-  echo "Verbosity level: " & $verbosityLevel(args)
+  echo "Verbosity level: " & $v
   let myfiles = args["files"].asSeq
   var outFile = args["out"].asFile
   for f in myfiles:
     for i in 1..n:
-      writeln(outFile, string(f.asFile.readLine()))
+      writeLine(outFile, string(f.asFile.readLine()))