Merge pull request databricks#196 from nicklan/migrate-to-crossterm-colors-and-abstract

Author: nicklan

Cargo.lock

@@ -18,13 +18,13 @@ travis-ci = { repository = "databricks/click" }
 argorollouts = [] # enable the `rollouts` command to view argo rollouts
 
 [dependencies]
-ansi_term = "^0.12"
 atomicwrites = "^0.3"
 base64 = "^0.13"
 bytes = "1.0.1"
 chrono = { version = "^0.4", features = ["serde"] }
 clap = { version = "^3.1", features = ["cargo", "color"] }
 comfy-table = "^5.0"
+crossterm = "^0.23"
 ctrlc = "^3.1"
 dirs = "^4.0"
 duct = "^0.13"
@@ -50,3 +50,4 @@ tempdir = "^0.3"
 tokio = { version = "1", features = ["full"] }
 url = "^2.2"
 yasna = "^0.5"
+derivative = "2.2.0"

Cargo.toml

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use ansi_term::Colour::Yellow;
 use clap::{Arg, Command as ClapCommand};
 use rustyline::completion::Pair as RustlinePair;
 

src/command/alias.rs

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use ansi_term::Colour::Yellow;
 use chrono::offset::Utc;
 use clap::{Arg, Command as ClapCommand};
 use comfy_table::Table;
@@ -57,14 +56,14 @@ fn print_contexts(env: &Env, writer: &mut ClickWriter) {
             };
             row.push(CellSpec::with_colors(
                 (*context).clone().into(),
-                Some(comfy_table::Color::Red),
+                Some(env.styles.context_table_color().into()),
                 None,
             ));
             row.push(cluster.into());
             row
         })
         .collect();
-    crate::table::print_table(vec!["Context", "Api Server Address"], ctxs, writer);
+    crate::table::print_table(vec!["Context", "Api Server Address"], ctxs, env, writer);
 }
 
 command!(

src/command/click.rs

@@ -219,9 +219,10 @@ macro_rules! command {
 
         impl $cmd_name {
             pub fn new() -> $cmd_name {
+                use crossterm::style::Stylize;
                 lazy_static! {
                     static ref ALIASES_STR: String =
-                        format!("{}:\n    {:?}", Yellow.paint("ALIASES"), $aliases);
+                        format!("{}:\n    {:?}", "ALIASES".yellow(), $aliases);
                 }
                 let clap = start_clap($name, $about, &ALIASES_STR, $trailing_var_arg);
                 let extra = $extra_args(clap);

src/command/command_def.rs

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use ansi_term::Colour::Yellow;
 use clap::{Arg, Command as ClapCommand};
 use k8s_openapi::api::core::v1 as api;
 

src/command/configmaps.rs

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use ansi_term::Colour::Yellow;
 use clap::{Arg, Command as ClapCommand};
 use rustyline::completion::Pair as RustlinePair;
 

src/command/copy.rs

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use ansi_term::Colour::Yellow;
 use clap::{Arg, Command as ClapCommand};
 
 use rustyline::completion::Pair as RustlinePair;
@@ -106,6 +105,7 @@ command!(
                 match env.run_on_context::<_, GetTableResponse>(|c| c.read(request))? {
                     GetTableResponse::Ok(resp) => {
                         let kobjs = resp.print_to(
+                            env,
                             env.namespace.is_none(),
                             &desc.name,
                             &desc.group_version,

src/command/crds.rs

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use ansi_term::Colour::Yellow;
 use clap::{Arg, Command as ClapCommand};
 use k8s_openapi::api::apps::v1 as apps_api;
 

src/command/daemonsets.rs

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use ansi_term::Colour::Yellow;
 use clap::{Arg, Command as ClapCommand};
 use k8s_openapi::{
     api::apps::v1 as api_apps, api::batch::v1 as api_batch, api::core::v1 as api,