aridity 97__tar.gz → 98__tar.gz

{aridity-97 → aridity-98}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aridity
-Version: 97
+Version: 98
 Summary: DRY config and template system, easily extensible with Python
 Home-page: https://pypi.org/project/aridity/
 Author: foyono

{aridity-97 → aridity-98}/aridity/config.py

@@ -1,9 +1,9 @@
 from .functions import OpaqueKey
-from .model import Entry, Locator, Resource, Stream, Text, wrap
+from .model import Entry, Locator, Resource, Stream, wrap
 from .scope import StaticScope
 from .search import resolvedscopeornone
 from .util import NoSuchPathException, selectentrypoints
-from foyndation import dotpy, Forkable, rmsuffix, solo
+from foyndation import dotpy, Forkable, rmsuffix
 from io import StringIO
 from parabject import Parabject, register
 from pathlib import Path
@@ -74,19 +74,6 @@ class ConfigCtrl(Forkable):
         resource.source(self.basescope.getorcreatesubscope([*self.prefix, appname]), Entry([]))
         return getattr(self.node, appname)
 
-    def reapplysettings(self, mainfunction):
-        if hasattr(mainfunction, 'encode'):
-            appname = mainfunction
-        else:
-            _, appname = _processmainfunction(mainfunction)
-        s = self.scope.duplicate()
-        s.label = Text(appname)
-        p = solo(s.parents)
-        p[appname,] = s
-        parent = self._of(p)
-        parent.loadsettings()
-        return getattr(parent.node, appname)
-
     def load(self, pathorstream):
         'Execute config from the given path or stream.'
         _wrappathorstream(pathorstream).source(self.scope, Entry([]))

{aridity-97 → aridity-98}/aridity/functions.py

@@ -1,4 +1,4 @@
-from .keyring import gpg, keyring
+from .keyring import gpg
 from .model import Boolean, Hole, Indeterminate, Number, Resource, Text, wrap
 from .util import NoSuchPathException
 from foyndation import dotpy
@@ -184,7 +184,7 @@ def processtemplate(scope, resolvable):
 def _lower(scope, resolvable):
     return Text(resolvable.resolve(scope).textvalue.lower())
 
-def pyref(scope, moduleresolvable, qualnameresolvable):
+def pyref(scope, moduleresolvable, qualnameresolvable): # FIXME: Allow load from __init__.py in current dir.
     'Python object in given module with given qualified name. Module may be relative to current resource, in which case assignment with `:=` is normally necessary. Typically used to import functions.'
     def moduleobj():
         moduleref = moduleresolvable.resolve(scope).textvalue
@@ -253,7 +253,6 @@ def getimpl(scope, *resolvables):
 
 def corefunctions():
     yield 'gpg', gpg
-    yield 'keyring', keyring
     yield 'screenstr', screenstr
     yield 'scstr', scstr
     yield 'hclstr', hclstr

aridity-98/aridity/keyring.py

@@ -0,0 +1,24 @@
+from .model import Scalar
+from base64 import b64decode
+from subprocess import CalledProcessError, check_output
+from tempfile import NamedTemporaryFile
+
+class Password(str):
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, *exc_info):
+        pass
+
+class DecryptionFailedException(Exception): pass
+
+def gpg(scope, resolvable):
+    'Use gpg to decrypt the given base64-encoded blob.'
+    with NamedTemporaryFile() as f:
+        f.write(b64decode(resolvable.resolve(scope).textvalue))
+        f.flush()
+        try:
+            return Scalar(Password(check_output(['gpg', '-d', f.name]).decode('ascii')))
+        except CalledProcessError:
+            raise DecryptionFailedException

{aridity-97 → aridity-98}/aridity/scope.py

@@ -245,8 +245,6 @@ class StaticScope(Scope):
             self[word,] = Directive(d)
         for name, f in corefunctions():
             self[name,] = Function(f)
-        self['keyring_cron',] = Scalar(False)
-        self['keyring_force',] = Scalar(False)
         self['~',] = Text(os.path.expanduser('~'))
         self['LF',] = Text('\n')
         self['EOL',] = Text(os.linesep)

{aridity-97 → aridity-98}/aridity.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aridity
-Version: 97
+Version: 98
 Summary: DRY config and template system, easily extensible with Python
 Home-page: https://pypi.org/project/aridity/
 Author: foyono

{aridity-97 → aridity-98}/setup.py

@@ -49,7 +49,7 @@ class SourceInfo:
 sourceinfo = SourceInfo('.')
 setup(
     name = 'aridity',
-    version = '97',
+    version = '98',
     description = 'DRY config and template system, easily extensible with Python',
     url = 'https://pypi.org/project/aridity/',
     author = 'foyono',

aridity-97/aridity/keyring.py

@@ -1,51 +0,0 @@
-from .model import Scalar
-from .util import null_exc_info
-from base64 import b64decode
-from functools import partial
-from getpass import getpass
-from subprocess import CalledProcessError, check_output
-from tempfile import NamedTemporaryFile
-from threading import Semaphore
-import logging, os
-
-log = logging.getLogger(__name__)
-passwordbase = str
-setenvonce = Semaphore()
-
-class Password(passwordbase):
-
-    def __new__(cls, password, setter):
-        p = passwordbase.__new__(cls, password)
-        p.setter = setter
-        return p
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, *exc_info):
-        if self.setter is not None and null_exc_info == exc_info:
-            self.setter(self)
-
-def keyring(scope, serviceres, usernameres):
-    if scope.resolved('keyring_cron').scalar and setenvonce.acquire(False):
-        key = 'DBUS_SESSION_BUS_ADDRESS'
-        value = f"unix:path=/run/user/{os.geteuid()}/bus"
-        log.debug("Set %s to: %s", key, value)
-        os.environ[key] = value
-    from keyring import get_password, set_password
-    service = serviceres.resolve(scope).textvalue
-    username = usernameres.resolve(scope).textvalue
-    password = None if scope.resolved('keyring_force').scalar else get_password(service, username)
-    return Scalar(Password(*[getpass(), partial(set_password, service, username)] if password is None else [password, None]))
-
-class DecryptionFailedException(Exception): pass
-
-def gpg(scope, resolvable):
-    'Use gpg to decrypt the given base64-encoded blob.'
-    with NamedTemporaryFile() as f:
-        f.write(b64decode(resolvable.resolve(scope).textvalue))
-        f.flush()
-        try:
-            return Scalar(Password(check_output(['gpg', '-d', f.name]).decode('ascii'), None))
-        except CalledProcessError:
-            raise DecryptionFailedException