morpheus-cli 3.3.2.2 → 3.3.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 395b47e5e7178e1377738cc1364bcfa666708a19
-  data.tar.gz: abf52a23f3becfdaefe4dc1f2af6b5a54ccc2e40
+  metadata.gz: f8701d670a60da80458ef5dc574852c5dc070c7e
+  data.tar.gz: 8b7f01e73bcdc238668b4d643c5976ded6956c2a
 SHA512:
-  metadata.gz: 48a81811c2be21dff84c9d973d4f46c5123e6b7ce278c855aeeabb77b4d0055f1ec6b566f307469173c014c4205e5e2178b03306b2f5c360a1a8a47b67e259d2
-  data.tar.gz: 3bf43c656b0c2d854a350b02ed655f7ed7e50e6e9accc65623bef0d0333f225add0c74c94c969ee3ddf4ec0a7f6943532058f416674c7fb91032e7a2ab7ccf62
+  metadata.gz: 31882e7b1280de15565ca180788d404dafbfe2b811a42c03c3006466d3f0d25b5ec24fb4cab5ec978b9e78eec2c4c6835463b059e57c957cf308d96f6c0ee3e3
+  data.tar.gz: 5bfc0364301f53166c3e70f56b9fa16304bf44aa69b75ac750c9a908520fff6f035386799327c06af998cdcd2593b746901aed28e35c284ab4ec8d7a4e6b955b

data/lib/morpheus/cli.rb

@@ -25,6 +25,20 @@ module Morpheus
       end
     end
 
