morpheus-cli 3.6.9 → 3.6.11

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

@@ -14,21 +14,6 @@ class Morpheus::Cli::HistoryCommand
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = "Usage: morpheus #{command_name}"
-      # opts.on( '-m', '--max MAX', "Max Results" ) do |max|
-      #   options[:max] = max.to_i
-      # end
-      # opts.on( '-o', '--offset OFFSET', "Offset Results" ) do |offset|
-      #   options[:offset] = offset.to_i.abs
-      # end
-      # opts.on( '-s', '--search PHRASE', "Search Phrase" ) do |phrase|
-      #   options[:phrase] = phrase
-      # end
-      # opts.on( '-S', '--sort ORDER', "Sort Order" ) do |v|
-      #   options[:sort] = v
-      # end
-      # opts.on( '-D', '--desc', "Reverse Sort Order" ) do |v|
-      #   options[:direction] = "desc"
-      # end
       opts.on( '-n', '--max-commands MAX', "Max Results. Default is 25" ) do |val|
         options[:max] = val
       end
@@ -64,11 +49,6 @@ EOT
     else
       max_commands = options[:max] || 25
       Morpheus::Cli::Shell.instance.print_history(max_commands)
-      last_cmd = Morpheus::Cli::Shell.instance.last_command
-      # log history, but not consecutive log entries
-      if last_cmd.nil? || last_cmd[:command] != raw_cmd
-        Morpheus::Cli::Shell.instance.log_history_command(raw_cmd)
-      end
       return 0  
     end
   end

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

@@ -66,15 +66,15 @@ EOT
 
     fn = Morpheus::Cli::ManCommand.man_file_path
     if regenerate || !File.exists?(fn)
-      #Morpheus::Logging::DarkPrinter.puts "generating manual #{fn} ..." if Morpheus::Logging.debug?
-      Morpheus::Cli::ManCommand.generate_manual()
+      #Morpheus::Logging::DarkPrinter.puts "generating manual #{fn} ..." if Morpheus::Logging.debug? && !options[:quiet]
+      Morpheus::Cli::ManCommand.generate_manual(options)
     end
     
     if options[:quiet]
       return 0, nil
     end
     
-    Morpheus::Logging::DarkPrinter.puts "opening manual file #{fn}" if Morpheus::Logging.debug?
+    Morpheus::Logging::DarkPrinter.puts "opening manual file #{fn}" if Morpheus::Logging.debug? && !options[:quiet]
     
     
     if open_as_link # not used atm
@@ -134,14 +134,14 @@ EOT
   #   FileUtils.chmod(0600, fn)
   # end
 
-  def self.generate_manual()
+  def self.generate_manual(options={})
     # todo: use pandoc or something else to convert the CLI-Manual.md to a man page
     # and install it, so the os command `man morpheus` will work too.
     fn = man_file_path()
     if !Dir.exists?(File.dirname(fn))
       FileUtils.mkdir_p(File.dirname(fn))
     end
-    Morpheus::Logging::DarkPrinter.puts "generating manual #{fn}" if Morpheus::Logging.debug?
+    Morpheus::Logging::DarkPrinter.puts "generating manual #{fn}" if Morpheus::Logging.debug? && !options[:quiet]
 
     File.open(fn, 'w') {|f| f.write("") } # clear file
     FileUtils.chmod(0600, fn)
@@ -211,7 +211,7 @@ EOT
 ENDTEXT
       
       terminal = Morpheus::Terminal.new($stdin, manpage)
-      Morpheus::Logging::DarkPrinter.puts "appending command help `morpheus --help`" if Morpheus::Logging.debug?
+      Morpheus::Logging::DarkPrinter.puts "appending command help `morpheus --help`" if Morpheus::Logging.debug? && !options[:quiet]
 
       manpage.print "\n"
       manpage.print "## morpheus\n"
@@ -224,7 +224,7 @@ ENDTEXT
       Morpheus::Cli::CliRegistry.all.keys.sort.each do |cmd|
         cmd_klass = Morpheus::Cli::CliRegistry.instance.get(cmd)
         cmd_instance = cmd_klass.new
