fix syntax and tests

.travis.yml

@@ -1,6 +1,5 @@
 language: python
 python:
-  - "3.3"
   - "3.4"
   - "3.5"
   - "3.6"

catcli/catcli.py

@@ -19,7 +19,7 @@ from .logger import Logger
 from .catalog import Catalog
 from .walker import Walker
 from .noder import Noder
-from .utils import *
+from .utils import ask, edit
 
 NAME = 'catcli'
 CUR = os.path.dirname(os.path.abspath(__file__))

catcli/decomp.py

@@ -5,7 +5,6 @@ Copyright (c) 2017, deadc0de6
 Catcli generic compressed data lister
 """
 
-import sys
 import os
 import tarfile
 import zipfile

catcli/utils.py

@@ -7,7 +7,6 @@ helpers
 
 import os
 import hashlib
-import sys
 import tempfile
 import subprocess
 import datetime

catcli/walker.py

@@ -6,10 +6,8 @@ Catcli filesystem indexer
 """
 
 import os
-import anytree
 
 # local imports
-from catcli.noder import Noder
 from catcli.logger import Logger
 
 
@@ -26,7 +24,7 @@ class Walker:
         '''index a directory and store in tree'''
         self._debug('indexing starting at {}'.format(path))
         if not parent:
-            parent = noder.dir_node(name, path, parent)
+            parent = self.noder.dir_node(name, path, parent)
 
         cnt = 0
         for (root, dirs, files) in os.walk(path):

tests/test_find.py

@@ -7,15 +7,10 @@ Basic unittest for find
 
 import unittest
 
-import catcli
+from catcli.catcli import cmd_find
-
-from catcli.catcli import *
 from catcli.noder import Noder
-from catcli.walker import Walker
 from catcli.catalog import Catalog
-from catcli.logger import Logger
+from tests.helpers import get_fakecatalog
-from catcli.utils import *
-from tests.helpers import *
 
 
 class TestFind(unittest.TestCase):

tests/test_graph.py

@@ -9,11 +9,10 @@ import unittest
 import tempfile
 import os
 
-from catcli.catcli import *
+from catcli.catcli import cmd_graph
 from catcli.noder import Noder
-from catcli.walker import Walker
 from catcli.catalog import Catalog
-from tests.helpers import *
+from tests.helpers import clean, get_fakecatalog
 
 
 class TestGraph(unittest.TestCase):

tests/test_index.py

@@ -5,13 +5,14 @@ Copyright (c) 2017, deadc0de6
 Basic unittest for indexing
 """
 
+import os
 import unittest
 
-from catcli.catcli import *
+from catcli.catcli import cmd_index
 from catcli.noder import Noder
-from catcli.walker import Walker
 from catcli.catalog import Catalog
-from tests.helpers import *
+from tests.helpers import get_tempdir, create_rnd_file, clean, \
+        get_rnd_string, create_dir
 
 
 class TestIndexing(unittest.TestCase):
@@ -35,13 +36,12 @@ class TestIndexing(unittest.TestCase):
         d2 = create_dir(dirpath, get_rnd_string(3))
 
         # fill directories with files
-        d1f1 = create_rnd_file(d1, get_rnd_string(4))
+        _ = create_rnd_file(d1, get_rnd_string(4))
-        d1f2 = create_rnd_file(d1, get_rnd_string(4))
+        _ = create_rnd_file(d1, get_rnd_string(4))
-        d2f1 = create_rnd_file(d2, get_rnd_string(6))
+        _ = create_rnd_file(d2, get_rnd_string(6))
 
         noder = Noder()
         top = noder.new_top_node()
-        walker = Walker(noder)
         catalog = Catalog(catalogpath, force=True, verbose=False)
 
         # create fake args

tests/test_ls.py

@@ -7,11 +7,10 @@ Basic unittest for ls
 
 import unittest
 
-from catcli.catcli import *
+from catcli.catcli import cmd_ls
 from catcli.noder import Noder
-from catcli.walker import Walker
 from catcli.catalog import Catalog
-from tests.helpers import *
+from tests.helpers import get_fakecatalog, clean
 
 
 class TestWalking(unittest.TestCase):

tests/test_rm.py

@@ -7,11 +7,10 @@ Basic unittest for rm
 
 import unittest
 
-from catcli.catcli import *
+from catcli.catcli import cmd_rm, cmd_ls
 from catcli.noder import Noder
-from catcli.walker import Walker
 from catcli.catalog import Catalog
-from tests.helpers import *
+from tests.helpers import clean, get_fakecatalog
 
 
 class TestRm(unittest.TestCase):

tests/test_tree.py

@@ -7,11 +7,10 @@ Basic unittest for tree
 
 import unittest
 
-from catcli.catcli import *
+from catcli.catcli import cmd_tree
 from catcli.noder import Noder
-from catcli.walker import Walker
 from catcli.catalog import Catalog
-from tests.helpers import *
+from tests.helpers import clean, get_fakecatalog
 
 
 class TestTree(unittest.TestCase):

tests/test_update.py

@@ -6,12 +6,13 @@ Basic unittest for updating an index
 """
 
 import unittest
+import os
 
-from catcli.catcli import *
+from catcli.catcli import cmd_index, cmd_update
 from catcli.noder import Noder
-from catcli.walker import Walker
 from catcli.catalog import Catalog
-from tests.helpers import *
+from tests.helpers import create_dir, create_rnd_file, get_tempdir, \
+        clean, unix_tree, edit_file, read_from_file
 import anytree
 
 
@@ -42,7 +43,6 @@ class TestIndexing(unittest.TestCase):
 
         noder = Noder()
         top = noder.new_top_node()
-        walker = Walker(noder)
         catalog = Catalog(catalogpath, force=True, verbose=False)
 
         # create fake args