From 8844084999a2b216a365bf2b0aa7964a287c8536 Mon Sep 17 00:00:00 2001
From: deadc0de6 <info@deadc0de.ch>
Date: Wed, 27 Nov 2019 19:11:31 +0100
Subject: [PATCH] refactor command "listfiles" to "files"

---
 dotdrop/dotdrop.py               |  8 +++---
 dotdrop/options.py               |  8 +++---
 tests-ng/deprecated-link.sh      |  2 +-
 tests-ng/duplicate-key.sh        |  2 +-
 tests-ng/import-configs.sh       | 12 ++++-----
 tests-ng/import-link-children.sh |  2 +-
 tests-ng/include.sh              | 10 ++++----
 tests-ng/link-value-tests.sh     | 44 ++++++++++++++++----------------
 tests/helpers.py                 |  2 +-
 tests/test_listings.py           |  6 ++---
 10 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/dotdrop/dotdrop.py b/dotdrop/dotdrop.py
index 1e8b7d1..5e20865 100644
--- a/dotdrop/dotdrop.py
+++ b/dotdrop/dotdrop.py
@@ -420,11 +420,11 @@ def cmd_list_files(o):
         LOG.warn('unknown profile \"{}\"'.format(o.profile))
         return
     what = 'Dotfile(s)'
-    if o.listfiles_templateonly:
+    if o.files_templateonly:
         what = 'Template(s)'
     LOG.emph('{} for profile \"{}\"\n'.format(what, o.profile))
     for dotfile in o.dotfiles:
-        if o.listfiles_templateonly:
+        if o.files_templateonly:
             src = os.path.join(o.dotpath, dotfile.src)
             if not Templategen.is_template(src):
                 continue
@@ -610,10 +610,10 @@ def main():
                 LOG.dbg('running cmd: list')
             cmd_list_profiles(o)
 
-        elif o.cmd_listfiles:
+        elif o.cmd_files:
             # list files for selected profile
             if o.debug:
-                LOG.dbg('running cmd: listfiles')
+                LOG.dbg('running cmd: files')
             cmd_list_files(o)
 
         elif o.cmd_install:
diff --git a/dotdrop/options.py b/dotdrop/options.py
index 80e04b0..1be3254 100644
--- a/dotdrop/options.py
+++ b/dotdrop/options.py
@@ -59,7 +59,7 @@ Usage:
   dotdrop update    [-VbfdkP]   [-c <path>] [-p <profile>]
                                 [-i <pattern>...] [<path>...]
   dotdrop remove    [-Vbfdk]    [-c <path>] [-p <profile>] [<path>...]
-  dotdrop listfiles [-VbT]      [-c <path>] [-p <profile>]
+  dotdrop files     [-VbT]      [-c <path>] [-p <profile>]
   dotdrop detail    [-Vb]       [-c <path>] [-p <profile>] [<key>...]
   dotdrop list      [-Vb]       [-c <path>]
   dotdrop --help
@@ -190,7 +190,7 @@ class Options(AttrMonitor):
         """apply cli args as attribute"""
         # the commands
         self.cmd_list = self.args['list']
-        self.cmd_listfiles = self.args['listfiles']
+        self.cmd_files = self.args['files']
         self.cmd_install = self.args['install']
         self.cmd_compare = self.args['compare']
         self.cmd_import = self.args['import']
@@ -212,8 +212,8 @@ class Options(AttrMonitor):
                 sys.exit(USAGE)
             self.import_link = OPT_LINK[link]
 
-        # "listfiles" specifics
-        self.listfiles_templateonly = self.args['--template']
+        # "files" specifics
+        self.files_templateonly = self.args['--template']
         # "install" specifics
         self.install_force_action = self.args['--force-actions']
         self.install_temporary = self.args['--temp']
diff --git a/tests-ng/deprecated-link.sh b/tests-ng/deprecated-link.sh
index 1085e91..fcda341 100755
--- a/tests-ng/deprecated-link.sh
+++ b/tests-ng/deprecated-link.sh
@@ -125,7 +125,7 @@ set -e
 
 # test values have been correctly updated
 echo "========> test for updated entries"
-dotfiles=`cd ${ddpath} | ${bin} listfiles -c ${cfg} -p p1 | grep -v '^ '`
+dotfiles=`cd ${ddpath} | ${bin} files -c ${cfg} -p p1 | grep -v '^ '`
 echo "${dotfiles}" | grep '^f_link ' | grep ', link: link)'
 echo "${dotfiles}" | grep '^f_nolink ' | grep ', link: nolink)'
 echo "${dotfiles}" | grep '^f_nolink1 ' | grep ', link: nolink)'
diff --git a/tests-ng/duplicate-key.sh b/tests-ng/duplicate-key.sh
index 2a34d36..b40451f 100755
--- a/tests-ng/duplicate-key.sh
+++ b/tests-ng/duplicate-key.sh
@@ -94,7 +94,7 @@ cd ${ddpath} | ${bin} import -c ${cfg} -p p2 \
   ${tmpd}/sub/sub2/abc
 
 # count dotfiles for p2
-cnt=`cd ${ddpath} | ${bin} listfiles -c ${cfg} -p p2 -b | grep '^f_' | wc -l`
+cnt=`cd ${ddpath} | ${bin} files -c ${cfg} -p p2 -b | grep '^f_' | wc -l`
 [ "${cnt}" != "4" ] && exit 1
 
 ## CLEANING
diff --git a/tests-ng/import-configs.sh b/tests-ng/import-configs.sh
index a2c76e4..a8278b1 100755
--- a/tests-ng/import-configs.sh
+++ b/tests-ng/import-configs.sh
@@ -116,12 +116,12 @@ echo "zzz" > ${tmps}/dotfiles/zzz
 echo "sub" > ${tmps}/dotfiles/sub
 
 # install
-cd ${ddpath} | ${bin} listfiles -c ${cfg1} -p p0 -V | grep f_def
-cd ${ddpath} | ${bin} listfiles -c ${cfg1} -p p1 -V | grep f_abc
-cd ${ddpath} | ${bin} listfiles -c ${cfg1} -p p2 -V | grep f_def
-cd ${ddpath} | ${bin} listfiles -c ${cfg1} -p p3 -V | grep f_zzz
-cd ${ddpath} | ${bin} listfiles -c ${cfg1} -p pup -V | grep f_sub
-cd ${ddpath} | ${bin} listfiles -c ${cfg1} -p psubsub -V | grep f_sub
+cd ${ddpath} | ${bin} files -c ${cfg1} -p p0 -V | grep f_def
+cd ${ddpath} | ${bin} files -c ${cfg1} -p p1 -V | grep f_abc
+cd ${ddpath} | ${bin} files -c ${cfg1} -p p2 -V | grep f_def
+cd ${ddpath} | ${bin} files -c ${cfg1} -p p3 -V | grep f_zzz
+cd ${ddpath} | ${bin} files -c ${cfg1} -p pup -V | grep f_sub
+cd ${ddpath} | ${bin} files -c ${cfg1} -p psubsub -V | grep f_sub
 
 ## CLEANING
 rm -rf ${tmps} ${tmpd}
diff --git a/tests-ng/import-link-children.sh b/tests-ng/import-link-children.sh
index 88ae7e2..c685f6f 100755
--- a/tests-ng/import-link-children.sh
+++ b/tests-ng/import-link-children.sh
@@ -88,7 +88,7 @@ _EOF
 cd ${ddpath} | ${bin} import -c ${cfg} -p p1 -V --link=link_children ${dt}
 
 # check is set to link_children
-line=$(cd ${ddpath} | ${bin} listfiles -c ${cfg} -p p1 -V | grep "d_`basename ${dt}`")
+line=$(cd ${ddpath} | ${bin} files -c ${cfg} -p p1 -V | grep "d_`basename ${dt}`")
 echo ${line} | grep 'link: link_children'
 
 # checks file exists in dotpath
diff --git a/tests-ng/include.sh b/tests-ng/include.sh
index a767d48..145f1de 100755
--- a/tests-ng/include.sh
+++ b/tests-ng/include.sh
@@ -92,13 +92,13 @@ cd ${ddpath} | ${bin} compare -c ${cfg} -p p3
 cd ${ddpath} | ${bin} compare -c ${cfg} -p p0
 
 # list
-cd ${ddpath} | ${bin} listfiles -c ${cfg} -p p1 | grep f_abc
-cd ${ddpath} | ${bin} listfiles -c ${cfg} -p p2 | grep f_abc
-cd ${ddpath} | ${bin} listfiles -c ${cfg} -p p3 | grep f_abc
-cd ${ddpath} | ${bin} listfiles -c ${cfg} -p p0 | grep f_abc
+cd ${ddpath} | ${bin} files -c ${cfg} -p p1 | grep f_abc
+cd ${ddpath} | ${bin} files -c ${cfg} -p p2 | grep f_abc
+cd ${ddpath} | ${bin} files -c ${cfg} -p p3 | grep f_abc
+cd ${ddpath} | ${bin} files -c ${cfg} -p p0 | grep f_abc
 
 # count
