git.delta.rocks / jrsonnet / refs/commits / 712f0045bec7

difftreelog

Merge pull request #16 from CertainLach/exec-to-string

Yaroslav Bulyukin2020-10-19parents: #e99c281 #f19080c.patch.diff
in: master
--exec should use toString format instead of standard json

2 files changed

modifiedcmds/jrsonnet/src/main.rsdiffbeforeafterboth
before · cmds/jrsonnet/src/main.rs
1use clap::Clap;2use jrsonnet_cli::{ConfigureState, GeneralOpts, InputOpts, ManifestOpts, OutputOpts};3use jrsonnet_evaluator::{error::LocError, EvaluationState};4use std::{5	fs::{create_dir_all, File},6	io::Write,7	path::PathBuf,8	rc::Rc,9};1011#[cfg(feature = "mimalloc")]12#[global_allocator]13static GLOBAL: mimallocator::Mimalloc = mimallocator::Mimalloc;1415#[derive(Clap)]16// #[clap(help_heading = "DEBUG")]17struct DebugOpts {18	/// Required OS stack size.19	/// This shouldn't be changed unless jrsonnet is failing with stack overflow error.20	#[clap(long, name = "size")]21	pub os_stack: Option<usize>,22}2324#[derive(Clap)]25struct Opts {26	#[clap(flatten)]27	input: InputOpts,28	#[clap(flatten)]29	general: GeneralOpts,30	#[clap(flatten)]31	manifest: ManifestOpts,32	#[clap(flatten)]33	output: OutputOpts,34	#[clap(flatten)]35	debug: DebugOpts,36}3738fn main() {39	let opts: Opts = Opts::parse();40	if let Some(size) = opts.debug.os_stack {41		std::thread::Builder::new()42			.stack_size(size * 1024 * 1024)43			.spawn(|| main_catch(opts))44			.expect("new thread spawned")45			.join()46			.expect("thread finished successfully");47	} else {48		main_catch(opts)49	}50}5152#[derive(thiserror::Error, Debug)]53enum Error {54	// Handled differently55	#[error("evaluation error")]56	Evaluation(jrsonnet_evaluator::error::LocError),57	#[error("io error")]58	Io(#[from] std::io::Error),59}60impl From<LocError> for Error {61	fn from(e: LocError) -> Self {62		Self::Evaluation(e)63	}64}6566fn main_catch(opts: Opts) {67	let state = EvaluationState::default();68	if let Err(e) = main_real(&state, opts) {69		if let Error::Evaluation(e) = e {70			println!("{}", state.stringify_err(&e));71		} else {72			println!("{}", e);73		}74	}75}7677fn main_real(state: &EvaluationState, opts: Opts) -> Result<(), Error> {78	opts.general.configure(&state)?;79	opts.manifest.configure(&state)?;8081	let val = if opts.input.exec {82		state.evaluate_snippet_raw(83			Rc::new(PathBuf::from("args")),84			(&opts.input.input as &str).into(),85		)?86	} else {87		state.evaluate_file_raw(&PathBuf::from(opts.input.input))?88	};8990	let val = state.with_tla(val)?;9192	if let Some(multi) = opts.output.multi {93		if opts.output.create_output_dirs {94			let mut dir = multi.clone();95			dir.pop();96			create_dir_all(dir)?;97		}98		for (file, data) in state.manifest_multi(val)?.iter() {99			let mut path = multi.clone();100			path.push(&file as &str);101			if opts.output.create_output_dirs {102				let mut dir = path.clone();103				dir.pop();104				create_dir_all(dir)?;105			}106			println!("{}", path.to_str().expect("path"));107			let mut file = File::create(path)?;108			writeln!(file, "{}", data)?;109		}110	} else if let Some(path) = opts.output.output_file {111		if opts.output.create_output_dirs {112			let mut dir = path.clone();113			dir.pop();114			create_dir_all(dir)?;115		}116		let mut file = File::create(path)?;117		writeln!(file, "{}", state.manifest(val)?)?;118	} else {119		println!("{}", state.manifest(val)?);120	}121122	Ok(())123}
modifiedcrates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -201,6 +201,7 @@
 	YamlStream(Box<ManifestFormat>),
 	Yaml(usize),
 	Json(usize),
+	ToString,
 	String,
 }
 
@@ -357,6 +358,7 @@
 			}
 			ManifestFormat::Yaml(padding) => self.to_yaml(*padding)?,
 			ManifestFormat::Json(padding) => self.to_json(*padding)?,
+			ManifestFormat::ToString => self.to_string()?,
 			ManifestFormat::String => match self {
 				Self::Str(s) => s.clone(),
 				_ => throw!(StringManifestOutputIsNotAString),