refactor out match since there is only one case

pull/1/head
Sebastian Geisler 7 years ago
parent de74ec56c4
commit 670b578371

@ -56,110 +56,106 @@ enum Opts {
fn main() {
simple_logger::init().unwrap();
let options = Opts::from_args();
match options {
Opts::Remote{command, remote, copy_back, manifest_path, hidden} => {
let manifest_path = manifest_path.as_ref().map(PathBuf::borrow);
let project_metadata = cargo_metadata::metadata(manifest_path)
.unwrap_or_else(|e| {
error!("Could not read cargo metadata: {}", e);
exit(-1);
});
// for now, assume that there is only one project and find it's root directory
let (project_dir, project_name) = project_metadata.packages.first().map_or_else(|| {
error!("No project found.");
exit(-2);
}, |project| {
(
Path::new(&project.manifest_path)
.parent()
.expect("Cargo.toml seems to have no parent directory?"),
&project.name
)
});
let Opts::Remote{command, remote, copy_back, manifest_path, hidden} = Opts::from_args();
let manifest_path = manifest_path.as_ref().map(PathBuf::borrow);
let project_metadata = cargo_metadata::metadata(manifest_path)
.unwrap_or_else(|e| {
error!("Could not read cargo metadata: {}", e);
exit(-1);
});
// for now, assume that there is only one project and find it's root directory
let (project_dir, project_name) = project_metadata.packages.first().map_or_else(|| {
error!("No project found.");
exit(-2);
}, |project| {
(
Path::new(&project.manifest_path)
.parent()
.expect("Cargo.toml seems to have no parent directory?"),
&project.name
)
});
// TODO: refactor argument and config parsing and merging (related: kbknapp/clap-rs#748)
let build_server = remote.unwrap_or_else(|| {
let config_path = project_dir.join(".cargo-remote.toml");
File::open(config_path).ok().and_then(|mut file| {
let mut config_file_string = "".to_owned();
// ignore the result for now, the whole config/argument parsing needs to
// be refactored
let _ = file.read_to_string(&mut config_file_string);
config_file_string.parse::<Value>().ok()
}).and_then(|value| {
value["remote"].as_str().map(str::to_owned)
}).unwrap_or_else(|| {
error!("No remote build server was defined (use config file or --remote flag)");
exit(-3);
})
});
info!("Transferring sources to build server.");
// transfer project to build server
let mut rsync_to = Command::new("rsync");
rsync_to.arg("-a".to_owned())
.arg("--delete")
.arg("--info=progress2")
.arg("--exclude")
.arg("target");
if !hidden {
rsync_to.arg("--exclude")
.arg(".*");
}
// TODO: refactor argument and config parsing and merging (related: kbknapp/clap-rs#748)
let build_server = remote.unwrap_or_else(|| {
let config_path = project_dir.join(".cargo-remote.toml");
File::open(config_path).ok().and_then(|mut file| {
let mut config_file_string = "".to_owned();
// ignore the result for now, the whole config/argument parsing needs to
// be refactored
let _ = file.read_to_string(&mut config_file_string);
config_file_string.parse::<Value>().ok()
}).and_then(|value| {
value["remote"].as_str().map(str::to_owned)
}).unwrap_or_else(|| {
error!("No remote build server was defined (use config file or --remote flag)");
exit(-3);
})
rsync_to.arg("--rsync-path")
.arg("mkdir -p remote-builds && rsync")
.arg(format!("{}/", project_dir.to_string_lossy()))
.arg(format!("{}:~/remote-builds/{}/", build_server, project_name))
.stdout(Stdio::inherit())
.stderr(Stdio::inherit())
.stdin(Stdio::inherit())
.output()
.unwrap_or_else(|e| {
error!("Failed to transfer project to build server (error: {})", e);
exit(-4);
});
let build_command = format!(
"cd ~/remote-builds/{}/; $HOME/.cargo/bin/cargo {}",
project_name,
command
);
info!("Starting build process.");
Command::new("ssh")
.arg(&build_server)
.arg(build_command)
.stdout(Stdio::inherit())
.stderr(Stdio::inherit())
.stdin(Stdio::inherit())
.output()
.unwrap_or_else(|e| {
error!("Failed to run cargo command remotely (error: {})", e);
exit(-5);
});
if copy_back {
info!("Transferring artifacts back to client.");
Command::new("rsync")
.arg("-a")
.arg("--delete")
.arg("--info=progress2")
.arg(format!("{}:~/remote-builds/{}/target/", build_server, project_name))
.arg(format!("{}/target/", project_dir.to_string_lossy()))
.stdout(Stdio::inherit())
.stderr(Stdio::inherit())
.stdin(Stdio::inherit())
.output()
.unwrap_or_else(|e| {
error!("Failed to transfer target back to local machine (error: {})", e);
exit(-6);
});
info!("Transferring sources to build server.");
// transfer project to build server
let mut rsync_to = Command::new("rsync");
rsync_to.arg("-a".to_owned())
.arg("--delete")
.arg("--info=progress2")
.arg("--exclude")
.arg("target");
if !hidden {
rsync_to.arg("--exclude")
.arg(".*");
}
rsync_to.arg("--rsync-path")
.arg("mkdir -p remote-builds && rsync")
.arg(format!("{}/", project_dir.to_string_lossy()))
.arg(format!("{}:~/remote-builds/{}/", build_server, project_name))
.stdout(Stdio::inherit())
.stderr(Stdio::inherit())
.stdin(Stdio::inherit())
.output()
.unwrap_or_else(|e| {
error!("Failed to transfer project to build server (error: {})", e);
exit(-4);
});
let build_command = format!(
"cd ~/remote-builds/{}/; $HOME/.cargo/bin/cargo {}",
project_name,
command
);
info!("Starting build process.");
Command::new("ssh")
.arg(&build_server)
.arg(build_command)
.stdout(Stdio::inherit())
.stderr(Stdio::inherit())
.stdin(Stdio::inherit())
.output()
.unwrap_or_else(|e| {
error!("Failed to run cargo command remotely (error: {})", e);
exit(-5);
});
if copy_back {
info!("Transferring artifacts back to client.");
Command::new("rsync")
.arg("-a")
.arg("--delete")
.arg("--info=progress2")
.arg(format!("{}:~/remote-builds/{}/target/", build_server, project_name))
.arg(format!("{}/target/", project_dir.to_string_lossy()))
.stdout(Stdio::inherit())
.stderr(Stdio::inherit())
.stdin(Stdio::inherit())
.output()
.unwrap_or_else(|e| {
error!("Failed to transfer target back to local machine (error: {})", e);
exit(-6);
});
}
}
}
}

Loading…
Cancel
Save