cmdpackage 0.1.3__py3-none-any.whl → 0.1.4__py3-none-any.whl

{src → cmdpackage}/defs/writeCLIPackage.py

@@ -1,6 +1,6 @@
 import os, json
 from ..templates.cmdTemplate import \
-    initFile, logPrintTemplate, \
+    mainFile, logPrintTemplate, \
     commandsFileStr, commandsJsonDict, \
     cmdSwitchbordFileStr, cmdOptSwitchbordFileStr, \
     argParseTemplate, optSwitchesTemplate, \
@@ -13,12 +13,12 @@ def writeCLIPackage(fields: dict):
     programName = fields[field_name]
     # -- package dir files
     ## write __init__.py to package dir from str
-    packDir = os.path.join(os.path.abspath("."),'src')
-    print('packDir:', str(packDir))
+    packDir = os.path.join(os.path.abspath("."), 'src', programName)
+    #print('packDir:', str(packDir))
     chkDir(packDir)
-    fileName = os.path.join(packDir,"__init__.py")
+    fileName = os.path.join(packDir,"main.py")
     with open(fileName,"w") as wf:
-        wf.write(initFile)
+        wf.write(mainFile)
 
     # -- defs dir files
     ## write logPrint.py def for def dir from template

src/__init__.py → cmdpackage/main.py

@@ -8,7 +8,9 @@ from pathlib import Path
 GREEN = "\033[32m"
 RESET = "\033[0m"
 
+
 def main():
+    print("--- Inside cmdPack.src.main() ---")
     projName = ''
     askForDirChange = False
     if len(sys.argv) > 1:
@@ -17,7 +19,7 @@ def main():
         askForDirChange = ensure_and_cd_to_directory(projName)
     else:
         projName = Path(os.getcwd()).stem
-    fields: dict[str,str] = writePyProject()
+    fields: dict[str, str] = writePyProject()
     writeCLIPackage(fields)
     createzVirtualEnv(fields)
     print(f'*** Activate and install {projName} virtual enviroment ***')
@@ -26,9 +28,11 @@ def main():
     print(f'{GREEN}execute{RESET}: . env/{projName}/bin/activate')
     print(f'{GREEN}execute{RESET}: pip install -e .')
 
+
 if __name__ == '__main__':
     main()
 
