morpheus-cli 3.3.2.2 → 3.3.2.3

data/lib/morpheus/cli/library_container_scripts_command.rb

@@ -151,7 +151,7 @@ class Morpheus::Cli::LibraryContainerScriptsCommand
 
   def add(args)
     options = {}
-    params = {'scriptType' => 'bash', 'scriptPhase' => 'postProvision'}
+    params = {'scriptType' => 'bash', 'scriptPhase' => 'provision'}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       opts.on('--name VALUE', String, "Name") do |val|
@@ -160,7 +160,7 @@ class Morpheus::Cli::LibraryContainerScriptsCommand
       opts.on('--type [bash|powershell]', String, "Script Type. Default is 'bash'") do |val|
         params['scriptType'] = val
       end
-      opts.on('--phase [start|stop|postProvision]', String, "Script Phase. Default is 'postProvision'") do |val|
+      opts.on('--phase [provision|start|stop]', String, "Script Phase. Default is 'provision'") do |val|
         params['scriptPhase'] = val
       end
       opts.on('--category VALUE', String, "Category") do |val|
@@ -169,7 +169,7 @@ class Morpheus::Cli::LibraryContainerScriptsCommand
       opts.on('--script TEXT', String, "Contents of the script.") do |val|
         params['script'] = val
       end
-      opts.on('--file FILE', "File containing the script. This can be used instead --script" ) do |filename|
+      opts.on('--file FILE', "File containing the script. This can be used instead of --script" ) do |filename|
         full_filename = File.expand_path(filename)
         if File.exists?(full_filename)
           params['script'] = File.read(full_filename)
@@ -257,7 +257,7 @@ class Morpheus::Cli::LibraryContainerScriptsCommand
       opts.on('--script TEXT', String, "Contents of the script.") do |val|
         params['script'] = val
       end
-      opts.on('--file FILE', "File containing the script. This can be used instead --script" ) do |filename|
+      opts.on('--file FILE', "File containing the script. This can be used instead of --script" ) do |filename|
         full_filename = File.expand_path(filename)
         if File.exists?(full_filename)
           params['script'] = File.read(full_filename)

data/lib/morpheus/cli/library_container_templates_command.rb

@@ -188,7 +188,7 @@ class Morpheus::Cli::LibraryContainerTemplatesCommand
       opts.on('--template TEXT', String, "Contents of the template.") do |val|
         params['template'] = val
       end
-      opts.on('--file FILE', "File containing the template. This can be used instead --template" ) do |filename|
+      opts.on('--file FILE', "File containing the template. This can be used instead of --template" ) do |filename|
         full_filename = File.expand_path(filename)
         if File.exists?(full_filename)
           params['template'] = File.read(full_filename)
@@ -283,7 +283,7 @@ class Morpheus::Cli::LibraryContainerTemplatesCommand
       opts.on('--template TEXT', String, "Contents of the template.") do |val|
         params['template'] = val
       end
-      opts.on('--file FILE', "File containing the template. This can be used instead --template" ) do |filename|
+      opts.on('--file FILE', "File containing the template. This can be used instead of --template" ) do |filename|
         full_filename = File.expand_path(filename)
         if File.exists?(full_filename)
           params['template'] = File.read(full_filename)

data/lib/morpheus/cli/login.rb

@@ -78,7 +78,7 @@ class Morpheus::Cli::Login
       # recalcuate echo vars
       Morpheus::Cli::Echo.recalculate_variable_map()
       # recalculate shell prompt after this change
-      if Morpheus::Cli::Shell.instance
+      if Morpheus::Cli::Shell.has_instance?
         Morpheus::Cli::Shell.instance.reinitialize()
       end
 

data/lib/morpheus/cli/logout.rb

@@ -63,7 +63,7 @@ class Morpheus::Cli::Logout
       # recalcuate echo vars
       Morpheus::Cli::Echo.recalculate_variable_map()
       # recalculate shell prompt after this change
-      if Morpheus::Cli::Shell.instance
+      if Morpheus::Cli::Shell.has_instance?
         Morpheus::Cli::Shell.instance.reinitialize()
       end
       return 0

data/lib/morpheus/cli/man_command.rb

@@ -111,13 +111,8 @@ EOT
   def system_command_available?(cmd)
     has_it = false
     begin
-      cmd = cmd.strip
-      if cmd.include?(';') || 
-          cmd =~ /^rm/  || cmd.strip =~ /^mv/ || cmd.strip =~ /^passwd/ || 
-          cmd.include?("/rm")  || cmd.include?("/mv") || cmd.include?("/passwd")
-        raise_command_error "The specified system command '#{cmd}' is invalid."
-      end
-      system("which #{cmd} > /dev/null 2>&1")
+      cmd = cmd.strip.gsub("'",'')
+      system("which '#{cmd}' > /dev/null 2>&1")
       has_it = $?.success?
     rescue => e
       raise e

data/lib/morpheus/cli/option_parser.rb

@@ -8,7 +8,10 @@ module Morpheus
     class Morpheus::Cli::OptionParser < OptionParser
 
       attr_accessor :footer
-      
+
+      # Array of option names to keep out of help message
+      attr_accessor :hidden_options
+
       alias :original_to_s :to_s
 
       def to_s
@@ -23,7 +26,19 @@ module Morpheus
         end
         if !self.to_a.empty?
           #out << "Options:\n"
-          out << summarize().join("")
+          # the default way..
+          # out << summarize().join("")
+
+          # super hacky, should be examining the option, not the fully formatted description
+          my_summaries = summarize()
+          summarize().each do |opt_description|
+            is_hidden = (@hidden_options || []).find { |hidden_switch|
+              opt_description.include?("--#{hidden_switch}")
+            }
+            if !is_hidden
+              out  << opt_description
+            end
+          end
         end
         if footer
           # nice_footer = footer.split("\n").collect {|line| "#{summary_indent}#{line}" }.join("\n")
@@ -35,6 +50,17 @@ module Morpheus
         out
       end
 
+      def add_hidden_option(opt_name)
+        opt_array = [opt_name].flatten.compact
+        @hidden_options ||= []
+        opt_array.each do |val|
+          if !@hidden_options.include?(val)
+            @hidden_options << val
+          end
+        end
+        @hidden_options
+      end
+
     end
 
   end

data/lib/morpheus/cli/power_scheduling_command.rb

@@ -113,7 +113,9 @@ class Morpheus::Cli::PowerSchedulingCommand
   end
 
   def _get(id, options)
-
+    options ||= {}
+    options[:max_servers] ||= 10
+    options[:max_instances] ||= 10
     begin
       schedule = find_schedule_by_name_or_id(id)
       if schedule.nil?
@@ -168,23 +170,20 @@ class Morpheus::Cli::PowerSchedulingCommand
         # print cyan,"No instances",reset,"\n"
       else
         print_h2 "Instances (#{instances.size})"
-        print as_pretty_table(instances.first(options[:max_instances]), [:id, :name])
-        if instances.size > options[:max_instances]
-          print_results_pagination({'meta'=>{'total'=>instances.size,'size'=>options[:max_instances]}}, {:label => "instance in schedule", :n_label => "instances in schedule"})
-          #print cyan, "(and #{instances.size - options[:max_instances]} more...)\n"
-        end
+        instance_rows = instances.first(options[:max_instances])
+        print as_pretty_table(instance_rows, [:id, :name])
+        print_results_pagination({'meta'=>{'total'=>instances.size,'size'=>instance_rows.size,'max'=>options[:max_servers],'offset'=>0}}, {:label => "instance in schedule", :n_label => "instances in schedule"})
       end
 
       ## Hosts
       if servers.size == 0
         # print cyan,"No hosts",reset,"\n"
       else
+        options[:max_servers] ||= 10
         print_h2 "Hosts (#{servers.size})"
-        print as_pretty_table(servers.first(options[:max_servers]), [:id, :name])
-        if servers.size > options[:max_servers]
-          print_results_pagination({'meta'=>{'total'=>servers.size,'size'=>options[:max_servers]}}, {:label => "host in schedule", :n_label => "hosts in schedule"})
-          #print cyan, "(and #{servers.size - options[:max_servers]} more...)\n"
-        end
+        server_rows = servers.first(options[:max_servers])
+        print as_pretty_table(server_rows, [:id, :name])
+        print_results_pagination({'meta'=>{'total'=>servers.size,'size'=>server_rows.size,'max'=>options[:max_servers],'offset'=>0}}, {:label => "host in schedule", :n_label => "hosts in schedule"})
       end
 
       print reset,"\n"
