refactor: Format by nph

Author: attakei

src/gigi.nim

@@ -1,13 +1,8 @@
-import
-  gigipkg/gitignore
-
+import gigipkg/gitignore
 
 export gitignore
 
-
 when isMainModule:
-  import
-    gigipkg/command
-
+  import gigipkg/command
 
   quit(main())

src/gigipkg/cache.nim

@@ -1,29 +1,24 @@
 ## Cache controller for API response
-import
-  std/[os, options, times],
-  ./utils
-
+import std/[os, options, times], ./utils
 
 const DEFAULT_EXPIRE_DAYS = 7
 const DEFAULT_CACHE_FILE = "list.json"
 
-
 proc getAppCacheDir*(): string =
   ## Get directory fullpath of application cache
   return getCacheDir() & DirSep & getAppName()
 
-
 proc saveCache(path, content: string) =
   path.parentDir().createDir()
   path.writeFile(content)
 
-
 proc saveCache*(content: string) =
   let cachePath = getAppCacheDir() & DirSep & DEFAULT_CACHE_FILE
   cachePath.saveCache(content)
 
-
-proc loadCache*(src: string, ts: Time, expireDays: int = DEFAULT_EXPIRE_DAYS): Option[string] =
+proc loadCache*(
+    src: string, ts: Time, expireDays: int = DEFAULT_EXPIRE_DAYS
+): Option[string] =
   ## Read cache content if it is exists and is before expired.
   if not src.fileExists():
     return none(string)
@@ -36,7 +31,6 @@ proc loadCache*(src: string, ts: Time, expireDays: int = DEFAULT_EXPIRE_DAYS): O
 
   return some(src.readFile())
 
-
 proc loadCache*(expireDays: int = DEFAULT_EXPIRE_DAYS): Option[string] =
   ## Simply using of ``loadCache``.
   ## - find default cache path

src/gigipkg/command.nim

@@ -1,47 +1,45 @@
 import
   std/[json, options, os, parseopt, strutils, terminal],
   pkg/puppy,
-  ./info, ./parser, ./utils, ./webapi,
+  ./info,
+  ./parser,
+  ./utils,
+  ./webapi,
   ./subcommands/create
 
-
-type
-  Options = ref object of RootObj
-    command: string
-    targets: seq[string]
-      ## Command targets
-    dest: Option[string]
-      ## If value is set, out into file fo dest instead of STDOUT
-
+type Options = ref object of RootObj
+  command: string
+  targets: seq[string] ## Command targets
+  dest: Option[string] ## If value is set, out into file fo dest instead of STDOUT
 
 proc parseArgs(params: seq[string]): Options =
   result = Options(command: "create", targets: @[], dest: none(string))
   var p = initOptParser(params)
   while true:
     p.next()
-    case p.kind:
-      of cmdEnd: break
-      of cmdLongOption, cmdShortOption:
-        if p.key == "h" or p.key == "help":
-          result.command = "help"
-          break
-        if p.key == "o" or p.key == "out":
-          result.dest = some(p.val)
-      of cmdArgument:
-        result.targets.add(p.key)
-
+    case p.kind
+    of cmdEnd:
+      break
+    of cmdLongOption, cmdShortOption:
+      if p.key == "h" or p.key == "help":
+        result.command = "help"
+        break
+      if p.key == "o" or p.key == "out":
+        result.dest = some(p.val)
+    of cmdArgument:
+      result.targets.add(p.key)
 
 proc main*(): int =
   result = 1
-  let
-    options = parseArgs(commandLineParams())
-  var
-    targets = deepCopy(options.targets)
+  let options = parseArgs(commandLineParams())
+  var targets = deepCopy(options.targets)
 
   if options.command == "help":
     result = 0
     stdout.writeLine(PKG_NAME & " version " & PKG_VERSION)
-    stdout.writeLine("Usage: " & getAppName() & " [-h/--help] [-o/--out output] (TARGETS)")
+    stdout.writeLine(
+      "Usage: " & getAppName() & " [-h/--help] [-o/--out output] (TARGETS)"
+    )
     stdout.writeLine("")
     stdout.writeLine("  -h/--help  Display help text")
     stdout.writeLine("  -o/--out   Write output instead of STDOUT")
@@ -56,23 +54,23 @@ proc main*(): int =
 
   if targets.len == 0:
     stderr.writeLine("No targets is specified.")
-    
 
   try:
     let
       content = fetchContentOrCache()
       templates = parseGitignoreTable(content.parseJson())
-    var
-      strm =
-        if isNone(options.dest):
-          stdout
-        else:
-          open(options.dest.get(), fmWrite, -1)
+    var strm =
+      if isNone(options.dest):
+        stdout
+      else:
+        open(options.dest.get(), fmWrite, -1)
     result = strm.outputGitignore(templates, targets)
   except PuppyError:
     let ex = getCurrentException()
     stderr.writeLine("Failured to fetch ignore templates.")
-    stderr.writeLine("Please see error messages and check your environment if you need.")
+    stderr.writeLine(
+      "Please see error messages and check your environment if you need."
+    )
     stderr.writeLine("Message: " & ex.msg)
     return
 

