aridity 86__tar.gz → 88__tar.gz

{aridity-86 → aridity-88}/PKG-INFO

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

aridity-88/aridity/__init__.py

@@ -0,0 +1,19 @@
+'Interactive REPL.'
+from .repl import CommandReader
+from .scope import Scope
+from .util import NoSuchPathException
+from traceback import print_exc
+import sys
+
+assert NoSuchPathException
+
+def main():
+    scope = Scope()
+    for command in CommandReader(sys.stdin):
+        try:
+            scope.execute(command)
+        except:
+            print_exc(0)
+
+if '__main__' == __name__:
+    main()

{aridity-86 → aridity-88}/aridity/config.py

@@ -1,9 +1,9 @@
 from .functions import OpaqueKey
 from .model import Entry, Locator, Resource, Stream, Text, wrap
-from .repl import Repl
 from .scope import Scope
 from .search import resolvedscopeornone
 from .util import dotpy, NoSuchPathException, qualname, selectentrypoints, solo
+from io import StringIO
 from parabject import Parabject, register
 from pathlib import Path
 import errno, logging, os, sys
@@ -34,7 +34,8 @@ def _wrappathorstream(pathorstream):
 class ConfigCtrl:
     'High level scope API.'
 
-    settingsopenable = Locator(Path.home() / '.settings.arid')
+    if 'HOME' in os.environ:
+        settingsopenable = Locator(Path.home() / '.settings.arid')
 
     @classmethod
     def _of(cls, *args, **kwargs):
@@ -99,9 +100,7 @@ class ConfigCtrl:
 
     def execute(self, text):
         'Execute given config text.'
-        with Repl(self.scope) as repl:
-            for line in text.splitlines(True):
-                repl(line)
+        self.load(StringIO(text))
 
     @property
     def scope(self):

{aridity-86 → aridity-88}/aridity/functions.py

@@ -286,3 +286,5 @@ def corefunctions():
     yield 'getfrom', _getfrom
     yield 'indentmorelines', _indentmorelines
     yield 'hole', _hole
+    yield '', getimpl # TODO: Refer to the other one.
+    yield 'get', getimpl

{aridity-86 → aridity-88}/aridity/model.py

@@ -5,7 +5,8 @@ from importlib.resources import files
 from io import TextIOWrapper
 from itertools import chain, islice
 from parabject import dereference, UnknownParabjectException
-import numbers, os
+from pathlib import PurePath
+import numbers, os, re
 
 class Struct:
 
@@ -429,10 +430,8 @@ class Stream(Resolved):
         self.streamvalue.flush()
 
     def source(self, scope, prefix):
-        from .repl import Repl
-        with Repl(scope, rootprefix = prefix) as repl:
-            for line in self.streamvalue:
-                repl(line)
+        from .repl import CommandReader
+        CommandReader(self.streamvalue, prefix).pipeto(scope)
 
     def processtemplate(self, scope):
         from .grammar import templateparser
@@ -445,6 +444,10 @@ class Entry(Struct):
     def pa(cls, s, l, t):
         return cls(t.asList())
 
+    @classmethod
+    def _of(cls, *args):
+        return cls(*args)
+
     def __init__(self, resolvables):
         self.resolvables = resolvables
 
@@ -490,8 +493,11 @@ class Entry(Struct):
         for r in self.resolvables:
             if not r.ignorable or r.boundary:
                 break
-            indent.append(r) # XXX: Can we simply grab its value?
-        return Concat.unlesssingleton(indent).resolve(None).textvalue
+            indent.append(r.textvalue)
+        return ''.join(indent)
+
+    def plus(self, that):
+        return self._of([*self.resolvables, *that.resolvables])
 
 def wrap(value):
     'Attempt to wrap the given value in a model object of the most specific type.'
@@ -511,3 +517,16 @@ def wrap(value):
     if hasattr(value, 'encode'):
         return Text(value)
     return Scalar(value) # XXX: Interpret mappings and sequences?
+
+quotablebysquare = re.compile('[$()]+')
+
+def quote(obj): # TODO: Duplicates some wrap logic.
+    for b in map(bool, range(2)):
+        if obj is b:
+            return str(b).lower()
+    if isinstance(obj, PurePath):
+        obj = str(obj)
+    try:
+        return f"""$.({quotablebysquare.sub(lambda m: f"$'[{m.group()}]", obj)})"""
+    except TypeError:
+        return obj

aridity-88/aridity/processtemplate.py

@@ -0,0 +1,15 @@
+'Process the given template to stdout using config from stdin.'
+from .config import ConfigCtrl
+from argparse import ArgumentParser
+import sys
+
+def main():
+    parser = ArgumentParser()
+    parser.add_argument('templatepath')
+    args = parser.parse_args()
+    cc = ConfigCtrl()
+    cc.load(sys.stdin)
+    cc.processtemplate(args.templatepath, sys.stdout)
+
+if '__main__' == __name__:
+    main()

aridity-88/aridity/repl.py

@@ -0,0 +1,74 @@
+from .grammar import commandparser
+from .model import Entry
+from pyparsing import ParseException
+
+class DanglingStackException(Exception): pass
+
+class NoSuchIndentException(Exception): pass
+
+class MalformedEntryException(Exception): pass
+
+class Suffix:
+
+    def __init__(self, entry):
+        self.indent = entry.indent()
+        self.entry = entry
+
+    def closing(self, contextindent):
+        if any(x != y for x, y in zip(self.indent, contextindent)):
+            raise MalformedEntryException(self.entry)
+        return len(self.indent) <= len(contextindent)
+
+class Command:
+
+    def __init__(self, entry):
+        self.size = entry.size()
+        self.entry = entry
+
+emptyentry = Entry([])
+emptysuffix = Suffix(emptyentry)
+
+class CommandReader:
+
+    def __init__(self, stream, rootprefix = emptyentry):
+        self.stack = []
+        self.partials = {'': emptyentry}
+        self.stream = stream
+        self.rootprefix = rootprefix
+        for _ in self._update(False, emptysuffix):
+            assert False
+
+    def _readcommands(self, line):
+        try:
+            suffix = Suffix(commandparser(''.join([*self.stack, line])))
+            del self.stack[:]
+        except ParseException:
+            self.stack.append(line)
+            return
+        fire = suffix.closing(self.indent)
+        if not fire:
+            self.partials[suffix.indent] = self.command.entry
+        elif suffix.indent not in self.partials:
+            raise NoSuchIndentException(suffix.entry)
+        for i in list(self.partials):
+            if len(suffix.indent) < len(i):
+                del self.partials[i]
+        yield from self._update(fire, suffix)
+
+    def _update(self, fire, suffix):
+        command = self.rootprefix.plus(self.command.entry) if fire and self.command.size else None
+        self.command = Command(self.partials[suffix.indent].plus(suffix.entry))
+        self.indent = suffix.indent
+        if command is not None:
+            yield command
+
+    def __iter__(self):
+        for line in self.stream:
+            yield from self._readcommands(line)
+        if self.stack:
+            raise DanglingStackException(self.stack)
+        yield from self._update(True, emptysuffix)
+
+    def pipeto(self, scope):
+        for command in self:
+            scope.execute(command)

{aridity-86 → aridity-88}/aridity/scope.py

@@ -214,8 +214,6 @@ class StaticScope(AbstractScope):
             self[word,] = Directive(d)
         for name, f in corefunctions():
             self[name,] = Function(f)
-        self['',] = Function(getimpl) # TODO: Refer to the other one.
-        self['get',] = Function(getimpl)
         self['keyring_cron',] = Scalar(False)
         self['keyring_force',] = Scalar(False)
         self['~',] = Text(os.path.expanduser('~'))

{aridity-86 → aridity-88}/aridity.egg-info/PKG-INFO

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

{aridity-86 → aridity-88}/setup.py

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

aridity-86/aridity/__init__.py

@@ -1,18 +0,0 @@
-'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-86/aridity/processtemplate.py

@@ -1,13 +0,0 @@
-'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-86/aridity/repl.py

@@ -1,81 +0,0 @@
-from .grammar import commandparser
-from .model import Entry, Text
-from .scope import Scope
-from pathlib import PurePath
-import pyparsing, re, traceback
-
-class DanglingStackException(Exception): pass
-
-class NoSuchIndentException(Exception): pass
-
-class MalformedEntryException(Exception): pass
-
-class Repl:
-
-    quotablebysquare = re.compile('[$()]+')
-
-    @classmethod
-    def _quote(cls, obj): # TODO: Duplicates some wrap logic.
-        for b in map(bool, range(2)):
-            if obj is b:
-                return str(b).lower()
-        if isinstance(obj, PurePath):
-            obj = str(obj)
-        try:
-            return f"""$.({cls.quotablebysquare.sub(lambda m: f"$'[{m.group()}]", obj)})"""
-        except TypeError:
-            return obj
-
-    def __init__(self, scope = None, interactive = False, rootprefix = Entry([])):
-        self.stack = []
-        self.indent = ''
-        self.command = Entry([Text(':')])
-        self.commandsize = self.command.size()
-        self.partials = {'': rootprefix}
-        self.scope = Scope() if scope is None else scope
-        self.interactive = interactive
-
-    def __enter__(self):
-        return self
-
-    def printf(self, template, *args): # TODO: Replace with methods corresponding to directives.
-        self(template % tuple(self._quote(a) for a in args))
-
-    def __call__(self, line):
-        try:
-            suffix = commandparser(''.join(self.stack + [line]))
-            del self.stack[:]
-        except pyparsing.ParseException:
-            self.stack.append(line)
-            return
-        indent = suffix.indent()
-        common = min(len(self.indent), len(indent))
-        if indent[:common] != self.indent[:common]:
-            raise MalformedEntryException(suffix)
-        if len(indent) <= len(self.indent):
-            self.fire()
-            if indent not in self.partials:
-                raise NoSuchIndentException(suffix)
-        else:
-            self.partials[indent] = self.command
-        for i in list(self.partials):
-            if len(indent) < len(i):
-                del self.partials[i]
-        self.command = Entry(self.partials[indent].resolvables + suffix.resolvables)
-        self.commandsize = Entry(suffix.resolvables).size()
-        self.indent = indent
-
-    def fire(self):
-        if self.commandsize:
-            try:
-                self.scope.execute(self.command)
-            except:
-                if not self.interactive:
-                    raise
-                traceback.print_exc(0)
-
-    def __exit__(self, exc_type, *args):
-        if exc_type is None:
-            if self.stack:
-                raise DanglingStackException(self.stack)
-            self.fire()