aridity 69__tar.gz → 70__tar.gz

aridity-69/README.md → aridity-70/PKG-INFO

@@ -1,3 +1,13 @@
+Metadata-Version: 2.1
+Name: aridity
+Version: 70
+Summary: DRY config and template system, easily extensible with Python
+Home-page: UNKNOWN
+Author: foyono
+License: UNKNOWN
+Platform: UNKNOWN
+Description-Content-Type: text/markdown
+
 # aridity
 DRY config and template system, easily extensible with Python
 
@@ -24,12 +34,12 @@ DRY config and template system, easily extensible with Python
 * Often tools/libraries must be configured using config files
     * Support for config file interpolation is not enough to stay DRY, and comes with a different set of gotchas per tool
     * In particular Helm/Terraform have their own ways of sharing config between envs
-* aridity is a general purpose solution for all the above, also see [soak](https://github.com/combatopera/soak)
+* aridity is a general purpose solution for all the above, also see [soak](https://pypi.org/project/soak/)
 
 ## Config API
 * Normally you pass around a Config object, and application code can get data out via attribute access e.g. config.foo.bar
     * Here config.foo is also a Config object, a child scope of config named foo
-    * The passing around can be taken care of by a dependency injection container such as [diapyr](https://github.com/combatopera/diapyr)
+    * The passing around can be taken care of by a dependency injection container such as [diapyr](https://pypi.org/project/diapyr/)
 * Every Config has an associated ConfigCtrl on which Python API such as processtemplate is available
     * Use negation to get ConfigCtrl when you have a Config e.g. (-config).processtemplate(...)
     * Use the node attribute to get Config when you have a ConfigCtrl, this is a rare situation in practice
@@ -69,23 +79,6 @@ venvname/bin/pip install aridity
 . venvname/bin/activate
 ```
 
-### To develop
-First clone the repo using HTTP or SSH:
-```
-git clone https://github.com/combatopera/aridity.git
-git clone git@github.com:combatopera/aridity.git
-```
-Now use pyven's pipify to create a setup.py, which pip can then use to install the project editably:
-```
-python3 -m venv pyvenvenv
-pyvenvenv/bin/pip install pyven
-pyvenvenv/bin/pipify aridity
-
-python3 -m venv venvname
-venvname/bin/pip install -e aridity
-. venvname/bin/activate
-```
-
 ## Config file syntax
 ```
 : Until aridity gets support for comments, you can use the colon directive to ignore data.
@@ -226,3 +219,5 @@ Interactive REPL.
 
 ### processtemplate
 Process the given template to stdout using config from stdin.
+
+

aridity-69/aridity.egg-info/PKG-INFO → aridity-70/README.md

@@ -1,14 +1,3 @@
-Metadata-Version: 2.1
-Name: aridity
-Version: 69
-Summary: DRY config and template system, easily extensible with Python
-Home-page: https://github.com/combatopera/aridity
-Author: Andrzej Cichocki
-License: UNKNOWN
-Platform: UNKNOWN
-Description-Content-Type: text/markdown
-License-File: COPYING
-
 # aridity
 DRY config and template system, easily extensible with Python
 
@@ -35,12 +24,12 @@ DRY config and template system, easily extensible with Python
 * Often tools/libraries must be configured using config files
     * Support for config file interpolation is not enough to stay DRY, and comes with a different set of gotchas per tool
     * In particular Helm/Terraform have their own ways of sharing config between envs
-* aridity is a general purpose solution for all the above, also see [soak](https://github.com/combatopera/soak)
+* aridity is a general purpose solution for all the above, also see [soak](https://pypi.org/project/soak/)
 
 ## Config API
 * Normally you pass around a Config object, and application code can get data out via attribute access e.g. config.foo.bar
     * Here config.foo is also a Config object, a child scope of config named foo
-    * The passing around can be taken care of by a dependency injection container such as [diapyr](https://github.com/combatopera/diapyr)
+    * The passing around can be taken care of by a dependency injection container such as [diapyr](https://pypi.org/project/diapyr/)
 * Every Config has an associated ConfigCtrl on which Python API such as processtemplate is available
     * Use negation to get ConfigCtrl when you have a Config e.g. (-config).processtemplate(...)
     * Use the node attribute to get Config when you have a ConfigCtrl, this is a rare situation in practice
@@ -80,23 +69,6 @@ venvname/bin/pip install aridity
 . venvname/bin/activate
 ```
 
-### To develop
-First clone the repo using HTTP or SSH:
-```
-git clone https://github.com/combatopera/aridity.git
-git clone git@github.com:combatopera/aridity.git
-```
-Now use pyven's pipify to create a setup.py, which pip can then use to install the project editably:
-```
-python3 -m venv pyvenvenv
-pyvenvenv/bin/pip install pyven
-pyvenvenv/bin/pipify aridity
-
-python3 -m venv venvname
-venvname/bin/pip install -e aridity
-. venvname/bin/activate
-```
-
 ## Config file syntax
 ```
 : Until aridity gets support for comments, you can use the colon directive to ignore data.
@@ -237,5 +209,3 @@ Interactive REPL.
 
 ### processtemplate
 Process the given template to stdout using config from stdin.
-
-

aridity-70/aridity/__init__.py

@@ -0,0 +1,18 @@
+'Interactive REPL.'
+from .model import Stream
+from .repl import Repl
+from .scope import Scope
+from .util import NoSuchPathException
+import sys
+
+assert NoSuchPathException
+
+def main():
+    scope = Scope()
+    scope['stdout',] = Stream(sys.stdout)
+    with Repl(scope, True) as repl:
+        for line in sys.stdin:
+            repl(line)
+
+if '__main__' == __name__:
+    main()

{aridity-69 → aridity-70}/aridity/arid_config.py

@@ -1,20 +1,3 @@
-# Copyright 2017, 2020 Andrzej Cichocki
-
-# This file is part of aridity.
-#
-# aridity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# aridity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with aridity.  If not, see <http://www.gnu.org/licenses/>.
-
 'Print given config (with optional path in config) as shell snippet.'
 from .model import Boolean, Entry, Locator, Number, Text
 from .scope import Scope

{aridity-69 → aridity-70}/aridity/config.py

@@ -1,23 +1,7 @@
-# Copyright 2017, 2020 Andrzej Cichocki
-
-# This file is part of aridity.
-#
-# aridity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# aridity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with aridity.  If not, see <http://www.gnu.org/licenses/>.
-
 from .model import Entry, Function, Locator, Number, Resource, Scalar, Stream, Text, wrap
 from .repl import Repl
 from .scope import Scope
+from .search import resolvedscopeornone
 from .util import CycleException, dotpy, NoSuchPathException, qualname, selectentrypoints, solo
 from functools import partial
 from itertools import chain
@@ -143,7 +127,7 @@ class ConfigCtrl:
 
     def scope(self, strict = False):
         if strict:
-            s = self.basescope.resolvedscopeornone(self.prefix)
+            s = resolvedscopeornone(self.basescope, self.prefix)
             if s is None:
                 raise ForeignScopeException
             return s

{aridity-69 → aridity-70}/aridity/directives.py

@@ -1,21 +1,5 @@
-# Copyright 2017, 2020 Andrzej Cichocki
-
-# This file is part of aridity.
-#
-# aridity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# aridity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with aridity.  If not, see <http://www.gnu.org/licenses/>.
-
 from .model import Stream, Text
+from .search import resolvedscopeornone
 import os, sys
 
 class Precedence:
@@ -60,7 +44,7 @@ class Source:
         # XXX: Use full algo to get phrasescope?
         phrasescope = scope
         for word in prefix.topath(scope):
-            s = phrasescope.resolvedscopeornone([word])
+            s = resolvedscopeornone(phrasescope, [word])
             if s is None:
                 break
             phrasescope = s

{aridity-69 → aridity-70}/aridity/functions.py

@@ -1,20 +1,3 @@
-# Copyright 2017, 2020 Andrzej Cichocki
-
-# This file is part of aridity.
-#
-# aridity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# aridity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with aridity.  If not, see <http://www.gnu.org/licenses/>.
-
 from __future__ import division
 from .model import Boolean, Number, Resource, Text, wrap
 from .util import allfunctions, dotpy, NoSuchPathException, realname
@@ -153,9 +136,6 @@ class Functions:
     def str(scope, resolvable):
         return resolvable.resolve(scope).totext()
 
-    def java(scope, resolvable):
-        return resolvable.resolve(scope).tojava()
-
     def list(scope, *resolvables):
         v = scope.createchild(islist = True)
         for r in resolvables:

{aridity-69 → aridity-70}/aridity/grammar.py

@@ -1,20 +1,3 @@
-# Copyright 2017, 2020 Andrzej Cichocki
-
-# This file is part of aridity.
-#
-# aridity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# aridity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with aridity.  If not, see <http://www.gnu.org/licenses/>.
-
 from .model import Blank, Boolean, Boundary, Call, Concat, Entry, nullmonitor, Number, Text
 from decimal import Decimal
 from functools import partial, reduce

{aridity-69 → aridity-70}/aridity/keyring.py

@@ -1,20 +1,3 @@
-# Copyright 2017, 2020 Andrzej Cichocki
-
-# This file is part of aridity.
-#
-# aridity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# aridity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with aridity.  If not, see <http://www.gnu.org/licenses/>.
-
 from .model import Scalar
 from .util import null_exc_info
 from base64 import b64decode

{aridity-69 → aridity-70}/aridity/model.py

@@ -1,20 +1,3 @@
-# Copyright 2017, 2020 Andrzej Cichocki
-
-# This file is part of aridity.
-#
-# aridity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# aridity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with aridity.  If not, see <http://www.gnu.org/licenses/>.
-
 from __future__ import division
 from .util import dotpy, ispy2
 from contextlib import contextmanager
@@ -229,12 +212,15 @@ class Resource(Resolved, Openable):
         package = m.__package__
         return (self.package_or_requirement if hasattr(m, '__path__') else self.package_or_requirement[:self.package_or_requirement.rindex('.')]) if package is None else package
 
+    def _resource_words(self):
+        return [] if self.resource_name is None else self.resource_name.split('/')
+
     @contextmanager
     def open(self, write):
         assert not write
         package = self._packagename()
         path = importlib_resources.files(package)
-        for name in self.resource_name.split('/'):
+        for name in self._resource_words():
             path /= name
         with path.open('rb') as f:
             if ispy2:
@@ -243,7 +229,8 @@ class Resource(Resolved, Openable):
                 yield f
 
     def slash(self, words, rstrip):
-        return self._of(self.package_or_requirement, '/'.join(chain(self.resource_name.split('/')[:-1 if rstrip else None], words)), self.encoding)
+        v = list(chain(self._resource_words()[:-1 if rstrip else None], words))
+        return self._of(self.package_or_requirement, '/'.join(v) if v else None, self.encoding)
 
     def modulenameornone(self):
         if self.resource_name.endswith(dotpy):

aridity-70/aridity/processtemplate.py

@@ -0,0 +1,13 @@
+'Process the given template to stdout using config from stdin.'
+from .repl import Repl
+import os, sys
+
+def main():
+    templatepath, = sys.argv[1:]
+    with Repl() as repl:
+        for line in sys.stdin:
+            repl(line)
+        repl.printf("< %s", os.path.abspath(templatepath))
+
+if '__main__' == __name__:
+    main()

{aridity-69 → aridity-70}/aridity/repl.py

@@ -1,20 +1,3 @@
-# Copyright 2017, 2020 Andrzej Cichocki
-
-# This file is part of aridity.
-#
-# aridity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# aridity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with aridity.  If not, see <http://www.gnu.org/licenses/>.
-
 from .grammar import commandparser
 from .model import Entry, Text
 from .scope import Scope

{aridity-69 → aridity-70}/aridity/scope.py

@@ -1,26 +1,11 @@
-# Copyright 2017, 2020 Andrzej Cichocki
-
-# This file is part of aridity.
-#
-# aridity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# aridity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with aridity.  If not, see <http://www.gnu.org/licenses/>.
-
 from . import directives
 from .directives import Precedence
 from .functions import getfunctions, OpaqueKey
 from .model import CatNotSupportedException, Directive, Function, Resolvable, Scalar, star, Stream, Text
+from .search import Query, resolvedscopeornone, scopedepths, slices
 from .stacks import IndentStack, SimpleStack, ThreadLocalResolvable
-from .util import CycleException, NoSuchPathException, OrderedDict, solo, TreeNoSuchPathException, UnparseNoSuchPathException, UnsupportedEntryException
+from .util import CycleException, NoSuchPathException, OrderedDict, solo, TreeNoSuchPathException, UnsupportedEntryException
+from itertools import chain
 import collections, os, sys, threading, unicodedata
 
 class NotAPathException(Exception): pass
@@ -142,66 +127,22 @@ class AbstractScope(Resolvable): # TODO LATER: Some methods should probably be m
             raise CycleException(path)
         resolving.add(path)
         try:
-            return self._resolved(path, self._findresolvable(path), kwargs) if path else self
+            return self._resolved(path, Query(path).search(self), kwargs) if path else self
         finally:
             resolving.remove(path)
 
-    def resolvedscopeornone(self, path):
-        s = self # Assume we are resolved.
-        for name in path:
-            r = s.resolvables.getornone(name)
-            if r is None:
-                return
-            s = r.resolve(s)
-            if not hasattr(s, 'resolvables'):
-                return
-        return s
-
-    def _selfandparents(self):
-        scopes = [self]
-        depth = 0
-        while scopes:
-            nextscopes = []
-            for s in scopes:
-                yield depth, s
-                nextscopes.extend(s.parents)
-            scopes = nextscopes
-            depth += 1
-
-    def _scoreresolvables(self, path):
-        tail = path[1:]
-        for k, s in self._selfandparents():
-            r = s.resolvables.getornone(path[0])
-            if r is not None:
-                if tail:
-                    obj = r.resolve(s) # XXX: Wise?
-                    try:
-                        obj_score = obj._scoreresolvables
-                    except AttributeError:
-                        pass
-                    else:
-                        for score, rr in obj_score(tail):
-                            yield score + [k], rr
-                else:
-                    yield [k], r
-
-    def _findresolvable(self, path):
-        pairs = list(self._scoreresolvables(path))
-        try:
-            return min(pairs, key = lambda t: t[0])[1]
-        except ValueError:
-            raise UnparseNoSuchPathException(path)
+    def resolvableornone(self, key):
+        return self.resolvables.getornone(key)
 
     def _resolved(self, path, resolvable, kwargs): # TODO: Review this algo.
         errors = []
-        for start in range(len(path)):
-            for end in range(len(path) - 1, start - 1, -1):
-                for s in (s.resolvedscopeornone(path[start:end]) for _, s in self._selfandparents()):
-                    if s is not None:
-                        try:
-                            return resolvable.resolve(s, **kwargs)
-                        except NoSuchPathException as e:
-                            errors.append(e)
+        for words in slices(path):
+            for s in (resolvedscopeornone(s, words) for s in chain.from_iterable(scopedepths(self))):
+                if s is not None:
+                    try:
+                        return resolvable.resolve(s, **kwargs)
+                    except NoSuchPathException as e:
+                        errors.append(e)
         raise TreeNoSuchPathException(path, errors)
 
     def unravel(self):
@@ -209,7 +150,7 @@ class AbstractScope(Resolvable): # TODO LATER: Some methods should probably be m
         return list(d) if self.islist or (d and all(OpaqueKey.isopaque(k) for k in d.keys())) else d
 
     def staticscope(self):
-        for _, s in self._selfandparents():
+        for s in chain.from_iterable(scopedepths(self)):
             pass
         return s
 
@@ -224,7 +165,7 @@ class AbstractScope(Resolvable): # TODO LATER: Some methods should probably be m
                 initialcategory = _categoryornone(word[0])
                 if initialcategory is None or initialcategory[0] not in 'PS':
                     continue
-                d = self._findresolvable([word]).directivevalue
+                d = Query([word]).search(self).directivevalue
                 p = Precedence.ofdirective(d)
                 if p > precedence:
                     del directives[:]
@@ -335,9 +276,6 @@ class Scope(AbstractScope):
     def resolve(self, scope):
         return self
 
-    def tojava(self):
-        return Text(''.join("%s %s\n" % (k, v.resolve(self).unravel()) for k, v in self.resolvables.items())) # TODO: Escaping.
-
 class ScalarScope(Scope):
 
     def __init__(self, parents, scalarobj):

aridity-70/aridity/search.py

@@ -0,0 +1,59 @@
+from .util import UnparseNoSuchPathException
+
+def scopedepths(scope):
+    scopes = [scope]
+    while scopes:
+        nextscopes = []
+        for s in scopes:
+            nextscopes.extend(s.parents)
+        yield scopes
+        scopes = nextscopes
+
+def resolvedscopeornone(s, path):
+    for name in path:
+        r = s.resolvableornone(name)
+        if r is None:
+            return
+        s = r.resolve(s)
+        if not hasattr(s, 'resolvableornone'):
+            return
+    return s
+
+class Query:
+
+    @classmethod
+    def _of(cls, *args):
+        return cls(*args)
+
+    def __init__(self, path):
+        self.path = path
+
+    def _scoreresolvables(self, scope):
+        tail = self.path[1:]
+        for k, v in enumerate(scopedepths(scope)):
+            for s in v:
+                r = s.resolvables.getornone(self.path[0])
+                if r is not None:
+                    if tail:
+                        obj = r.resolve(s) # XXX: Wise?
+                        if hasattr(obj, 'parents'):
+                            for score, rr in self._of(tail)._scoreresolvables(obj):
+                                yield score + [k], rr
+                    else:
+                        yield [k], r
+
+    def search(self, scope):
+        pairs = list(self._scoreresolvables(scope))
+        try:
+            return min(pairs, key = lambda t: t[0])[1]
+        except ValueError:
+            raise UnparseNoSuchPathException(self.path)
+
+def slices(path):
+    n = len(path)
+    for k in range(n)[::-1]:
+        for start in range(n - k):
+            v = path[start:start + k]
+            yield v
+            if not v:
+                return

{aridity-69 → aridity-70}/aridity/stacks.py

@@ -1,20 +1,3 @@
-# Copyright 2017, 2020 Andrzej Cichocki
-
-# This file is part of aridity.
-#
-# aridity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# aridity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with aridity.  If not, see <http://www.gnu.org/licenses/>.
-
 from .model import Resolvable, Text
 from .util import NoSuchPathException
 from contextlib import contextmanager

{aridity-69 → aridity-70}/aridity/util.py

@@ -1,20 +1,3 @@
-# Copyright 2017, 2020 Andrzej Cichocki
-
-# This file is part of aridity.
-#
-# aridity is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# aridity is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with aridity.  If not, see <http://www.gnu.org/licenses/>.
-
 from importlib_metadata import entry_points
 import collections, inspect, sys