@@ -226,7 +225,7 @@ class Morpheus::Cli::PowerSchedulingCommand
         end
       end
       opts.on('--enabled [on|off]', String, "Can be used to disable it") do |val|
-        options['enabled'] = !(val.to_s == 'off' || val.to_s == 'false')
+        params['enabled'] = !(val.to_s == 'off' || val.to_s == 'false')
       end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote, :quiet])
       opts.footer = "Create a new power schedule." + "\n" +
@@ -305,7 +304,7 @@ class Morpheus::Cli::PowerSchedulingCommand
         end
       end
       opts.on('--enabled [on|off]', String, "Can be used to disable it") do |val|
-        options['enabled'] = !(val.to_s == 'off' || val.to_s == 'false')
+        params['enabled'] = !(val.to_s == 'off' || val.to_s == 'false')
       end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote, :quiet])
       opts.footer = "Update a power schedule." + "\n" +

data/lib/morpheus/cli/remote.rb

@@ -558,7 +558,7 @@ EOT
     # recalcuate echo vars
     Morpheus::Cli::Echo.recalculate_variable_map()
     # recalculate shell prompt after this change
-    if Morpheus::Cli::Shell.instance
+    if Morpheus::Cli::Shell.has_instance?
       Morpheus::Cli::Shell.instance.reinitialize()
     end
     return 0, nil
@@ -600,7 +600,7 @@ EOT
     # recalcuate echo vars
     Morpheus::Cli::Echo.recalculate_variable_map()
     # recalculate shell prompt after this change
-    if Morpheus::Cli::Shell.instance
+    if Morpheus::Cli::Shell.has_instance?
       Morpheus::Cli::Shell.instance.reinitialize()
     end
 
@@ -630,7 +630,7 @@ EOT
     # recalcuate echo vars
     Morpheus::Cli::Echo.recalculate_variable_map()
     # recalculate shell prompt after this change
-    if Morpheus::Cli::Shell.instance
+    if Morpheus::Cli::Shell.has_instance?
       Morpheus::Cli::Shell.instance.reinitialize()
     end
     return true

data/lib/morpheus/cli/shell.rb

@@ -16,6 +16,10 @@ class Morpheus::Cli::Shell
 
   @@instance = nil
 
+  def self.has_instance?
+    defined?(@@instance) && @@instance
+  end
+
   def self.instance
     @@instance ||= reload_instance
   end
@@ -108,12 +112,55 @@ class Morpheus::Cli::Shell
     usage = "Usage: morpheus #{command_name}"
     optparse = OptionParser.new do|opts|
       opts.banner = usage
+      # change to a temporary home directory, delete it afterwards.
+      opts.on('-e','--exec COMMAND', "Execute the provided morpheus commands and exit.") do |val|
+        @execute_mode = true
+        @execute_mode_command = val
+      end
       opts.on('--norc','--norc', "Do not read and execute the personal initialization script .morpheusrc") do
         @norc = true
       end
       opts.on('-I','--insecure', "Allow for insecure HTTPS communication i.e. bad SSL certificate") do |val|
         @@insecure = true
         Morpheus::RestClient.enable_ssl_verification = false
+      end
+       opts.on('-Z','--incognito', "Incognito mode. Use a temporary shell, no saved credentials and no history.") do
+        @incognito_mode = true
+        #@norc = true # perhaps?
+        tmpdir = ENV['MORPHEUS_CLI_TMPDIR'] || ENV['TMPDIR'] || ENV['TMP']
+        if !tmpdir
+          puts_error "Temporary directory not found. Use environment variable MORPHEUS_CLI_TMPDIR or TMPDIR or TMP"
+        end
+        @original_home_directory = my_terminal.home_directory
+        @temporary_home_directory = File.join(tmpdir, "morpheus-temp-shell-#{rand().to_s[2..7]}")
+        # change to a temporary home directory
+        Morpheus::Logging::DarkPrinter.puts "incognito mode" if Morpheus::Logging.debug?
+        Morpheus::Logging::DarkPrinter.puts "temporary home directory is #{@temporary_home_directory}" if Morpheus::Logging.debug?
+        my_terminal.set_home_directory(@temporary_home_directory)
+        # wow..this already has cached list of Remote.appliances
+        # this is kinda nice though..keep it for now, 
+        #Morpheus::Cli::Remote.load_appliance_file
+        
+        Morpheus::Cli::Remote.appliances.each do |app_name, app|
+          #app[:username] = "(anonymous)"
+          #app[:status] = "fresh"
+          app[:authenticated] = false
+          app.delete(:username)
+          app.delete(:last_login_at)
+          app.delete(:last_logout_at)
+          app.delete(:last_success_at)
+          app.delete(:last_check)
+          app.delete(:username)
+          app.delete(:error)
+          #app[:error] = "ho ho ho"
+        end
+        
+        # Morpheus::Cli::Remote.save_appliances(new_remote_config)
+
+        # Morpheus::Cli::Remote.clear_active_appliance
+        # Morpheus::Cli::Credentials.clear_saved_credentials(@appliance_name)
+        # Morpheus::Cli::Credentials.load_saved_credentials
+        # Morpheus::Cli::Credentials.new(@appliance_name, @appliance_url).load_saved_credentials()
       end
       opts.on('-C','--nocolor', "Disable ANSI coloring") do
         Term::ANSIColor::coloring = false
