Merge pull request #5 from loganintech/provider/bitbucket

Added bitbucket support

Author: loganintech

CHANGELOG.md

@@ -1,12 +1,23 @@
 # Changelog
 
+## [0.3.0] - 2019-04-XX
+### Added
+
+* Initial bitbucket support using app base64-encoded username:apppasword flow. [Read more about app passwords](https://confluence.atlassian.com/bitbucket/app-passwords-828781300.html)
+
+### Changed
+
+* Slightly changed helptext for github privacy flag.
+* Github parameters are no longer serialized if they're `None`.
+
 ## [0.2.2] - 2019-04-14
 ### Added
 
 * Custom --endpoint (-e) param allowing request redirection to enterprise providers
 
 ## [0.2.1] - 2019-04-14
 ### Changed
+
 * Modified Cargo manifest entry for the license
 
 ## [0.2.0] - 2019-04-14

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "gitpub"
-version = "0.2.2"
+version = "0.3.0"
 authors = ["Logan Saso <[email protected]>"]
 description = "A CLI app to create remote git repositories."
 repository = "https://github.com/loganintech/gitpub"
@@ -13,8 +13,9 @@ license = "GPL-3.0"
 edition = "2018"
 
 [dependencies]
-reqwest = "0.9.14"
+reqwest = "0.9.15"
 serde = { version = "1.0.90", features = [ "derive" ] }
 serde_json = "1.0.39"
 structopt = "0.2.15"
 clap = "2.33.0"
+base64 = "0.10.1"

Cargo.toml

@@ -2,10 +2,12 @@
 
 A small program to create remote git repositories from the command line.
 
+_Note:_ Environment variables can also be passed directly via CLI parameters, therefore setting said variables are always optional.
+
 Usage:
 
 ```
-Git Publish 0.2.2
+Git Publish 0.3.0
 Logan Saso <[email protected]>
 A small program to create remote git repositories from the command line.
 
@@ -17,9 +19,10 @@ FLAGS:
     -V, --version    Prints version information
 
 SUBCOMMANDS:
-    github    Create a repo on github.
-    gitlab    Create a repo on gitlab.
-    help      Prints this message or the help of the given subcommand(s)
+    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
@@ -31,7 +34,7 @@ _Note:_ If you want to create org repositories the token also requires `org` sco
 
 ### Github
 ```
-gitpub-github 0.2.2
+gitpub-github 0.3.0
 Logan Saso <[email protected]>
 Create a repo on github.
 
@@ -61,10 +64,8 @@ OPTIONS:
         --org <org>                             Creates the repo under an organization. Requires you have CREATE REPO
                                                 permissions in that org.
     -p, --private <private>                     Requires 'repo' scope on your personal access token
-        --team <team_id>                        Id of the team that has access to this repo. Only valid when using
-                                                --org.
-    -t, --token <token>                         A personal access token. Alternatively read from GITHUB_REPO_TOKEN env
-                                                variable [env: GITHUB_REPO_TOKEN=<YOUR_TOKEN>]
+        --team <team_id>                        Id of the team that has access to this repo. Only valid when using --org.
+    -t, --token <token>                         A personal access token. Alternatively read from GITHUB_REPO_TOKEN env variable [env: GITHUB_REPO_TOKEN=<YOUR_TOKEN>]
 ```
 
 ## Gitlab Setup
@@ -77,7 +78,7 @@ _Note_: Optionally set the `GITLAB_USERNAME` environment variable to enable prin
 
 ### Gitlab
 ```
-gitpub-gitlab 0.2.2
+gitpub-gitlab 0.3.0
 Logan Saso <[email protected]>
 Create a repo on gitlab.
 
@@ -184,3 +185,37 @@ OPTIONS:
             Enables or disables wikis for this repo. Defaults to true.
 ```
 
+## BitBucket Setup
+
+1. Create an app password with repo scope from https://bitbucket.org/account/user/<YOUR_USERNAME>/app-passwords
+2. Set the environment variable `BITBUCKET_REPO_TOKEN` to the generated personal access token.
+3. Set the environment variable `BITBUCKET_USERNAME` to your bitbucket username.
+
+### Bitbucket
+
+```
+gitpub-bitbucket 0.3.0
+Logan Saso <[email protected]>
+Create a repo on bitbucket.
+
+USAGE:
+    gitpub bitbucket [OPTIONS] --name <name> --token <token> --username <username>
+
+FLAGS:
+    -h, --help       Prints help information
+    -V, --version    Prints version information
+
+OPTIONS:
+    -e, --endpoint <custom_endpoint>    Allows redirection of requests to enterprise providers.
+    -d, --description <description>     A short description of the repository.
+        --fork_policy <fork_policy>     Allow public forking of this repo. [possible values: allow_forks, no_public_forks, no_forks]
+    -i, --issues <has_issues>           Enable or disable issues for this repo. Defaults to true.
+    -w, --wiki <has_wiki>               Enables or disables wikis for this repo. Defaults to true.
+    -p, --private <is_private>          Sets whether or not the repository is private.
+        --language <language>           Give bitbucket a hint about the programming language.
+    -n, --name <name>                   The name of the new repository.
+        --scm <scm>                     Control the underlying source control method. [possible values: hg, git]
+    -t, --token <token>                 A personal access token. Alternatively read from BITBUCKET_REPO_TOKEN env variable [env: BITBUCKET_REPO_TOKEN=<YOUR_APP_PASSWORD>]
+        --username <username>           Your bitbucket username. Alternatively read from BITBUCKET_USERNAME env variable [env: BITBUCKET_USERNAME=<YOUR_USERNAME>]
+        --homepage <website>            A URL with more information about the repository.
+```

README.md

@@ -1,4 +1,4 @@
-use crate::provider::{github::GithubArgs, gitlab::GitlabArgs, Provider};
+use crate::provider::{bitbucket::BitbucketArgs, github::GithubArgs, gitlab::GitlabArgs, Provider};
 use structopt::StructOpt;
 
 #[derive(StructOpt)]
@@ -20,30 +20,38 @@ pub enum Gitpo {
         raw(setting = "structopt::clap::AppSettings::ColoredHelp")
     )]
     Gitlab(GitlabArgs),
+    #[structopt(
+        name = "bitbucket",
+        about = "Create a repo on bitbucket.",
+        raw(setting = "structopt::clap::AppSettings::ColoredHelp")
+    )]
+    BitBucket(BitbucketArgs),
 }
 
 // You're probably looking at this and thinking, logan, what are you doing.
 // Well, the idea here is to allow the possibility for more complicated provider options in the future.
 // We may not want every subcommand to be a provider
 impl Provider for Gitpo {
-
     fn payload(&self) -> String {
         match self {
             Gitpo::Github(config) => config.payload(),
             Gitpo::Gitlab(config) => config.payload(),
+            Gitpo::BitBucket(config) => config.payload(),
         }
     }
 
     fn endpoint(&self) -> String {
         match self {
             Gitpo::Github(config) => config.endpoint(),
             Gitpo::Gitlab(config) => config.endpoint(),
+            Gitpo::BitBucket(config) => config.endpoint(),
         }
     }
     fn extract_url(&self, src: &reqwest::header::HeaderMap) -> String {
         match self {
             Gitpo::Github(config) => config.extract_url(src),
             Gitpo::Gitlab(config) => config.extract_url(src),
+            Gitpo::BitBucket(config) => config.extract_url(src),
         }
     }
 }

src/cli.rs

@@ -22,13 +22,20 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let request = match &config {
         Gitpo::Github(config) => request.header("Authorization", format!("token {}", config.token)),
         Gitpo::Gitlab(config) => request.header("Private-Token", config.token.to_string()),
+        Gitpo::BitBucket(config) => request.header(
+            "Authorization",
+            format!(
+                "Basic {}",
+                base64::encode(&format!("{}:{}", &config.username, &config.token))
+            ),
+        ),
     };
 
     let result = request.send()?;
     let status = result.status();
     let headers = result.headers();
     match status {
-        StatusCode::CREATED => {
+        StatusCode::OK | StatusCode::CREATED => {
             let apiloc = config.extract_url(&headers);
             println!("Repo created: {}", apiloc);
         }

src/main.rs

@@ -0,0 +1,104 @@
+use super::Provider;
+use serde::Serialize;
+use serde_json::to_string;
+use structopt::StructOpt;
+
+#[derive(Serialize, StructOpt)]
+pub struct BitbucketArgs {
+    #[structopt(short = "n", long = "name", help = "The name of the new repository.")]
+    name: String,
+    #[structopt(
+        short = "t",
+        long = "token",
+        help = "A personal access token. Alternatively read from BITBUCKET_REPO_TOKEN env variable",
+        env = "BITBUCKET_REPO_TOKEN"
+    )]
+    #[serde(skip_serializing)]
+    pub token: String,
+    #[structopt(
+        long = "username",
+        help = "Your bitbucket username. Alternatively read from BITBUCKET_USERNAME env variable",
+        env = "BITBUCKET_USERNAME"
+    )]
+    #[serde(skip_serializing)]
+    pub username: String,
+    #[structopt(
+        short = "d",
+        long = "description",
+        help = "A short description of the repository."
+    )]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    description: Option<String>,
+    #[structopt(
+        short = "p",
+        long = "private",
+        help = "Sets whether or not the repository is private."
+    )]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    is_private: Option<bool>,
+    #[structopt(
+        short = "w",
+        long = "wiki",
+        help = "Enables or disables wikis for this repo. Defaults to true."
+    )]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    has_wiki: Option<bool>,
+    #[structopt(
+        short = "i",
+        long = "issues",
+        help = "Enable or disable issues for this repo. Defaults to true."
+    )]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    has_issues: Option<bool>,
+    #[structopt(
+        long = "fork_policy",
+        help = "Allow public forking of this repo.",
+        possible_value = "allow_forks",
+        possible_value = "no_public_forks",
+        possible_value = "no_forks"
+    )]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    fork_policy: Option<String>,
+    #[structopt(
+        long = "scm",
+        help = "Control the underlying source control method.",
+        possible_value = "hg",
+        possible_value = "git"
+    )]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    scm: Option<String>,
+    #[structopt(
+        long = "language",
+        help = "Give bitbucket a hint about the programming language."
+    )]
+    language: Option<String>,
+    #[serde(skip_serializing)]
+    #[structopt(
+        short = "e",
+        long = "endpoint",
+        help = "Allows redirection of requests to enterprise providers."
+    )]
+    custom_endpoint: Option<String>,
+}
+
+const ENDPOINT: &str = "https://api.bitbucket.org/2.0/repositories/{username}/{slug}";
+
+impl Provider for BitbucketArgs {
+    fn payload(&self) -> String {
+        to_string(&self).unwrap()
+    }
+
+    fn endpoint(&self) -> String {
+        if let Some(custom_endpoint) = &self.custom_endpoint {
+            custom_endpoint.to_string()
+        } else {
+            ENDPOINT
+                .replace("{username}", &self.username)
+                .replace("{slug}", &self.name)
+        }
+    }
+
+    fn extract_url(&self, _: &reqwest::header::HeaderMap) -> String {
+        format!("https://bitbucket.org/{}/{}", &self.username, &self.name)
+    }
+}