morpheus-cli 3.6.7 → 3.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fb66614a0f521d326378762305f731b8feaba20f65f5b08795a65389edab957
-  data.tar.gz: 4fca1eda17c8916ec93d937a893d9d7e3793c913a8058db434043b443c0e8773
+  metadata.gz: f07f82c8c3a9f9040ddd94a5d7537c5bd0f060c2299964f6338876eea0886a84
+  data.tar.gz: fc432221b5e84bc65cf18daba858aad0f491700c5b6fcc02a2092ab6e504d4b9
 SHA512:
-  metadata.gz: 6e4e3064928cbdc7679746463fb078e1b74818caeee2f3141b19bcdbb0f357924340883a321e67da830dcca4cc958e78fd5cd4f79c4c5674569ad2bb400bc4bb
-  data.tar.gz: c2e8593449ecab682f3346dfbacad7d0a6b63aea6ce2a16fcf6e52f07fd982e65d4c7a3fb06cd5332733b51404fa084301c12e5c975a8bcbfa14ed0414059f39
+  metadata.gz: dd6fe7211b9b4634daa9a497786cb755b7f8127860810d06903398d4ada337dd02cd1a6cdb68aa244773783277131dc2a08bc2fe2be6b912da01daf5d3983d04
+  data.tar.gz: 696525d04100e85028de52f8417bdf3449815236e1da81a57d5d9418d79fbaa82a554a3b774f45d46f7c6d6c7a096c3b3e63d77f61376d43d88218a8bfb42fc8

data/lib/morpheus/cli/credentials.rb

@@ -214,6 +214,14 @@ module Morpheus
           @@appliance_credentials_map = credential_map
         rescue => e
           puts "failed to save #{fn}. #{e}"  if Morpheus::Logging.debug?
+        ensure
+          # recalcuate echo vars
+          #puts "Recalculating variable maps for username change"
+          Morpheus::Cli::Echo.recalculate_variable_map()
+          # recalculate shell prompt after this change
+          if Morpheus::Cli::Shell.has_instance?
+            Morpheus::Cli::Shell.instance.reinitialize()
+          end
         end
       end
     end

data/lib/morpheus/cli/login.rb

@@ -79,11 +79,7 @@ class Morpheus::Cli::Login
       creds = Morpheus::Cli::Credentials.new(@appliance_name, @appliance_url).load_saved_credentials() # .load_saved_credentials(true)
 
       # recalcuate echo vars
-      Morpheus::Cli::Echo.recalculate_variable_map()
-      # recalculate shell prompt after this change
-      if Morpheus::Cli::Shell.has_instance?
-        Morpheus::Cli::Shell.instance.reinitialize()
-      end
+      ::Morpheus::Cli::Remote.recalculate_variable_map()
 
       if creds
         if !options[:quiet]

data/lib/morpheus/cli/remote.rb

@@ -560,19 +560,13 @@ EOT
 
     # ok, delete it
     ::Morpheus::Cli::Remote.delete_remote(appliance_name)
-
+    
     # return result
     if options[:quiet]
       return 0, nil
     end
     print_green_success "Deleted remote #{appliance_name}"
     list([])
-    # recalcuate echo vars
-    Morpheus::Cli::Echo.recalculate_variable_map()
-    # recalculate shell prompt after this change
-    if Morpheus::Cli::Shell.has_instance?
-      Morpheus::Cli::Shell.instance.reinitialize()
-    end
     return 0, nil
   end
 
@@ -609,12 +603,8 @@ EOT
     appliance[:active] = true
     appliance = ::Morpheus::Cli::Remote.save_remote(appliance_name, appliance)
     
-    # recalcuate echo vars
-    Morpheus::Cli::Echo.recalculate_variable_map()
-    # recalculate shell prompt after this change
-    if Morpheus::Cli::Shell.has_instance?
-      Morpheus::Cli::Shell.instance.reinitialize()
-    end
+    # recalculate session variables
+    ::Morpheus::Cli::Remote.recalculate_variable_map()
 
     if !options[:quiet]
       puts "#{cyan}Using remote #{appliance_name}#{reset}"
@@ -639,12 +629,8 @@ EOT
     end
     Morpheus::Cli::Remote.clear_active_appliance()
     puts "You are no longer using the appliance #{@appliance_name}"
-    # recalcuate echo vars
-    Morpheus::Cli::Echo.recalculate_variable_map()
-    # recalculate shell prompt after this change
-    if Morpheus::Cli::Shell.has_instance?
-      Morpheus::Cli::Shell.instance.reinitialize()
-    end
+    # recalculate session variables
+    ::Morpheus::Cli::Remote.recalculate_variable_map()
     return true
   end
 
@@ -1126,7 +1112,8 @@ EOT
 
       # persist all appliances
       save_appliances(cur_appliances)
-
+      # recalculate session variables
+      recalculate_variable_map()
       return app_map
     end
 
@@ -1144,6 +1131,8 @@ EOT
       ::Morpheus::Cli::Credentials.new(app_name, nil).clear_saved_credentials(app_name)
       # delete from groups too..
       ::Morpheus::Cli::Groups.clear_active_group(app_name)
+      # recalculate session variables
+      recalculate_variable_map()
       # return the deleted value
       return app_map
     end
@@ -1250,6 +1239,14 @@ EOT
 
     end
 
+    def recalculate_variable_map()
+      Morpheus::Cli::Echo.recalculate_variable_map()
+      # recalculate shell prompt after this change
+      if Morpheus::Cli::Shell.has_instance?
+        Morpheus::Cli::Shell.instance.reinitialize()
+      end
+    end
+
   end
 
 end

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "3.6.7"
+    VERSION = "3.6.8"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 3.6.7
+  version: 3.6.8
 platform: ruby
 authors:
 - David Estes