Change ownerships to groups and some more (#24)

Author: allanger

README.md

@@ -37,7 +37,6 @@ It will create an empty config file
 
 4. Work with teams
 
-`teams` commands takes team names as arguments, so if you want to modify not default team pass an argumanet with a team name
 ```
 $ gum teams help
 $ gum teams add-project -u PROJECT_ID # will add a project to the default team

TODO.md

@@ -1,20 +1,7 @@
 # MVP
 What needs to be done before the tool can actually be used.
-- [X] Implement all required gitlab API
-  - APIs
-    - Add members
-    - Delete members
-    - Update members
-  - On adding handle error User Already Exists
-  - On removing handle error User Not Found 
-  - Add corresponding output to error handling (Already Added, Not Found)
-
-- [ ] Get rid of billions of loops and start using HashMaps
 - [ ] Add tests
-- [X] Create a Dockerfile and GitHub Actions for tests and releases
-- [ ] Refactor whole arguments module. Maybe rewrite it to methods or something
 - [ ] Refactor error handling
-- [ ] Write good documentation in README.md
 
 # Nice to have
 - [ ] Add a `describe` command foreach config entity 
@@ -32,8 +19,6 @@ What needs to be done before the tool can actually be used.
   ```
 
 - [ ] Async actions
-- [ ] Get rid of state file
-- [X] Use spinners for output
 - [ ] Add auto suggestions for every command
 - [ ] Start versioning the config file and add possibility to migrate from to a newer version. And add kinda annotation to let gum know it's a gum-config. Something like that
   ```
@@ -63,8 +48,8 @@ What needs to be done before the tool can actually be used.
   ```
 And remove each user, which is being updated anyhow, from groups provided via head_groups (remove from groups, sub groups and projects)
 
-- [ ] Remove extra fields from state. State should only contain IDs and access_level
-- [ ] Auto check for updates
+- [X] Remove extra fields from state. State should only contain IDs and access_level
+- [X] Auto check for updates
 - [ ] Add feature for inviting users, if it's possible. 
   When user is invited, he won't have an id until he confirms invitation. But after he confirms, he will be added to projects where he's been invited. So I think it should look like that:
   -  New object is added to config
@@ -75,7 +60,7 @@ And remove each user, which is being updated anyhow, from groups provided via he
    teams: []
    groups: []
   ```
-  - On each sync this invites should be checked for confirmation (if there so no such possibility, the whole invite ting seems impossible)
+  - On each sync this invites should be checked for confirmation (if there so no such possibility, the whole invite thing seems impossible)h
   - If it's confirmed, the user should be automatically added to users and to state
 - [ ] Add patterns for checking users emails and usernames
 # Maybe nice to have

example/gum-config-v1.yaml

@@ -0,0 +1,8 @@
+meta: 
+  version: v1
+config: 
+  teams: 
+    name: default
+    projects: [] 
+  users: []
+state: 

example/gum-config-v2.yaml

@@ -0,0 +1,51 @@
+# How I think config should look like
+meta:
+  version: v2
+  groups:
+    - id: group_id
+      name: group_name
+    - id: group_id
+      name: group_name
+  patterns:
+    users:
+      name: regexp
+      username: regexp
+      email: regexp
+    projects:
+      name: regexp
+config:
+  teams:
+    name: default
+    projects: []
+    groups: []
+  users:
+    - user:
+        id: user_id
+        name: name
+        username: username
+        email: email
+      projects:
+        - data:
+            id: user_id
+            name: project_name
+            url: project_url
+          access: Developer
+      groups:
+        - data:
+            id: user_id
+            name: group_name
+            url: group_url
+          access: Developer
+      teams:
+        - team_1
+        - team_2
+        - team_3
+state:
+  last_sync:
+    - user_info:
+        id: user_id
+        name: name
+        username: username
+        email: email
+    - date: DATE
+  data: ~

src/args.rs

@@ -4,6 +4,9 @@ pub(crate) mod file_name;
 pub(crate) mod gitlab_token;
 pub(crate) mod gitlab_url;
 pub(crate) mod group_id;
+pub(crate) mod group_list;
+pub(crate) mod large_out;
+pub(crate) mod no_confirm;
 pub(crate) mod project_id;
 pub(crate) mod state_destination;
 pub(crate) mod state_source;
@@ -14,43 +17,8 @@ pub(crate) mod write_state;
 use clap::{Arg, ArgMatches};
 use std::io::Result;
 
-pub(crate) trait Args<'a> {
+pub(crate) trait Args {
     type ArgType;
     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/access_level.rs

@@ -1,5 +1,5 @@
 use super::Args;
-use crate::{output::OutMessage, types::v1::access_level::AccessLevel};
+use crate::{output::out_message::OutMessage, types::v1::access_level::AccessLevel};
 use clap::{Arg, ArgMatches};
 use std::{
     io::{Error, Result},
@@ -18,7 +18,7 @@ impl ArgAccess {
     }
 }
 
-impl Args<'_> for ArgAccess {
+impl Args for ArgAccess {
     type ArgType = ArgAccess;
 
     fn add() -> Arg<'static> {
@@ -46,4 +46,4 @@ impl Args<'_> for ArgAccess {
                 };
             })
     }
-}
+}

src/args/dry_run.rs

@@ -2,7 +2,7 @@ use clap::{Arg, ArgMatches};
 
 use super::Args;
 
-static ARG_DRY_RUN: &str = "dry-run";
+static ARG: &str = "dry-run";
 pub(crate) struct ArgDryRun {
     value: bool,
 }
@@ -13,20 +13,20 @@ impl ArgDryRun {
     }
 }
 
-impl Args<'_> for ArgDryRun {
+impl Args for ArgDryRun {
     type ArgType = ArgDryRun;
 
     fn add() -> Arg<'static> {
-        Arg::new(ARG_DRY_RUN)
-            .long("dry-run")
+        Arg::new(ARG)
+            .long(ARG)
             .short('d')
             .takes_value(false)
             .help("Use if you wanna see what's gonna happen without actually applying a  new configuration")
     }
 
     fn parse<'b>(sub_matches: &'b ArgMatches) -> std::io::Result<Self::ArgType> {
         Ok(ArgDryRun {
-            value: sub_matches.is_present(ARG_DRY_RUN),
+            value: sub_matches.is_present(ARG),
         })
     }
 }

src/args/file_name.rs

@@ -1,5 +1,5 @@
 use super::Args;
-use crate::output::OutMessage;
+use crate::output::out_message::OutMessage;
 use clap::{Arg, ArgMatches};
 use std::io::{Error, Result};
 
@@ -15,7 +15,7 @@ impl ArgFileName {
     }
 }
 
-impl Args<'_> for ArgFileName {
+impl Args for ArgFileName {
     type ArgType = ArgFileName;
 
     fn add() -> Arg<'static> {

src/args/gitlab_token.rs

@@ -1,5 +1,5 @@
 use super::Args;
-use crate::output::OutMessage;
+use crate::output::out_message::OutMessage;
 use clap::{Arg, ArgMatches};
 use std::io::{Error, Result};
 
@@ -15,7 +15,7 @@ impl ArgGitlabToken {
     }
 }
 
-impl Args<'_> for ArgGitlabToken {
+impl Args for ArgGitlabToken {
     type ArgType = ArgGitlabToken;
 
     fn add() -> Arg<'static> {

src/args/gitlab_url.rs

@@ -1,5 +1,5 @@
 use super::Args;
-use crate::output::OutMessage;
+use crate::output::out_message::OutMessage;
 use clap::{Arg, ArgMatches};
 use std::io::{Error, Result};
 
@@ -15,7 +15,7 @@ impl ArgGitlabUrl {
     }
 }
 
-impl Args<'_> for ArgGitlabUrl {
+impl Args for ArgGitlabUrl {
     type ArgType = ArgGitlabUrl;
 
     fn add() -> Arg<'static> {

src/args/group_id.rs

@@ -14,7 +14,7 @@ impl ArgGroupId {
     }
 }
 
-impl Args<'_> for ArgGroupId {
+impl Args for ArgGroupId {
     type ArgType = ArgGroupId;
 
     fn add() -> Arg<'static> {

src/args/group_list.rs

@@ -0,0 +1,47 @@
+use super::Args;
+use clap::{Arg, ArgMatches};
+use std::io::{Error, ErrorKind, Result};
+
+static ARG: &str = "groups";
+
+pub(crate) struct ArgGroupList {
+    value: Vec<u64>,
+}
+
+impl ArgGroupList {
+    /// Get a reference to the arg group list's value.
+
+    /// Get a reference to the arg group list's value.
+    pub(crate) fn value(&self) -> &[u64] {
+        self.value.as_ref()
+    }
+}
+
+impl Args for ArgGroupList {
+    type ArgType = ArgGroupList;
+
+    fn add() -> Arg<'static> {
+        Arg::new(ARG)
+            .short('g')
+            .long(ARG)
+            .takes_value(true)
+            .value_name("GROUP_IDS")
+            .help("Provide a list of groups to create a snapshot on initializing")
+            .global(true)
+            .multiple_values(true)
+    }
+
+    fn parse<'a>(sub_matches: &'a ArgMatches) -> Result<Self> {
+        let value = match sub_matches.values_of(ARG) {
+            Some(v) => v.map(|f| f.parse::<u64>().unwrap()).collect(),
+            None => {
+                return Err(Error::new(
+                    ErrorKind::InvalidInput,
+                    "You have to provide values for using group-list args",
+                ))
+            }
+        };
+
+        Ok(ArgGroupList { value })
+    }
+}

src/args/large_out.rs

@@ -0,0 +1,32 @@
+use clap::{Arg, ArgMatches};
+
+use super::Args;
+
+static ARG: &str = "large";
+pub(crate) struct ArgLargeOut {
+    value: bool,
+}
+
+impl ArgLargeOut {
+    pub(crate) fn value(&self) -> bool {
+        self.value
+    }
+}
+
+impl Args for ArgLargeOut {
+    type ArgType = ArgLargeOut;
+
+    fn add() -> Arg<'static> {
+        Arg::new(ARG)
+            .long(ARG)
+            .short('l')
+            .takes_value(false)
+            .help("Display a lot of data")
+    }
+
+    fn parse<'b>(sub_matches: &'b ArgMatches) -> std::io::Result<Self::ArgType> {
+        Ok(ArgLargeOut {
+            value: sub_matches.is_present(ARG),
+        })
+    }
+}