-        Morpheus::Logging::DarkPrinter.puts "appending command help `morpheus #{cmd} --help`" if Morpheus::Logging.debug?
+        Morpheus::Logging::DarkPrinter.puts "appending command help `morpheus #{cmd} --help`" if Morpheus::Logging.debug? && !options[:quiet]
         #help_cmd = "morpheus #{cmd} --help"
         #help_output = `#{help_cmd}`
         manpage.print "\n"
@@ -240,7 +240,7 @@ ENDTEXT
         subcommands = cmd_klass.subcommands
         if subcommands && subcommands.size > 0
           subcommands.sort.each do |subcommand, subcommand_method|
-            Morpheus::Logging::DarkPrinter.puts "appending command help `morpheus #{cmd} #{subcommand} --help`" if Morpheus::Logging.debug?
+            Morpheus::Logging::DarkPrinter.puts "appending command help `morpheus #{cmd} #{subcommand} --help`" if Morpheus::Logging.debug? && !options[:quiet]
             manpage.print "\n"
             manpage.print "#### morpheus #{cmd} #{subcommand}\n"
             manpage.print "\n"

data/lib/morpheus/cli/containers_command.rb

@@ -59,6 +59,7 @@ class Morpheus::Cli::ContainersCommand
 
   def _get(arg, options)
     begin
+      @containers_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @containers_interface.dry.get(arg.to_i)
         return
@@ -179,6 +180,7 @@ class Morpheus::Cli::ContainersCommand
   def _stop(container_id, options)
     container = find_container_by_id(container_id) # could skip this since only id is supported
     return 1 if container.nil?
+    @containers_interface.setopts(options)
     if options[:dry_run]
       print_dry_run @containers_interface.dry.stop(container['id'])
       return 0
@@ -218,6 +220,7 @@ class Morpheus::Cli::ContainersCommand
   def _start(container_id, options)
     container = find_container_by_id(container_id) # could skip this since only id is supported
     return 1 if container.nil?
+    @containers_interface.setopts(options)
     if options[:dry_run]
       print_dry_run @containers_interface.dry.start(container['id'])
       return 0
@@ -257,6 +260,7 @@ class Morpheus::Cli::ContainersCommand
   def _restart(container_id, options)
     container = find_container_by_id(container_id) # could skip this since only id is supported
     return 1 if container.nil?
+    @containers_interface.setopts(options)
     if options[:dry_run]
       print_dry_run @containers_interface.dry.restart(container['id'])
       return 0
@@ -296,6 +300,7 @@ class Morpheus::Cli::ContainersCommand
   def _suspend(container_id, options)
     container = find_container_by_id(container_id) # could skip this since only id is supported
     return 1 if container.nil?
+    @containers_interface.setopts(options)
     if options[:dry_run]
       print_dry_run @containers_interface.dry.suspend(container['id'])
       return 0
@@ -335,6 +340,7 @@ class Morpheus::Cli::ContainersCommand
   def _eject(container_id, options)
     container = find_container_by_id(container_id) # could skip this since only id is supported
     return 1 if container.nil?
+    @containers_interface.setopts(options)
     if options[:dry_run]
       print_dry_run @containers_interface.dry.eject(container['id'])
       return 0
@@ -379,6 +385,7 @@ class Morpheus::Cli::ContainersCommand
     container_ids = containers.collect {|container| container["id"] }
     begin
       # container = find_container_by_name_or_id(args[0])
+      @containers_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @containers_interface.dry.available_actions(container_ids)
         return 0
@@ -479,6 +486,7 @@ class Morpheus::Cli::ContainersCommand
     # return run_command_for_each_arg(containers) do |arg|
     #   _action(arg, action_id, options)
     # end
+    @containers_interface.setopts(options)
     if options[:dry_run]
       print_dry_run @containers_interface.dry.action(container_ids, action_id)
       return 0
