chore(cli): Separate status message outputting from knowing about our…

… env

src/lib.rs

@@ -11,7 +11,7 @@ use git2::{Oid, Repository, Signature};
 use i18n::LocalText;
 use regex::Regex;
 use std::ffi::OsStr;
-use std::{error, fmt, path, result, str};
+use std::{env, error, fmt, path, result, str};
 
 pub mod cli;
 pub mod config;
@@ -74,6 +74,16 @@ pub fn get_repo() -> Result<Repository> {
     Ok(Repository::discover(path)?)
 }
 
+/// Check to see if we're running in GitHub Actions
+pub fn is_gha() -> bool {
+    env::var("GITHUB_ACTIONS").is_ok()
+}
+
+/// Check to see if we're running in GitLab CI
+pub fn is_glc() -> bool {
+    env::var("GITLAB_CI").is_ok()
+}
+
 pub fn commit(repo: Repository, oid: Oid, msg: &str) -> result::Result<Oid, git2::Error> {
     let prefix = "[casile]";
     let commiter = repo.signature()?;

src/make/mod.rs

@@ -37,8 +37,8 @@ pub fn run(target: Vec<String>) -> Result<()> {
     if targets.is_empty() {
         targets.push(String::from("default"));
     }
-    let is_gha = status::is_gha()?;
-    let is_glc = status::is_glc()?;
+    let is_gha = status::status_is_gha()?;
+    let is_glc = status::status_is_glc()?;
     if is_gha {
         targets.push(String::from("_gha"));
     }

src/status/mod.rs

@@ -3,7 +3,7 @@ use crate::*;
 
 use git2::{DescribeFormatOptions, DescribeOptions};
 use regex::Regex;
-use std::{env, path};
+use std::path;
 
 // FTL: help-subcommand-status
 /// Dump what we know about the repo
@@ -31,16 +31,16 @@ fn run_as() -> RunAsMode {
 }
 
 /// Check to see if we're running in GitHub Actions
-pub fn is_gha() -> Result<bool> {
-    let ret = env::var("GITHUB_ACTIONS").is_ok();
+pub fn status_is_gha() -> Result<bool> {
+    let ret = is_gha();
     let status = CASILEUI.new_check("status-is-gha");
     status.end(ret);
     Ok(ret)
 }
 
 /// Check to see if we're running in GitLab CI
-pub fn is_glc() -> Result<bool> {
-    let ret = env::var("GITLAB_CI").is_ok();
+pub fn status_is_glc() -> Result<bool> {
+    let ret = is_glc();
     let status = CASILEUI.new_check("status-is-glc");
     status.end(ret);
     Ok(ret)