Merge pull request #21 from cfengine/index

Fixed issues found by flake8

cfbs/commands.py

@@ -2,9 +2,10 @@
 import os
 import sys
 
-from cf_remote.paths import cfengine_dir
-
 from cfbs.utils import (
+    cfbs_dir,
+    cfbs_filename,
+    is_cfbs_repo,
     user_error,
     get_json,
     strip_left,
@@ -24,18 +25,6 @@
 from cfbs.index import Index
 
 
-def cfbs_filename() -> str:
-    return "cfbs.json"
-
-
-def is_cfbs_repo() -> bool:
-    return os.path.isfile(cfbs_filename())
-
-
-def cfbs_dir(append=None) -> str:
-    return os.path.join(cfengine_dir("cfbs"), append if append else "")
-
-
 definition = None
 
 

cfbs/index.py

@@ -5,6 +5,7 @@
 from cf_remote.paths import cfengine_dir
 
 from cfbs.utils import (
+    cfbs_dir,
     user_error,
     get_json,
     strip_left,

cfbs/main.py

@@ -8,7 +8,7 @@
 import logging as log
 
 from cfbs.version import string as version
-from cfbs.utils import user_error
+from cfbs.utils import user_error, is_cfbs_repo
 from cfbs import commands
 
 
@@ -76,7 +76,7 @@ def main() -> int:
     if args.command == "pretty":
         return commands.pretty_command(args.args)
 
-    if not commands.is_cfbs_repo():
+    if not is_cfbs_repo():
         user_error("This is not a cfbs repo, to get started, type: cfbs init")
 
     if args.command == "status":

cfbs/utils.py

@@ -4,6 +4,7 @@
 import copy
 from collections import OrderedDict
 from shutil import rmtree
+from cf_remote.paths import cfengine_dir
 
 import requests
 
@@ -139,3 +140,15 @@ def merge_json(a, b, overwrite_callback=None, stack=None):
             a[k] = v
 
     return a
+
+
+def cfbs_filename() -> str:
+    return "cfbs.json"
+
+
+def is_cfbs_repo() -> bool:
+    return os.path.isfile(cfbs_filename())
+
+
+def cfbs_dir(append=None) -> str:
+    return os.path.join(cfengine_dir("cfbs"), append if append else "")