@@ -550,7 +558,7 @@ class Morpheus::Cli::ContainersCommand
         end
         payload['script'] = script_content
       end
-      # dry run?
+      @execution_request_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @execution_request_interface.dry.create(params, payload)
         return 0

data/lib/morpheus/cli/credentials.rb

@@ -49,13 +49,14 @@ module Morpheus
           # for now, it just stores the access token without other wallet info
           begin
             whoami_interface = Morpheus::WhoamiInterface.new(options[:remote_token], nil, nil, @appliance_url)
+            whoami_interface.setopts(options)
             if options[:dry_run]
               print_dry_run whoami_interface.dry.get()
               return nil
             end
             whoami_response = whoami_interface.get()
             if options[:json]
-              print JSON.pretty_generate(whoami_response)
+              puts as_json(whoami_response, options)
               print reset, "\n"
             end
             # store mock /oauth/token  auth_interface.login() result

data/lib/morpheus/cli/cypher_command.rb

@@ -381,8 +381,16 @@ class Morpheus::Cli::CypherCommand
         print_dry_run @cypher_interface.dry.create(item_key, payload)
         return
       end
-      unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to overwrite the cypher key #{item_key}?", {default:true})
-        return 9, "aborted command"
+      existing_cypher = nil
+      json_response = @cypher_interface.list(item_key)
+      puts "json_response: #{json_response}"
+      if json_response["data"] && json_response["data"]["keys"]
+        existing_cypher = json_response["data"]["keys"].find {|k| k == item_key }
+      end
+      if existing_cypher
+        unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to overwrite the cypher key #{item_key}?")
+          return 9, "aborted command"
+        end
       end
       json_response = @cypher_interface.create(item_key, payload)
       if options[:json]

data/lib/morpheus/cli/dashboard_command.rb

@@ -35,6 +35,7 @@ class Morpheus::Cli::DashboardCommand
     connect(options)
     begin
       params = {}
+      @dashboard_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @dashboard_interface.dry.get(params)
         return

data/lib/morpheus/cli/deployments.rb

@@ -35,6 +35,7 @@ class Morpheus::Cli::Deployments
       [:phrase, :offset, :max, :sort, :direction].each do |k|
         params[k] = options[k] unless options[k].nil?
       end
+      @deployments_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @deployments_interface.dry.get(params)
         return
@@ -82,7 +83,7 @@ class Morpheus::Cli::Deployments
       end
       deployment = find_deployment_by_name_or_id(deployment_name)
       exit 1 if deployment.nil?
-
+      @deployments_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @deployments_interface.dry.list_versions(deployment['id'],params)
         return
@@ -148,6 +149,7 @@ class Morpheus::Cli::Deployments
 
 
       payload = {deployment: deployment_payload}
+      @deployments_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @deployments_interface.dry.update(deployment['id'], payload)
         return
@@ -185,6 +187,7 @@ class Morpheus::Cli::Deployments
     connect(options)
     begin
       payload = {deployment: {name: deployment_name, description: options[:description]}}
+      @deployments_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @deployments_interface.dry.create(payload)
         return
@@ -220,6 +223,7 @@ class Morpheus::Cli::Deployments
       unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the deployment #{deployment['name']}?")
         exit
       end
+      @deployments_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @deployments_interface.dry.destroy(deployment['id'])
         return

data/lib/morpheus/cli/deploys.rb

@@ -29,7 +29,7 @@ class Morpheus::Cli::Deploys
     options={}
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = "Usage: morpheus deploy [environment]"
-      build_common_options(opts, options, [])
+      build_common_options(opts, options, [:remote, :dry_run])
       opts.footer = "Deploy to an environment using the morpheus.yml file, located in the working directory."
       # "todo: document me better!"
     end
@@ -66,6 +66,11 @@ class Morpheus::Cli::Deploys
         return
       end
     end
+    @deploy_interface.setopts(options)
+    @instances_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @deploy_interface.create(instance_id)
+    end
     # Create a new deployment record
     deploy_result = @deploy_interface.create(instance_id)
     app_deploy = deploy_result['appDeploy']
