morpheus-cli 3.6.14 → 3.6.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aec984aa936c4514cf97141863e02468799a227e98d1f09862a5f7be773cd512
-  data.tar.gz: d491b1541ae9e74d02ba9857a475b7ab15ac7eac0901c55937bb07b5d953be71
+  metadata.gz: 44cd5f86f718d01477f1d822a42fbf33374ad0339e080b57d589040bcad06dd5
+  data.tar.gz: 3b43a3da6bfa2b65e683a1696ec3d39ef4f17acde0d388dd9004ab1416ad9bb8
 SHA512:
-  metadata.gz: 4d1da2f8325d05492b0e03ce8a28e7a6301361b84ce78526761de0a86a78a1d2003e11abb2fb00b4f520016cbef8a3b9a4b72aee85fe7034d9cf33505bf3b7f4
-  data.tar.gz: 1916a80f9e8b895806e40f3c29f47139b2cf2d97ad91bef6f91e000bb8233defcd71725bc09cd986e0730eba39aff45667afd9d4891e142709c39966f8da934d
+  metadata.gz: 12da78b947b3aec266e206833af10ec1a068efe9aab6e92d01b0d266ff36c06a37d371f5e16bb7d9d9c96cf43daa2b7ce8feed7989d4bc72b2bc065d2a73014c
+  data.tar.gz: a7e99aa6d071b30f64344505c2cce44204f1d11dc255e253c4c750798a7483074dee8162a206ec59bd04be94f9bbc4fc2e09f48b048754dedbccf49bd1896e93

data/lib/morpheus/benchmarking.rb

@@ -124,7 +124,7 @@ module Morpheus::Benchmarking
         start_benchmark(opts)
         if block_given?
           result = block.call()
-          # exit_code, err = Morpheus::Cli::CliCommand.parse_command_result(result)
+          # exit_code, err = Morpheus::Cli.parse_command_result(result)
           if result.is_a?(Array)
             exit_code = result[0]
             err = result[0]

data/lib/morpheus/cli.rb

@@ -39,6 +39,36 @@ module Morpheus
       return @@is_windows
     end
 
+    def self.parse_command_result(cmd_result)
+      exit_code, err = nil, nil
+      if cmd_result.is_a?(Array)
+        exit_code, err = cmd_result[0], cmd_result[1]
+      elsif cmd_result.is_a?(Hash)
+        exit_code, err = cmd_result[:exit_code], (cmd_result[:error] || cmd_result[:err])
+      end
+      if cmd_result == nil || cmd_result == true
+        exit_code = 0
+      elsif cmd_result == false
+        exit_code = 1
+      elsif cmd_result.is_a?(Integer)
+        exit_code = cmd_result
+      elsif cmd_result.is_a?(Float)
+        exit_code = cmd_result.to_i
+      elsif cmd_result.is_a?(String)
+        exit_code = cmd_result.to_i
+      else
+        if cmd_result.respond_to?(:to_i)
+          exit_code = cmd_result.to_i
+        else
+          # happens for aliases right now.. and execution flow probably, need to handle Array
+          # uncomment to track them down, proceed with exit 0 for now
+          #Morpheus::Logging::DarkPrinter.puts "debug: command #{command_name} produced an unexpected result: (#{cmd_result.class}) #{cmd_result}" if Morpheus::Logging.debug?
+          exit_code = 0
+        end
+      end
+      return exit_code, err
+    end
+
     # load all the well known commands and utilties they need
     def self.load!()
       # load interfaces

data/lib/morpheus/cli/cli_command.rb

@@ -933,44 +933,8 @@ module Morpheus
         return output
       end
 
-      def parse_command_result(cmd_result)
-        self.class.parse_command_result(cmd_result)
-      end
-
       module ClassMethods
 
