morpheus-cli 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 225abeec72be29393b66192db842883e5a6a0260
-  data.tar.gz: ddcee03ffae03cc3ade5f42d727bda5da4481e14
+  metadata.gz: 7f4478e92b5478811a8d5520c5295009bc6a9547
+  data.tar.gz: 7bacea0771637cf3e033e5c962bbe2f1e0bd67f6
 SHA512:
-  metadata.gz: 5396e4da45c594a30ead62e81349439edafff63faaeae9a1b11cd18d684973d313487c4a67193389c461d877ef6c4e2c0cd2d94a40aa3e04d2834e5dfcaa2bc7
-  data.tar.gz: 06b4067301d92403d0190c2290cbf02a99f1c4707a142c5162a508a3372417c060feb8ef0eafdfc25c3159e1c5c885688ad0b45e2329c96c769341d8e26ca0d4
+  metadata.gz: 3039dd65f5c4a4e56c9efcb89db550183e8c2e0ed36ccafcd97a2ab2efb7763ca8d1f4ee7a32d01e1f6ee20e5f9c44681d96f11bcc658d8fe21a33bc19513a9e
+  data.tar.gz: d876f23eafb32db8354b7805dde7814b477c37b966adeb4e50a1e02834fa14684073e5e46706bb3f8c716a94a6f05cf6a04bf5f91e600ea4e4d88187e2945e95

data/lib/morpheus/cli/key_pairs.rb

@@ -148,17 +148,18 @@ class Morpheus::Cli::KeyPairs
     #   exit 1
     # end
     account_name = nil
+    keypair_name = args[0]
     options = {}
     optparse = OptionParser.new do|opts|
-      opts.banner = "Usage: morpheus key-pairs add [options]"
+      opts.banner = "Usage: morpheus key-pairs add [name] [options]"
       
       opts.on( '-a', '--account ACCOUNT', "Account Name" ) do |val|
         account_name = val
       end
 
       opts.on( '', '--public-key-file FILENAME', "Public Key File" ) do |filename|
-        if File.exists?(filename)
-          options['publicKey'] = File.read(filename)
+        if File.exists?(File.expand_path(filename))
+          options['publicKey'] = File.read(File.expand_path(filename))
           options[:options] ||= {}
           options[:options]['publicKey'] = options['publicKey']
         else
@@ -174,8 +175,8 @@ class Morpheus::Cli::KeyPairs
       end
 
       opts.on( '', '--private-key-file FILENAME', "Private Key File" ) do |filename|
-        if File.exists?(filename)
-          options['privateKey'] = File.read(filename)
+        if File.exists?(File.expand_path(filename))
+          options['privateKey'] = File.read(File.expand_path(filename))
           options[:options] ||= {}
           options[:options]['privateKey'] = options['privateKey']
         else
@@ -192,6 +193,10 @@ class Morpheus::Cli::KeyPairs
 
       Morpheus::Cli::CliCommand.genericOptions(opts,options)
     end
+    if args.count < 1
+      puts "\n#{optparse}\n\n"
+      exit 1
+    end
     optparse.parse(args)
 
     connect(options)
@@ -215,12 +220,13 @@ class Morpheus::Cli::KeyPairs
         print_red_alert "privateKey is required"
         exit 1
       end
+      params['name'] = args[0]
 
-      key_pair_payload = params.select {|k,v| ['name', 'publicKey', 'privateKey'].include?(k) }
+      key_pair_payload = params.select {|k,v| ['name','publicKey', 'privateKey'].include?(k) }
 
       request_payload = {keyPair: key_pair_payload}
       response = @key_pairs_interface.create(account_id, request_payload)
-      print "\n", cyan, "Account #{key_pair_payload['name']} added", reset, "\n\n"
+      print "\n", cyan, "Keypair #{key_pair_payload['name']} added", reset, "\n\n"
     rescue RestClient::Exception => e
       ::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
       exit 1
@@ -378,7 +384,6 @@ private
 
   def add_key_pair_option_types
     [
-      {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
       {'fieldName' => 'publicKey', 'fieldLabel' => 'Public Key', 'type' => 'text', 'required' => true, 'displayOrder' => 2},
       {'fieldName' => 'privateKey', 'fieldLabel' => 'Private Key', 'type' => 'text', 'required' => true, 'displayOrder' => 3},
     ]

data/lib/morpheus/cli/option_types.rb

@@ -1,5 +1,5 @@
 require 'term/ansicolor'
-
+require 'readline'
 module Morpheus
   module Cli
     module OptionTypes
@@ -138,8 +138,11 @@ module Morpheus
             value = source_option['value']
           end
           while !value_found do
-              print "#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? ('(' + option_type['fieldAddOn'] + ') ') : '' }#{!option_type['required'] ? ' (optional)' : ''} ['?' for options]: "
-              input = $stdin.gets.chomp!
+              Readline.completion_append_character = ""
+              Readline.basic_word_break_characters = ''
+              Readline.completion_proc = proc {|s| source_options.collect{|opt| opt['name']}.grep(/^#{Regexp.escape(s)}/)}
+              input = Readline.readline("#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? ('(' + option_type['fieldAddOn'] + ') ') : '' }#{!option_type['required'] ? ' (optional)' : ''} ['?' for options]: ", false).to_s
+              input = input.chomp.strip
               if option_type['optionSource']
                 source_option = source_options.find{|b| b['name'] == input || (!b['value'].nil? && b['value'].to_s == input) || (b['value'].nil? && input.empty?)}
                 if source_option

data/lib/morpheus/cli/shell.rb

@@ -6,6 +6,7 @@ require 'optparse'
 require 'table_print'
 require 'morpheus/cli/cli_command'
 require "shellwords"
+require 'readline'
 
 
 class Morpheus::Cli::Shell
@@ -13,6 +14,17 @@ class Morpheus::Cli::Shell
 	include Term::ANSIColor
 	def initialize() 
 		@appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance	
+		@auto_complete = proc do |s|
+			command_list = Morpheus::Cli::CliRegistry.all.keys
+			result = command_list.grep(/^#{Regexp.escape(s)}/)
+			if result.nil? || result.empty?
+				Readline::FILENAME_COMPLETION_PROC.call(s)
+			else
+				result
+			end
+		end
+
+		
 	end
 
 	def handle(args)
@@ -41,8 +53,12 @@ class Morpheus::Cli::Shell
 		remote_handler = Morpheus::Cli::Remote.new()
 		exit = false
 		while !exit do
-			print cyan,"morpheus > ",reset
-			input = $stdin.gets.chomp!
+			Readline.completion_append_character = " "
+			Readline.completion_proc = @auto_complete
+			Readline.basic_word_break_characters = "\t\n\"\‘`@$><=;|&{( "
+			input = Readline.readline("#{cyan}morpheus> #{reset}", true).to_s
+			# print cyan,"morpheus > ",reset
+			# input = $stdin.gets.chomp!
 			if !input.empty?
 
 				if input == 'exit'
@@ -85,6 +101,7 @@ class Morpheus::Cli::Shell
 						puts "Argument Syntax Error..."
 					rescue SystemExit, Interrupt
 							# nothing to do
+							puts "Interrupted..."
 					rescue => e
 						print red, "\n", e.message, "\n", reset
 						print e.backtrace.join("\n"), "\n"

data/lib/morpheus/cli/version.rb

@@ -1,5 +1,5 @@
 module Morpheus
   module Cli
-    VERSION = "0.9.6"
+    VERSION = "0.9.7"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - David Estes
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-31 00:00:00.000000000 Z
+date: 2016-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler