From 5a337db2b05963cba2a5e162f2f6cc5bbe7700ec Mon Sep 17 00:00:00 2001
From: nolash <dev@holbrook.no>
Date: Wed, 10 Nov 2021 09:20:25 +0100
Subject: [PATCH] Add packaging files

---
 MANIFEST.in              |  1 +
 clicada/cli/arg.py       |  4 ++--
 clicada/cli/none.py      | 14 ++++++++++++++
 clicada/runnable/view.py |  5 +++--
 requirements.txt         |  2 +-
 setup.cfg                | 36 ++++++++++++++++++++++++++++++++++++
 setup.py                 | 31 +++++++++++++++++++++++++++++++
 7 files changed, 88 insertions(+), 5 deletions(-)
 create mode 100644 MANIFEST.in
 create mode 100644 clicada/cli/none.py
 create mode 100644 setup.cfg
 create mode 100644 setup.py

diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..e8708cd
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1 @@
+include clicada/data/config/* *requirements* LICENSE
diff --git a/clicada/cli/arg.py b/clicada/cli/arg.py
index 873a34f..1607105 100644
--- a/clicada/cli/arg.py
+++ b/clicada/cli/arg.py
@@ -78,7 +78,7 @@ class CmdCtrl:
             self.cmd_string = cmd_string_translate
 
         if self.cmd_string == None:
-            raise ValueError('Subcommand missing')
+            self.cmd_string = 'none'
    
         modname = 'clicada.cli.{}'.format(self.cmd_string)
         self.logger.debug('using module {}'.format(modname))
@@ -98,7 +98,7 @@ class CmdCtrl:
     def config(self):
         extra_args = self.cmd_mod.extra_args()
         if self.cmd_args.config:
-            self.config = chainlib.eth.cli.Config.from_args(self.cmd_args, base_config_dir=base_config_dir, extra_args=extra_args, override_dirs=self.cmd_args.c)
+            self.config = chainlib.eth.cli.Config.from_args(self.cmd_args, base_config_dir=base_config_dir, extra_args=extra_args, default_config_dir=self.cmd_args.config)
         else:
             self.config = chainlib.eth.cli.Config.from_args(self.cmd_args, base_config_dir=base_config_dir, extra_args=extra_args)
 
diff --git a/clicada/cli/none.py b/clicada/cli/none.py
new file mode 100644
index 0000000..4f4a2b5
--- /dev/null
+++ b/clicada/cli/none.py
@@ -0,0 +1,14 @@
+def process_args(argparser):
+    pass
+
+def extra_args():
+    return {}
+
+def apply_args(config, args):
+    pass
+
+def validate(config, args):
+    pass
+
+def execute(ctrl):
+    raise ValueError('subcommand missing')
diff --git a/clicada/runnable/view.py b/clicada/runnable/view.py
index 54dacef..f8edb09 100644
--- a/clicada/runnable/view.py
+++ b/clicada/runnable/view.py
@@ -9,10 +9,11 @@ logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()
 
 
-def main(ctrl):
+ctrl = CmdCtrl(argv=sys.argv[1:], logger=logg)
+
+def main():
     ctrl.execute()
 
 
 if __name__ == '__main__':
-    ctrl = CmdCtrl(argv=sys.argv[1:], logger=logg)
     main(ctrl)
diff --git a/requirements.txt b/requirements.txt
index c77ccc6..a5dc2ed 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-usumbufu~=0.3.3a1
+usumbufu~=0.3.3a3
 confini~=0.5.1
 cic-eth-registry~=0.6.1
 cic-types~=0.2.1a5
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..4e6c7e3
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,36 @@
+[metadata]
+name = clicada
+version = 0.0.1a7
+description = CLI CRM tool for the cic-stack custodial wallet system
+author = Louis Holbrook
+author_email = dev@holbrook.no
+url = https://gitlab.com/chaintools/chainlib
+keywords =
+	dlt
+	evm
+	blockchain
+	cryptocurrency
+classifiers =
+	Programming Language :: Python :: 3
+	Operating System :: OS Independent
+	Development Status :: 3 - Alpha
+	Environment :: Console
+	Intended Audience :: Developers
+	License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
+	Topic :: Internet
+license = GPL3
+licence_files =
+	LICENSE.txt
+
+
+[options]
+python_requires = >= 3.6
+include_package_data = True
+packages = 
+	clicada
+	clicada.runnable
+	clicada.store
+	clicada.token
+	clicada.cli
+	clicada.tx
+	clicada.user
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..4298759
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,31 @@
+from setuptools import setup
+import os
+
+
+requirements = []
+f = open('requirements.txt', 'r')
+while True:
+    l = f.readline()
+    if l == '':
+        break
+    requirements.append(l.rstrip())
+f.close()
+
+#test_requirements = []
+#f = open('test_requirements.txt', 'r')
+#while True:
+#    l = f.readline()
+#    if l == '':
+#        break
+#    eth_requirements.append(l.rstrip())
+#f.close()
+
+
+setup(
+        install_requires=requirements,
+        entry_points={
+            'console_scripts': [
+                'clicada=clicada.runnable.view:main',
+                ],
+            },
+)