Self update and script for installing (#23)

Author: allanger

Cargo.lock

@@ -18,3 +18,4 @@ termion = "1.5.6"
 rand = "0.8.5"
 tabled = "0.5.0"
 serde_json = "1.0.79"
+self_update = "0.28.0"

Cargo.toml

@@ -8,7 +8,7 @@
 
 Prebuilt binaries exist for **Linux x86_64** and **MacOS arm64** and **x86_64**
 ```
-$ export VERSION=v0.0.2 && curl -LJO  https://github.com/allanger/gitlab-user-manager/releases/download/$VERSION/gum-$VERSION-$(arch)-$(uname) && mv gum-$VERSION-$(arch)-$(uname) gum && chmod +x gum
+$ curl https://raw.githubusercontent.com/allanger/gitlab-user-manager/main/scripts/download_gum.sh | bash
 $ gum -h
 ```
 ### Docker
@@ -72,7 +72,7 @@ $ gum users add-team USER_ID team-1 team-2
 9. Apply config
 ```
 ## to see what's gonna happen
-$ gum sync --dry-run true 
+$ gum sync --dry-run
 ## to apply 
 $ gum sync 
 ```

README.md

@@ -0,0 +1 @@
+v0.0.6

index.html

@@ -0,0 +1,49 @@
+#!/bin/bash
+case "$(uname)" in
+
+"Darwin")
+  SYSTEM="apple-darwin"
+  case $(uname -m) in
+  "arm64")
+    TARGET="aarch64-$SYSTEM"
+    ;;
+  "x68_64")
+    TARGET="x86_64-$SYSTEM"
+    ;;
+  *)
+    echo "Unsuported target"
+    exit 1
+    ;;
+  esac
+  ;;
+"Linux")
+  SYSTEM="unknown-linux-gnu"
+  case $(uname -m) in
+  "x68_64")
+    TARGET="x86_64-$SYSTEM"
+    ;;
+  *)
+    echo "Unsuported target"
+    exit 1
+    ;;
+  esac
+  ;;
+*)
+  echo "Signal number $1 is not processed"
+  exit 1
+  ;;
+esac
+LATEST_VERSION=$(curl https://allanger.github.io/gitlab-user-manager/)
+echo "Downloading"
+RELEASE_NAME=gum-$LATEST_VERSION-$TARGET
+RELEASE_URL="https://github.com/allanger/gitlab-user-manager/releases/download/$LATEST_VERSION/$RELEASE_NAME"
+echo $RELEASE_URL
+curl -LJO $RELEASE_URL
+
+mv $RELEASE_NAME gum
+chmod +x gum
+
+echo "Make sure that gum is in your $PATH"
+echo 'Try: '
+echo ' $ export PATH=$PATH:$PWD'
+echo ' $ gum -h'

scripts/download_gum.sh

@@ -19,3 +19,38 @@ pub(crate) trait Args<'a> {
     fn add() -> Arg<'static>;
     fn parse<'b>(sub_matches: &'b ArgMatches) -> Result<Self::ArgType>;
 }
+
+pub(crate) mod no_confirm {
+    use clap::{Arg, ArgMatches};
+
+    use super::Args;
+
+    static ARG: &str = "no-confirm";
+    pub(crate) struct ArgNoConfirm {
+        value: bool,
+    }
+
+    impl ArgNoConfirm {
+        pub(crate) fn value(&self) -> bool {
+            self.value
+        }
+    }
+
+    impl Args<'_> for ArgNoConfirm {
+        type ArgType = ArgNoConfirm;
+
+        fn add() -> Arg<'static> {
+            Arg::new(ARG)
+                .long(ARG)
+                .short('y')
+                .takes_value(false)
+                .help("Use if the user shouldn't be prompted to confirm an update")
+        }
+
+        fn parse<'b>(sub_matches: &'b ArgMatches) -> std::io::Result<Self::ArgType> {
+            Ok(ArgNoConfirm {
+                value: sub_matches.is_present(ARG),
+            })
+        }
+    }
+}

src/args.rs

@@ -1,5 +1,6 @@
 pub(crate) mod init;
 pub(crate) mod search;
+pub(crate) mod upgrade;
 pub(crate) mod sync;
 pub(crate) mod teams;
 pub(crate) mod users;

src/cmd.rs

@@ -0,0 +1,47 @@
+use std::io::{Error, ErrorKind};
+
+use clap::{ArgMatches, Command};
+use self_update::{backends::github::Update, cargo_crate_version};
+
+use crate::{
+    args::{no_confirm::ArgNoConfirm, Args},
+    cmd::Cmd,
+    output::OutMessage,
+};
+
+/// init cmd should be used to generate an empty gum-config
+pub(crate) fn add_upgrade_cmd() -> Command<'static> {
+    return Command::new("upgrade")
+        .about("Update current gum with a newer version")
+        .arg(ArgNoConfirm::add());
+}
+
+pub(crate) struct UpgradeCmd {
+    no_confirm: bool,
+}
+
+pub(crate) fn prepare<'a>(sub_matches: &'a ArgMatches) -> Result<impl Cmd<'a>, Error> {
+    let no_confirm: bool = ArgNoConfirm::parse(sub_matches).unwrap().value();
+    Ok(UpgradeCmd { no_confirm })
+}
+
+impl<'a> Cmd<'a> for UpgradeCmd {
+    fn exec(&self) -> Result<(), Error> {
+        let status = match Update::configure()
+            .repo_owner("allanger")
+            .repo_name("gitlab-user-manager")
+            .bin_name("gum")
+            .show_download_progress(true)
+            .current_version(cargo_crate_version!())
+            .no_confirm(self.no_confirm)
+            .build()
+            .unwrap()
+            .update()
+        {
+            Ok(s) => s,
+            Err(err) => return Err(Error::new(ErrorKind::Other, err.to_string())),
+        };
+        OutMessage::message_empty(format!("Update status: `{}`!", status.version()).as_str());
+        Ok(())
+    }
+}

src/cmd/upgrade.rs

@@ -10,6 +10,7 @@ use cmd::{
     search::{self, add_search_cmd},
     sync::{self, add_sync_cmd},
     teams::{self, add_teams_cmd},
+    upgrade::{self, add_upgrade_cmd},
     users::{self, add_users_cmd},
     Cmd,
 };
@@ -29,6 +30,7 @@ fn main() {
         .subcommand(add_teams_cmd())
         .subcommand(add_search_cmd())
         .subcommand(add_sync_cmd())
+        .subcommand(add_upgrade_cmd())
         .get_matches();
 
     let result: Result<(), Error>;
@@ -64,8 +66,16 @@ fn main() {
                 Err(err) => Err(err),
             };
         }
+        Some(("upgrade", sub_matches)) => {
+            result = match upgrade::prepare(sub_matches) {
+                Ok(cmd) => cmd.exec(),
+                Err(err) => Err(err),
+            };
+        }
+
         _ => result = Err(Error::new(ErrorKind::InvalidInput, "No command provided")),
     }
+
     match result {
         Err(err) => {
             OutSum::sum_failure(&err.to_string());