+    def self.windows?
+      if defined?(@@is_windows)
+        return @@is_windows
+      end
+      @@is_windows = false
+      begin
+        require 'rbconfig'
+        @@is_windows = (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
+      rescue => ex
+        # $stderr.puts "unable to determine if this is a Windows machine."
+      end
+      return @@is_windows
+    end
+
     # load all the well known commands and utilties they need
     def self.load!()
       # load interfaces
@@ -53,6 +67,8 @@ module Morpheus
       load 'morpheus/cli/coloring_command.rb'
       load 'morpheus/cli/log_level_command.rb'
       load 'morpheus/cli/ssl_verification_command.rb'
+      load 'morpheus/cli/edit_profile_command.rb'
+      load 'morpheus/cli/edit_rc_command.rb'
 
       # all the known commands
       load 'morpheus/cli/remote.rb'

data/lib/morpheus/cli/alias_command.rb

@@ -92,7 +92,7 @@ class Morpheus::Cli::AliasCommand
         return false
       end
 
-    if Morpheus::Cli::Shell.instance
+    if Morpheus::Cli::Shell.has_instance?
       Morpheus::Cli::Shell.instance.recalculate_auto_complete_commands()
     end
 

data/lib/morpheus/cli/cli_command.rb

@@ -389,6 +389,8 @@ module Morpheus
               options[:format] = :json
               options[:pretty_json] = false
             end
+            
+            opts.add_hidden_option('json-raw') if opts.is_a?(Morpheus::Cli::OptionParser)
 
           when :yaml
             opts.on(nil, '--yaml', "YAML Output") do
@@ -477,6 +479,7 @@ module Morpheus
           puts opts
           exit
         end
+
         opts
       end
 

data/lib/morpheus/cli/edit_profile_command.rb

@@ -0,0 +1,46 @@
+require 'morpheus/cli/cli_command'
+require 'term/ansicolor'
+require 'json'
+
+# Command for editing the .morpheus_profile initalization script
+class Morpheus::Cli::EditProfileCommand
+  include Morpheus::Cli::CliCommand
+  set_command_name :'edit-profile'
+  #set_command_hidden
+
+  def handle(args)
+    options = {}
+    editor = ENV['EDITOR'] || 'nano'
+    filename = Morpheus::Cli::DotFile.morpheus_profile_filename
+    optparse = Morpheus::Cli::OptionParser.new do|opts|
+      opts.banner = "Usage: morpheus #{command_name}"
+      opts.on( '-e', '--editor PROGRAM', "Editor program to use. The default is $EDITOR." ) do |val|
+        editor = val
+      end
+      build_common_options(opts, options, [])
+      opts.footer = "Edit your interactive shell script at #{filename}"
+    end
+    optparse.parse!(args)
+
+    if !editor
+      print_error Morpheus::Terminal.angry_prompt
+      puts_error "You have not defined an EDITOR."
+      puts_error "Try export EDITOR=emacs"
+      #puts "Trying nano..."
+      #editor = "nano"
+      return 1
+    end
+    puts "opening #{filename} for editing"
+    system(editor, filename)
+    if !$?.success?
+      print_error Morpheus::Terminal.angry_prompt
+      puts_error "edit command failed with #{$?.exitstatus}: #{editor} #{filename}"
+      return $?.exitstatus
+    end
+    if Morpheus::Cli::Shell.has_instance?
+      puts "use 'reload' to re-execute your startup script"
+    end
+    return 0 # $?
+  end
+
+end

data/lib/morpheus/cli/edit_rc_command.rb

@@ -0,0 +1,61 @@
+require 'morpheus/cli/cli_command'
+require 'term/ansicolor'
+require 'json'
+
+# Command for editing the .morpheus_profile initalization script
+class Morpheus::Cli::EditRcCommand
+  include Morpheus::Cli::CliCommand
+  set_command_name :'edit-rc'
+  #set_command_hidden
+
+  def handle(args)
+    options = {}
+    editor = nil
+    filename = Morpheus::Cli::DotFile.morpheusrc_filename
+    optparse = Morpheus::Cli::OptionParser.new do|opts|
+      opts.banner = "Usage: morpheus #{command_name}"
+      opts.on( '-e', '--editor PROGRAM', "Editor program to use. The default is $EDITOR." ) do |val|
+        editor = val.gsub("'",'')
+      end
+      build_common_options(opts, options, [])
+      opts.footer = "Edit your morpheus initialization script at #{filename}"
+    end
+    optparse.parse!(args)
+    
+
+    if !editor
+      editor = ENV['EDITOR']
+    end
+
+    # try something...
+    if !editor
+      if Morpheus::Cli.windows?
+        editor = "notepad"
+      else
+        editor = "nano"
+      end
+    end
+
+    if !editor
+      print_error Morpheus::Terminal.angry_prompt
+      puts_error "You have not defined an EDITOR."
+      puts_error "Try export EDITOR=emacs"
+      #puts "Trying nano..."
+      #editor = "nano"
+      return 1
+    end
+    has_editor = true
+    puts "opening #{filename} for editing"
+    system(editor, filename)
+    if !$?.success?
+      print_error Morpheus::Terminal.angry_prompt
+      puts_error "edit command failed with #{$?.exitstatus}: #{editor} #{filename}"
+      return $?.exitstatus
+    end
+    if Morpheus::Cli::Shell.has_instance?
+      puts "use 'reload' to re-execute your startup script"
+    end
+    return 0 # $?
+  end
+
+end

data/lib/morpheus/cli/instances.rb

@@ -208,7 +208,7 @@ class Morpheus::Cli::Instances
 
   def add(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       # opts.banner = subcommand_usage("[type] [name]")
       opts.banner = subcommand_usage("[name] -c CLOUD -t TYPE")
       opts.on( '-g', '--group GROUP', "Group Name or ID" ) do |val|
@@ -323,7 +323,7 @@ class Morpheus::Cli::Instances
   def update(args)
     usage = "Usage: morpheus instances update [name] [options]"
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       build_common_options(opts, options, [:options, :json, :dry_run, :remote])
     end
@@ -384,7 +384,7 @@ class Morpheus::Cli::Instances
   def status_check(args)
     out = ""
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       build_common_options(opts, options, [:quiet, :json, :remote]) # no :dry_run, just do it man
     end
@@ -416,7 +416,7 @@ class Morpheus::Cli::Instances
 
   def stats(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
     end
@@ -469,7 +469,7 @@ class Morpheus::Cli::Instances
 
   def console(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       opts.on( '-n', '--node NODE_ID', "Scope console to specific Container or VM" ) do |node_id|
         options[:node_id] = node_id.to_i
@@ -506,7 +506,7 @@ class Morpheus::Cli::Instances
 
   def logs(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       opts.on( '-n', '--node NODE_ID', "Scope logs to specific Container or VM" ) do |node_id|
         options[:node_id] = node_id.to_i
@@ -576,7 +576,7 @@ class Morpheus::Cli::Instances
 
   def get(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       opts.on( nil, '--containers', "Display Instance Containers" ) do
         options[:include_containers] = true
@@ -788,7 +788,7 @@ class Morpheus::Cli::Instances
 
   def list_containers(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
     end
@@ -883,7 +883,7 @@ class Morpheus::Cli::Instances
 
   def backups(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :remote])
     end
@@ -927,7 +927,7 @@ class Morpheus::Cli::Instances
 
   def clone(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] -g GROUP")
       build_option_type_options(opts, options, clone_instance_option_types(false))
       opts.on( '-g', '--group GROUP', "Group Name or ID for the new instance" ) do |val|
@@ -987,7 +987,7 @@ class Morpheus::Cli::Instances
 
   def envs(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       build_common_options(opts, options, [:json, :dry_run, :remote])
     end
@@ -1028,7 +1028,7 @@ class Morpheus::Cli::Instances
   def setenv(args)
     options = {}
 
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] VAR VALUE [-e]")
       opts.on( '-e', "Exportable" ) do |exportable|
         options[:export] = exportable
@@ -1068,7 +1068,7 @@ class Morpheus::Cli::Instances
 
   def delenv(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] VAR")
       build_common_options(opts, options, [:json, :dry_run, :remote])
     end
@@ -1101,7 +1101,7 @@ class Morpheus::Cli::Instances
   def stop(args)
     params = {'server' => true, 'muteMonitoring' => false}
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       opts.on('--muteMonitoring [on|off]', String, "Mute monitoring. Default is off.") do |val|
         params['muteMonitoring'] = val.nil? || val.to_s == 'on' || val.to_s == 'true'
@@ -1139,7 +1139,7 @@ class Morpheus::Cli::Instances
   def start(args)
     params = {'server' => true}
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       build_common_options(opts, options, [:json, :dry_run, :remote])
     end
@@ -1172,7 +1172,7 @@ class Morpheus::Cli::Instances
   def restart(args)
     params = {'server' => true, 'muteMonitoring' => true}
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       opts.on('--muteMonitoring [on|off]', String, "Mute monitoring. Default is on.") do |val|
         params['muteMonitoring'] = val.nil? || val.to_s == 'on' || val.to_s == 'true'
@@ -1210,7 +1210,7 @@ class Morpheus::Cli::Instances
   def suspend(args)
     params = {'server' => true, 'muteMonitoring' => false}
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       opts.on('--muteMonitoring [on|off]', String, "Mute monitoring. Default is off.") do |val|
         params['muteMonitoring'] = val.nil? || val.to_s == 'on' || val.to_s == 'true'
@@ -1246,7 +1246,7 @@ class Morpheus::Cli::Instances
   def eject(args)
     params = {'server' => true}
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       build_common_options(opts, options, [:auto_confirm, :quiet, :json, :dry_run, :remote])
     end
@@ -1279,7 +1279,7 @@ class Morpheus::Cli::Instances
   def stop_service(args)
     params = {'server' => false, 'muteMonitoring' => false}
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       opts.on('--muteMonitoring [on|off]', String, "Mute monitoring. Default is off.") do |val|
         params['muteMonitoring'] = val.nil? || val.to_s == 'on' || val.to_s == 'true'
@@ -1317,7 +1317,7 @@ class Morpheus::Cli::Instances
   def start_service(args)
     params = {'server' => true}
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       build_common_options(opts, options, [:quiet, :json, :dry_run, :remote])
     end
@@ -1348,7 +1348,7 @@ class Morpheus::Cli::Instances
   def restart_service(args)
     params = {'server' => false, 'muteMonitoring' => true}
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       opts.on('--muteMonitoring [on|off]', String, "Mute monitoring. Default is on.") do |val|
         params['muteMonitoring'] = val.nil? || val.to_s == 'on' || val.to_s == 'true'
@@ -1527,7 +1527,7 @@ class Morpheus::Cli::Instances
 
   def resize(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       build_common_options(opts, options, [:options, :json, :dry_run, :remote])
     end
@@ -1603,7 +1603,7 @@ class Morpheus::Cli::Instances
 
   def backup(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :remote])
     end
@@ -1639,7 +1639,7 @@ class Morpheus::Cli::Instances
   def remove(args)
     options = {}
     query_params = {keepBackups: 'off', force: 'off'}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] [-fB]")
       opts.on( '-f', '--force', "Force Delete" ) do
         query_params[:force] = 'on'
@@ -1687,7 +1687,7 @@ class Morpheus::Cli::Instances
 
   def firewall_disable(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       build_common_options(opts, options, [:json, :dry_run, :quiet, :remote])
     end
@@ -1718,7 +1718,7 @@ class Morpheus::Cli::Instances
 
   def firewall_enable(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       build_common_options(opts, options, [:json, :dry_run, :quiet, :remote])
     end
@@ -1749,7 +1749,7 @@ class Morpheus::Cli::Instances
 
   def security_groups(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       build_common_options(opts, options, [:json, :dry_run, :remote])
     end
@@ -1796,7 +1796,7 @@ class Morpheus::Cli::Instances
     options = {}
     security_group_ids = nil
     clear_or_secgroups_specified = false
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] [-S] [-c]")
       opts.on( '-S', '--secgroups SECGROUPS', "Apply the specified comma separated security group ids" ) do |secgroups|
         security_group_ids = secgroups.split(",")
@@ -1842,7 +1842,7 @@ class Morpheus::Cli::Instances
 
   def run_workflow(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] [workflow] [options]")
       build_common_options(opts, options, [:options, :json, :dry_run, :remote])
     end
@@ -1867,7 +1867,8 @@ class Morpheus::Cli::Instances
         end
       end
     end
-    params = options[:options] || {}
+    params = {}
+    params.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
 
     if params.empty? && !editable_options.empty?
       puts optparse
@@ -1887,8 +1888,9 @@ class Morpheus::Cli::Instances
         print as_json(json_response, options), "\n"
         return
       else
-        puts "Running workflow..."
+        print_green_success "Running workflow #{workflow['name']} on instance #{instance['name']} ..."
       end
+      return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
@@ -1898,7 +1900,7 @@ class Morpheus::Cli::Instances
   def import_snapshot(args)
     options = {}
     storage_provider_id = nil
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       opts.on("--storage-provider ID", String, "Optional storage provider") do |val|
         storage_provider_id = val