Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: use cargo generate instead of hardcoding examples source code #888

Merged
merged 14 commits into from
Jun 9, 2023
Merged

feat: use cargo generate instead of hardcoding examples source code #888

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5d907e9
feat: use `cargo generate` instead of hardcoding examples source code
paulotten May 8, 2023
ccdbea2
Merge branch 'shuttle-hq:main' into paul/cargo_generate
paulotten Jun 6, 2023
e1824e7
feat: use `cargo-generate` as a library
paulotten Jun 6, 2023
b49c285
feat: add `custom/none` example
paulotten Jun 7, 2023
bdb6212
use project name `.as_ref()`
paulotten Jun 7, 2023
07dbbf2
fix: apparently we need to use `auto_path` instead of `subfolder`.
paulotten Jun 7, 2023
bd4551c
chore: update `examples` git submodule
paulotten Jun 7, 2023
aac6948
manually set the crate name
paulotten Jun 7, 2023
001000e
fix: clippy lints
paulotten Jun 7, 2023
2602993
fix: rocket sub path
paulotten Jun 7, 2023
c4a8239
move `use` to top of file
paulotten Jun 7, 2023
65ab862
remove the Shuttle.toml file, if it exists
paulotten Jun 7, 2023
77e7398
Merge branch 'main' into paul/cargo_generate
iulianbarbu Jun 7, 2023
c381487
feat: create a .gitignore file when copying an example
paulotten Jun 8, 2023
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
Prev Previous commit
Next Next commit
remove the Shuttle.toml file, if it exists
  • Loading branch information
@paulotten
paulotten committed Jun 7, 2023
commit 65ab862983616adb17b9c59c4947ff2aee95bb7a
16 changes: 16 additions & 0 deletions cargo-shuttle/src/init.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,8 @@ pub fn cargo_generate(path: PathBuf, name: &ProjectName, framework: Template) ->

set_crate_name(&path, name.as_str()).with_context(|| "Failed to set crate name.")?;

remove_shuttle_toml(&path);

Ok(())
}

Expand All @@ -236,3 +238,17 @@ fn set_crate_name(path: &Path, name: &str) -> Result<()> {

Ok(())
}

/*
Currently Shuttle.toml only has a project name override.
This project name will already be in use, so the file is useless.

If we start putting more things in Shuttle.toml we may wish to re-evaluate.
*/
fn remove_shuttle_toml(path: &Path) {
let mut path = path.to_path_buf();
path.push("Shuttle.toml");

// this file only exists for some of the examples, it's fine if we don't find it
_ = std::fs::remove_file(path);
}