-

Author: voschezang

src/mash/shell/ast/set_definition.py

@@ -27,9 +27,18 @@ def __init__(self, items, condition=None):
 
     def run(self, prev_result='', shell: BaseShell = None, lazy=False):
         items = []
-        with shell.use_mode(Mode.COMPILE):
-            for item in self.items.values:
-                results = shell.run_commands(item)
+        for item in self.items.values:
+            with shell.use_mode(Mode.COMPILE):
+                results = shell.run_commands(item, '', not lazy)
+
+            if results is None:
+                return
+
+            if isinstance(results, dict):
+                for k, v in results.items():
+                    # TODO use values 
+                    items.append((str(k),))
+            else:
                 for row in results:
                     items.append(row.splitlines())
 
@@ -46,6 +55,10 @@ def apply(self, items, shell: BaseShell = None):
             yield from product(*items)
             return
 
+        if 1:
+            # TODO remove
+            yield from product(*items)
+            return
         for element in product(*items):
             result = shell.run_commands(self.condition, element)
             if result:

src/mash/shell/with_filesystem.py

@@ -48,11 +48,10 @@ def init_shell(self, *build_args, **build_kwds):
 
     def _set_shell_functions(self, cls):
         # convert methods to functions
-        cd = partial_simple(self.repository.cd)
         ll = partial_simple(self.repository.ll)
 
-        set_functions({'cd': cd,
-                       'use': cd,
+        set_functions({'cd': partial_simple(self.repository.cd),
+                       'use': partial_simple(self.use),
                        'l': ll,
                        'list': ll,
                        'foreach': partial_simple(self.foreach),
@@ -84,6 +83,16 @@ def pwd(self):
         """
         return ' '.join(self.repository.full_path)
 
+    def use(self, *path: str):
+        """Access a directory.
+        Change directory in REPL mode, otherwise return the directory.
+        """
+        if self.shell.mode == Mode.REPL:
+            return self.repository.cd(*path)
+        elif self.shell.mode == Mode.COMPILE:
+            return self.get(*path)
+        raise NotImplementedError(self.shell.mode)
+
     def get(self, *path: str):
         """Return the value of the file associated with `path`.
         """
@@ -164,7 +173,7 @@ def add_cd_alias(self, dirname: str):
         # create alias
         func = partial(self.repository.cd, dirname)
         name = f'{self.repository.cd.__name__}({dirname})'
-        cd_dirname = Function(func, name, f'cd {dirname}')
+        cd_dirname = Function(func, name, f'use {dirname}')
 
         self.shell.add_functions({dirname: cd_dirname},
                                  group_key=cd_aliasses)
@@ -209,19 +218,10 @@ def default_method(self, dirname: str):
         if candidates:
             error = hamming(dirname, str(candidates[0]))
             if error < 0.8:
-                if self.shell.mode == Mode.REPL:
-                    self.repository.cd(candidates[0])
-                    return
-                elif self.shell.mode == Mode.COMPILE:
-                    return self.get(candidates[0])
+                return self.use(candidates[0])
 
         if is_digit(dirname):
-            if self.shell.mode == Mode.REPL:
-                self.repository.cd(dirname)
-                return
-            elif self.shell.mode == Mode.COMPILE:
-                return self.get(dirname)
-            
+            return self.use(dirname)
 
         debug('No matching directory found')
         return dirname

test/shell/test_shell_rest_client.py

@@ -121,7 +121,9 @@ def test_rest_client_standard_set():
         shell, _ = init()
         shell = shell.shell
 
-        result = catch_output(r'{users}', shell=shell)
+        result = catch_output(r'{user}', shell=shell)
+        assert '1000' in result
+        assert '1002' in result
         result = catch_output(r'{users} >>= show $.id', shell=shell)
         # TODO add assertions
         # assert '1001' in result