morpheus-cli 0.9.9 → 0.9.10

data/lib/morpheus/cli/security_group_rules.rb

@@ -1,7 +1,6 @@
 # require 'yaml'
 require 'io/console'
 require 'rest_client'
-require 'term/ansicolor'
 require 'optparse'
 require 'filesize'
 require 'table_print'
@@ -9,7 +8,7 @@ require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::SecurityGroupRules
   include Morpheus::Cli::CliCommand
-	include Term::ANSIColor
+
 	def initialize() 
 		@appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
 		@access_token = Morpheus::Cli::Credentials.new(@appliance_name,@appliance_url).request_credentials()
@@ -20,7 +19,7 @@ class Morpheus::Cli::SecurityGroupRules
 
 	def handle(args) 
 		if @access_token.empty?
-			print red,bold, "\nInvalid Credentials. Unable to acquire access token. Please verify your credentials and try again.\n\n",reset
+			print_red_alert "Invalid Credentials. Unable to acquire access token. Please verify your credentials and try again."
 			return 1
 		end
 		if args.empty?
@@ -49,25 +48,22 @@ Usage: morpheus security-group-rules add_custom_rule SOURCE_CIDR PORT_RANGE PROT
   PORT_RANGE: Port value (i.e. 123) or port range (i.e. 1-65535)
   PROTOCOL: tcp, udp, icmp\n\n'
 EOT
-
-		if args.count < 3
-			puts usage
-			return
-		end
-		
+		options = {}
 		security_group_id = nil 
 		optparse = OptionParser.new do|opts|
-			opts.banner = "\nUsage: morpheus security-group-rules add_custom_rule SOURCE_CIDR PORT_RANGE PROTOCOL [options]"
+			opts.banner = usage
 			opts.on( '-s', '--secgroup SECGROUP', "Security Group ID (Use will use security as set with 'security-groups use id'" ) do |id|
 				security_group_id = id
 			end
-			opts.on( '-h', '--help', "Prints this help" ) do
-				puts opts
-				exit
-			end
+			build_common_options(opts, options, [])
 		end
 		optparse.parse(args)
 
+		if args.count < 3
+			puts "\n#{optparse.banner}\n\n"
+			exit 1
+		end
+
 		if security_group_id.nil?
 			security_group_id = @active_security_group[@appliance_name.to_sym]
 		end
@@ -77,7 +73,7 @@ EOT
 			exit
 		end
 
