small fixes & moa tree [something] works now

lib/python/moa/plugin/adhoc.py

@@ -33,19 +33,19 @@
 
 def defineCommands(data):
     data['commands']['adhoc'] = { 
-        'desc' : 'Quickly create an adhoc analysis',
+        'desc' : 'Create an adhoc analysis',
         'call' : createAdhoc,
         'needsJob' : False,
         'usage' : 'moa adhoc -t "title" -- echo "do something"'        
         }
     data['commands']['simple'] = { 
-        'desc' : 'Quickly create a "simple" adhoc analysis',
+        'desc' : 'Create a "simple" adhoc analysis',
         'call' : createSimple,
         'needsJob' : False,
         'usage' : 'moa simple -t "title" -- echo "do something"'
         }
     data['commands']['map'] = { 
-        'desc' : 'Quickly create a "map" adhoc analysis',
+        'desc' : 'Create a "map" adhoc analysis',
         'call' : createMap,
         'needsJob' : False,
         'usage' : 'moa map -t "title" -- echo "do something"',

lib/python/moa/plugin/info.py

@@ -57,7 +57,7 @@ def defineCommands(data):
         'log' : False
         }
     data['commands']['tree'] = {
-        'desc' : 'Print a directory tree with extra information',
+        'desc' : 'display a directory tree',
         'call' : tree,
         'needsJob' : False,
         'log' : False
@@ -67,25 +67,29 @@ def defineCommands(data):
 def tree(data):
     wd = data.wd
     filt = data.args[1:]
-
     for path, dirs, files in os.walk(data.wd):
         rpath = path.replace(wd, '')[1:]
-
-        if filt and not rpath:
-            for d in dirs:
-                if d in filt: continue
-                dirs.remove(d)
 
+        remove = set(dirs) - set(filt)
+        if not rpath and filt:
+            while True:
+                for r in remove:
+                    if r in dirs:
+                        dirs.remove(r)
+                        break
+                else:
+                    break
 
         isMoa = '.moa' in dirs
-        while '.moa' in dirs: dirs.remove('.moa')
+        for d in dirs:
+            if d[0] == '.': dirs.remove(d)
         dirs.sort()
 
         if not rpath: lev = 0
         else: lev = rpath.count('/') + 1
 
         if not isMoa:
-            moa.ui.fprint('.. %s./%s' % ('  ' * lev, rpath), f='jinja')
+            moa.ui.fprint('(..) %s./%s' % ('  ' * lev, rpath), f='jinja')
             continue
         tag = '{{green}}M{{reset}}'
         statusFile = os.path.join(path, '.moa', 'status')
@@ -99,7 +103,7 @@ def tree(data):
                 'error' : '{{red}}E{{reset}}',
                 'interrupted' : '{{blue}}I{{reset}}'
                 }.get(message, '{{green}}?{{reset}}')
-        moa.ui.fprint("%s%s %s./%s" % ( tag, status, '  ' * lev, rpath),
+        moa.ui.fprint("(%s%s) %s./%s" % ( tag, status, '  ' * lev, rpath),
                       f = 'jinja')
 
 

lib/python/moa/plugin/moautil.py

@@ -19,31 +19,6 @@
 import moa.logger as l
 import moa.ui
 
-COPYTEST = '''
-mkdir 10.test
-cd 10.test
-moa simple -t "test" -- echo "hello"
-cd ..
-moa cp 10.test 20 2>/dev/null
-cd 20.test
-output=`moa run`
-[[ "$output" =~ "hello" ]] || (echo "invalid output"; false)
-cd ..
-pwd
-moa cp 10.test 30.test2 2>/dev/null
-cd 30.test2
-output=`moa run`
-[[ "$output" =~ "hello" ]] || (echo "invalid output"; false)
-cd ../10.test
-mkdir 05.subtest
-cd 05.subtest
-moa simple -t "test2" -- echo "subtest"
-cd ../../
-moa cp 10.test 40.test 2>/dev/null
-[[ ! -d "40.test/05.subtest" ]] || (echo "subdirectory should not be there"; false)
-moa cp -r 10.test 50.test 2>/dev/null
-[[ -d "50.test/05.subtest" ]] || (echo "subdirectory is not there?"; false)
-'''
 def defineCommands(data):
     data['commands']['cp'] = {
         'desc' : 'Copy a moa job',
@@ -228,3 +203,30 @@ def _copyMoaDir(job, toDir):
                 if not os.path.exists(thisToDir):
                     os.makedirs(thisToDir)
                 shutil.copyfile(fromFile, toFile)
+
+#Unittest scripts
+
+COPYTEST = '''
+mkdir 10.test
+cd 10.test
+moa simple -t "test" -- echo "hello"
+cd ..
+moa cp 10.test 20 2>/dev/null
+cd 20.test
+output=`moa run`
+[[ "$output" =~ "hello" ]] || (echo "invalid output"; false)
+cd ..
+moa cp 10.test 30.test2 2>/dev/null
+cd 30.test2
+output=`moa run`
+[[ "$output" =~ "hello" ]] || (echo "invalid output"; false)
+cd ../10.test
+mkdir 05.subtest
+cd 05.subtest
+moa simple -t "test2" -- echo "subtest"
+cd ../../
+moa cp 10.test 40.test 2>/dev/null
+[[ ! -d "40.test/05.subtest" ]] || (echo "subdirectory should not be there"; false)
+moa cp -r 10.test 50.test 2>/dev/null
+[[ -d "50.test/05.subtest" ]] || (echo "subdirectory is not there?"; false)
+'''

lib/python/moa/plugin/newjob.py

@@ -20,7 +20,7 @@
 
 def defineCommands(data):
     data['commands']['new'] = {
-        'desc' : "Create a new Moa job in the this directory",
+        'desc' : "Create a new Moa job",
         'call' : newJob,
         'needsJob' : False
         }