+
 def ensure_and_cd_to_directory(target_dir_name: str) -> bool:
     """
     Checks if a target directory exists in the current working directory.

{src → cmdpackage}/templates/cmdTemplate.py

@@ -2,7 +2,7 @@
 from string import Template
 from textwrap import dedent
 
-initFile = dedent("""import sys, os
+mainFile = dedent("""import sys, os
 from .classes.argParse import ArgParse
 from .commands.cmdSwitchbord import cmdSwitchbord
 

{src → cmdpackage}/templates/pyprojectTemplate.py

@@ -24,11 +24,9 @@ pyproject_base_template = Template(dedent("""\
     build-backend = "setuptools.build_meta"
 
     [tool.setuptools.packages.find]
-    [tool.setuptools.package-dir]
-    ${name} = "src"
-
+    where = ["src"]
     [project.scripts]
-    ${name} = "src:main"
+    ${name} = "${name}.main:main"
     """))
 
 classifiers_line = Template(

{cmdpackage-0.1.3.dist-info → cmdpackage-0.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cmdpackage
-Version: 0.1.3
+Version: 0.1.4
 Summary: Automated python package generator for CLI function calls
 Author-email: mpytel <mpytel@domain.com>
 Maintainer-email: mpytel <mpytel@domain.com>

cmdpackage-0.1.4.dist-info/RECORD

@@ -0,0 +1,18 @@
+cmdpackage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+cmdpackage/main.py,sha256=myRgnGORMAVp0n8Da-SO3H9U7S6cDW3uvcRQ55jwo30,2702
+cmdpackage/defs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+cmdpackage/defs/createzVirtualEnv.py,sha256=ZKsf_y82pRK_ExpEcAg7LfwNl6arwBFZYwtF5ZCBCiU,1008
+cmdpackage/defs/runSubProc.py,sha256=J-TVMYkrsmf8UnmA5KYco6Wso2XfyNp-0QEN5P6-cZY,356
+cmdpackage/defs/writeCLIPackage.py,sha256=P353n9V3gkpYctYDFmvUdoia_DMX_B2IGHgWBF1YpZY,3621
+cmdpackage/defs/writePyProject.py,sha256=KA5p07WyXZvJ-SG70831EcE-KoK4suZanDsxrGIzp20,4582
+cmdpackage/defs/writeSetup.py,sha256=t3S1vR8en9rDPoMGZfBgoZpHDzCGmDsvY_6M1MnjKhk,3868
+cmdpackage/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+cmdpackage/templates/cmdTemplate.py,sha256=cJ0uod9DO0fMnjwn_fy1bsS2k0Ze3qwLtyDfRoxRo74,27384
+cmdpackage/templates/pyprojectTemplate.py,sha256=h_m86kob5lqIIwnc4SwC9JbjzohDCI6g-I6cxwCF8tk,1752
+cmdpackage/templates/setupTemplates.py,sha256=SVmUVP0anIaSGWBVby-eqDoksHMTR4C8wl31qAKCdp0,1720
+cmdpackage-0.1.4.dist-info/licenses/LICENSE,sha256=I-KXocS3ZqDVWR09w3y-b41lJG1RLsYM3SYN5Haudo0,1069
+cmdpackage-0.1.4.dist-info/METADATA,sha256=GFqH5MIQRrOl7HmTP3cBHlYIfpLpdOL_BiFEnG7bxfU,8865
+cmdpackage-0.1.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cmdpackage-0.1.4.dist-info/entry_points.txt,sha256=IfotrjJqP7BIvZaryJR6RmC_wZ9bvsYSofg8qrJiWGs,52
+cmdpackage-0.1.4.dist-info/top_level.txt,sha256=ZEPclda-CZbQln2Sw13Sd5eGI7dHxGqd0UphZ9ti5ew,11
+cmdpackage-0.1.4.dist-info/RECORD,,

cmdpackage-0.1.4.dist-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+cmdpackage = cmdpackage.main:main

cmdpackage-0.1.4.dist-info/top_level.txt

@@ -0,0 +1 @@
+cmdpackage

cmdpackage-0.1.3.dist-info/RECORD

@@ -1,17 +0,0 @@
-cmdpackage-0.1.3.dist-info/licenses/LICENSE,sha256=I-KXocS3ZqDVWR09w3y-b41lJG1RLsYM3SYN5Haudo0,1069
-src/__init__.py,sha256=jVjBxmyRJ5OTQ9ty5aZr_FR2LOa8vnLo1Z06edN-u6s,2651
-src/defs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-src/defs/createzVirtualEnv.py,sha256=ZKsf_y82pRK_ExpEcAg7LfwNl6arwBFZYwtF5ZCBCiU,1008
-src/defs/runSubProc.py,sha256=J-TVMYkrsmf8UnmA5KYco6Wso2XfyNp-0QEN5P6-cZY,356
-src/defs/writeCLIPackage.py,sha256=rfvQmX9CkpwUqQnMoCYCoPxEE_le78A128GQXBdzfjk,3610
-src/defs/writePyProject.py,sha256=KA5p07WyXZvJ-SG70831EcE-KoK4suZanDsxrGIzp20,4582
-src/defs/writeSetup.py,sha256=t3S1vR8en9rDPoMGZfBgoZpHDzCGmDsvY_6M1MnjKhk,3868
-src/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-src/templates/cmdTemplate.py,sha256=6sffPLlGAYNO-KxXX9VL8AsD0FX-K3R4QSB49I2tc_0,27384
-src/templates/pyprojectTemplate.py,sha256=9f-AKvbAWzHhDHvsh4Yk1TeATJi1RIecic4vrmAK5ns,1778
-src/templates/setupTemplates.py,sha256=SVmUVP0anIaSGWBVby-eqDoksHMTR4C8wl31qAKCdp0,1720
-cmdpackage-0.1.3.dist-info/METADATA,sha256=TP60x6NoWlNBKdruZAEMP_2f14yts_56JtGHTfRm7sQ,8865
-cmdpackage-0.1.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cmdpackage-0.1.3.dist-info/entry_points.txt,sha256=AMwJtkreLnhYlrSO2lms8N_aeFxXiIvryvUnIPNoADQ,40
-cmdpackage-0.1.3.dist-info/top_level.txt,sha256=74rtVfumQlgAPzR5_2CgYN24MB0XARCg0t-gzk6gTrM,4
-cmdpackage-0.1.3.dist-info/RECORD,,

cmdpackage-0.1.3.dist-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-cmdpackage = src:main

cmdpackage-0.1.3.dist-info/top_level.txt

@@ -1 +0,0 @@
-src