Bump version no to 0.3.0

- Do proper test cleanup

Author: JSAbrahams

Cargo.lock

@@ -1,8 +1,8 @@
 [package]
 name = "mamba"
-version = "0.2.2"
-authors = ["Joel Abrahams <abrahamsjo@gmail.com>"]
-description = "A transpiler which translates Mamba to Python 3 files"
+version = "0.3.0"
+authors = ["Joël Abrahams <abrahamsjo@gmail.com>"]
+description = "A transpiler which converts Mamba files to Python 3 files"
 edition = "2018"
 license-file = "LICENSE"
 

Cargo.toml

@@ -9,7 +9,7 @@ use std::path::PathBuf;
 use python_parser::ast::Statement;
 use tempfile::tempdir_in;
 
-pub fn resource_content_path(path: &String) -> String {
+pub fn resource_content_path(path: &str) -> String {
     match File::open(path) {
         Ok(mut path) => {
             let mut content = String::new();

tests/common.rs

@@ -6,6 +6,7 @@ use mamba::pipeline::transpile_directory;
 use crate::common::{delete_dir, python_src_to_stmts, resource_content, resource_content_path,
                     resource_content_randomize, resource_path};
 use crate::output::common::PYTHON;
+use python_parser::ast::Statement;
 
 mod common;
 
@@ -17,21 +18,32 @@ fn test_directory(
     _output: &[&str],
     file_name: &str
 ) -> Result<(), Vec<String>> {
-    let current_dir_string = resource_path(valid, input, "");
-    let current_dir = Path::new(&current_dir_string);
     let (output_path, output_file) =
         resource_content_randomize(true, input, &format!("{}.py", file_name));
 
+    let res = fallable(valid, input, &output_path, &output_file, file_name);
+    delete_dir(&output_path).map_err(|_| vec![])?;
+    let (check_ast, out_ast) = res?;
+    assert_eq!(check_ast, out_ast);
+    Ok(())
+}
+
+fn fallable(
+    valid: bool,
+    input: &[&str],
+    output_path: &str,
+    output_file: &str,
+    file_name: &str
+) -> Result<(Vec<Statement>, Vec<Statement>), Vec<String>> {
+    let current_dir_string = resource_path(valid, input, "");
+    let current_dir = Path::new(&current_dir_string);
+
     let map_err = |(ty, msg): &(String, String)| {
         eprintln!("[error | {}] {}", ty, msg);
         format!("[error | {}] {}", ty, msg)
     };
-    transpile_directory(
-        &current_dir,
-        Some(&format!("{}.mamba", file_name)),
-        Some(output_path.as_str())
-    )
-    .map_err(|errs| errs.iter().map(&map_err).collect::<Vec<String>>())?;
+    transpile_directory(&current_dir, Some(&format!("{}.mamba", file_name)), Some(output_path))
+        .map_err(|errs| errs.iter().map(&map_err).collect::<Vec<String>>())?;
 
     let cmd = Command::new(PYTHON).arg("-m").arg("py_compile").arg(&output_file).output().unwrap();
     if cmd.status.code().unwrap() != 0 {
@@ -40,8 +52,7 @@ fn test_directory(
 
     let check_src = resource_content(true, input, &format!("{}_check.py", file_name));
     let check_ast = python_src_to_stmts(&check_src);
-    let out_ast = python_src_to_stmts(&resource_content_path(&output_file));
+    let out_ast = python_src_to_stmts(&resource_content_path(output_file));
 
-    assert_eq!(out_ast, check_ast);
-    delete_dir(&output_path).map_err(|_| vec![])
+    Ok((check_ast, out_ast))
 }