-		options = {
+		params = {
 			:rule => {
 				:source => args[0],
 				:portRange => args[1],
@@ -87,17 +83,12 @@ EOT
 		}
 
 		begin
-			@security_group_rules_interface.create(security_group_id, options)
-		rescue => e
-			if e.response.code == 400
-				error = JSON.parse(e.response.to_s)
-				::Morpheus::Cli::ErrorHandler.new.print_errors(error)
-			else
-				puts "Error Communicating with the Appliance. Please try again later. #{e}"
-			end
-			return nil
+			@security_group_rules_interface.create(security_group_id, params)
+			list([])
+		rescue RestClient::Exception => e
+			print_rest_exception(e, options)
+			exit 1
 		end
-		list([])
 	end
 
 	def add_instance_rule(args)
@@ -106,24 +97,21 @@ Usage: morpheus security-group-rules add_instance_rule SOURCE_CIDR INSTANCE_TYPE
   SOURCE_CIDR: CIDR to white-list
   INSTANCE_TYPE_ID: ID of the Instance Type to access
 EOT
-		if args.count < 2
-			puts usage
-			return
-		end
 		
+		options = {}
 		security_group_id = nil 
 		optparse = OptionParser.new do|opts|
-			opts.banner = "\nmorpheus security-group-rules add_instance_rule SOURCE_CIDR INSTANCE_TYPE_ID [options]"
+			opts.banner = usage
 			opts.on( '-s', '--secgroup secgroup', "Security Group ID (Use will use security as set with 'security-groups use id'" ) do |id|
 				security_group_id = id
 			end
-			opts.on( '-h', '--help', "Prints this help" ) do
-				puts opts
-				exit
-			end
+			build_common_options(opts, options, [])
 		end
 		optparse.parse(args)
-
+		if args.count < 2
+			puts "\n#{optparse.banner}\n\n"
+			exit 1
+		end
 		if security_group_id.nil?
 			security_group_id = @active_security_group[@appliance_name.to_sym]
 		end
@@ -133,7 +121,7 @@ EOT
 			exit
 		end
 
-		options = {
+		params = {
 			:rule => {
 				:source => args[0],
 				:instanceTypeId => args[1]
@@ -141,17 +129,12 @@ EOT
 		}
 
 		begin
-			@security_group_rules_interface.create(security_group_id, options)
-		rescue => e
-			if e.response.code == 400
-				error = JSON.parse(e.response.to_s)
-				::Morpheus::Cli::ErrorHandler.new.print_errors(error)
-			else
-				puts "Error Communicating with the Appliance. Please try again later. #{e}"
-			end
-			return nil
+			@security_group_rules_interface.create(security_group_id, params)
+			list([security_group_id])
+		rescue RestClient::Exception => e
+			print_rest_exception(e, options)
+			exit 1
 		end
-		list([])
 	end
 
 	def list(args)
@@ -159,7 +142,7 @@ EOT
 		security_group_id = nil 
 		optparse = OptionParser.new do|opts|
 			opts.banner = "\nUsage: morpheus security-group-rules list [ID]"
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:json])
 		end
 		security_group_id = args[0].to_i
 		optparse.parse(args)
@@ -175,7 +158,12 @@ EOT
 
 		begin
 			params = {}
-			json_response = @security_group_rules_interface.get(security_group_id, options)
+			json_response = @security_group_rules_interface.get(security_group_id, params)
+			if options[:json]
+				print JSON.pretty_generate(json_response)
+				print "\n"
+				return
+			end
 			rules = json_response['rules']
 			print "\n" ,cyan, bold, "Morpheus Security Group Rules for Security Group ID:#{security_group_id}\n","==================", reset, "\n\n"
 			if rules.empty?
@@ -187,31 +175,28 @@ EOT
 			end
 			print reset,"\n\n"
 			
-		rescue => e
-			puts "Error Communicating with the Appliance. Please try again later. #{e}"
-			return nil
+		rescue RestClient::Exception => e
+			print_rest_exception(e, options)
+			exit 1
 		end
 	end
 
 	def remove(args)
-		if args.count < 1
-			puts "\nUsage: morpheus security-group-rules remove ID [options]\n\n"
-			return
-		end
-
+		
+		options = {}
 		security_group_id = nil 
 		optparse = OptionParser.new do|opts|
-			opts.banner = "\nUsage: morpheus security-group-rules remove ID [options]"
+			opts.banner = "Usage: morpheus security-group-rules remove ID [options]"
 			opts.on( '-s', '--secgroup secgroup', "Security Group ID (Use will use security as set with 'security-groups use id'" ) do |id|
 				security_group_id = id
 			end
-			opts.on( '-h', '--help', "Prints this help" ) do
-				puts opts
-				exit
-			end
+			build_common_options(opts, options, [])
 		end
 		optparse.parse(args)
-
+		if args.count < 1
+			puts "\n#{optparse.banner}\n\n"
+			exit 1
+		end
 		if security_group_id.nil?
 			security_group_id = @active_security_group[@appliance_name.to_sym]
 		end
@@ -223,15 +208,10 @@ EOT
 
 		begin
 			@security_group_rules_interface.delete(security_group_id, args[0])
-			list([])
+			list([security_group_id])
 		rescue RestClient::Exception => e
-			if e.response.code == 400
-				error = JSON.parse(e.response.to_s)
-				::Morpheus::Cli::ErrorHandler.new.print_errors(error)
-			else
-				puts "Error Communicating with the Appliance. Please try again later. #{e}"
-			end
-			return nil
+			print_rest_exception(e, options)
+			exit 1
 		end
 	end
 

data/lib/morpheus/cli/security_groups.rb

@@ -1,7 +1,6 @@
 # require 'yaml'
 require 'io/console'
 require 'rest_client'
-require 'term/ansicolor'
 require 'optparse'
 require 'filesize'
 require 'table_print'
@@ -9,7 +8,7 @@ require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::SecurityGroups
   include Morpheus::Cli::CliCommand
-	include Term::ANSIColor
+
 	def initialize() 
 		@appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
 		@access_token = Morpheus::Cli::Credentials.new(@appliance_name,@appliance_url).request_credentials()
@@ -20,7 +19,7 @@ class Morpheus::Cli::SecurityGroups
 
 	def handle(args) 
 		if @access_token.empty?
-			print red,bold, "\nInvalid Credentials. Unable to acquire access token. Please verify your credentials and try again.\n\n",reset
+			print_red_alert "Invalid Credentials. Unable to acquire access token. Please verify your credentials and try again."
 			return 1
 		end
 		if args.empty?
@@ -45,6 +44,12 @@ class Morpheus::Cli::SecurityGroups
 	end
 
 	def list(args)
+		options = {}
+		optparse = OptionParser.new do|opts|
+			opts.banner = "\nUsage: morpheus security-groups list"
+			build_common_options(opts, options, [])
+		end
+		optparse.parse(args)
 		begin
 			json_response = @security_groups_interface.list()
 			security_groups = json_response['securityGroups']
@@ -53,21 +58,32 @@ class Morpheus::Cli::SecurityGroups
 				puts yellow,"No Security Groups currently configured.",reset
 			else
 				security_groups.each do |security_group|
-					print cyan, "=  #{security_group['id']}: #{security_group['name']} (#{security_group['description']})\n"
+					
+					if @active_security_group[@appliance_name.to_sym] = security_group['id']
+						print cyan, "=> #{security_group['id']}: #{security_group['name']} (#{security_group['description']})\n"
+					else
+						print cyan, "=  #{security_group['id']}: #{security_group['name']} (#{security_group['description']})\n"
+					end
 				end
 			end
 			print reset,"\n\n"
 			
-		rescue => e
-			puts "Error Communicating with the Appliance. Please try again later. #{e}"
-			return nil
+		rescue RestClient::Exception => e
+			print_rest_exception(e, options)
+			exit 1
 		end
 	end
 
 	def get(args)
+		options = {}
+		optparse = OptionParser.new do|opts|
+			opts.banner = "Usage: morpheus security-groups get ID"
+			build_common_options(opts, options, [])
+		end
+		optparse.parse(args)
 		if args.count < 1
-			puts "\nUsage: morpheus security-groups get ID\n\n"
-			return
+			puts "\n#{optparse.banner}\n\n"
+			exit 1
 		end
 
 		begin
@@ -81,49 +97,45 @@ class Morpheus::Cli::SecurityGroups
 			end
 			print reset,"\n\n"
 			
-		rescue => e
-			puts "Error Communicating with the Appliance. Please try again later. #{e}"
-			return nil
+		rescue RestClient::Exception => e
+			print_rest_exception(e, options)
+			exit 1
 		end
 	end
 
 	def add(args)
-		if args.count < 1
-			puts "\nUsage: morpheus security-groups add NAME [options]\n\n"
-			return
-		end
-
-		options = {:securityGroup => {:name => args[0]} }
+		options = {}
+		params = {:securityGroup => {:name => args[0]} }
 		optparse = OptionParser.new do|opts|
 			opts.banner = "\nUsage: morpheus security-groups add NAME [options]"
 			opts.on( '-d', '--description Description', "Description of the security group" ) do |description|
-				options[:securityGroup][:description] = description
-			end
-
-			opts.on( '-h', '--help', "Prints this help" ) do
-				puts opts
-				exit
+				params[:securityGroup][:description] = description
 			end
+			build_common_options(opts, options, [])
 		end
 		optparse.parse(args)
-
+		if args.count < 1
+			puts "\n#{optparse.banner}\n\n"
+			exit 1
+		end
 		begin
-			@security_groups_interface.create(options)
-		rescue => e
-			if e.response.code == 400
-				error = JSON.parse(e.response.to_s)
-				::Morpheus::Cli::ErrorHandler.new.print_errors(error)
-			else
-				puts "Error Communicating with the Appliance. Please try again later. #{e}"
-			end
-			return nil
+			@security_groups_interface.create(params)
+			list([])
+		rescue RestClient::Exception => e
+			print_rest_exception(e, options)
+			exit 1
 		end
-		list([])
 	end
 
 	def remove(args)
+		options = {}
+		optparse = OptionParser.new do|opts|
+			opts.banner = "\nUsage: morpheus security-groups remove ID"
+			build_common_options(opts, options, [])
+		end
+		optparse.parse(args)
 		if args.count < 1
-			puts "\nUsage: morpheus security-groups remove ID\n\n"
+			puts "\n#{optparse.banner}\n\n"
 			return
 		end
 		begin
@@ -136,19 +148,20 @@ class Morpheus::Cli::SecurityGroups
 			@security_groups_interface.delete(security_group['id'])
 			list([])
 		rescue RestClient::Exception => e
-			if e.response.code == 400
-				error = JSON.parse(e.response.to_s)
-				::Morpheus::Cli::ErrorHandler.new.print_errors(error)
-			else
-				puts "Error Communicating with the Appliance. Please try again later. #{e}"
-			end
-			return nil
+			print_rest_exception(e, options)
+			exit 1
 		end
 	end
 
-	def use(args) 
+	def use(args)
+		options = {}
+		optparse = OptionParser.new do|opts|
+			opts.banner = "Usage: morpheus security-groups use ID"
+			build_common_options(opts, options, [])
+		end
+		optparse.parse(args)
 		if args.length < 1
-			puts "Usage: morpheus security-groups use ID"
+			puts "\n#{optparse.banner}\n\n"
 			return
 		end
 		begin
@@ -161,9 +174,9 @@ class Morpheus::Cli::SecurityGroups
 			else
 				puts "Security Group not found"
 			end
-		rescue => e
-			puts "Error Communicating with the Appliance. Please try again later. #{e}"
-			return nil
+		rescue RestClient::Exception => e
+			print_rest_exception(e, options)
+			exit 1
 		end
 	end
 

data/lib/morpheus/cli/shell.rb

@@ -7,6 +7,8 @@ require 'table_print'
 require 'morpheus/cli/cli_command'
 require "shellwords"
 require 'readline'
+require 'logger'
+require 'fileutils'
 
 
 class Morpheus::Cli::Shell
@@ -15,7 +17,8 @@ class Morpheus::Cli::Shell
 	def initialize() 
 		@appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance	
 		@auto_complete = proc do |s|
-			command_list = Morpheus::Cli::CliRegistry.all.keys
+			command_list = Morpheus::Cli::CliRegistry.all.keys.reject {|k| [:shell].include?(k) }
+			command_list += [:clear, :history, :flush_history, :exit]
 			result = command_list.grep(/^#{Regexp.escape(s)}/)
 			if result.nil? || result.empty?
 				Readline::FILENAME_COMPLETION_PROC.call(s)
@@ -24,7 +27,6 @@ class Morpheus::Cli::Shell
 			end
 		end
 
-		
 	end
 
 	def handle(args)
@@ -49,7 +51,10 @@ class Morpheus::Cli::Shell
 		end
 		optparse.parse(args)
 
-		history = []
+		@history_logger ||= load_history_logger
+		@history_logger.info "shell started" if @history_logger
+		load_history_from_log_file()
+
 		remote_handler = Morpheus::Cli::Remote.new()
 		exit = false
 		while !exit do
@@ -57,28 +62,56 @@ class Morpheus::Cli::Shell
 			Readline.completion_proc = @auto_complete
 			Readline.basic_word_break_characters = "\t\n\"\‘`@$><=;|&{( "
 			input = Readline.readline("#{cyan}morpheus> #{reset}", true).to_s
+			input = input.strip
 			# print cyan,"morpheus > ",reset
 			# input = $stdin.gets.chomp!
 			if !input.empty?
 
 				if input == 'exit'
+					@history_logger.info "exit" if @history_logger
 					break
-				elsif input == 'history'
-					commands = history.last(100)
-					puts "Last #{commands.size} commands"
-					commands.reverse.each do |cmd|
-						puts "#{cmd}"
+				elsif input =~ /^history/
+					n_commands = input.sub(/^history\s?/, '').sub(/\-n\s?/, '')
+					n_commands = n_commands.empty? ? 25 : n_commands.to_i
+					cmd_numbers = @history.keys.last(n_commands)
+					puts "Last #{cmd_numbers.size} commands"
+					cmd_numbers.each do |cmd_number|
+						cmd = @history[cmd_number]
+						puts "#{cmd_number.to_s.rjust(3, ' ')}  #{cmd}"
 					end
 					next
 				elsif input == 'clear'
 					print "\e[H\e[2J"
 					next
-				elsif input == '!'
-					input = history[-1]
+				elsif input == 'flush_history'
+					file_path = history_file_path
+					if File.exists?(file_path)
+						File.truncate(file_path, 0)
+					end
+					@history = {}
+					@last_command_number = 0
+					@history_logger = load_history_logger
+					puts "history cleared!"
+					next
+				elsif input == '!!'
+					cmd_number = @history.keys[-1]
+					input = @history[cmd_number]
+					if !input
+						puts "There is no previous command"
+						next
+					end
+				elsif input =~ /^\!.+/
+					cmd_number = input.sub("!", "").to_i
+					if cmd_number != 0
+						input = @history[cmd_number]
+						if !input
+							puts "Command not found by number #{cmd_index}"
+							next
+						end
+					end
 				end
 
 					begin
-						history << input
 						argv = Shellwords.shellsplit(input)
 						if @command_options[:account_name]
 							argv.push "--account", @command_options[:account_name]
@@ -90,19 +123,31 @@ class Morpheus::Cli::Shell
 							argv.push "--nocolor"
 						end
 						#puts "cmd: #{argv.join(' ')}"
-						if argv[0] == 'remote'
+
+						if argv[0] == 'shell'
+							puts "Unrecognized Command."
+						elsif argv[0] == 'remote'
+							log_history_command(input)
 							remote_handler.handle(argv[1..-1])
 						elsif Morpheus::Cli::CliRegistry.has_command?(argv[0])
+							log_history_command(input)
 							Morpheus::Cli::CliRegistry.exec(argv[0], argv[1..-1])
 						else
+							@history_logger.warn "Unrecognized Command: #{input}" if @history_logger
 							puts "Unrecognized Command."
 						end
 					rescue ArgumentError
 						puts "Argument Syntax Error..."
-					rescue SystemExit, Interrupt
-							# nothing to do
+					rescue Interrupt
+						# nothing to do
+						@history_logger.warn "shell interrupt" if @history_logger
+						print "\n"
+					rescue SystemExit
+						# nothing to do
 						print "\n"
 					rescue => e
+						
+						@history_logger.error "#{e.message}" if @history_logger
 						print red, "\n", e.message, "\n", reset
 						print e.backtrace.join("\n"), "\n"
 					end
@@ -125,4 +170,68 @@ class Morpheus::Cli::Shell
 		end
 		return input
 	end
+
+	def history_file_path
+		File.join(Dir.home, '.morpheus', "shell_history")
+	end
+
+	def load_history_logger
+		file_path = history_file_path
+		if !Dir.exists?(File.dirname(file_path))
+			FileUtils.mkdir_p(File.dirname(file_path))
+		end
+		logger = Logger.new(file_path)
+		# logger.formatter = proc do |severity, datetime, progname, msg|
+		# 	"#{msg}\n"
+		# end
+		return logger
+	end
+
+	def load_history_from_log_file(n_commands=1000)
+		@history ||= {}
+		@last_command_number ||= 0
+
+		if Gem.win_platform?
+			return @history
+		end
+
+		begin
+			file_path = history_file_path
+			FileUtils.mkdir_p(File.dirname(file_path))
+			# grab extra lines because not all log entries are commands
+			n_lines = n_commands + 500
+			history_lines = `tail -n #{n_lines} #{file_path}`.split(/\n/)
+			command_lines = history_lines.select do |line| 
+				line.match(/\(cmd (\d+)\) (.+)/)
+			end
+			command_lines = command_lines.last(n_commands)
+			command_lines.each do |line|
+				matches = line.match(/\(cmd (\d+)\) (.+)/)
+				if matches && matches.size == 3
+					cmd_number = matches[1].to_i
+					cmd = matches[2]
+
+					@last_command_number = cmd_number
+					@history[@last_command_number] = cmd
+
+					# for Ctrl+R history searching
+					Readline::HISTORY << cmd
+				end
+			end
+		rescue => e
+			raise e
+		end
+
+		return @history
+	end
+
+	def log_history_command(cmd)
+		@history ||= {}
+		@last_command_number ||= 0
+		@last_command_number += 1
+		@history[@last_command_number] = cmd
+		if @history_logger
+			@history_logger.info "(cmd #{@last_command_number}) #{cmd}" 
+		end
+	end
 end