From 3e33a8a773730a02e360451777cee57b5f9e043f Mon Sep 17 00:00:00 2001
From: Sven Heidemann <sven.heidemann@sh-edraft.de>
Date: Mon, 8 Mar 2021 20:32:09 +0100
Subject: [PATCH] Bugfixes in build process

---
 .idea/workspace.xml                      | 25 ++++++++++++------------
 src/cpl/__init__.py                      |  2 +-
 src/cpl/application/__init__.py          |  2 +-
 src/cpl/configuration/__init__.py        |  2 +-
 src/cpl/console/__init__.py              |  2 +-
 src/cpl/database/__init__.py             |  2 +-
 src/cpl/database/connection/__init__.py  |  2 +-
 src/cpl/database/context/__init__.py     |  2 +-
 src/cpl/dependency_injection/__init__.py |  2 +-
 src/cpl/environment/__init__.py          |  2 +-
 src/cpl/logging/__init__.py              |  2 +-
 src/cpl/mailing/__init__.py              |  2 +-
 src/cpl/time/__init__.py                 |  2 +-
 src/cpl/utils/__init__.py                |  2 +-
 src/cpl_cli/__init__.py                  |  2 +-
 src/cpl_cli/command/__init__.py          |  2 +-
 src/cpl_cli/configuration/__init__.py    |  2 +-
 src/cpl_cli/publish/__init__.py          |  2 +-
 src/cpl_cli/publish/publisher.py         |  6 +++++-
 19 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0189656f..18f6503d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -22,8 +22,9 @@
     <select />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="7e2256bc-a6b8-4880-83a6-8b0e3372d0a4" name="Default Changelist" comment="Added publish logic">
-      <change beforePath="$PROJECT_DIR$/src/cpl_cli/templates/build/init.txt" beforeDir="false" afterPath="$PROJECT_DIR$/src/cpl_cli/templates/build/init.txt" afterDir="false" />
+    <list default="true" id="7e2256bc-a6b8-4880-83a6-8b0e3372d0a4" name="Default Changelist" comment="Bugfixes in build process">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/cpl_cli/publish/publisher.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/cpl_cli/publish/publisher.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -462,13 +463,6 @@
       <option name="presentableId" value="Default" />
       <updated>1605881914521</updated>
     </task>
-    <task id="LOCAL-00054" summary="Improved publish process">
-      <created>1608137669182</created>
-      <option name="number" value="00054" />
-      <option name="presentableId" value="LOCAL-00054" />
-      <option name="project" value="LOCAL" />
-      <updated>1608137669182</updated>
-    </task>
     <task id="LOCAL-00055" summary="Added publish command to cli">
       <created>1608138851088</created>
       <option name="number" value="00055" />
@@ -805,7 +799,14 @@
       <option name="project" value="LOCAL" />
       <updated>1615231748656</updated>
     </task>
-    <option name="localTasksCounter" value="103" />
+    <task id="LOCAL-00103" summary="Bugfixes in build process">
+      <created>1615231794961</created>
+      <option name="number" value="00103" />
+      <option name="presentableId" value="LOCAL-00103" />
+      <option name="project" value="LOCAL" />
+      <updated>1615231794961</updated>
+    </task>
+    <option name="localTasksCounter" value="104" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -821,7 +822,6 @@
     <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="Improved tests" />
     <MESSAGE value="Bugfixes and improved tests" />
     <MESSAGE value="Removed unused packages" />
     <MESSAGE value="Removed publish package" />
@@ -846,7 +846,8 @@
     <MESSAGE value="Fixed output when console is spinning" />
     <MESSAGE value="Added argument handling to spinner" />
     <MESSAGE value="Added publish logic" />
-    <option name="LAST_COMMIT_MESSAGE" value="Added publish logic" />
+    <MESSAGE value="Bugfixes in build process" />
+    <option name="LAST_COMMIT_MESSAGE" value="Bugfixes in build process" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
diff --git a/src/cpl/__init__.py b/src/cpl/__init__.py
index b75fa16f..ca0e2c9a 100644
--- a/src/cpl/__init__.py
+++ b/src/cpl/__init__.py
@@ -11,7 +11,7 @@ sh-edraft Common Python library
 
 """
 
-__title__ = 'src.cpl'
+__title__ = 'sh_cpl.cpl'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 sh-edraft.de'
diff --git a/src/cpl/application/__init__.py b/src/cpl/application/__init__.py
index 4aece354..7cddb168 100644
--- a/src/cpl/application/__init__.py
+++ b/src/cpl/application/__init__.py
@@ -11,7 +11,7 @@ sh-edraft Common Python library
 
 """
 
