Improvements to the virtual env functionality.

Author: bakpakin

bin/janet-pm

@@ -34,6 +34,9 @@
         string search. If no search pattern is given, prints the
         entire package listing.
 
+    env name
+        Create an environment with which one can install Janet dependencies and scripts in an isolated manner.
+
     new-project name
         Create a new Janet project in a directory `name`.
 
@@ -236,7 +239,9 @@
 (defn new-venv
   "Create a new virtual environment"
   [path]
-  (pm/scaffold-pm-shell path))
+  (pm/scaffold-pm-shell path)
+  (print "created project shell environment at " path)
+  (print "run `source " path "/bin/activate` to enter the new environment, then `deactivate` to exit."))
 
 (defn quickbin
   "Create an executable file"
@@ -264,7 +269,7 @@
    "help" help
    "deps" deps
    "hook" do-hook
-   "new-venv" new-venv
+   "env" new-venv
    "new-project" new-project
    "new-simple-project" new-simple-project
    "new-c-project" new-c-project

spork/pm.janet

@@ -633,7 +633,7 @@
 
 (deftemplate enter-shell-template
     ````
-    # source bin/enter_shell
+    # source bin/activate
     _OLD_JANET_PATH="$$JANET_PATH";
     _OLD_PATH="$$PATH";
     _OLD_PS1="$$PS1";
@@ -643,7 +643,7 @@
     export PATH;
     PS1="("$name") $${PS1:-}"
     export PS1;
-    exit_shell() {
+    deactivate() {
       PATH="$$_OLD_PATH";
       JANET_PATH="$$_OLD_JANET_PATH";
       PS1="$$_OLD_PS1";
@@ -660,20 +660,24 @@
 
 (deftemplate enter-cmd-template
     ````
-    @rem bin\enter_shell.bat
-    @set _OLD_JANET_PATH="%JANET_PATH%"
-    @set _OLD_PATH="%PATH%"
-    @set JANET_PATH="$abspath"
+    @rem bin\activate.bat
+    @set _OLD_JANET_PATH=%JANET_PATH%
+    @set _OLD_PATH=%PATH%
+    @set _OLD_PROMPT=%PROMPT%
+    @set JANET_PATH=$abspath
     @set PATH=%JANET_PATH%\bin:%PATH%
+    @set PROMPT=($path) %PROMPT%
     ````)
 
 (deftemplate exit-cmd-template
     ````
-    @rem bin\exit_shell.bat
+    @rem bin\deactivate.bat
     @set JANET_PATH=%_OLD_JANET_PATH%
     @set PATH=%_OLD_PATH%
+    @set PROMPT=%_OLD_PROMPT%
     @set _OLD_JANET_PATH=%PATH%
     @set _OLD_PATH=%PATH%
+    @set _OLD_PROMPT=%PROMPT%
     ````)
 
 (defn scaffold-pm-shell
@@ -683,6 +687,6 @@
   (os/mkdir (path/join path "bin"))
   (os/mkdir (path/join path "man"))
   (def opts {:path path :abspath (path/abspath path) :name (path/basename path)})
-  (spit (path/join path "bin" "enter_shell") (enter-shell-template opts))
-  (spit (path/join path "bin" "enter_shell.bat") (enter-cmd-template opts))
-  (spit (path/join path "bin" "exit_shell.bat") (enter-cmd-template opts)))
+  (spit (path/join path "bin" "activate") (enter-shell-template opts))
+  (spit (path/join path "bin" "activate.bat") (enter-cmd-template opts))
+  (spit (path/join path "bin" "deactivate.bat") (exit-cmd-template opts)))

spork/sh.janet

@@ -178,14 +178,26 @@
   [& args]
   (string/join (map shell-quote args) " "))
 
+(defn which
+  "Search for the full path to a program, like the `which` command on unix or the `where` command on Windows."
+  [name &opt paths]
+  (default paths
+    (let [o (os/which)]
+      (if (or (= o :windows) (= o :mingw))
+        (string/split ";" (os/getenv "Path"))
+        (string/split ":" (os/getenv "PATH")))))
+  (prompt :result
+    (each p paths
+      (when (= (os/stat p :mode) :directory)
+        (def fp (path/join p name))
+        (when (= (os/stat fp :mode) :file)
+          (return :result fp))))))
+
 (defn self-exe
   "Get path to the janet executable"
   []
   (def janet (dyn *executable* "janet"))
-  (defn which [cmd] (try (exec-slurp cmd janet) ([e] janet)))
   (case (os/which)
-    :windows (which "where")
-    :mingw (which "where")
     :linux (os/readlink "/proc/self/exe")
     # default
-    (which "which")))
+    (which janet)))