Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
163 changes: 160 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 15 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,31 @@ repository = "https://github.com/mozilla-ai/cargo-goose"

[[bin]]
name = "cargo-goose"
path = "src/main.rs"
path = "bin/cli.rs"
required-features = ["cli"]

[[bin]]
name = "generate-json-schemas"
path = "bin/utils/generate-json-schemas.rs"
required-features = ["_internal"]

[features]
default = ["cli"]
_internal = []
cli = ["dep:clap"]

[dependencies]
anyhow = "1.0.100"
cargo_metadata = "0.23.1"
figment = { version = "0.10.19", features = ["toml"] }
once_cell = "1.21.3"
regex = "1.12.2"
schemars = "1.2.0"
serde = { version = "1.0.228", features = ["serde_derive"] }
serde_json = "1.0.149"
toml_edit = { version = "0.24.0", features = ["serde"] }

[dependencies.clap]
version = "4.5.54"
features = ["derive"]
optional = true
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.PHONY: generate-schemas
generate-schemas:
cargo run \
--bin generate-json-schemas \
--all-features
Empty file added bin/.gitkeep
Empty file.
14 changes: 7 additions & 7 deletions src/main.rs → bin/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@ use anyhow::Result;
use cargo_metadata::MetadataCommand;
use clap::Parser;

use crate::cli::CargoGooseCli;

mod cli;
mod metadata;
mod utils;
mod version;
use cargo_goose::cli::CargoGooseCli;

fn main() -> Result<()> {
// TODO: complete when we're ready to support configs
// let config: Config = figment::Figment::new()
// .merge(figment::providers::Toml::file("goose.toml"))
// .extract()?;

// get cargo metadata
let metadata = MetadataCommand::new().exec()?.into();

// parse args
let args = cli::CargoGooseCli::parse();
let args = CargoGooseCli::parse();

match args {
CargoGooseCli::Goose(args) => args.execute(&metadata)?,
Expand Down
22 changes: 22 additions & 0 deletions bin/utils/generate-json-schemas.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
use std::{fs::File, io::Write, path::PathBuf};

use anyhow::Result;
use schemars::{JsonSchema, schema_for};

const SCHEMA_PATH: &str = "schemas";

fn main() -> Result<()> {
write_to_path::<cargo_goose::config::Config>("goose")?;
Ok(())
}

fn write_to_path<T: JsonSchema>(name: &str) -> Result<()> {
let schema = schema_for!(T);
let schema_bytes = serde_json::to_vec_pretty(&schema)?;

let path = PathBuf::from(SCHEMA_PATH).join(format!("{name}.schema.json"));
let mut file = File::create(&path)?;
file.write_all(&schema_bytes)?;

Ok(())
}
26 changes: 26 additions & 0 deletions schemas/goose.schema.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"title": "Config",
"type": "object",
"properties": {
"project": {
"$ref": "#/$defs/GooseConfig"
},
"rust": {
"$ref": "#/$defs/LanguageConfig"
},
"version": {
"type": "integer",
"format": "uint64",
"minimum": 0
}
},
"$defs": {
"GooseConfig": {
"type": "object"
},
"LanguageConfig": {
"type": "object"
}
}
}
Loading
Loading