-        # Parse exit_code and err from a command result (object of some type)
-        # returns [exit_code, err]
-        def parse_command_result(cmd_result)
-          exit_code, err = nil, nil
-          if cmd_result.is_a?(Array)
-            exit_code, err = cmd_result[0], cmd_result[1]
-          elsif cmd_result.is_a?(Hash)
-            exit_code, err = cmd_result[:exit_code], (cmd_result[:error] || cmd_result[:err])
-          end
-          if cmd_result == nil || cmd_result == true
-            exit_code = 0
-          elsif cmd_result == false
-            exit_code = 1
-          elsif cmd_result.is_a?(Integer)
-            exit_code = cmd_result
-          elsif cmd_result.is_a?(Float)
-            exit_code = cmd_result.to_i
-          elsif cmd_result.is_a?(String)
-            exit_code = cmd_result.to_i
-          else
-            if cmd_result.respond_to?(:to_i)
-              exit_code = cmd_result.to_i
-            else
-              # happens for aliases right now.. and execution flow probably, need to handle Array
-              # uncomment to track them down, proceed with exit 0 for now
-              #Morpheus::Logging::DarkPrinter.puts "debug: command #{command_name} produced an unexpected result: (#{cmd_result.class}) #{cmd_result}" if Morpheus::Logging.debug?
-              exit_code = 0
-            end
-          end
-          return exit_code, err
-        end
-
         def set_command_name(cmd_name)
           @command_name = cmd_name
           Morpheus::Cli::CliRegistry.add(self, self.command_name)

data/lib/morpheus/cli/commands/standard/benchmark_command.rb

@@ -322,7 +322,7 @@ EOT
     # exit_code, err = my_terminal.execute(cmd)
     # do this way until terminal supports expressions
     cmd_result = execute_commands_as_expression(cmd)
-    exit_code, err = parse_command_result(cmd_result)
+    exit_code, err = Morpheus::Cli.parse_command_result(cmd_result)
   
     benchmark_record = stop_benchmark(exit_code, err)
     Morpheus::Logging::DarkPrinter.puts(cyan + dark + benchmark_record.msg) if benchmark_record
@@ -373,13 +373,13 @@ EOT
             if flow_cmd == '&&'
               # AND operator
               current_operator = flow_cmd
-              exit_code, cmd_err = parse_command_result(previous_command_result)
+              exit_code, cmd_err = Morpheus::Cli.parse_command_result(previous_command_result)
               if exit_code != 0
                 still_executing = false
               end
             elsif flow_cmd == '||' # or with previous command
               current_operator = flow_cmd
-              exit_code, err = parse_command_result(previous_command_result)
+              exit_code, err = Morpheus::Cli.parse_command_result(previous_command_result)
               if exit_code == 0
                 still_executing = false
               end

data/lib/morpheus/cli/groups.rb

@@ -64,7 +64,7 @@ class Morpheus::Cli::Groups
           active_group = groups.find { |it| it['id'] == @active_group_id }
           active_group = active_group || find_group_by_name_or_id(@active_group_id)
           #unless @appliances.keys.size == 1
-            print cyan, "\n# => Currently using group #{green}#{active_group['name']}#{reset}\n", reset
+            print cyan, "\n# => Currently using group #{active_group['name']}\n", reset
           #end
         else
           unless options[:remote]
@@ -399,12 +399,12 @@ class Morpheus::Cli::Groups
         "This sets the active group.\n" +
         "The active group will be auto-selected for use during provisioning.\n" +
         "You can still use the --group option to override this."
-      build_common_options(opts, options, [])
+      build_common_options(opts, options, [:quiet, :remote])
     end
     optparse.parse!(args)
     if args.count < 1
       puts optparse
-      exit 1
+      return 1
     end
     connect(options)
     begin
@@ -412,20 +412,24 @@ class Morpheus::Cli::Groups
       group = find_group_by_name_or_id(args[0])
       if !group
         print_red_alert "Group not found by name #{args[0]}"
-        exit 1
+        return 1
       end
-
       if @active_group_id == group['id']
-        print reset,"Already using the group #{group['name']}","\n",reset
+        unless options[:quiet]
+          print reset,"Already using the group #{group['name']}","\n",reset
+        end
       else
         ::Morpheus::Cli::Groups.set_active_group(@appliance_name, group['id'])
         # ::Morpheus::Cli::Groups.save_groups(@active_groups)
-        #print cyan,"Switched active group to #{group['name']}","\n",reset
+        unless options[:quiet]
+          print cyan,"Switched active group to #{group['name']}","\n",reset
+        end
         #list([])
       end
+      return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
-      exit 1
+      return 1
     end
 
   end
