From b518f6986ae0b98f1f9ef5fe706e2c22a57ea409 Mon Sep 17 00:00:00 2001
From: "Antonio J. Delgado" <antoniodelgado@susurrando.com>
Date: Tue, 23 Mar 2021 12:23:06 +0200
Subject: [PATCH] Fix some errors and create folder for module

---
 deploy_new_python_project.sh                        | 3 ++-
 skeleton/{ => project_codename}/__init__.py         | 0
 skeleton/{ => project_codename}/project_codename.py | 4 ++--
 skeleton/setup.cfg                                  | 6 +++---
 4 files changed, 7 insertions(+), 6 deletions(-)
 rename skeleton/{ => project_codename}/__init__.py (100%)
 rename skeleton/{ => project_codename}/project_codename.py (96%)

diff --git a/deploy_new_python_project.sh b/deploy_new_python_project.sh
index a972c8b..a7778e1 100644
--- a/deploy_new_python_project.sh
+++ b/deploy_new_python_project.sh
@@ -86,7 +86,8 @@ destination_path="${DEPLOYMENT_PATH}/${PROJECT_CODENAME}"
 mkdir -p "${DEPLOYMENT_PATH}"
 script_path=$(dirname "${0}")
 cp "${script_path}/skeleton" "${destination_path}" -rfp
-mv "${destination_path}/project_codename.py" "${destination_path}/${PROJECT_CODENAME}.py"
+mv "${destination_path}/project_codename" "${destination_path}/${PROJECT_CODENAME}"
+mv "${destination_path}/${PROJECT_CODENAME}/project_codename.py" "${destination_path}/${PROJECT_CODENAME}/${PROJECT_CODENAME}.py"
 while read -r file
 do
   sed -i "s/__project_codename__/${PROJECT_CODENAME}/g" "${file}"
diff --git a/skeleton/__init__.py b/skeleton/project_codename/__init__.py
similarity index 100%
rename from skeleton/__init__.py
rename to skeleton/project_codename/__init__.py
diff --git a/skeleton/project_codename.py b/skeleton/project_codename/project_codename.py
similarity index 96%
rename from skeleton/project_codename.py
rename to skeleton/project_codename/project_codename.py
index 90ce677..04cfd69 100644
--- a/skeleton/project_codename.py
+++ b/skeleton/project_codename/project_codename.py
@@ -14,7 +14,7 @@ from logging.handlers import SysLogHandler
 
 class __project_codename__:
 
-    def _init_(self, debug_level, log_file):
+    def __init__(self, debug_level, log_file):
         ''' Initial function called when object is created '''
         self.config = dict()
         self.config['debug_level'] = debug_level
@@ -44,7 +44,7 @@ class __project_codename__:
             log_file = os.path.join(log_folder, "__project_codename__.log")
 
         if not os.path.exists(os.path.dirname(log_file)):
-            os.path.mkdir(os.path.dirname(log_file))
+            os.mkdir(os.path.dirname(log_file))
 
         filehandler = logging.handlers.RotatingFileHandler(log_file, maxBytes=102400000)
         # create formatter
diff --git a/skeleton/setup.cfg b/skeleton/setup.cfg
index cfdc443..32bd01f 100644
--- a/skeleton/setup.cfg
+++ b/skeleton/setup.cfg
@@ -1,9 +1,9 @@
 [metadata]
-name = %project_codename%
-version = %version%
+name = __project_codename__
+version = __version__
 
 [options]
-packages = %project_codename%
+packages = __project_codename__
 install_requires =
   requests
   importlib; python_version == "3.6"