s/CARGO_SCRIPT/RUST_SCRIPT

Author: fornwall

docs/README.md

@@ -157,13 +157,13 @@ Note that, like with expressions, you can specify a custom template for stream f
 
 The following environment variables are provided to scripts by `rust-script`:
 
-- `CARGO_SCRIPT_BASE_PATH`: the base path used by `rust-script` to resolve relative dependency paths.  Note that this is *not* necessarily the same as either the working directory, or the directory in which the script is being compiled.
+- `RUST_SCRIPT_BASE_PATH`: the base path used by `rust-script` to resolve relative dependency paths.  Note that this is *not* necessarily the same as either the working directory, or the directory in which the script is being compiled.
 
-- `CARGO_SCRIPT_PKG_NAME`: the generated package name of the script.
+- `RUST_SCRIPT_PKG_NAME`: the generated package name of the script.
 
-- `CARGO_SCRIPT_SAFE_NAME`: the file name of the script (sans file extension) being run.  For scripts, this is derived from the script's filename.  May also be `"expr"` or `"loop"` for those invocations.
+- `RUST_SCRIPT_SAFE_NAME`: the file name of the script (sans file extension) being run.  For scripts, this is derived from the script's filename.  May also be `"expr"` or `"loop"` for those invocations.
 
-- `CARGO_SCRIPT_SCRIPT_PATH`: absolute path to the script being run, assuming one exists.  Set to the empty string for expressions.
+- `RUST_SCRIPT_PATH`: absolute path to the script being run, assuming one exists.  Set to the empty string for expressions.
 
 ## Templates
 

src/main.rs

@@ -533,12 +533,12 @@ fn try_main() -> Result<i32> {
         }
         let add_env = hint(move |cmd| {
             cmd.env(
-                "CARGO_SCRIPT_SCRIPT_PATH",
+                "RUST_SCRIPT_PATH",
                 input.path().unwrap_or_else(|| Path::new("")),
             );
-            cmd.env("CARGO_SCRIPT_SAFE_NAME", input.safe_name());
-            cmd.env("CARGO_SCRIPT_PKG_NAME", input.package_name());
-            cmd.env("CARGO_SCRIPT_BASE_PATH", input.base_path());
+            cmd.env("RUST_SCRIPT_SAFE_NAME", input.safe_name());
+            cmd.env("RUST_SCRIPT_PKG_NAME", input.package_name());
+            cmd.env("RUST_SCRIPT_BASE_PATH", input.base_path());
             cmd
         });
 

src/platform.rs

@@ -44,6 +44,12 @@ pub fn binary_cache_path() -> Result<PathBuf, MainError> {
 }
 
 pub fn templates_dir() -> Result<PathBuf, MainError> {
+    if cfg!(debug_assertions) {
+        if let Ok(path) = std::env::var("RUST_SCRIPT_DEBUG_TEMPLATE_PATH") {
+            return Ok(path.into());
+        }
+    }
+
     dirs::data_local_dir()
         .map(|dir| dir.join(consts::PROGRAM_NAME).join("templates"))
         .ok_or_else(|| (Blame::Human, "Cannot get cache directory").into())

src/templates.rs

@@ -8,7 +8,6 @@ use regex::Regex;
 use std::borrow::Cow;
 use std::collections::HashMap;
 use std::fs;
-use std::path::PathBuf;
 
 lazy_static! {
     static ref RE_SUB: Regex = Regex::new(r#"#\{([A-Za-z_][A-Za-z0-9_]*)}"#).unwrap();
@@ -48,28 +47,13 @@ pub fn expand(src: &str, subs: &HashMap<&str, &str>) -> Result<String> {
     Ok(result)
 }
 
-/**
-Returns the path to the template directory.
-*/
-pub fn get_template_path() -> Result<PathBuf> {
-    if cfg!(debug_assertions) {
-        use std::env;
-        if let Ok(path) = env::var("CARGO_SCRIPT_DEBUG_TEMPLATE_PATH") {
-            return Ok(path.into());
-        }
-    }
-
-    let cache_path = platform::templates_dir()?;
-    Ok(cache_path)
-}
-
 /**
 Attempts to locate and load the contents of the specified template.
 */
 pub fn get_template(name: &str) -> Result<Cow<'static, str>> {
     use std::io::Read;
 
-    let base = get_template_path()?;
+    let base = platform::templates_dir()?;
 
     let file = fs::File::open(base.join(format!("{}.rs", name)))
         .map_err(MainError::from)
@@ -107,7 +91,7 @@ fn builtin_template(name: &str) -> Option<&'static str> {
 pub fn list() -> Result<()> {
     use std::ffi::OsStr;
 
-    let t_path = get_template_path()?;
+    let t_path = platform::templates_dir()?;
 
     if !t_path.exists() {
         fs::create_dir_all(&t_path)?;

tests/data/script-cs-env.rs

@@ -2,11 +2,11 @@ use std::env;
 
 fn main() {
     println!("--output--");
-    let path = env::var("CARGO_SCRIPT_SCRIPT_PATH").expect("CSSP wasn't set");
+    let path = env::var("RUST_SCRIPT_PATH").expect("CSSP wasn't set");
     assert!(path.ends_with("script-cs-env.rs"));
-    assert_eq!(env::var("CARGO_SCRIPT_SAFE_NAME"), Ok("script-cs-env".into()));
-    assert_eq!(env::var("CARGO_SCRIPT_PKG_NAME"), Ok("script-cs-env".into()));
-    let base_path = env::var("CARGO_SCRIPT_BASE_PATH").expect("CSBP wasn't set");
+    assert_eq!(env::var("RUST_SCRIPT_SAFE_NAME"), Ok("script-cs-env".into()));
+    assert_eq!(env::var("RUST_SCRIPT_PKG_NAME"), Ok("script-cs-env".into()));
+    let base_path = env::var("RUST_SCRIPT_BASE_PATH").expect("CSBP wasn't set");
     assert!(base_path.ends_with("data"));
     println!("Ok");
 }

tests/tests/expr.rs

@@ -66,7 +66,7 @@ fn test_expr_qmark() {
 fn test_expr_template() {
     let template_dir = "tests/data/templates";
     let out = cargo_script!(
-        #[env(CARGO_SCRIPT_DEBUG_TEMPLATE_PATH=template_dir)]
+        #[env(RUST_SCRIPT_DEBUG_TEMPLATE_PATH=template_dir)]
         "-t",
         "shout",
         "-e",
@@ -83,7 +83,7 @@ fn test_expr_template() {
 fn test_expr_template_with_deps() {
     let template_dir = "tests/data/templates";
     let out = cargo_script!(
-        #[env(CARGO_SCRIPT_DEBUG_TEMPLATE_PATH=template_dir)]
+        #[env(RUST_SCRIPT_DEBUG_TEMPLATE_PATH=template_dir)]
         "-t",
         "boolinate",
         "-e",
@@ -100,7 +100,7 @@ fn test_expr_template_with_deps() {
 fn test_expr_template_override_expr() {
     let template_dir = "tests/data/templates/override";
     let out = cargo_script!(
-        #[env(CARGO_SCRIPT_DEBUG_TEMPLATE_PATH=template_dir)]
+        #[env(RUST_SCRIPT_DEBUG_TEMPLATE_PATH=template_dir)]
         "-e",
         with_output_marker!(r#"true"#)
     )