-cnt=`cd ${ddpath} | ${bin} listfiles -c ${cfg} -p p1 -b | grep '^f_' | wc -l`
+cnt=`cd ${ddpath} | ${bin} files -c ${cfg} -p p1 -b | grep '^f_' | wc -l`
 [ "${cnt}" != "1" ] && exit 1
 
 ## CLEANING
diff --git a/tests-ng/link-value-tests.sh b/tests-ng/link-value-tests.sh
index 61a86dd..1e77de3 100755
--- a/tests-ng/link-value-tests.sh
+++ b/tests-ng/link-value-tests.sh
@@ -78,8 +78,8 @@ df="${tmpd}/qwert"
 cd ${ddpath} | ${bin} import -c ${cfg} -p p1 ${df} -V
 
 # checks
-cd ${ddpath} | ${bin} listfiles -c ${cfg} -p p1 -V
-line=$(cd ${ddpath} | ${bin} listfiles -c ${cfg} -p p1 -V | grep "f_`basename ${df}`")
+cd ${ddpath} | ${bin} files -c ${cfg} -p p1 -V
+line=$(cd ${ddpath} | ${bin} files -c ${cfg} -p p1 -V | grep "f_`basename ${df}`")
 echo ${line} | grep 'link: nolink'
 
 # try to install
@@ -113,8 +113,8 @@ df="${tmpd}/qwert"
 cd ${ddpath} | ${bin} import -c ${cfg} -p p1 ${df} -V
 
 # checks
-cd ${ddpath} | ${bin} listfiles -c ${cfg} -p p1 -V
-line=$(cd ${ddpath} | ${bin} listfiles -c ${cfg} -p p1 -V | grep "f_`basename ${df}`")
+cd ${ddpath} | ${bin} files -c ${cfg} -p p1 -V
+line=$(cd ${ddpath} | ${bin} files -c ${cfg} -p p1 -V | grep "f_`basename ${df}`")
 echo ${line} | grep 'link: nolink'
 
 # try to install
@@ -148,8 +148,8 @@ df="${tmpd}/qwert"
 cd ${ddpath} | ${bin} import -c ${cfg} -p p1 ${df} -V --link=nolink
 
 # checks
-cd ${ddpath} | ${bin} listfiles -c ${cfg} -p p1 -V
-line=$(cd ${ddpath} | ${bin} listfiles -c ${cfg} -p p1 -V | grep "f_`basename ${df}`")
+cd ${ddpath} | ${bin} files -c ${cfg} -p p1 -V
+line=$(cd ${ddpath} | ${bin} files -c ${cfg} -p p1 -V | grep "f_`basename ${df}`")
 echo ${line} | grep 'link: nolink'
 
 # try to install
@@ -183,8 +183,8 @@ df="${tmpd}/qwert"
 cd ${ddpath} | ${bin} import -c ${cfg} -p p1 ${df} -V --link=link
 
 # checks
-cd ${ddpath} | ${bin} listfiles -c ${cfg} -p p1 -V
-line=$(cd ${ddpath} | ${bin} listfiles -c ${cfg} -p p1 -V | grep "f_`basename ${df}`")
+cd ${ddpath} | ${bin} files -c ${cfg} -p p1 -V
+line=$(cd ${ddpath} | ${bin} files -c ${cfg} -p p1 -V | grep "f_`basename ${df}`")
 echo ${line} | grep 'link: link'
 
 # try to install
@@ -218,8 +218,8 @@ df="${tmpd}/qwert"
 cd ${ddpath} | ${bin} import -c ${cfg} -p p1 ${df} -V
 
 # checks
-cd ${ddpath} | ${bin} listfiles -c ${cfg} -p p1 -V
-line=$(cd ${ddpath} | ${bin} listfiles -c ${cfg} -p p1 -V | grep "f_`basename ${df}`")
+cd ${ddpath} | ${bin} files -c ${cfg} -p p1 -V
+line=$(cd ${ddpath} | ${bin} files -c ${cfg} -p p1 -V | grep "f_`basename ${df}`")
 echo ${line} | grep 'link: link'
 
 # try to install
@@ -253,8 +253,8 @@ df="${tmpd}/qwert"
 cd ${ddpath} | ${bin} import -c ${cfg} -p p1 ${df} -V --link=nolink
 
 # checks
-cd ${ddpath} | ${bin} listfiles -c ${cfg} -p p1 -V
-line=$(cd ${ddpath} | ${bin} listfiles -c ${cfg} -p p1 -V | grep "f_`basename ${df}`")
+cd ${ddpath} | ${bin} files -c ${cfg} -p p1 -V
+line=$(cd ${ddpath} | ${bin} files -c ${cfg} -p p1 -V | grep "f_`basename ${df}`")
 echo ${line} | grep 'link: nolink'
 
 # try to install
