Merge pull request #7 from loganintech/feature/6

Added support for setting remote after repo creation. Adds support for ssh formatting remotes.

Author: loganintech

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Changelog
 
-## [0.4.0] - 2019-05-07
+## [0.4.0] - 2019-05-11
+### Added
+* Added `--ssh_remote_format`, `--set_remote`, and `--remote_name` commands. These are global commands and must be used before the subcommand. Example: `gitpub --ssh_remote_format github -n "name"` Check README for more info.
+
 ### Changed
 
 * This version encompasses changes to the CLI interface. It was re-written from structopt to use a clap app.

README.md

@@ -12,21 +12,23 @@ Logan Saso <[email protected]>
 A small program to create remote git repositories from the command line.
 
 USAGE:
-    gitpub [OPTIONS] <SUBCOMMAND>
+    gitpub [FLAGS] [OPTIONS] <SUBCOMMAND>
 
 FLAGS:
-    -h, --help       Prints help information
-    -V, --version    Prints version information
+    -h, --help                 Prints help information
+        --set_remote           Sets the remote of the local dir after successful creation.
+        --ssh_remote_format    Attempts to convert the git remote url into ssh format. If it fails (the provider doesn't support ssh format), the remote isn't set.
+    -V, --version              Prints version information
 
 OPTIONS:
-        --endpoint <endpoint>
+        --endpoint <endpoint>          Sets a custom endpoint to POST to, useful if you want a private instance and know the api matches one gitpub supports.
+        --remote_name <remote_name>    Designates a custom name for setting remote. Defaults to origin.
 
 SUBCOMMANDS:
     bitbucket    Create a repo on bitbucket.
     github       Create a repo on github.
     gitlab       Create a repo on gitlab.
     help         Prints this message or the help of the given subcommand(s)
-
 ```
 
 ## Github Setup

src/cli.rs

@@ -45,12 +45,30 @@ pub fn get_app() -> App<'static, 'static> {
         .author("Logan Saso <[email protected]>")
         .about("A small program to create remote git repositories from the command line.")
         .version(env!("CARGO_PKG_VERSION"))
+        .subcommand(github::subcommand())
+        .subcommand(gitlab::subcommand())
+        .subcommand(bitbucket::subcommand())
         .arg(
             Arg::with_name("endpoint")
                 .long("endpoint")
-                .takes_value(true),
+                .takes_value(true)
+                .help("Sets a custom endpoint to POST to, useful if you want a private instance and know the api matches one gitpub supports.")
+                .conflicts_with("set_remote"),
+        )
+        .arg(
+            Arg::with_name("set_remote")
+                .long("set_remote")
+                .help("Sets the remote of the local dir after successful creation."),
+        ).arg(
+            Arg::with_name("remote_name")
+                .long("remote_name")
+                .help("Designates a custom name for setting remote. Defaults to origin.")
+                .default_value("origin")
+                .hide_default_value(true),
+        ).arg(
+            Arg::with_name("ssh_remote_format")
+                .long("ssh_remote_format")
+                .help("Attempts to convert the git remote url into ssh format. If it fails (the provider doesn't support ssh format), the remote isn't set.")
+                .conflicts_with("endpoint"),
         )
-        .subcommand(github::subcommand())
-        .subcommand(gitlab::subcommand())
-        .subcommand(bitbucket::subcommand())
 }

src/git.rs

@@ -0,0 +1,35 @@
+use std::env::current_dir;
+use std::process::Command;
+
+pub fn add_remote(name: &str, url: &str) -> bool {
+    if can_create_remote(name) {
+        if let Ok(dir) = current_dir() {
+            if dir.ancestors().any(|p| p.join(".git").exists()) {
+                return Command::new("git")
+                    .arg("remote")
+                    .arg("add")
+                    .arg(name)
+                    .arg(url)
+                    .output()
+                    .is_ok();
+            }
+        }
+    }
+
+    false
+}
+
+fn can_create_remote(name: &str) -> bool {
+    if let Ok(out) = Command::new("git")
+        .arg("remote")
+        .arg("get-url")
+        .arg(name)
+        .output()
+    {
+        if let Ok(err) = String::from_utf8(out.stderr) {
+            return err.starts_with("fatal"); //If it starts with fatal, that means the remote doesn't exist and we can create one
+        }
+    }
+
+    false
+}

src/main.rs

@@ -2,8 +2,11 @@ use cli::Gitpo;
 use reqwest::StatusCode;
 use std::process::exit;
 mod cli;
+mod git;
 mod provider;
 
+use git::add_remote;
+
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let matches = cli::get_app().get_matches();
     let config = Gitpo::from_matches(&matches);
@@ -26,7 +29,23 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     match status {
         StatusCode::OK | StatusCode::CREATED => {
             let apiloc = config.extract_url(&headers);
+            let (remote_url, can_use_ssh) = match (
+                config.ssh_url(&headers),
+                matches.is_present("ssh_remote_format"),
+            ) {
+                (Some(url), true) => (url, true),
+                _ => (config.extract_url(&headers), false),
+            };
             println!("Repo created: {}", apiloc);
+            let remote_name = matches
+                .value_of("remote_name")
+                .expect("This should default to origin, so something is wrong.");
+            if matches.is_present("set_remote")
+                && ((matches.is_present("ssh_remote_format") && can_use_ssh) || !can_use_ssh)
+                && !add_remote(remote_name, &remote_url)
+            {
+                eprintln!("Couldn't set remote.");
+            }
         }
         StatusCode::UNPROCESSABLE_ENTITY | StatusCode::BAD_REQUEST => {
             eprintln!("The provider had an issue processing this request. Perhaps the repository already exists, or you're using an unsupported option. e.g. Enabling projects on a repo in an org that has them disabled.");

src/provider/bitbucket.rs

@@ -49,6 +49,13 @@ impl<'a> Provider for BitbucketArgs<'a> {
     fn auth_header(&self) -> String {
         "Authorization".to_string()
     }
+
+    fn ssh_url(&self, _: &reqwest::header::HeaderMap) -> Option<String> {
+        Some(format!(
+            "[email protected]:{}/{}.git",
+            &self.username, &self.name
+        ))
+    }
 }
 
 pub fn subcommand() -> App<'static, 'static> {

src/provider/github.rs

@@ -60,6 +60,20 @@ impl<'a> Provider for GithubArgs<'a> {
     fn auth_header(&self) -> String {
         "Authorization".to_string()
     }
+
+    fn ssh_url(&self, headers: &reqwest::header::HeaderMap) -> Option<String> {
+        headers
+            .get("location")
+            .and_then(|x| x.to_str().ok())
+            .map(|src| {
+                Some({
+                    let mut res = src.replace("https://api.github.com/repos/", "[email protected]:");
+                    res.push_str(".git");
+                    res
+                })
+            })
+            .unwrap_or(None)
+    }
 }
 
 pub fn subcommand() -> App<'static, 'static> {

src/provider/gitlab.rs

@@ -87,6 +87,13 @@ impl<'a> Provider for GitlabArgs<'a> {
     fn auth_header(&self) -> String {
         "Private-Token".to_string()
     }
+
+    fn ssh_url(&self, _: &reqwest::header::HeaderMap) -> Option<String> {
+        match std::env::var("GITLAB_USERNAME") {
+            Ok(u) => Some(format!("[email protected]:{}/{}.git", u, self.project_name())),
+            _ => None,
+        }
+    }
 }
 
 pub fn subcommand() -> App<'static, 'static> {

src/provider/mod.rs

@@ -5,7 +5,8 @@ pub mod gitlab;
 pub trait Provider {
     fn payload(&self) -> String;
     fn endpoint(&self) -> String;
-    fn extract_url(&self, src: &reqwest::header::HeaderMap) -> String;
+    fn extract_url(&self, _: &reqwest::header::HeaderMap) -> String;
     fn token(&self) -> String;
     fn auth_header(&self) -> String;
+    fn ssh_url(&self, _: &reqwest::header::HeaderMap) -> Option<String> { None }
 }