morpheus-cli 4.0.0 → 4.0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bca59b88ea028739f7cb9d7484a2c48c23603bbd804fb72226297c976cc498e3
-  data.tar.gz: 843cf1f628ddc9f1c090243edccc5c43bd978c2df802be2a3fbea4a395919ff2
+  metadata.gz: 5c6b60209108abab70f0d88711bf7779b71d96e9b8bafed4fc151c2cca8ab309
+  data.tar.gz: 0be087086ccd2e2eeb28cec0541a15140b69ce232b830dd3c8c9a14a0a62dd48
 SHA512:
-  metadata.gz: d4ae8a45df624e4a89d0c29cd12649e2d3c752e243aff2bb919c3542fa70ba4d144a8da403e77d050c1b41885aa254901ebe6e99a2c69753d6d826e8e49be104
-  data.tar.gz: c69d3d7b235e1ca9178fb583858a317b6a64ea66bba115df28a1527aa3c45b75ba0318cd42c5fcd528c920e06773fe6fc7d5a55cf086cad2e3e977e6f7ecae77
+  metadata.gz: 3a92a52eb2a891c390b411508bd5dccdbaa4001be1e91578fddb19979fd169e4fbb5a890e21115d459de90fe4c441ecf39d158f244005a80dbd778e458591a9b
+  data.tar.gz: 85e1ea8863afaa9341f1dc35877398724a6c3a08331bab816d18fab5e95ad943a978e9946ae31911e95e9e805b81a724c39ad04dad02404cb17d861d12adaef5

data/lib/morpheus/cli/instances.rb

@@ -3457,7 +3457,7 @@ class Morpheus::Cli::Instances
         subtitles = []
         subtitles += parse_list_subtitles(options)
         print_h1 title, subtitles, options
-        print_process_event_details(process_event)
+        print_process_event_details(process_event, options)
         print reset, "\n"
         return 0
       end
@@ -3804,7 +3804,7 @@ private
     end
   end
 
-  def print_process_event_details(process_event)
+  def print_process_event_details(process_event, options={})
     # process_event =~ process
     description_cols = {
       "Process ID" => lambda {|it| it['processId'] },

data/lib/morpheus/cli/library_option_lists_command.rb

@@ -193,11 +193,7 @@ class Morpheus::Cli::LibraryOptionListsCommand
     end
     optparse.parse!(args)
     
-    if !list_type
-      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'type', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => get_available_option_list_types, 'defaultValue' => 'rest', 'required' => true}], options[:options], @api_client, {})
-      list_type = v_prompt['type']
-    end
-
+    
     connect(options)
     begin
       payload = nil
@@ -209,6 +205,10 @@ class Morpheus::Cli::LibraryOptionListsCommand
           payload['optionTypeList'].deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) })
         end
       else
+        if !list_type
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'type', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => get_available_option_list_types, 'defaultValue' => 'rest', 'required' => true}], options[:options], @api_client, {})
+          list_type = v_prompt['type']
+        end
         params = Morpheus::Cli::OptionTypes.prompt(new_option_type_list_option_types(list_type), options[:options], @api_client, options[:params])
         params['type'] = list_type
         if params['type'] == 'rest'
@@ -235,12 +235,10 @@ class Morpheus::Cli::LibraryOptionListsCommand
         print JSON.pretty_generate(json_response), "\n"
         return
       end
-      print_green_success "Added Option List #{list_payload['name']}"
-      #list([])
       option_type_list = json_response['optionTypeList']
-      if option_type_list
-        get([option_type_list['id']])
-      end
+      print_green_success "Added Option List #{option_type_list['name']}"
+      get([option_type_list['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
+      return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
@@ -306,8 +304,7 @@ class Morpheus::Cli::LibraryOptionListsCommand
         return
       end
       print_green_success "Updated Option List #{list_payload['name']}"
-      #list([])
-      get([option_type_list['id']])
+      get([option_type_list['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1

data/lib/morpheus/cli/library_option_types_command.rb

@@ -162,17 +162,27 @@ class Morpheus::Cli::LibraryOptionTypesCommand
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[options]")
       build_option_type_options(opts, options, new_option_type_option_types)
-      build_common_options(opts, options, [:options, :json, :dry_run, :remote])
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
     connect(options)
     begin
-      params = Morpheus::Cli::OptionTypes.prompt(new_option_type_option_types, options[:options], @api_client, options[:params])
-      if params.key?('required')
-        params['required'] = ['on','true'].include?(params['required'].to_s)
+      payload = nil
+      if options[:payload]
+        payload = options[:payload]
+        # support -O OPTION switch on top of --payload
+        if options[:options]
+          payload['optionType'] ||= {}
+          payload['optionType'].deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) })
+        end
+      else
+        params = Morpheus::Cli::OptionTypes.prompt(new_option_type_option_types, options[:options], @api_client, options[:params])
+        if params.key?('required')
+          params['required'] = ['on','true'].include?(params['required'].to_s)
+        end
+        option_type_payload = params
+        payload = {optionType: option_type_payload}
       end
-      option_type_payload = params
-      payload = {optionType: option_type_payload}
       @option_types_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @option_types_interface.dry.create(payload)
@@ -186,7 +196,7 @@ class Morpheus::Cli::LibraryOptionTypesCommand
       option_type = json_response['optionType']
       print_green_success "Added Option Type #{option_type['name']}"
       #list([])
-      get([option_type['id']])
+      get([option_type['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
@@ -200,7 +210,7 @@ class Morpheus::Cli::LibraryOptionTypesCommand
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] [options]")
       build_option_type_options(opts, options, update_option_type_option_types)
-      build_common_options(opts, options, [:options, :json, :dry_run, :remote])
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
     connect(options)
@@ -208,18 +218,27 @@ class Morpheus::Cli::LibraryOptionTypesCommand
       option_type = find_option_type_by_name_or_id(args[0])
       exit 1 if option_type.nil?
 
-      #params = options[:options] || {}
-      params = Morpheus::Cli::OptionTypes.no_prompt(update_option_type_option_types, options[:options], @api_client, options[:params])
-      if params.empty?
-        print_red_alert "Specify at least one option to update"
-        puts optparse
-        exit 1
-      end
-      if params.key?('required')
-        params['required'] = ['on','true'].include?(params['required'].to_s)
+      if options[:payload]
+        payload = options[:payload]
+        # support -O OPTION switch on top of --payload
+        if options[:options]
+          payload['optionType'] ||= {}
+          payload['optionType'].deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) })
+        end
+      else
+        #params = options[:options] || {}
+        params = Morpheus::Cli::OptionTypes.no_prompt(update_option_type_option_types, options[:options], @api_client, options[:params])
+        if params.empty?
+          print_red_alert "Specify at least one option to update"
+          puts optparse
+          exit 1
+        end
+        if params.key?('required')
+          params['required'] = ['on','true'].include?(params['required'].to_s)
+        end
+        option_type_payload = params
+        payload = {optionType: option_type_payload}
       end
-      option_type_payload = params
-      payload = {optionType: option_type_payload}
       @option_types_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @option_types_interface.dry.update(option_type['id'], payload)
@@ -232,7 +251,7 @@ class Morpheus::Cli::LibraryOptionTypesCommand
       end
       print_green_success "Updated Option Type #{option_type_payload['name']}"
       #list([])
-      get([option_type['id']])
+      get([option_type['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "4.0.0"
+    VERSION = "4.0.0.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.0.1
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-08 00:00:00.000000000 Z
+date: 2019-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler