uffizzi-cli 2.4.4 → 2.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0dca2ba03ac849c8e1ca71bac3c495b698fda210f888320b06bbac114eb2168
-  data.tar.gz: 1441cff7ebd668159423966a6b5a9604e8e377a45f8d027802c381814e297d1d
+  metadata.gz: 1ef83eb18cf4f320ac6b596cc3b2d9ba72b6ed5a60e90e7dc54f61fa1e042630
+  data.tar.gz: 0a93840aa290162c4dc58a8ff3614fac4d58d988bd5296da5614db69524d0b43
 SHA512:
-  metadata.gz: 310e1accb7217654da0e8d4f84364c2db240495d5c5d4df602f63a8ad87b72c798b8151817a44a95224599dfd312bd83875fd7a36e4430bb1aefdcbd5425a9f0
-  data.tar.gz: 262191965e225983bf075b45a878c49953f4f3955da4628ff64a39b5bc1641182e954a2c6d8bbc4a2808e3f4ba1382edc9b8cacfa36ac0d7de8db3bdf610c41a
+  metadata.gz: 215e24c7486176be02a14265492195334b096c20458f3ab926cb4bc76a82955f3f05f5ead2f9d812ca622a07e28d8747b580e47a8ac7f50c7a017c4674addb21
+  data.tar.gz: ad0e2178d3ad1d440d8b29cc2e1abc031b2ee5bdb5a6ac7119db36d287d69c7b8ae648ea817013c7fc1ad1d96dcd575ed0df956b6ed24f9da993acc41ccae577

data/lib/uffizzi/cli/install.rb

@@ -11,7 +11,7 @@ module Uffizzi
 
     default_task :controller
 
-    desc 'controller [HOSTNMAE]', 'Install uffizzi controller to cluster'
+    desc 'controller [HOSTNAME]', 'Install uffizzi controller to cluster'
     method_option :namespace, type: :string
     method_option :email, type: :string, required: true
     method_option :context, type: :string
@@ -20,14 +20,14 @@ module Uffizzi
     def controller(hostname)
       Uffizzi::AuthHelper.check_login
 
-      InstallService.kubectl_exists?
-      InstallService.helm_exists?
+      # InstallService.kubectl_exists?
+      # InstallService.helm_exists?
 
       if options[:context].present? && options[:context] != InstallService.kubeconfig_current_context
         InstallService.set_current_context(options[:context])
       end
 
-      ask_confirmation
+      ask_confirmation(options[:namespace])
 
       uri = parse_hostname(hostname)
       installation_options = build_installation_options(uri)
@@ -159,16 +159,8 @@ module Uffizzi
       update_controller_settings(existing_controller_setting[:id], controller_setting_params)
     end
 
-    def ask_confirmation
-      msg = "\r\n"\
-            'This command will install Uffizzi into the default namespace of'\
-            " the '#{InstallService.kubeconfig_current_context}' context."\
-            "\r\n"\
-            "To install in a different place, use options '--namespace' and/or '--context'."\
-            "\r\n\r\n"\
-            "After installation, new environments created for account '#{account_name}' will be deployed to this host cluster."\
-            "\r\n\r\n"
-
+    def ask_confirmation(namespace)
+      msg = namespace.present? ? custom_namespace_installation_message(namespace) : default_installation_message
       Uffizzi.ui.say(msg)
 
       question = 'Okay to proceed?'
@@ -263,5 +255,25 @@ module Uffizzi
     def existing_controller_setting
       @existing_controller_setting ||= fetch_controller_settings[0]
     end
+
+    def default_installation_message
+      "\r\n"\
+      "This command will install Uffizzi into the 'default' namespace of"\
+      " the '#{InstallService.kubeconfig_current_context}' context."\
+      "\r\n"\
+      "To install in a different place, use options '--namespace' and/or '--context'."\
+      "\r\n\r\n"\
+      "After installation, new environments created for account '#{account_name}' will be deployed to this host cluster."\
+      "\r\n\r\n"
+    end
+
+    def custom_namespace_installation_message(namespace)
+      "\r\n"\
+      "This command will install Uffizzi into the '#{namespace}' namespace of"\
+      " the '#{InstallService.kubeconfig_current_context}' context."\
+      "\r\n\r\n"\
+      "After installation, new environments created for account '#{account_name}' will be deployed to this host cluster."\
+      "\r\n\r\n"
+    end
   end
 end

data/lib/uffizzi/cli/uninstall.rb

@@ -11,7 +11,7 @@ module Uffizzi
 
     default_task :controller
 
-    desc 'controller [HOSTNMAE]', 'Install uffizzi controller to cluster'
+    desc 'controller [HOSTNAME]', 'Install uffizzi controller to cluster'
     method_option :namespace, type: :string
     method_option :context, type: :string
     def controller

data/lib/uffizzi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uffizzi
-  VERSION = '2.4.4'
+  VERSION = '2.4.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi-cli
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: 2.4.5
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-29 00:00:00.000000000 Z
+date: 2024-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport