fixes #7

Author: jph00

00_core.ipynb

@@ -140,9 +140,9 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "00_core.ipynb\r\n",
-      "CHANGELOG.md\r\n",
-      "index.ipynb\r\n",
+      "_docs\r\n",
+      "_proc\r\n",
+      "_quarto.yml\r\n",
       "\n"
      ]
     }
@@ -236,9 +236,9 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "00_core.ipynb\r\n",
-      "CHANGELOG.md\r\n",
-      "index.ipynb\n"
+      "_docs\r\n",
+      "_proc\r\n",
+      "_quarto.yml\n"
      ]
     }
    ],
@@ -271,6 +271,21 @@
     "# print(sh('whoami'))"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "a64bf8ae",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "#| export\n",
+    "@patch\n",
+    "def sync_cwd(self:ShellInterpreter):\n",
+    "    \"Sync session's cwd to match pshnb's cwd\"\n",
+    "    _cwd = self._ex('pwd').strip()\n",
+    "    if _cwd != os.getcwd(): os.chdir(_cwd)"
+   ]
+  },
   {
    "cell_type": "markdown",
    "id": "af3ce49d",
@@ -350,6 +365,7 @@
     "    @argument('-X', '--no-expand', action='store_true', help='Disable variable expansion')\n",
     "    @argument('-s', '--sudo',      action='store_true', help='Enable sudo')\n",
     "    @argument('-S', '--no-sudo',   action='store_true', help='Disable sudo')\n",
+    "    @argument('-c', '--cwd',       action='store_true', help=\"Sync session's cwd to match pshnb's cwd\")\n",
     "    @argument('-t', '--timeout', type=int, help='Set timeout in seconds')\n",
     "    @argument('command', nargs='*', help='The command to run')\n",
     "    @no_var_expand\n",
@@ -359,6 +375,7 @@
     "        if cell: cell = shell_replace(cell, self.shell)\n",
     "        if line: line = shell_replace(line, self.shell)\n",
     "        args = self.bash.parser.parse_args(line.split())\n",
+    "        if not self.o: self.reset()\n",
     "        if not args.command and not cell:\n",
     "            if args.expand:    return self._xpand(True)\n",
     "            if args.no_expand: return self._xpand(False)\n",
@@ -368,11 +385,11 @@
     "            if args.reset:     return self.reset(args.reset if isinstance(args.reset, str) else None)\n",
     "            if args.help:      return self.help()\n",
     "            if args.obj:       return self\n",
+    "            if args.cwd:       return self.o.sync_cwd()\n",
     "            if args.command: cell = ' '.join(args.command)\n",
     "        if not cell and line: cell=line\n",
     "        disp = True\n",
     "        if cell.endswith(';'): disp,cell = False,cell[:-1]\n",
-    "        if not self.o: self.reset()\n",
     "        try: res = self.o(cell) or None\n",
     "        except Exception as e:\n",
     "            self.o = None\n",
@@ -441,9 +458,10 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "00_core.ipynb\tLICENSE\t\tpshnb.egg-info\tsettings.ini\r\n",
-      "CHANGELOG.md\tMANIFEST.in\tpyproject.toml\tsetup.py\r\n",
-      "index.ipynb\tpshnb\t\tREADME.md\tstyles.css\n"
+      "_docs\t\tCHANGELOG.bak\tLICENSE\t\tpshnb.egg-info\tsetup.py\r\n",
+      "_proc\t\tCHANGELOG.md\tMANIFEST.in\tpyproject.toml\tsidebar.yml\r\n",
+      "_quarto.yml\tdist\t\tnbdev.yml\tREADME.md\tstyles.css\r\n",
+      "00_core.ipynb\tindex.ipynb\tpshnb\t\tsettings.ini\n"
      ]
     }
    ],
@@ -542,6 +560,37 @@
     "%bash ls | head -3"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "0f71b893",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "%bash -c"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "ad940b0c",
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "'/Users/jhoward/aai-ws'"
+      ]
+     },
+     "execution_count": null,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "os.getcwd()"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,

pshnb/_modidx.py

@@ -17,6 +17,7 @@
                             'pshnb.core.ShellInterpreter.__call__': ('core.html#shellinterpreter.__call__', 'pshnb/core.py'),
                             'pshnb.core.ShellInterpreter.__init__': ('core.html#shellinterpreter.__init__', 'pshnb/core.py'),
                             'pshnb.core.ShellInterpreter._ex': ('core.html#shellinterpreter._ex', 'pshnb/core.py'),
+                            'pshnb.core.ShellInterpreter.sync_cwd': ('core.html#shellinterpreter.sync_cwd', 'pshnb/core.py'),
                             'pshnb.core.ShellInterpreter.wait_echo': ('core.html#shellinterpreter.wait_echo', 'pshnb/core.py'),
                             'pshnb.core.create_ipython_config': ('core.html#create_ipython_config', 'pshnb/core.py'),
                             'pshnb.core.create_magic': ('core.html#create_magic', 'pshnb/core.py'),

pshnb/core.py

@@ -59,6 +59,13 @@ def __call__(self, cmd, timeout=None):
         output = self._ex(cmd.rstrip(), timeout=timeout)
         return output.replace(cmd + '\r\n', '', 1).rstrip()
 
+# %% ../00_core.ipynb
+@patch
+def sync_cwd(self:ShellInterpreter):
+    "Sync session's cwd to match pshnb's cwd"
+    _cwd = self._ex('pwd').strip()
+    if _cwd != os.getcwd(): os.chdir(_cwd)
+
 # %% ../00_core.ipynb
 def shell_replace(s, shell=None):
     "Replace `@{var}` refs in `s` with their variable values, if they exist"
@@ -89,6 +96,7 @@ def _timeout(self, timeout=2):
     @argument('-X', '--no-expand', action='store_true', help='Disable variable expansion')
     @argument('-s', '--sudo',      action='store_true', help='Enable sudo')
     @argument('-S', '--no-sudo',   action='store_true', help='Disable sudo')
+    @argument('-c', '--cwd',       action='store_true', help="Sync session's cwd to match pshnb's cwd")
     @argument('-t', '--timeout', type=int, help='Set timeout in seconds')
     @argument('command', nargs='*', help='The command to run')
     @no_var_expand
@@ -98,6 +106,7 @@ def bash(self, line, cell=None):
         if cell: cell = shell_replace(cell, self.shell)
         if line: line = shell_replace(line, self.shell)
         args = self.bash.parser.parse_args(line.split())
+        if not self.o: self.reset()
         if not args.command and not cell:
             if args.expand:    return self._xpand(True)
             if args.no_expand: return self._xpand(False)
@@ -107,11 +116,11 @@ def bash(self, line, cell=None):
             if args.reset:     return self.reset(args.reset if isinstance(args.reset, str) else None)
             if args.help:      return self.help()
             if args.obj:       return self
+            if args.cwd:       return self.o.sync_cwd()
             if args.command: cell = ' '.join(args.command)
         if not cell and line: cell=line
         disp = True
         if cell.endswith(';'): disp,cell = False,cell[:-1]
-        if not self.o: self.reset()
         try: res = self.o(cell) or None
         except Exception as e:
             self.o = None