Some comments, updated master

Author: loganintech

CHANGELOG.md

@@ -1,6 +1,14 @@
 # Changelog
 
-## [0.4.0] - 2019-05-07
+## [0.4.1] - 2019-05-11
+### Removed
+
+* Removed `--endpoint` from bitbucket subcommand. It is taken care of via a global param now.
+
+## [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.

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "gitpub"
-version = "0.4.0"
+version = "0.4.1"
 authors = ["Logan Saso <[email protected]>"]
 description = "A CLI app to create remote git repositories."
 repository = "https://github.com/loganintech/gitpub"

Cargo.toml

@@ -7,26 +7,28 @@ _Note:_ Environment variables can also be passed directly via CLI parameters, th
 Usage:
 
 ```
-Git Publish 0.4.0
+Git Publish 0.4.1
 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
@@ -38,7 +40,7 @@ _Note:_ If you want to create org repositories the token also requires `org` sco
 
 ### Github
 ```
-gitpub-github 0.4.0
+gitpub-github 0.4.1
 Create a repo on github.
 
 USAGE:
@@ -78,7 +80,7 @@ _Note_: Optionally set the `GITLAB_USERNAME` environment variable to enable prin
 
 ### Gitlab
 ```
-gitpub-gitlab 0.4.0
+gitpub-gitlab 0.4.1
 Create a repo on gitlab.
 
 USAGE:
@@ -129,7 +131,7 @@ OPTIONS:
 ### Bitbucket
 
 ```
-gitpub-bitbucket 0.4.0
+gitpub-bitbucket 0.4.1
 Create a repo on bitbucket.
 
 USAGE:
@@ -145,7 +147,6 @@ FLAGS:
 
 OPTIONS:
     -d, --description <description>    A short description of the repository.
-    -e, --endpoint <endpoint>          Allows redirection of requests to enterprise providers.
         --fork_policy <fork_policy>    Changes the allowed forking method for this repo. [possible values: allow_forks, no_public_forks, no_forks]
     -n, --name <name>                  The name of the new repository.
         --scm <scm>                    Control underlying source control method. [possible values: git, hg]

README.md

@@ -51,12 +51,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/cli.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/git.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/main.rs

@@ -49,11 +49,18 @@ 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> {
     SubCommand::with_name("bitbucket")
-        .version("0.4.0")
+        .version(env!("CARGO_PKG_VERSION"))
         .about("Create a repo on bitbucket.")
         .arg(
             Arg::with_name("name")
@@ -116,12 +123,6 @@ pub fn subcommand() -> App<'static, 'static> {
             Arg::with_name("language")
                 .long("language")
                 .help("Give bitbucket a hint about the programming language.")
-        ).arg(
-            Arg::with_name("endpoint")
-                .short("e")
-                .long("endpoint")
-                .help("Allows redirection of requests to enterprise providers.")
-                .takes_value(true)
         )
 }
 

src/provider/bitbucket.rs

@@ -60,11 +60,25 @@ 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> {
     SubCommand::with_name("github")
-        .version("0.4.0")
+        .version(env!("CARGO_PKG_VERSION"))
         .about("Create a repo on github.")
         .arg(
             Arg::with_name("name")

src/provider/github.rs

@@ -87,11 +87,18 @@ 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> {
     SubCommand::with_name("gitlab")
-        .version("0.4.0")
+        .version(env!("CARGO_PKG_VERSION"))
         .about("Create a repo on gitlab.")
         .arg(
             Arg::with_name("name")