-__title__ = 'src.cpl.application'
+__title__ = 'cpl.application'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 sh-edraft.de'
diff --git a/src/cpl/configuration/__init__.py b/src/cpl/configuration/__init__.py
index 9921ca42..0390cd3c 100644
--- a/src/cpl/configuration/__init__.py
+++ b/src/cpl/configuration/__init__.py
@@ -11,7 +11,7 @@ sh-edraft Common Python library
 
 """
 
-__title__ = 'src.cpl.configuration'
+__title__ = 'cpl.configuration'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 sh-edraft.de'
diff --git a/src/cpl/console/__init__.py b/src/cpl/console/__init__.py
index b4006f60..14939696 100644
--- a/src/cpl/console/__init__.py
+++ b/src/cpl/console/__init__.py
@@ -11,7 +11,7 @@ sh-edraft Common Python library
 
 """
 
-__title__ = 'src.cpl.console'
+__title__ = 'cpl.console'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 sh-edraft.de'
diff --git a/src/cpl/database/__init__.py b/src/cpl/database/__init__.py
index 0410f868..00d60753 100644
--- a/src/cpl/database/__init__.py
+++ b/src/cpl/database/__init__.py
@@ -11,7 +11,7 @@ sh-edraft Common Python library
 
 """
 
-__title__ = 'src.cpl.database'
+__title__ = 'cpl.database'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 sh-edraft.de'
diff --git a/src/cpl/database/connection/__init__.py b/src/cpl/database/connection/__init__.py
index 9d03458d..4d8d82b7 100644
--- a/src/cpl/database/connection/__init__.py
+++ b/src/cpl/database/connection/__init__.py
@@ -11,7 +11,7 @@ sh-edraft Common Python library
 
 """
 
-__title__ = 'src.cpl.database.connection'
+__title__ = 'cpl.database.connection'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 sh-edraft.de'
diff --git a/src/cpl/database/context/__init__.py b/src/cpl/database/context/__init__.py
index 1dff6371..84c9bade 100644
--- a/src/cpl/database/context/__init__.py
+++ b/src/cpl/database/context/__init__.py
@@ -11,7 +11,7 @@ sh-edraft Common Python library
 
 """
 
-__title__ = 'src.cpl.database.context'
+__title__ = 'cpl.database.context'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 sh-edraft.de'
diff --git a/src/cpl/dependency_injection/__init__.py b/src/cpl/dependency_injection/__init__.py
index 2df836e3..3212dc59 100644
--- a/src/cpl/dependency_injection/__init__.py
+++ b/src/cpl/dependency_injection/__init__.py
@@ -11,7 +11,7 @@ sh-edraft Common Python library
 
 """
 
-__title__ = 'src.cpl.dependency_injection'
+__title__ = 'cpl.dependency_injection'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 sh-edraft.de'
diff --git a/src/cpl/environment/__init__.py b/src/cpl/environment/__init__.py
index f48e02c9..e8c90703 100644
--- a/src/cpl/environment/__init__.py
+++ b/src/cpl/environment/__init__.py
@@ -11,7 +11,7 @@ sh-edraft Common Python library
 
 """
 
-__title__ = 'src.cpl.environment'
+__title__ = 'cpl.environment'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 sh-edraft.de'
diff --git a/src/cpl/logging/__init__.py b/src/cpl/logging/__init__.py
index 1e550984..e81f7e49 100644
--- a/src/cpl/logging/__init__.py
+++ b/src/cpl/logging/__init__.py
@@ -11,7 +11,7 @@ sh-edraft Common Python library
 
 """
 
-__title__ = 'src.cpl.logging'
+__title__ = 'cpl.logging'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 sh-edraft.de'
diff --git a/src/cpl/mailing/__init__.py b/src/cpl/mailing/__init__.py
index ec847a41..3fdcdcfe 100644
--- a/src/cpl/mailing/__init__.py
+++ b/src/cpl/mailing/__init__.py
@@ -11,7 +11,7 @@ sh-edraft Common Python library
 
 """
 
-__title__ = 'src.cpl.mailing'
+__title__ = 'cpl.mailing'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 sh-edraft.de'
diff --git a/src/cpl/time/__init__.py b/src/cpl/time/__init__.py
index 5d247d2b..95f50657 100644
--- a/src/cpl/time/__init__.py
+++ b/src/cpl/time/__init__.py
@@ -11,7 +11,7 @@ sh-edraft Common Python library
 
 """
 
-__title__ = 'src.cpl.time'
+__title__ = 'cpl.time'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 sh-edraft.de'
diff --git a/src/cpl/utils/__init__.py b/src/cpl/utils/__init__.py
index 8eb71179..d8b64aed 100644
--- a/src/cpl/utils/__init__.py
+++ b/src/cpl/utils/__init__.py
@@ -11,7 +11,7 @@ sh-edraft Common Python library
 
 """
 
-__title__ = 'src.cpl.utils'
+__title__ = 'cpl.utils'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 sh-edraft.de'
diff --git a/src/cpl_cli/__init__.py b/src/cpl_cli/__init__.py
index 747e8e19..b2fbf81c 100644
--- a/src/cpl_cli/__init__.py
+++ b/src/cpl_cli/__init__.py
@@ -11,7 +11,7 @@ sh-edraft Common Python library
 
 """
 
-__title__ = 'src.cpl_cli'
+__title__ = 'sh_cpl.cpl_cli'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 sh-edraft.de'
diff --git a/src/cpl_cli/command/__init__.py b/src/cpl_cli/command/__init__.py
index af311476..4acd126f 100644
--- a/src/cpl_cli/command/__init__.py
+++ b/src/cpl_cli/command/__init__.py
@@ -11,7 +11,7 @@ sh-edraft Common Python library
 
 """
 
-__title__ = 'src.cpl_cli.command'
+__title__ = 'cpl_cli.command'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 sh-edraft.de'
diff --git a/src/cpl_cli/configuration/__init__.py b/src/cpl_cli/configuration/__init__.py
index dd20eb8c..fd25e6c1 100644
--- a/src/cpl_cli/configuration/__init__.py
+++ b/src/cpl_cli/configuration/__init__.py
@@ -11,7 +11,7 @@ sh-edraft Common Python library
 
 """
 
-__title__ = 'src.cpl_cli.configuration'
+__title__ = 'cpl_cli.configuration'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 sh-edraft.de'
diff --git a/src/cpl_cli/publish/__init__.py b/src/cpl_cli/publish/__init__.py
index e2442fc2..353e4013 100644
--- a/src/cpl_cli/publish/__init__.py
+++ b/src/cpl_cli/publish/__init__.py
@@ -11,7 +11,7 @@ sh-edraft Common Python library
 
 """
 
-__title__ = 'src.cpl_cli.publish'
+__title__ = 'cpl_cli.publish'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 sh-edraft.de'
diff --git a/src/cpl_cli/publish/publisher.py b/src/cpl_cli/publish/publisher.py
index f324e8db..f2f523c5 100644
--- a/src/cpl_cli/publish/publisher.py
+++ b/src/cpl_cli/publish/publisher.py
@@ -38,6 +38,9 @@ class Publisher(PublisherABC):
 
     @staticmethod
     def _get_module_name_from_dirs(file: str) -> str:
+        if 'src/' in file:
+            file = file.replace('src/', '')
+
         dirs = os.path.dirname(file).split('/')
         for d in dirs:
             if d.__contains__('.'):
@@ -225,7 +228,8 @@ class Publisher(PublisherABC):
             setup_string = stringTemplate(template_string).substitute(
                 Name=self._project_settings.name,
                 Version=self._project_settings.version.to_str(),
-                Packages=setuptools.find_packages(where=self._build_settings.source_path, exclude=self._build_settings.excluded),
+                Packages=setuptools.find_packages(where=self._build_settings.source_path,
+                                                  exclude=self._build_settings.excluded),
                 URL=self._project_settings.url,
                 LicenseName=self._project_settings.license_name,
                 Author=self._project_settings.author,