@@ -146,18 +193,63 @@ class Morpheus::Cli::Shell
     # recalculate_prompt()
     # recalculate_auto_complete_commands()
 
-    exit = false
-    while !exit do
-      Readline.completion_append_character = " "
-      Readline.completion_proc = @auto_complete
-      Readline.basic_word_break_characters = ""
-      #Readline.basic_word_break_characters = "\t\n\"\‘`@$><=;|&{( "
-      input = Readline.readline(@calculated_prompt, true).to_s
-      input = input.strip
-
-      execute_commands(input)
+    result = nil
+    if @execute_mode_command
+      # execute a single command and exit
+      result = execute_commands(@execute_mode_command)
+    else
+      # interactive prompt
+      result = 0
+      @exit_now_please = false
+      while !@exit_now_please do
+        Readline.completion_append_character = " "
+        Readline.completion_proc = @auto_complete
+        Readline.basic_word_break_characters = ""
+        #Readline.basic_word_break_characters = "\t\n\"\‘`@$><=;|&{( "
+        input = Readline.readline(@calculated_prompt, true).to_s
+        input = input.strip
+
+        result = execute_commands(input)
+      end
     end
     
+    # incognito mode, cover our tracks
+    if @temporary_home_directory
+      if @temporary_home_directory.include?("morpheus-temp-shell")
+        begin
+          FileUtils.remove_dir(@temporary_home_directory, true)
+          Morpheus::Logging::DarkPrinter.puts "cleaning up temporary home directory #{@temporary_home_directory}" if Morpheus::Logging.debug?
+        rescue
+        end
+      end
+      @temporary_home_directory = nil
+      if @original_home_directory
+        my_terminal.set_home_directory(@original_home_directory)
+      end
+      @original_home_directory = nil
+    end
+
+    return result
+  end
+
+  # return exitstatus integer for a given command result
+  #todo: clean up CliCommand return values, handle a few diff types for now
+  def parse_result_exitstatus(result)
+    exit_code, err = 0, nil
+    if result.is_a?(Array) # exit_code, err
+      exit_code = result[0].to_i
+      err = result[1]
+    elsif result == nil || result == true || result == 0
+      exit_code = 0
+    elsif result == false
+      exit_code = 1
+    # elsif result.is_a?(Integer)
+    #   exit_code = result.to_i
+    else
+      exit_code = result.to_i
+    end
+    # return exit_code, err
+    return exit_code
   end
 
   # same as Terminal instance
@@ -198,12 +290,12 @@ class Morpheus::Cli::Shell
               if flow_cmd == '&&'
                 # AND operator
                 current_operator = flow_cmd
-                if previous_command_result.to_i != 0
+                if parse_result_exitstatus(previous_command_result) != 0
                   still_executing = false
                 end
               elsif flow_cmd == '||' # or with previous command
                 current_operator = flow_cmd
-                if previous_command_result.to_i == 0
+                if parse_result_exitstatus(previous_command_result) == 0
                   still_executing = false
                 end
               elsif flow_cmd == '|' # or with previous command
@@ -282,7 +374,9 @@ class Morpheus::Cli::Shell
       if input == 'exit'
         #print cyan,"Goodbye\n",reset
         @history_logger.info "exit" if @history_logger
