Lots of changes:

- Package features
- New command
- Init command
- Better logging
- More dependency types
- Local pkg dir instead of global
- Probably more I forgot

Author: RogueMacro

.gitignore

@@ -2,9 +2,7 @@
 
 /target
 
-/dummy
-/dummy2
-/proj
-
 choco/tools/grill.exe
-*.nupkg
+*.nupkg
+
+/testing_cmd

Cargo.lock

@@ -8,15 +8,17 @@ description = "A package manager for the Beef Programming Language"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
-anyhow = "1.0.53"
+anyhow = { version = "1.0.53", features = ["backtrace"] }
 clap = { version = "3.0.10", features = ["cargo"] }
 console = "0.15.0"
 dialoguer = "0.10.2"
+either = "1.8.0"
 env_logger = "0.9.0"
 dirs = "4.0.0"
 git2 = "0.15.0"
 indicatif = "0.17.0-beta.1"
 itertools = "0.10.3"
+lazy_static = "1.4.0"
 log = "0.4.14"
 maplit = "1.0.2"
 multi_log = "0.1.2"

Cargo.toml

@@ -1,8 +1,10 @@
 use std::{
     collections::{HashMap, HashSet},
-    path::PathBuf,
+    fs,
+    path::{Path, PathBuf},
 };
 