@@ -288,8 +288,8 @@ df="${tmpd}/qwert"
 cd ${ddpath} | ${bin} import -c ${cfg} -p p1 ${df} -V --link=nolink
 
 # checks
-cd ${ddpath} | ${bin} listfiles -c ${cfg} -p p1 -V
-line=$(cd ${ddpath} | ${bin} listfiles -c ${cfg} -p p1 -V | grep "f_`basename ${df}`")
+cd ${ddpath} | ${bin} files -c ${cfg} -p p1 -V
+line=$(cd ${ddpath} | ${bin} files -c ${cfg} -p p1 -V | grep "f_`basename ${df}`")
 echo ${line} | grep 'link: nolink'
 
 # try to install
@@ -323,8 +323,8 @@ df="${tmpd}/qwert"
 cd ${ddpath} | ${bin} import -c ${cfg} -p p1 ${df} -V --link=nolink
 
 # checks
-cd ${ddpath} | ${bin} listfiles -c ${cfg} -p p1 -V
-line=$(cd ${ddpath} | ${bin} listfiles -c ${cfg} -p p1 -V | grep "f_`basename ${df}`")
+cd ${ddpath} | ${bin} files -c ${cfg} -p p1 -V
+line=$(cd ${ddpath} | ${bin} files -c ${cfg} -p p1 -V | grep "f_`basename ${df}`")
 echo ${line} | grep 'link: nolink'
 
 # try to install
@@ -356,8 +356,8 @@ df="${tmpd}/qwert"
 cd ${ddpath} | ${bin} import -c ${cfg} --link=link -p p1 ${df} -V
 
 # checks
-cd ${ddpath} | ${bin} listfiles -c ${cfg} -p p1 -V
-line=$(cd ${ddpath} | ${bin} listfiles -c ${cfg} -p p1 -V | grep "f_`basename ${df}`")
+cd ${ddpath} | ${bin} files -c ${cfg} -p p1 -V
+line=$(cd ${ddpath} | ${bin} files -c ${cfg} -p p1 -V | grep "f_`basename ${df}`")
 echo ${line} | grep 'link: link'
 
 # try to install
@@ -418,8 +418,8 @@ df="${tmpd}/qwert"
 cd ${ddpath} | ${bin} import -c ${cfg} --link=link_children -p p1 ${df} -V
 
 # checks
-cd ${ddpath} | ${bin} listfiles -c ${cfg} -p p1 -V
-line=$(cd ${ddpath} | ${bin} listfiles -c ${cfg} -p p1 -V | grep "d_`basename ${df}`")
+cd ${ddpath} | ${bin} files -c ${cfg} -p p1 -V
+line=$(cd ${ddpath} | ${bin} files -c ${cfg} -p p1 -V | grep "d_`basename ${df}`")
 echo ${line} | grep 'link: link_children'
 
 # try to install
@@ -459,8 +459,8 @@ df="${tmpd}/qwert"
 cd ${ddpath} | ${bin} import -c ${cfg} -p p1 ${df} -V
 
 # checks
-cd ${ddpath} | ${bin} listfiles -c ${cfg} -p p1 -V
-line=$(cd ${ddpath} | ${bin} listfiles -c ${cfg} -p p1 -V | grep "d_`basename ${df}`")
+cd ${ddpath} | ${bin} files -c ${cfg} -p p1 -V
+line=$(cd ${ddpath} | ${bin} files -c ${cfg} -p p1 -V | grep "d_`basename ${df}`")
 echo ${line} | grep 'link: link_children'
 
 # try to install
diff --git a/tests/helpers.py b/tests/helpers.py
index 80cc8d0..2d57838 100644
--- a/tests/helpers.py
+++ b/tests/helpers.py
@@ -130,7 +130,7 @@ def _fake_args():
     args['--force-actions'] = False
     # cmds
     args['list'] = False
-    args['listfiles'] = False
+    args['files'] = False
     args['install'] = False
     args['compare'] = False
     args['import'] = False
diff --git a/tests/test_listings.py b/tests/test_listings.py
index e07c5a5..39905ec 100644
--- a/tests/test_listings.py
+++ b/tests/test_listings.py
@@ -82,13 +82,13 @@ class TestListings(unittest.TestCase):
         cmd_importer(o)
         o = load_options(confpath, profile)
 
-        # listfiles
+        # files
         cmd_list_profiles(o)
 
         # list files
-        o.listfiles_templateonly = False
+        o.files_templateonly = False
         cmd_list_files(o)
-        o.listfiles_templateonly = True
+        o.files_templateonly = True
         cmd_list_files(o)
 
         # details