haskal
/
starship
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(package): Use specified directory instead of current working directory (#774)

This commit is contained in:
Tobias Bieniek 2019-12-24 04:38:00 +01:00 committed by Matan Kushner
parent 3ddb7460a6
commit ecc8754335
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/modules/package.rs
View File

@ -1,3 +1,5 @@
use std::path::PathBuf;
use super::{Context, Module}; use super::{Context, Module};
use crate::utils; use crate::utils;
@ -11,7 +13,7 @@ use crate::configs::package::PackageConfig;
/// ///
/// Will display if a version is defined for your Node.js or Rust project (if one exists) /// Will display if a version is defined for your Node.js or Rust project (if one exists)
pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> { pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
match get_package_version() { match get_package_version(&context.current_dir) {
Some(package_version) => { Some(package_version) => {
let mut module = context.new_module("package"); let mut module = context.new_module("package");
let config: PackageConfig = PackageConfig::try_load(module.config); let config: PackageConfig = PackageConfig::try_load(module.config);
@ -70,14 +72,14 @@ fn extract_composer_version(file_contents: &str) -> Option<String> {
Some(formatted_version) Some(formatted_version)
} }
fn get_package_version() -> Option<String> { fn get_package_version(base_dir: &PathBuf) -> Option<String> {
if let Ok(cargo_toml) = utils::read_file("Cargo.toml") { if let Ok(cargo_toml) = utils::read_file(base_dir.join("Cargo.toml")) {
extract_cargo_version(&cargo_toml) extract_cargo_version(&cargo_toml)
} else if let Ok(package_json) = utils::read_file("package.json") { } else if let Ok(package_json) = utils::read_file(base_dir.join("package.json")) {
extract_package_version(&package_json) extract_package_version(&package_json)
} else if let Ok(poetry_toml) = utils::read_file("pyproject.toml") { } else if let Ok(poetry_toml) = utils::read_file(base_dir.join("pyproject.toml")) {
extract_poetry_version(&poetry_toml) extract_poetry_version(&poetry_toml)
} else if let Ok(composer_json) = utils::read_file("composer.json") { } else if let Ok(composer_json) = utils::read_file(base_dir.join("composer.json")) {
extract_composer_version(&composer_json) extract_composer_version(&composer_json)
} else { } else {
None None