aridity 94__tar.gz → 96__tar.gz

{aridity-94 → aridity-96}/PKG-INFO

@@ -1,11 +1,12 @@
 Metadata-Version: 2.1
 Name: aridity
-Version: 94
+Version: 96
 Summary: DRY config and template system, easily extensible with Python
 Home-page: https://pypi.org/project/aridity/
 Author: foyono
 Author-email: shrovis@foyono.com
 Description-Content-Type: text/markdown
+Requires-Dist: foyndation>=13
 Requires-Dist: pyparsing>=3.0.2
 
 # aridity
@@ -158,6 +159,17 @@ def source(prefix, suffix, scope)
 
 Include path or resource at prefix.
 
+<a id="aridity.directives.sourceifexists"></a>
+
+###### sourceifexists
+
+```python
+@prime
+def sourceifexists(prefix, suffix, scope)
+```
+
+Like `.` but allow the resource to be absent.
+
 <a id="aridity.directives.equals"></a>
 
 ###### equals
@@ -514,16 +526,6 @@ def openresource(package_or_name, resource_name, encoding='ascii')
 
 Like `pkg_resources.resource_stream` but text mode.
 
-<a id="aridity.util.solo"></a>
-
-###### solo
-
-```python
-def solo(v)
-```
-
-Assert exactly one object in the given sequence and return it.
-
 <a id="parabject"></a>
 
 ### parabject

{aridity-94 → aridity-96}/README.md

@@ -148,6 +148,17 @@ def source(prefix, suffix, scope)
 
 Include path or resource at prefix.
 
+<a id="aridity.directives.sourceifexists"></a>
+
+###### sourceifexists
+
+```python
+@prime
+def sourceifexists(prefix, suffix, scope)
+```
+
+Like `.` but allow the resource to be absent.
+
 <a id="aridity.directives.equals"></a>
 
 ###### equals
@@ -504,16 +515,6 @@ def openresource(package_or_name, resource_name, encoding='ascii')
 
 Like `pkg_resources.resource_stream` but text mode.
 
-<a id="aridity.util.solo"></a>
-
-###### solo
-
-```python
-def solo(v)
-```
-
-Assert exactly one object in the given sequence and return it.
-
 <a id="parabject"></a>
 
 ### parabject

{aridity-94 → aridity-96}/aridity/config.py

@@ -2,7 +2,8 @@ from .functions import OpaqueKey
 from .model import Entry, Locator, Resource, Stream, Text, wrap
 from .scope import StaticScope
 from .search import resolvedscopeornone
-from .util import dotpy, Forkable, NoSuchPathException, qualname, selectentrypoints, solo
+from .util import NoSuchPathException, qualname, selectentrypoints
+from foyndation import dotpy, Forkable, rmsuffix, solo
 from io import StringIO
 from parabject import Parabject, register
 from pathlib import Path
@@ -13,13 +14,12 @@ log = logging.getLogger(__name__)
 def _processmainfunction(mainfunction):
     module = mainfunction.__module__
     if '__main__' == module:
-        p = sys.argv[0]
-        name = os.path.basename(p)
-        if '__main__.py' == name:
-            stem = os.path.basename(os.path.dirname(p))
+        p = Path(sys.argv[0])
+        name = p.name
+        if name in {'__init__.py', '__main__.py'}:
+            stem = p.parent.name
         else:
-            assert name.endswith(dotpy)
-            stem = name[:-len(dotpy)]
+            assert (stem := rmsuffix(name, dotpy)) is not None
         assert '-' not in stem
         appname = stem.replace('_', '-')
     else:
@@ -183,3 +183,8 @@ class WConfig(Parabject):
         query = (-self).addname(OpaqueKey())
         query.basescope[tuple(query.prefix)] = wrap(value)
         return self
+
+    def __neg__(self):
+        query = super().__neg__()
+        query.basescope.getorcreatesubscope(query.prefix) # TODO: Too eager.
+        return query

{aridity-94 → aridity-96}/aridity/directives.py

@@ -1,7 +1,10 @@
 from .model import Stream
 from .search import resolvedscopeornone
+from .util import Burial
 from itertools import chain
-import os, sys, unicodedata
+import logging, os, sys, unicodedata
+
+log = logging.getLogger(__name__)
 
 def acceptdirectivename(word):
     return word and unicodedata.category(word[0])[0] in 'PS'
@@ -48,7 +51,19 @@ def source(prefix, suffix, scope):
         if s is None:
             break
         phrasescope = s
