iniUts 1.1.8__tar.gz → 1.2.0__tar.gz

iniuts-1.2.0/MANIFEST.in

@@ -0,0 +1,2 @@
+global-include *.txt *.py *.md
+recursive-exclude venv *

{iniUts-1.1.8/iniUts.egg-info → iniuts-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iniUts
-Version: 1.1.8
+Version: 1.2.0
 Summary: Ini file manipulator
 Home-page: 
 Author: Melque Lima
@@ -23,6 +23,10 @@ License-File: LICENCE.txt
 pip install iniUts
 ```
 
+## GitHub
+https://github.com/ZdekPyPi/IniUts
+
+
 ## Usage
 #
 <!-- //==================================================== -->

{iniUts-1.1.8 → iniuts-1.2.0}/README.md

@@ -6,6 +6,10 @@
 pip install iniUts
 ```
 
+## GitHub
+https://github.com/ZdekPyPi/IniUts
+
+
 ## Usage
 #
 <!-- //==================================================== -->

{iniUts-1.1.8 → iniuts-1.2.0}/commands.txt

@@ -1,4 +1,4 @@
 pip3 install setuptools twine
 python setup.py sdist
 twine upload --config-file .\.pypirc --repository-url https://upload.pypi.org/legacy/ dist/* 
-twine upload --config-file .\.pypirc .\dist\iniUts-1.0.4.tar.gz
+twine upload --config-file .\.pypirc .\dist\iniUts-1.1.

{iniUts-1.1.8 → iniuts-1.2.0}/iniUts/__init__.py

@@ -2,6 +2,23 @@ import configparser as cp
 from dataclasses import dataclass
 from datetime import datetime
 import re
+import os
+
+class envar():
+    def __init__(self,key:str,default:str=None):
+        self.key  = key
+        self.default = default
+    
+    def get_value(self):
+        if self.default != None:
+            return os.getenv(self.key,self.default)
+        else:
+            value = os.getenv(self.key)
+            if not value:
+                raise Exception(f"envar '{self.key}' not found!")
+            return value
+
+    
 
 
 class IniUts():
@@ -112,9 +129,19 @@ class IniUts():
             v = cls(v)
         return v
 
+    def setup_initial_values(self,dtClass):
+        for k in dtClass.__annotations__:
+            if not hasattr(dtClass, k):
+                setattr(dtClass, k, None)
+        return dtClass
+
     def section2DataClass(self,section,dtClass,skip_missing=False,empty_as_null=False):
         dt = self.Section2Dict(section,empty_as_null=empty_as_null)
         dt2 = self.Section2Dict(section,empty_as_null=empty_as_null,fileIni=self.prd_file)
+
+        dtClass = self.setup_initial_values(dtClass)
+
+        #VALIDA AS KEYS NO INI DE DEV
         for k, v in dt.items():
             if not k in dtClass.__annotations__:
                 if not skip_missing:
@@ -122,20 +149,22 @@ class IniUts():
                 else:
                     continue
             v = self.format_data(dtClass,k,v)
-
-            
-
             setattr(dtClass, k, v)
         
+        class_keys = [x for x in dtClass.__annotations__ if getattr(dtClass,x) != envar]
         
-        MissingKeysFromClass = lambda x:list(set(dtClass.__annotations__.keys())  - set(x.keys()))
+        MissingKeysFromClass = lambda x:list(set(class_keys)  - set(x.keys()))
 
         #VERIFICA SE AS KEYS NAO ENCONTRADAS ESTAO NO ARQUIVO DE PRD:
         if not self.in_prd:
             for k in MissingKeysFromClass(dt):
                 if not k in dt2.keys():
+                    if isinstance(getattr(dtClass,k),envar):
+                        v = getattr(dtClass,k).get_value()
+                        setattr(dtClass, k, v)
+                        continue
                     if not skip_missing:
-                        raise Exception(f"Cound not find '{MissingKeysFromClass(dt)}' keys at section '{section}' in ini file")
+                        raise Exception(f"Cound not find '{k}' keys at section '{section}' in ini file")
                     continue
                 v = self.format_data(dtClass,k,dt2[k])
                 setattr(dtClass, k, v)
@@ -151,52 +180,7 @@ class IniUts():
 
 
 
-ini = IniUts('prd_config.ini')
-#ini = IniUts('prd_config.ini','dev_config.ini',in_prd=False)
-
-#TODAS AS CHAVES DE DEV DEVE CONTER EM PRD
-
-
-# @ini.link('PERSON')
-# class Person():
-#     NAME   : str
-#     age    : int
-#     amount : float
-#     friends: tuple = ','
-#     dob    : datetime = "%Y-%m-%d"
-
-# pass
-# a = 1
-
-# @dataclass
-# class IPS():
-#    ip5   : bool
-
-# @dataclass
-# class IPS2():
-#    ip5   : str
-
-#import os
-#os.system("cls")
-
-#os.environ['ENV'] = 'PRD'
-
-#ini = IniUts('prd_config.ini')
-#ini = IniUts('prd_config.ini','dev_config.ini',in_prd=False)
-#ini.section2DataClass('PERSON',Person)
-#ini.section2DataClass('IPS',IPS)
-#ini.section2DataClass('IPS2',IPS2)
-#print(IPS2.ip5)
-
-#a  =1
-
-#print(ini.read("PERSON","NAME"))
-# ini.Section2Dict('IPS2')
-# # ini.section2DataClass('PERSON',Person)
-# # ini.section2DataClass('PERSON',Person)
-# # print(Person.NAME)
 
-#a  =1
 
 
 

{iniUts-1.1.8 → iniuts-1.2.0/iniUts.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iniUts
-Version: 1.1.8
+Version: 1.2.0
 Summary: Ini file manipulator
 Home-page: 
 Author: Melque Lima
@@ -23,6 +23,10 @@ License-File: LICENCE.txt
 pip install iniUts
 ```
 
+## GitHub
+https://github.com/ZdekPyPi/IniUts
+
+
 ## Usage
 #
 <!-- //==================================================== -->

iniuts-1.2.0/iniUts.egg-info/SOURCES.txt

@@ -0,0 +1,12 @@
+CHANGELOG.txt
+LICENCE.txt
+MANIFEST.in
+README.md
+commands.txt
+run.py
+setup.py
+iniUts/__init__.py
+iniUts.egg-info/PKG-INFO
+iniUts.egg-info/SOURCES.txt
+iniUts.egg-info/dependency_links.txt
+iniUts.egg-info/top_level.txt

iniuts-1.2.0/run.py

@@ -0,0 +1,57 @@
+#TEST FILE
+from dotenv import load_dotenv
+import sys
+import os
+sys.path.append("./iniUts")
+from iniUts import *
+load_dotenv()
+
+ini = IniUts('prd_config.ini')
+ini = IniUts('prd_config.ini','dev_config.ini',in_prd=False)
+
+#TODAS AS CHAVES DE DEV DEVE CONTER EM PRD
+
+
+@ini.link('PERSON')
+class Person():
+    USERNAME: str = envar("USERNAME")
+    NAME   : str
+    age    : int
+    amount : float
+    friends: tuple = ','
+    dob    : datetime = "%Y-%m-%d"
+
+
+pass
+# pass
+# a = 1
+
+# @dataclass
+# class IPS():
+#    ip5   : bool
+
+# @dataclass
+# class IPS2():
+#    ip5   : str
+
+#import os
+#os.system("cls")
+
+#os.environ['ENV'] = 'PRD'
+
+#ini = IniUts('prd_config.ini')
+#ini = IniUts('prd_config.ini','dev_config.ini',in_prd=False)
+#ini.section2DataClass('PERSON',Person)
+#ini.section2DataClass('IPS',IPS)
+#ini.section2DataClass('IPS2',IPS2)
+#print(IPS2.ip5)
+
+#a  =1
+
+#print(ini.read("PERSON","NAME"))
+# ini.Section2Dict('IPS2')
+# # ini.section2DataClass('PERSON',Person)
+# # ini.section2DataClass('PERSON',Person)
+# # print(Person.NAME)
+
+#a  =1

{iniUts-1.1.8 → iniuts-1.2.0}/setup.py

@@ -10,7 +10,7 @@ classifiers = [
  
 setup(
   name='iniUts',
-  version='1.1.8',
+  version='1.2.0',
   description='Ini file manipulator',
   long_description=open('README.md').read() + '\n\n' + open('CHANGELOG.txt').read(),
   long_description_content_type='text/markdown',

iniUts-1.1.8/MANIFEST.in

@@ -1 +0,0 @@
-global-include *.txt *.py *.md