@@ -81,7 +86,11 @@ class Morpheus::Cli::Deploys
         if File.file?(file)
           print cyan,bold, "  - Uploading #{file} ...", reset, "\n"
           destination = file.split("/")[0..-2].join("/")
-          @deploy_interface.upload_file(deployment_id,file,destination)
+          if options[:dry_run]
+            print_dry_run @deploy_interface.upload_file(deployment_id,file,destination)
+          else
+            upload_result = @deploy_interface.upload_file(deployment_id,file,destination)
+          end
         end
       end
     end
@@ -103,8 +112,13 @@ class Morpheus::Cli::Deploys
         evars << {name: key, value: value, export: false}
       end
       payload = {envs: evars}
-      @instances_interface.create_env(instance_id, payload)
-      @instances_interface.restart(instance_id)
+      if options[:dry_run]
+        print_dry_run @instances_interface.create_env(instance_id, payload)
+        print_dry_run @instances_interface.restart(instance_id)
+      else
+        @instances_interface.create_env(instance_id, payload)
+        @instances_interface.restart(instance_id)
+      end
     end
     if deploy_args['options']
       deploy_payload = {
@@ -113,12 +127,15 @@ class Morpheus::Cli::Deploys
         }
       }
     end
-
-    print cyan, bold, "Deploying to Servers...", reset, "\n"
-    @deploy_interface.deploy(deployment_id,deploy_payload)
-    print cyan, bold, "Deploy Successful!", reset, "\n"
+    if options[:dry_run]
+      print_dry_run @deploy_interface.deploy(deployment_id,deploy_payload)
+    else
+      print cyan, bold, "Deploying to Servers...", reset, "\n"
+      @deploy_interface.deploy(deployment_id,deploy_payload)
+      print cyan, bold, "Deploy Successful!", reset, "\n"
+    end
+    
   end
-
   def list(args)
   end
 

data/lib/morpheus/cli/execute_schedules_command.rb

@@ -33,6 +33,7 @@ class Morpheus::Cli::ExecuteSchedulesCommand
     connect(options)
     begin
       params.merge!(parse_list_options(options))
+      @execute_schedules_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @execute_schedules_interface.dry.list(params)
         return
@@ -102,6 +103,7 @@ class Morpheus::Cli::ExecuteSchedulesCommand
       if schedule.nil?
         return 1
       end
+      @execute_schedules_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @execute_schedules_interface.dry.get(schedule['id'])
         return
@@ -218,6 +220,7 @@ class Morpheus::Cli::ExecuteSchedulesCommand
         # todo: prompt?
         payload = {'schedule' => params}
       end
+      @execute_schedules_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @execute_schedules_interface.dry.create(payload)
         return
@@ -289,6 +292,7 @@ class Morpheus::Cli::ExecuteSchedulesCommand
         params.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
         payload = {'schedule' => params}
       end
+      @execute_schedules_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @execute_schedules_interface.dry.update(schedule["id"], payload)
         return
@@ -336,7 +340,7 @@ class Morpheus::Cli::ExecuteSchedulesCommand
       # }
       # payload['schedule'].merge!(schedule)
       payload = params
-
+      @execute_schedules_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @execute_schedules_interface.dry.destroy(schedule["id"])
         return
@@ -391,6 +395,7 @@ class Morpheus::Cli::ExecuteSchedulesCommand
         end
         payload = {'instances' => instances.collect {|it| it['id'] } }
       end
+      @execute_schedules_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @execute_schedules_interface.dry.add_instances(schedule["id"], payload)
         return 0
@@ -449,6 +454,7 @@ class Morpheus::Cli::ExecuteSchedulesCommand
         end
         payload = {'instances' => instances.collect {|it| it['id'] } }
       end
+      @execute_schedules_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @execute_schedules_interface.dry.remove_instances(schedule["id"], payload)
         return 0
@@ -507,6 +513,7 @@ class Morpheus::Cli::ExecuteSchedulesCommand
         end
         payload = {'servers' => servers.collect {|it| it['id'] } }
       end
