admin/topgrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use structopt

Browse Source
This commit is contained in:
Roey Darwish Dror
2018-09-06 14:42:56 +03:00
parent 993dec166f
commit 682d4445b7
4 changed files with 87 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Cargo.lock generated
View File

@@ -245,6 +245,25 @@ name = "strsim"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "structopt"
version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
"structopt-derive 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "structopt-derive"
version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"proc-macro2 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)",
"syn 0.14.9 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "syn"
version = "0.14.9"
@@ -322,7 +341,6 @@ dependencies = [
name = "topgrade"
version = "0.15.0"
dependencies = [
"clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
"directories 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)",
"failure 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -331,6 +349,7 @@ dependencies = [
"serde 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)",
"shellexpand 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"structopt 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
"term_size 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"termcolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"toml 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -454,6 +473,8 @@ dependencies = [
"checksum serde_derive 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)" = "234fc8b737737b148ccd625175fc6390f5e4dacfdaa543cb93a3430d984a9119"
"checksum shellexpand 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de7a5b5a9142fd278a10e0209b021a1b85849352e6951f4f914735c976737564"
"checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550"
"checksum structopt 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d8e9ad6a11096cbecdcca0cc6aa403fdfdbaeda2fb3323a39c98e6a166a1e45a"
"checksum structopt-derive 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4cbce8ccdc62166bd594c14396a3242bf94c337a51dbfa9be1076dd74b3db2af"
"checksum syn 0.14.9 (registry+https://github.com/rust-lang/crates.io-index)" = "261ae9ecaa397c42b960649561949d69311f08eeaea86a65696e6e46517cf741"
"checksum synstructure 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "85bb9b7550d063ea184027c9b8c20ac167cd36d3e06b3a40bceb9d746dc1a7b7"
"checksum term_size 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9e5b9a66db815dcfd2da92db471106457082577c3c278d4138ab3e3b4e189327"

2
Cargo.toml
View File

@@ -16,7 +16,7 @@ serde_derive = "1.0.75"
toml = "0.4.6"
which = "2.0.0"
shellexpand = "1.0.0"
clap = "2.32.0"
structopt = "0.2"
log = "0.4.4"
env_logger = "0.5.13"
term_size = "0.3.1"

19
src/config.rs
View File

@@ -44,3 +44,22 @@ impl Config {
&self.git_repos
}
}
#[derive(StructOpt, Debug)]
#[structopt(name = "Topgrade")]
pub struct Opt {
#[structopt(short = "t", long = "tmux", help = "Run inside tmux")]
pub run_in_tmux: bool,
#[structopt(long = "no-system", help = "Don't perform system upgrade")]
pub no_system: bool,
#[structopt(long = "no-git-repos", help = "Don't perform updates on configured git repos")]
pub no_git_repos: bool,
#[structopt(long = "no-emacs", help = "Don't upgrade Emacs packages or configuration files")]
pub no_emacs: bool,
#[structopt(short = "n", long = "dry-run", help = "Print what would be done")]
pub dry_run: bool,
}

109
src/main.rs
View File

@@ -7,7 +7,7 @@ extern crate toml;
#[macro_use]
extern crate serde_derive;
#[macro_use]
extern crate clap;
extern crate structopt;
extern crate serde;
extern crate shellexpand;
#[macro_use]
@@ -41,11 +41,11 @@ use self::config::Config;
use self::git::{Git, Repositories};
use self::report::Report;
use self::terminal::Terminal;
use clap::{App, Arg};
use failure::Error;
use std::borrow::Cow;
use std::env;
use std::process::exit;
use structopt::StructOpt;
#[derive(Fail, Debug)]
#[fail(display = "A step failed")]
@@ -73,39 +73,9 @@ where
}
fn run() -> Result<(), Error> {
let matches = App::new("Topgrade")
.version(crate_version!())
.about("Upgrade all the things")
.arg(
Arg::with_name("tmux")
.help("Invoke inside tmux")
.short("t")
.long("tmux"),
)
.arg(
Arg::with_name("no_system")
.help("Don't perform system upgrade")
.long("no-system"),
)
.arg(
Arg::with_name("no_git_repos")
.help("Don't perform updates on configured git repos")
.long("no-git-repos"),
)
.arg(
Arg::with_name("no_emacs")
.help("Don't upgrade Emacs packages or configuration files")
.long("no-emacs"),
)
.arg(
Arg::with_name("dry_run")
.help("Print what would be done")
.short("n")
.long("dry-run"),
)
.get_matches();
let opt = config::Opt::from_args();
if matches.is_present("tmux") && env::var("TMUX").is_err() {
if opt.run_in_tmux && env::var("TMUX").is_err() {
#[cfg(unix)]
{
tmux::run_in_tmux();
@@ -119,14 +89,13 @@ fn run() -> Result<(), Error> {
let mut terminal = Terminal::new();
let config = Config::read(&base_dirs)?;
let mut report = Report::new();
let dry_run = matches.is_present("dry_run");
#[cfg(target_os = "linux")]
let sudo = utils::which("sudo");
if let Some(commands) = config.pre_commands() {
for (name, command) in commands {
generic::run_custom_command(&name, &command, &mut terminal, dry_run)?;
generic::run_custom_command(&name, &command, &mut terminal, opt.dry_run)?;
}
}
@@ -135,15 +104,15 @@ fn run() -> Result<(), Error> {
#[cfg(windows)]
report.push_result(execute(
|terminal| powershell.update_modules(terminal, dry_run),
|terminal| powershell.update_modules(terminal, opt.dry_run),
&mut terminal,
));
#[cfg(target_os = "linux")]
{
if !(matches.is_present("no_system")) {
if !(opt.no_system) {
report.push_result(execute(
|terminal| linux::upgrade(&sudo, terminal, dry_run),
|terminal| linux::upgrade(&sudo, terminal, opt.dry_run),
&mut terminal,
));
}
@@ -151,14 +120,17 @@ fn run() -> Result<(), Error> {
#[cfg(windows)]
report.push_result(execute(
|terminal| windows::run_chocolatey(terminal, dry_run),
|terminal| windows::run_chocolatey(terminal, opt.dry_run),
&mut terminal,
));
#[cfg(unix)]
report.push_result(execute(|terminal| unix::run_homebrew(terminal, dry_run), &mut terminal));
report.push_result(execute(
|terminal| unix::run_homebrew(terminal, opt.dry_run),
&mut terminal,
));
if !(matches.is_present("no_emacs")) {
if !(opt.no_emacs) {
git_repos.insert(base_dirs.home_dir().join(".emacs.d"));
}
@@ -181,7 +153,7 @@ fn run() -> Result<(), Error> {
}
}
if !(matches.is_present("no_git_repos")) {
if !(opt.no_git_repos) {
if let Some(custom_git_repos) = config.git_repos() {
for git_repo in custom_git_repos {
git_repos.insert(git_repo);
@@ -189,68 +161,77 @@ fn run() -> Result<(), Error> {
}
}
for repo in git_repos.repositories() {
report.push_result(execute(|terminal| git.pull(&repo, terminal, dry_run), &mut terminal));
report.push_result(execute(
|terminal| git.pull(&repo, terminal, opt.dry_run),
&mut terminal,
));
}
#[cfg(unix)]
{
report.push_result(execute(
|terminal| unix::run_zplug(&base_dirs, terminal, dry_run),
|terminal| unix::run_zplug(&base_dirs, terminal, opt.dry_run),
&mut terminal,
));
report.push_result(execute(
|terminal| unix::run_fisherman(&base_dirs, terminal, dry_run),
|terminal| unix::run_fisherman(&base_dirs, terminal, opt.dry_run),
&mut terminal,
));
report.push_result(execute(
|terminal| tmux::run_tpm(&base_dirs, terminal, dry_run),
|terminal| tmux::run_tpm(&base_dirs, terminal, opt.dry_run),
&mut terminal,
));
}
report.push_result(execute(
|terminal| generic::run_rustup(&base_dirs, terminal, dry_run),
|terminal| generic::run_rustup(&base_dirs, terminal, opt.dry_run),
&mut terminal,
));
report.push_result(execute(
|terminal| generic::run_cargo_update(&base_dirs, terminal, dry_run),
|terminal| generic::run_cargo_update(&base_dirs, terminal, opt.dry_run),
&mut terminal,
));
if !(matches.is_present("no_git_repos")) {
if !(opt.no_emacs) {
report.push_result(execute(
|terminal| generic::run_emacs(&base_dirs, terminal, dry_run),
|terminal| generic::run_emacs(&base_dirs, terminal, opt.dry_run),
&mut terminal,
));
}
report.push_result(execute(
|terminal| generic::run_opam_update(terminal, dry_run),
|terminal| generic::run_opam_update(terminal, opt.dry_run),
&mut terminal,
));
report.push_result(execute(
|terminal| vim::upgrade_vim(&base_dirs, terminal, dry_run),
|terminal| vim::upgrade_vim(&base_dirs, terminal, opt.dry_run),
&mut terminal,
));
report.push_result(execute(
|terminal| vim::upgrade_neovim(&base_dirs, terminal, dry_run),
|terminal| vim::upgrade_neovim(&base_dirs, terminal, opt.dry_run),
&mut terminal,
));
report.push_result(execute(
|terminal| node::run_npm_upgrade(&base_dirs, terminal, dry_run),
|terminal| node::run_npm_upgrade(&base_dirs, terminal, opt.dry_run),
&mut terminal,
));
report.push_result(execute(
|terminal| node::yarn_global_update(terminal, dry_run),
|terminal| node::yarn_global_update(terminal, opt.dry_run),
&mut terminal,
));
report.push_result(execute(
|terminal| generic::run_apm(terminal, opt.dry_run),
&mut terminal,
));
report.push_result(execute(|terminal| generic::run_apm(terminal, dry_run), &mut terminal));
#[cfg(target_os = "linux")]
{
report.push_result(execute(|terminal| linux::run_flatpak(terminal, dry_run), &mut terminal));
report.push_result(execute(
|terminal| linux::run_snap(&sudo, terminal, dry_run),
|terminal| linux::run_flatpak(terminal, opt.dry_run),
&mut terminal,
));
report.push_result(execute(
|terminal| linux::run_snap(&sudo, terminal, opt.dry_run),
&mut terminal,
));
}
@@ -261,7 +242,7 @@ fn run() -> Result<(), Error> {
|terminal| {
Some((
name,
generic::run_custom_command(&name, &command, terminal, dry_run).is_ok(),
generic::run_custom_command(&name, &command, terminal, opt.dry_run).is_ok(),
))
},
&mut terminal,
@@ -272,11 +253,11 @@ fn run() -> Result<(), Error> {
#[cfg(target_os = "linux")]
{
report.push_result(execute(
|terminal| linux::run_fwupdmgr(terminal, dry_run),
|terminal| linux::run_fwupdmgr(terminal, opt.dry_run),
&mut terminal,
));
report.push_result(execute(
|terminal| linux::run_needrestart(&sudo, terminal, dry_run),
|terminal| linux::run_needrestart(&sudo, terminal, opt.dry_run),
&mut terminal,
));
}
@@ -285,7 +266,7 @@ fn run() -> Result<(), Error> {
{
if !(matches.is_present("no_system")) {
report.push_result(execute(
|terminal| macos::upgrade_macos(terminal, dry_run),
|terminal| macos::upgrade_macos(terminal, opt.dry_run),
&mut terminal,
));
}
@@ -295,7 +276,7 @@ fn run() -> Result<(), Error> {
{
if !(matches.is_present("no_system")) {
report.push_result(execute(
|terminal| powershell.windows_update(terminal, dry_run),
|terminal| powershell.windows_update(terminal, opt.dry_run),
&mut terminal,
));
}