@@ -486,14 +490,15 @@ class Morpheus::Cli::Groups
       {
         active: (is_active ? "=>" : ""),
         id: group['id'],
-        name: is_active ? "#{green}#{group['name']}#{reset}#{table_color}" : group['name'],
+        # name: is_active ? "#{green}#{group['name']}#{reset}#{table_color}" : group['name'],
+        name: group['name'],
         location: group['location'],
         cloud_count: group['zones'] ? group['zones'].size : 0,
         server_count: group['serverCount']
       }
     end
     columns = [
-      #{:active => {:display_name => ""}},
+      {:active => {:display_name => ""}},
       {:id => {:width => 10}},
       {:name => {:width => 16}},
       {:location => {:width => 32}},

data/lib/morpheus/cli/remote.rb

@@ -72,8 +72,9 @@ EOT
     else
       print cyan
       columns = [
-        #{:active => {:display_name => "", :display_method => lambda {|it| it[:active] ? "=>" : "" } } },
-        {:name => {display_method: lambda {|it| it[:active] ? "#{green}#{it[:name]}#{reset}#{cyan}" : it[:name] }, :width => 16 } },
+        {:active => {:display_name => "", :display_method => lambda {|it| it[:active] ? "=>" : "" } } },
+        # {:name => {display_method: lambda {|it| it[:active] ? "#{green}#{it[:name]}#{reset}#{cyan}" : it[:name] }, :width => 16 } },
+        {:name => {display_method: lambda {|it| it[:name] }, :width => 16 } },
         {:url => {display_method: lambda {|it| it[:host] || it[:url] }, :width => 40 } },
         {:version => lambda {|it| it[:build_version] } },
         {:status => lambda {|it| format_appliance_status(it, cyan) } },
@@ -85,7 +86,7 @@ EOT
       print reset
       if @appliance_name
         #unless appliances.keys.size == 1
-          print cyan, "\n# => Currently using remote #{green}#{@appliance_name}#{reset}\n", reset
+          print cyan, "\n# => Currently using remote #{@appliance_name}\n", reset
         #end
       else
         print "\n# => No current remote appliance, see `remote use`\n", reset

data/lib/morpheus/cli/shell.rb

@@ -287,13 +287,13 @@ class Morpheus::Cli::Shell
             if flow_cmd == '&&'
               # AND operator
               current_operator = flow_cmd
-              exit_code, cmd_err = parse_command_result(previous_command_result)
+              exit_code, cmd_err = Morpheus::Cli.parse_command_result(previous_command_result)
               if exit_code != 0
                 still_executing = false
               end
             elsif flow_cmd == '||' # or with previous command
               current_operator = flow_cmd
-              exit_code, err = parse_command_result(previous_command_result)
+              exit_code, err = Morpheus::Cli.parse_command_result(previous_command_result)
               if exit_code == 0
                 still_executing = false
               end
@@ -536,7 +536,7 @@ class Morpheus::Cli::Shell
             end
           end
           cmd_result = Morpheus::Cli::CliRegistry.exec(cmd_name, cmd_args)
-          cmd_exit_code, cmd_err = parse_command_result(cmd_result)
+          cmd_exit_code, cmd_err = Morpheus::Cli.parse_command_result(cmd_result)
           benchmark_record = stop_benchmark(cmd_exit_code, cmd_err) # if benchmarking?
           Morpheus::Logging::DarkPrinter.puts(cyan + dark + benchmark_record.msg) if benchmark_record
         else

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "3.6.14"
+    VERSION = "3.6.15"
   end
 end

data/lib/morpheus/terminal.rb

@@ -382,17 +382,7 @@ module Morpheus
         else
           result = Morpheus::Cli::CliRegistry.exec(args[0], args[1..-1])
         end
-        # todo: clean up CliCommand return values, handle a few diff types for now
-        if result == nil || result == true || result == 0
-          exit_code = 0
-        elsif result == false
-          exit_code = 1
-        elsif result.is_a?(Array) # exit_code, err
-          exit_code = result[0] #.to_i
-          err = result[1]
-        else
-          exit_code = result #.to_i
-        end
+        exit_code, err = Morpheus::Cli.parse_command_result(result)
       rescue => e
         exit_code = Morpheus::Cli::ErrorHandler.new(@stderr).handle_error(e)
         err = e

metadata

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