+      @execute_schedules_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @execute_schedules_interface.dry.add_servers(schedule["id"], payload)
         return 0
@@ -565,6 +572,7 @@ class Morpheus::Cli::ExecuteSchedulesCommand
         end
         payload = {'servers' => servers.collect {|it| it['id'] } }
       end
+      @execute_schedules_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @execute_schedules_interface.dry.remove_servers(schedule["id"], payload)
         return 0

data/lib/morpheus/cli/execution_request_command.rb

@@ -56,6 +56,7 @@ class Morpheus::Cli::ExecutionRequestCommand
     execution_request_id = args[0]
     begin
       params.merge!(parse_list_options(options))
+      @execution_request_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @execution_request_interface.dry.get(execution_request_id, params)
         return
@@ -194,7 +195,7 @@ class Morpheus::Cli::ExecutionRequestCommand
         end
         payload['script'] = script_content
       end
-      # dry run?
+      @execution_request_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @execution_request_interface.dry.create(params, payload)
         return 0
@@ -269,7 +270,7 @@ class Morpheus::Cli::ExecutionRequestCommand
           payload['script'] = script_content
         end
       end
-      # dry run?
+      @execution_request_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @execution_request_interface.dry.execute_against_lease(execution_request_id, params, payload)
         return 0

data/lib/morpheus/cli/file_copy_request_command.rb

@@ -56,6 +56,7 @@ class Morpheus::Cli::FileCopyRequestCommand
     file_copy_request_id = args[0]
     begin
       params.merge!(parse_list_options(options))
+      @file_copy_request_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @file_copy_request_interface.dry.get(file_copy_request_id, params)
         return
@@ -203,7 +204,7 @@ class Morpheus::Cli::FileCopyRequestCommand
         params['targetPath'] = v_prompt['targetPath']
       end
 
-      # dry run?
+      @file_copy_request_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @file_copy_request_interface.dry.create(local_file, params)
         return 0
@@ -297,7 +298,7 @@ class Morpheus::Cli::FileCopyRequestCommand
     begin
       # construct payload
       
-      # dry run?
+      @file_copy_request_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @file_copy_request_interface.dry.download_file_chunked(file_copy_request_id, outfile, params)
         return 0

data/lib/morpheus/cli/hosts.rb

@@ -293,16 +293,17 @@ class Morpheus::Cli::Hosts
 
   def _get(arg, options)
     begin
+      @servers_interface.setopts(options)
       if options[:dry_run]
         if arg.to_s =~ /\A\d{1,}\Z/
-          print_dry_run @servers_interface.setopts(options).get(arg.to_i)
+          print_dry_run @servers_interface.dry.get(arg.to_i)
         else
-          print_dry_run @servers_interface.setopts(options).list({name: arg})
+          print_dry_run @servers_interface.dry.list({name: arg})
         end
         return
       end
       server = find_host_by_name_or_id(arg)
-      json_response = @servers_interface.setopts(options).get(server['id'])
+      json_response = @servers_interface.get(server['id'])
       if options[:json]
         json_response.delete('stats') if options[:include_fields]
         puts as_json(json_response, options, "server")
@@ -384,16 +385,17 @@ class Morpheus::Cli::Hosts
 
   def _stats(arg, options)
     begin
+      @servers_interface.setopts(options)
       if options[:dry_run]
         if arg.to_s =~ /\A\d{1,}\Z/
-          print_dry_run @servers_interface.setopts(options).get(arg.to_i)
+          print_dry_run @servers_interface.dry.get(arg.to_i)
         else
-          print_dry_run @servers_interface.setopts(options).list({name: arg})
+          print_dry_run @servers_interface.dry.list({name: arg})
         end
         return
       end
       server = find_host_by_name_or_id(arg)
-      json_response = @servers_interface.setopts(options).get(server['id'])
+      json_response = @servers_interface.get(server['id'])
       if options[:json]
         puts as_json(json_response, options, "stats")
         return 0