-    suffix.tophrase().resolve(phrasescope).openable(phrasescope).source(scope, prefix.subentry(k, n))
+    with Burial.bumping(FileNotFoundError):
+        openable = suffix.tophrase().resolve(phrasescope).openable(phrasescope)
+    openable.source(scope, prefix.subentry(k, n))
+
+@prime
+def sourceifexists(prefix, suffix, scope):
+    'Like `.` but allow the resource to be absent.'
+    try:
+        source(prefix, suffix, scope)
+    except FileNotFoundError as e:
+        if Burial.value(e):
+            raise
+        log.debug("Ignore absence: %s", e)
 
 @prime
 def _cd(prefix, suffix, scope):
@@ -95,6 +110,7 @@ def coredirectives():
     yield '!redirect', _redirect
     yield '!write', _write
     yield '.', source
+    yield '.?', sourceifexists
     yield '!cd', _cd
     yield '!test', _test
     yield '=', equals

{aridity-94 → aridity-96}/aridity/functions.py

@@ -1,6 +1,7 @@
 from .keyring import gpg, keyring
 from .model import Boolean, Hole, Indeterminate, Number, Resource, Text, wrap
-from .util import dotpy, NoSuchPathException
+from .util import NoSuchPathException
+from foyndation import dotpy
 from importlib import import_module
 from itertools import chain
 import json, re, shlex

{aridity-94 → aridity-96}/aridity/model.py

@@ -1,5 +1,6 @@
-from .util import dotpy, Forkable
+from .util import Burial
 from contextlib import contextmanager
+from foyndation import dotpy, Forkable, rmsuffix
 from importlib import import_module
 from importlib.resources import files
 from io import TextIOWrapper
@@ -232,7 +233,7 @@ class Openable:
             yield f
 
     def source(self, scope, prefix):
-        with self.pushopen(scope) as f:
+        with self.pushopen(scope) as f, Burial.bumping(FileNotFoundError):
             Stream(f).source(scope, prefix)
 
     def processtemplate(self, scope):
@@ -287,8 +288,8 @@ class Resource(Resolved, Openable, Forkable):
         return self._of(self.package_or_requirement, '/'.join(v) if v else None, self.encoding)
 
     def modulenameornone(self):
-        if self.resource_name.endswith(dotpy):
-            return f"{self._packagename()}.{self.resource_name[:-len(dotpy)].replace('/', '.')}"
+        if (stem := rmsuffix(self.resource_name, dotpy)) is not None:
+            return f"{self._packagename()}.{stem.replace('/', '.')}"
 
 class Binary(BaseScalar, Forkable):
 

{aridity-94 → aridity-96}/aridity/resolve.py

@@ -1,44 +1,39 @@
 from .search import Query
-from .util import CycleException, Forkable, NoSuchPathException, TreeNoSuchPathException
+from .util import CycleException, NoSuchPathException, TreeNoSuchPathException
+from foyndation import Forkable
 
 class BaseResolveContext:
 
     @property
     def label(self):
-        return self.leafscope().label
+        return self.resolved().label
 
     @property
     def parents(self):
-        return self.leafscope().parents
+        return self.resolved().parents
 
     @property
     def resolvables(self):
-        return self.leafscope().resolvables
+        return self.resolved().resolvables
 
     def createchild(self):
-        return self.leafscope().createchild()
+        return self.resolved().createchild()
 
     def getresolvecontext(self):
         return self
 
     def resolvableornone(self, key):
-        return self.leafscope().resolvableornone(key)
-
-    def resolved(self, *path):
-        return self.resolvedimpl(path) if path else self.leafscope()
+        return self.resolved().resolvableornone(key)
 
     def staticscope(self):
-        return self.leafscope().staticscope()
+        return self.resolved().staticscope()
 
 class AnchorResolveContext(BaseResolveContext):
 
     def __init__(self, anchorscope):
         self.anchorscope = anchorscope
 
-    def leafscope(self):
-        return self.anchorscope
-
-    def resolvedimpl(self, path):
+    def resolved(self, *path):
         hit = Query([], path).search(self.anchorscope)
         return hit.resolvable.resolve(ResolveContext(self.anchorscope, path, [hit.address]))
 
@@ -50,10 +45,7 @@ class ResolveContext(BaseResolveContext, Forkable):
         self.exprpath = exprpath
         self.addresses = addresses
 
-    def leafscope(self):
-        return Query([], self.scopepath).search(self.anchorscope).naiveresolve() if self.scopepath else self.anchorscope # XXX: Is naiveresolve correct here?
-
-    def resolvedimpl(self, path):
+    def resolved(self, *path):
         try:
             hit = Query(self.scopepath, path).search(self.anchorscope)
             if hit.address in self.addresses: # XXX: Could it be valid to resolve the same address recursively with 2 different contexts?

{aridity-94 → aridity-96}/aridity/scope.py

@@ -4,7 +4,8 @@ from .model import Directive, Function, Hole, Resolvable, Scalar, star, Stream,
 from .resolve import AnchorResolveContext
 from .search import Query
 from .stacks import IndentStack, SimpleStack, ThreadLocalResolvable