src/gigipkg/gitignore.nim

@@ -1,35 +1,27 @@
 ## Definition for gitignore template
-import
-  std/[strutils, tables]
-
+import std/[strutils, tables]
 
 type
-  Gitignore* = ref object of RootObj
-    ## Gigitnore entity of gigi
+  Gitignore* = ref object of RootObj ## Gigitnore entity of gigi
     name: string
     contents: seq[string]
 
-  GitignoreTable* = TableRef[string, Gitignore]
-    ## It is alias
-
+  GitignoreTable* = TableRef[string, Gitignore] ## It is alias
 
 proc name*(self: Gitignore): string =
   return self.name
 
-
 proc newGitignore*(name: string, contents: seq[string]): Gitignore =
   result = Gitignore()
   result.name = name
   result.contents = contents
 
-
 proc output*(self: Gitignore): string =
   ## Return gitignore body for output.
   ##
   ## It is used to write into ``.gitignore``.
   return self.contents.join("\n")
 
-
 proc newGitignoreTable*(): GitignoreTable =
   ## Create empty table for Gitignore entities.
   result = newTable[string, Gitignore]()

src/gigipkg/parser.nim

@@ -1,14 +1,10 @@
-import
-  std/[json, strutils, tables],
-  ./gitignore
-
+import std/[json, strutils, tables], ./gitignore
 
 proc parseGitignore(src: JsonNode): Gitignore =
   let name = src["name"].getStr()
   let contents = src["contents"].getStr("").strip().splitLines()
   result = newGitignore(name, contents)
 
-
 proc parseGitignoreTable*(src: JsonNode): GitignoreTable =
   result = newGitignoreTable()
   for key, tmpl in src.pairs:

src/gigipkg/subcommands/create.nim

@@ -2,12 +2,11 @@
 # =====================
 #
 # Output gitignore text.
-import
-  std/[strutils, tables],
-  ../gitignore, ../info
+import std/[strutils, tables], ../gitignore, ../info
 
-
-proc outputGitignore*(strm: var File, templates: GitignoreTable, targets: seq[string]): int =
+proc outputGitignore*(
+    strm: var File, templates: GitignoreTable, targets: seq[string]
+): int =
   ## Create gitignore text into STDOUT.
   result = 1
   strm.writeLine("### " & PKG_NAME & " version " & PKG_VERSION)

src/gigipkg/utils.nim

@@ -1,6 +1,4 @@
-import
-  std/[os, strutils]
-
+import std/[os, strutils]
 
 proc getAppName*(): string =
   ## Get application stem (filename without ext).

src/gigipkg/webapi.nim

@@ -1,23 +1,16 @@
 ## Management access to Web API
-import
-  std/options,
-  pkg/puppy,
-  ./cache
-
+import std/options, pkg/puppy, ./cache
 
 const
-  DEFAULT_WEBAPI_URL* = "https://www.toptal.com/developers/gitignore/api/list?format=json"
-  DEFAULT_USER_AGENT  = "gigi web-client"
-
+  DEFAULT_WEBAPI_URL* =
+    "https://www.toptal.com/developers/gitignore/api/list?format=json"
+  DEFAULT_USER_AGENT = "gigi web-client"
 
 proc fetchContent*(url: string = DEFAULT_WEBAPI_URL): string =
   ## Fetch raw content from Web API.
-  let headers = @[
-    Header(key: "User-Agent", value: DEFAULT_USER_AGENT),
-  ]
+  let headers = @[Header(key: "User-Agent", value: DEFAULT_USER_AGENT)]
   return fetch(url, headers = headers)
 
-
 proc fetchContentOrCache*(url: string = DEFAULT_WEBAPI_URL): string =
   ## Fetch raw content from Web API. If cache is available, return it.
   let cacheContent = loadCache()

tests/test_cache.nim

@@ -1,7 +1,4 @@
-import
-  std/[options, os, tempfiles, times, unittest],
-  gigipkg/cache {.all.}
-
+import std/[options, os, tempfiles, times, unittest], gigipkg/cache {.all.}
 
 suite "loadCache":
   let
@@ -21,7 +18,6 @@ suite "loadCache":
     check isSome(cached)
     check cached.get() == "content"
 
-
 suite "saveCache":
   let
     tmpDir = createTempDir("test_utils--loadCache", "")

tests/test_parser.nim

@@ -1,25 +1,22 @@
-import
-  std/[json, strutils, tables, unittest],
-  gigipkg/gitignore, gigipkg/parser {.all.}
+import std/[json, strutils, tables, unittest], gigipkg/gitignore, gigipkg/parser {.all.}
 
-
-let data = parseJson("""{
+let data = parseJson(
+  """{
   "nim": {
     "fileName": "Nim.gitignore",
     "key": "nim",
     "contents": "\n### Nim ###\nnimcache/\nnimblecache/\nhtmldocs/\n",
     "name": "Nim"
   }
 }
-""")
-
+"""
+)
 
 test "Parse content":
   let gi = parseGitignore(data["nim"])
   check gi.name == "Nim"
   check gi.output.splitLines.len == 4
 
-
 test "Parse contents":
   let table = parseGitignoreTable(data)
   check table.len == 1