+use anyhow::{Context, Result};
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -15,6 +17,7 @@ pub struct BeefSpace {
     pub projects: HashMap<String, ProjectEntry>,
     #[serde(default)]
     pub workspace_folders: HashMap<String, HashSet<String>>,
+    pub workspace: Workspace,
 
     #[serde(flatten)]
     pub other: HashMap<String, toml::Value>,
@@ -27,12 +30,13 @@ impl Default for BeefSpace {
             locked: Default::default(),
             projects: Default::default(),
             workspace_folders: Default::default(),
+            workspace: Default::default(),
             other: Default::default(),
         }
     }
 }
 
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, Debug, Default)]
 #[serde(rename_all = "PascalCase")]
 pub struct ProjectEntry {
     pub path: PathBuf,
@@ -41,13 +45,10 @@ pub struct ProjectEntry {
     pub other: HashMap<String, toml::Value>,
 }
 
-impl Default for ProjectEntry {
-    fn default() -> Self {
-        Self {
-            path: Default::default(),
-            other: Default::default(),
-        }
-    }
+#[derive(Serialize, Deserialize, Debug, Default)]
+#[serde(rename_all = "PascalCase")]
+pub struct Workspace {
+    pub startup_project: String,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -59,13 +60,68 @@ pub struct BeefProj {
     pub project: Project,
 
     #[serde(flatten)]
-    pub other: HashMap<String, toml::Value>,
+    other: HashMap<String, toml::Value>,
+
+    #[serde(skip)]
+    path: PathBuf,
 }
 
-#[derive(Serialize, Deserialize, Debug)]
+impl BeefProj {
+    pub fn new<P>(name: String, path: &P) -> BeefProj
+    where
+        P: AsRef<Path>,
+    {
+        let startup_object = format!("{}.Program", name);
+
+        Self {
+            file_version: 1,
+            dependencies: Default::default(),
+            project: Project {
+                name,
+                target_type: String::from("BeefConsoleApplication"),
+                startup_object,
+                ..Default::default()
+            },
+            other: Default::default(),
+            path: path.as_ref().to_path_buf(),
+        }
+    }
+
+    pub fn from_file<P>(path: &P) -> Result<BeefProj>
+    where
+        P: AsRef<Path>,
+    {
+        let mut proj: Self = toml::from_str(&fs::read_to_string(&path)?).with_context(|| {
+            format!("Failed to read project file '{}'", path.as_ref().display())
+        })?;
+        proj.path = path.as_ref().to_path_buf();
+        Ok(proj)
+    }
+
+    pub fn save(&self) -> Result<()> {
+        fs::write(&self.path, toml::to_string(&self)?)
+            .with_context(|| format!("Failed to write project file: '{}'", self.path.display()))
+    }
+
+    pub fn path<P>(&mut self, path: &P) -> &mut Self
+    where
+        P: AsRef<Path>,
+    {
+        self.path = path.as_ref().to_path_buf();
+        self
+    }
+}
+
+#[derive(Serialize, Deserialize, Debug, Default)]
 #[serde(rename_all = "PascalCase")]
 pub struct Project {
     pub name: String,
+    #[serde(default)]
+    pub target_type: String,
+    #[serde(default)]
+    pub startup_object: String,
+    #[serde(default)]
+    pub processor_macros: HashSet<String>,
 
     #[serde(flatten)]
     pub other: HashMap<String, toml::Value>,

src/beef.rs

@@ -1,7 +1,9 @@
+pub mod init;
 pub mod install;
 pub mod list;
 pub mod login;
 pub mod make;
+pub mod new;
 pub mod publish;
 pub mod purge;
 pub mod update;

src/commands.rs

@@ -0,0 +1,30 @@
+use std::{fs, path::Path};
+
+use crate::{beef::BeefProj, prelude::*};
+
+pub fn cli() -> App {
+    App::new("init")
+        .about("Initialize an existing beef workspace with grill")
+        .arg(
+            Arg::new("path")
+                .long("path")
+                .value_name("PATH")
+                .default_value("."),
+        )
+}
+
+pub fn exec(args: &ArgMatches) -> Result<()> {
+    let path = Path::new(args.value_of("path").unwrap());
+    let proj_path = path.join("BeefProj.toml");
+    let name = if proj_path.exists() {
+        BeefProj::from_file(&proj_path)?.project.name
+    } else {
+        fs::canonicalize(std::env::current_dir()?.join(path))?
+            .file_name()
+            .context("Invalid filename")?
+            .to_string_lossy()
+            .to_string()
+    };
+
+    crate::ops::init::init(path, &name)
+}

src/commands/init.rs

@@ -90,7 +90,7 @@ pub fn exec(args: &ArgMatches) -> Result<()> {
     let mut already_installed_prompt =
         "This package is already installed, do you want to update it?".to_owned();
     let has_manifest = if let Ok(file) = fs::read_to_string(manifest_path) {
-        let manifest: Manifest = toml::from_str(&file)?;
+        let manifest = Manifest::from_file(&file)?;
         pkg = manifest.package.name;
 
         let pkg_path = paths::beeflib(&pkg);

src/commands/install.rs

@@ -14,7 +14,7 @@ pub fn exec(args: &ArgMatches) -> Result<()> {
     let dir = if args.is_present("themes") {
         paths::themes()
     } else {
-        paths::pkgs()
+        paths::pkgs(".")
     };
 
     for entry in fs::read_dir(dir)? {

src/commands/list.rs

@@ -13,9 +13,25 @@ pub fn cli() -> App {
                 .help("Path to the workspace"),
         )
         .arg(Arg::new("quiet").long("quiet").short('q'))
+        .arg(
+            Arg::new("fix-pkg")
+                .long("fix")
+                .value_name("PACKAGE")
+                .help("Run make for an installed package")
+                .conflicts_with("path"),
+        )
 }
 
 pub fn exec(args: &ArgMatches) -> Result<()> {
-    let path = PathBuf::from(args.value_of("path").unwrap());
-    crate::ops::make(&path, args.is_present("quiet"))
+    if let Some(pkg) = args.value_of("fix-pkg") {
+        let pkg_path = crate::paths::pkg(args.value_of("path").unwrap(), pkg);
+        if !pkg_path.exists() {
+            bail!("Package '{}' is not installed. Did you include the right version? I.e. Dummy-1.2.3", pkg)
+        }
+        log::debug!("Fixing {}", pkg);
+        crate::ops::install::prepare_pkg(&pkg_path, None)
+    } else {
+        let path = PathBuf::from(args.value_of("path").unwrap());
+        crate::ops::make(&path, args.is_present("quiet"))
+    }
 }