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

Cargo: install-by-name and install-by-uuid #1314

Merged
merged 2 commits into from
Dec 16, 2011
Merged

Cargo: install-by-name and install-by-uuid #1314

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce9fbf7
cargo: support uuid:<uuid> and shortname package forms.
Dec 16, 2011
7953a5d
cargo: update to new rust-pkg-index API.
Dec 16, 2011
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
36 changes: 36 additions & 0 deletions src/cargo/cargo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import rustc::syntax::parse::parser;
import std::fs;
import std::generic_os;
import std::io;
import std::json;
import option;
import option::{none, some};
import std::os;
Expand Down Expand Up @@ -206,6 +207,36 @@ fn install_file(c: cargo, wd: str, _path: str) {
install_source(c, wd);
}

fn install_resolved(c: cargo, wd: str, key: str) {
fs::remove_dir(wd);
let u = "https://rust-package-index.appspot.com/pkg/" + key;
let p = run::program_output("curl", [u]);
if p.status != 0 {
fail #fmt["Fetch of %s failed: %s", u, p.err];
}
let j = json::from_str(p.out);
alt j {
some (json::dict(_j)) {
alt _j.find("install") {
some (json::string(g)) {
log #fmt["Resolved: %s -> %s", key, g];
cmd_install(c, ["cargo", "install", g]);
}
_ { fail #fmt["Bogus install: '%s'", p.out]; }
}
}
_ { fail #fmt["Bad json: '%s'", p.out]; }
}
}

fn install_uuid(c: cargo, wd: str, uuid: str) {
install_resolved(c, wd, "by-uuid/" + uuid);
}

fn install_named(c: cargo, wd: str, name: str) {
install_resolved(c, wd, "by-name/" + name);
}

fn cmd_install(c: cargo, argv: [str]) {
// cargo install <pkg>
if vec::len(argv) < 3u {
Expand All @@ -226,6 +257,11 @@ fn cmd_install(c: cargo, argv: [str]) {
} else if str::starts_with(argv[2], "file:") {
let path = rest(argv[2], 5u);
install_file(c, wd, path);
} else if str::starts_with(argv[2], "uuid:") {
let uuid = rest(argv[2], 5u);
install_uuid(c, wd, uuid);
} else {
install_named(c, wd, argv[2]);
}
}

Expand Down