From 88abf799b0039256d392bed72e384a4f01842d73 Mon Sep 17 00:00:00 2001 From: Tom Forbes Date: Sat, 23 Nov 2019 21:38:02 +0000 Subject: [PATCH] Lowercase group names in github and gitlab providers --- src/providers/github.rs | 14 +++++++++++--- src/providers/gitlab.rs | 12 ++++++++++-- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/providers/github.rs b/src/providers/github.rs index d21f884..6e52e5a 100644 --- a/src/providers/github.rs +++ b/src/providers/github.rs @@ -34,8 +34,8 @@ impl fmt::Display for GithubProvider { write!( f, "Github user/org {} in directory {}", - style(&self.name).green(), - style(&self.path).green() + style(&self.name.to_lowercase()).green(), + style(&self.path.to_lowercase()).green() ) } } @@ -77,6 +77,14 @@ impl Provider for GithubProvider { println!("Set a GITHUB_TOKEN environment variable with the value"); return false; } + if self.name.ends_with('/') { + println!( + "{}", + style("Error: Ensure that names do not end in forward slashes").red() + ); + println!("You specified: {}", self.name); + return false; + } true } @@ -89,7 +97,7 @@ impl Provider for GithubProvider { loop { let q = Repositories::build_query(repositories::Variables { - login: self.name.clone(), + login: self.name.to_lowercase(), after, }); let res = ureq::post("https://api.github.com/graphql") diff --git a/src/providers/gitlab.rs b/src/providers/gitlab.rs index 47618eb..8ef8fec 100644 --- a/src/providers/gitlab.rs +++ b/src/providers/gitlab.rs @@ -75,7 +75,7 @@ impl fmt::Display for GitlabProvider { write!( f, "Gitlab user/group {} at {} in directory {}", - style(&self.name).green(), + style(&self.name.to_lowercase()).green(), style(&self.url).green(), style(&self.path).green() ) @@ -95,6 +95,14 @@ impl Provider for GitlabProvider { println!("Set a GITLAB_TOKEN environment variable with the value"); return false; } + if self.name.ends_with('/') { + println!( + "{}", + style("Error: Ensure that names do not end in forward slashes").red() + ); + println!("You specified: {}", self.name); + return false; + } true } fn fetch_repositories(&self) -> Result, Error> { @@ -104,7 +112,7 @@ impl Provider for GitlabProvider { let mut after = Some("".to_string()); loop { let q = Repositories::build_query(repositories::Variables { - name: self.name.to_string(), + name: self.name.to_string().to_lowercase(), after, }); let res = ureq::post(format!("{}/api/graphql", self.url).as_str())