-        exit 0
+        @exit_now_please = true
+        return 0
+        #exit 0
       elsif input == 'help'
 
         #print_h1 "Morpheus Shell Help", [], white
@@ -356,44 +450,44 @@ class Morpheus::Cli::Shell
         @history_logger = load_history_logger
         puts "history cleared!"
         return 0
-      elsif input == "edit rc"
-        fn = Morpheus::Cli::DotFile.morpheusrc_filename
-        editor = ENV['EDITOR'] # || 'nano'
-        if !editor
-          puts "You have no EDITOR defined. Use 'export EDITOR=emacs'"
-          #puts "Trying nano..."
-          #editor = "nano"
-        end
-        system("which #{editor} > /dev/null 2>&1")
-        has_editor = $?.success?
-        if has_editor
-          puts "opening #{fn} for editing with #{editor} ..."
-          system("#{editor} #{fn}")
-          puts "Use 'reload' to re-execute your startup script #{File.basename(fn)}"
-        else
-          puts_error2 Morpheus::Terminal.angry_prompt
-          puts_error "The defined EDITOR '#{editor}' was not found on your system."
-        end
-        return 0 # $?
-      elsif input == "edit profile"
-        fn = Morpheus::Cli::DotFile.morpheus_profile_filename
-        editor = ENV['EDITOR'] # || 'nano'
-        if !editor
-          puts "You have no EDITOR defined. Use 'export EDITOR=emacs'."
-          #puts "Trying nano..."
-          #editor = "nano"
-        end
-        system("which #{editor} > /dev/null 2>&1")
-        has_editor = $?.success?
-        if has_editor
-          puts "opening #{fn} for editing with #{editor} ..."
-          `#{editor} #{fn}`
-          puts "Use 'reload' to re-execute your startup script #{File.basename(fn)}"
-        else
-          puts_error Morpheus::Terminal.angry_prompt
-          puts_error "The defined EDITOR '#{editor}' was not found on your system."
-        end
-        return 0 # $?
+      # elsif input == "edit rc"
+      #   fn = Morpheus::Cli::DotFile.morpheusrc_filename
+      #   editor = ENV['EDITOR'] # || 'nano'
+      #   if !editor
+      #     puts "You have no EDITOR defined. Use 'export EDITOR=emacs'"
+      #     #puts "Trying nano..."
+      #     #editor = "nano"
+      #   end
+      #   system("which #{editor} > /dev/null 2>&1")
+      #   has_editor = $?.success?
+      #   if has_editor
+      #     puts "opening #{fn} for editing with #{editor} ..."
+      #     system("#{editor} #{fn}")
+      #     puts "Use 'reload' to re-execute your startup script #{File.basename(fn)}"
+      #   else
+      #     puts_error2 Morpheus::Terminal.angry_prompt
+      #     puts_error "The defined EDITOR '#{editor}' was not found on your system."
+      #   end
+      #   return 0 # $?
+      # elsif input == "edit profile"
+      #   fn = Morpheus::Cli::DotFile.morpheus_profile_filename
+      #   editor = ENV['EDITOR'] # || 'nano'
+      #   if !editor
+      #     puts "You have no EDITOR defined. Use 'export EDITOR=emacs'."
+      #     #puts "Trying nano..."
+      #     #editor = "nano"
+      #   end
+      #   system("which #{editor} > /dev/null 2>&1")
+      #   has_editor = $?.success?
+      #   if has_editor
+      #     puts "opening #{fn} for editing with #{editor} ..."
+      #     `#{editor} #{fn}`
+      #     puts "Use 'reload' to re-execute your startup script #{File.basename(fn)}"
+      #   else
+      #     puts_error Morpheus::Terminal.angry_prompt
+      #     puts_error "The defined EDITOR '#{editor}' was not found on your system."
+      #   end
+      #   return 0 # $?
       elsif input == 'reload' || input == 'reload!'
         # raise RestartShellPlease
         #log_history_command(input)
@@ -497,7 +591,7 @@ class Morpheus::Cli::Shell
         ::RestClient.log = Morpheus::Logging.debug? ? Morpheus::Logging::DarkPrinter.instance : nil
         @return_to_log_level = nil
       end
-      
+
       # commands should be a number or nil (treated as 0)
       if cmd_result == true
         cmd_result = 0