-from .util import NoSuchPathException, solo, UnsupportedEntryException
+from .util import NoSuchPathException, UnsupportedEntryException
+from foyndation import solo
 from itertools import chain
 import os, sys, threading
 

{aridity-94 → aridity-96}/aridity/search.py

@@ -111,4 +111,4 @@ class Query:
                     return hit
                 if besthit is None or _lt(hit.depths, besthit.depths):
                     besthit = hit
-        raise UnparseNoSuchPathException(self.path)
+        raise UnparseNoSuchPathException(scope, self.path[:self.prefixlen], self.path[self.prefixlen:])

{aridity-94 → aridity-96}/aridity/util.py

@@ -1,7 +1,7 @@
+from contextlib import contextmanager
 from importlib.metadata import entry_points
 import sys
 
-dotpy = '.py'
 inf = float('inf')
 null_exc_info = None, None, None
 
@@ -9,9 +9,12 @@ class NoSuchPathException(Exception): pass
 
 class UnparseNoSuchPathException(NoSuchPathException):
 
+    @property
+    def path(self):
+        return self.args[-1]
+
     def __str__(self):
-        path, = self.args
-        return ' '.join(path)
+        return ' '.join(self.path)
 
 class TreeNoSuchPathException(NoSuchPathException):
 
@@ -40,11 +43,6 @@ def openresource(package_or_name, resource_name, encoding = 'ascii'):
     from .model import Resource
     return Resource(package_or_name, resource_name, encoding).open(False)
 
-def solo(v):
-    'Assert exactly one object in the given sequence and return it.'
-    x, = v
-    return x
-
 def qualname(obj):
     try:
         return obj.__qualname__
@@ -67,8 +65,19 @@ def popattr(obj, name):
     delattr(obj, name)
     return val
 
-class Forkable:
+class Burial:
+
+    name = 'burial'
 
     @classmethod
-    def _of(cls, *args, **kwargs):
-        return cls(*args, **kwargs)
+    def value(cls, e):
+        return getattr(e, cls.name, 0)
+
+    @classmethod
+    @contextmanager
+    def bumping(cls, exctype):
+        try:
+            yield
+        except exctype as e:
+            setattr(e, cls.name, cls.value(e) + 1)
+            raise

{aridity-94 → aridity-96}/aridity.egg-info/PKG-INFO

@@ -1,11 +1,12 @@
 Metadata-Version: 2.1
 Name: aridity
-Version: 94
+Version: 96
 Summary: DRY config and template system, easily extensible with Python
 Home-page: https://pypi.org/project/aridity/
 Author: foyono
 Author-email: shrovis@foyono.com
 Description-Content-Type: text/markdown
+Requires-Dist: foyndation>=13
 Requires-Dist: pyparsing>=3.0.2
 
 # aridity
@@ -158,6 +159,17 @@ def source(prefix, suffix, scope)
 
 Include path or resource at prefix.
 
+<a id="aridity.directives.sourceifexists"></a>
+
+###### sourceifexists
+
+```python
+@prime
+def sourceifexists(prefix, suffix, scope)
+```
+
+Like `.` but allow the resource to be absent.
+
 <a id="aridity.directives.equals"></a>
 
 ###### equals
@@ -514,16 +526,6 @@ def openresource(package_or_name, resource_name, encoding='ascii')
 
 Like `pkg_resources.resource_stream` but text mode.
 
-<a id="aridity.util.solo"></a>
-
-###### solo
-
-```python
-def solo(v)
-```
-
-Assert exactly one object in the given sequence and return it.
-
 <a id="parabject"></a>
 
 ### parabject

{aridity-94 → aridity-96}/aridity.egg-info/requires.txt

@@ -1 +1,2 @@
+foyndation>=13
 pyparsing>=3.0.2

{aridity-94 → aridity-96}/setup.py

@@ -49,13 +49,13 @@ class SourceInfo:
 sourceinfo = SourceInfo('.')
 setup(
     name = 'aridity',
-    version = '94',
+    version = '96',
     description = 'DRY config and template system, easily extensible with Python',
     url = 'https://pypi.org/project/aridity/',
     author = 'foyono',
     author_email = 'shrovis@foyono.com',
     py_modules = ['parabject'],
-    install_requires = ['pyparsing>=3.0.2'],
+    install_requires = ['foyndation>=13', 'pyparsing>=3.0.2'],
     package_data = {'': ['*.pxd', '*.pyx', '*.pyxbld', '*.arid', '*.aridt']},
     entry_points = {'console_scripts': ['aridity=aridity.__init__:main', 'arid-config=aridity.arid_config:main', 'processtemplate=aridity.processtemplate:main']},
     **sourceinfo.setup_kwargs(),