morpheus-cli 0.9.9 → 0.9.10

data/lib/morpheus/cli/deploys.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,6 @@ require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::Deploys
   include Morpheus::Cli::CliCommand
-	include Term::ANSIColor
 
   cli_command_name :deploy
   
@@ -24,7 +22,7 @@ class Morpheus::Cli::Deploys
 
 	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	
 

data/lib/morpheus/cli/groups.rb

@@ -1,14 +1,12 @@
-# require 'yaml'
+require 'yaml'
 require 'io/console'
 require 'rest_client'
-require 'term/ansicolor'
 require 'optparse'
 require 'table_print'
 require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::Groups
   include Morpheus::Cli::CliCommand
-	include Term::ANSIColor
   
 	def initialize() 
 		@appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
@@ -20,7 +18,7 @@ class Morpheus::Cli::Groups
 
 	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?
@@ -43,61 +41,72 @@ class Morpheus::Cli::Groups
 	end
 
 	def add(args)
-		if args.count < 1
-			puts "\nUsage: morpheus groups add [name] [--location]\n\n"
-			return
-		end
+		options = {}
 		params = {}
 		optparse = OptionParser.new do|opts|
+			opts.banner = "Usage: morpheus groups add [name] [--location]"
 			opts.on( '-l', '--location LOCATION', "Location" ) do |desc|
 				params[:location] = desc
 			end
+			build_common_options(opts, options, [])
 		end
 		optparse.parse(args)
-
+		if args.count < 1
+			puts "\n#{optparse.banner}\n\n"
+			exit 1
+		end
 		group = {name: args[0], location: params[:location]}
 		begin
 			@groups_interface.create(group)
-		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
+			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 = "Usage: morpheus groups remove [name]"
+			build_common_options(opts, options, [:auto_confirm])
+		end
+		optparse.parse(args)
 		if args.count < 1
-			puts "\nUsage: morpheus groups remove [name]\n\n"
-			return
+			puts "\n#{optparse.banner}\n\n"
+			exit 1
 		end
 
 		begin
 			group_results = @groups_interface.get(args[0])
 			if group_results['groups'].empty?
-				puts "Group not found by name #{args[0]}"
-				return
+				print_red_alert "Group not found by name #{args[0]}"
+				exit 1
+			end
+			unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the group #{group_results['groups'][0]['name']}?")
+				exit
 			end
 			@groups_interface.destroy(group_results['groups'][0]['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 list(args)
+		options = {}
+		optparse = OptionParser.new do|opts|
+			opts.banner = "Usage: morpheus groups list"
+			build_common_options(opts, options, [:json])
+		end
+		optparse.parse(args)
 		begin
 			json_response = @groups_interface.get()
+			if options[:json]
+				print JSON.pretty_generate(json_response)
+				return
+			end
 			groups = json_response['groups']
 			print "\n" ,cyan, bold, "Morpheus Groups\n","==================", reset, "\n\n"
 			if groups.empty?
@@ -113,15 +122,22 @@ class Morpheus::Cli::Groups
 			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 use(args) 
+	def use(args)
+		options = {}
+		optparse = OptionParser.new do|opts|
+			opts.banner = "Usage: morpheus groups use [name]"
+			build_common_options(opts, options, [])
+		end
+		optparse.parse(args)
 		if args.length < 1
-			puts "Usage: morpheus groups use [name]"
+			puts "\n#{optparse.banner}\n\n"
+			exit 1
 		end
 		begin
 			json_response = @groups_interface.get(args[0])
@@ -131,11 +147,11 @@ class Morpheus::Cli::Groups
 				::Morpheus::Cli::Groups.save_groups(@active_groups)
 				list([])
 			else
-				puts "Group not found"
+				print_red_alert "Group not found by name #{args[0]}"
 			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/hosts.rb

@@ -1,15 +1,13 @@
 # require 'yaml'
 require 'io/console'
 require 'rest_client'
-require 'term/ansicolor'
 require 'optparse'
 require 'morpheus/cli/cli_command'
 require 'morpheus/cli/option_types'
 require 'json'
 
 class Morpheus::Cli::Hosts
-	include Term::ANSIColor
-    include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::CliCommand
   
 	def initialize() 
 		@appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
@@ -33,15 +31,16 @@ class Morpheus::Cli::Hosts
 		@logs_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).logs
 		@cloud_types = @clouds_interface.cloud_types['zoneTypes']
 		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."
 			exit 1
 		end
 	end
 
 	def handle(args) 
+		usage = "Usage: morpheus hosts [list,add,remove,logs,start,stop,run-workflow,make-managed,upgrade-agent,server-types] [name]"
 		if args.empty?
-			puts "\nUsage: morpheus hosts [list,add,remove,logs,start,stop,run-workflow,make-managed,upgrade-agent, server-types] [name]\n\n"
-			exit 1
+			puts "\n#{usage}\n\n"
+			exit 127
 		end
 
 		case args[0]
@@ -64,7 +63,7 @@ class Morpheus::Cli::Hosts
 			when 'server-types'
 				server_types(args[1..-1])
 			else
-				puts "\nUsage: morpheus hosts [list,add,remove,logs,start,stop,run-workflow,make-managed,upgrade-agent, server-types] [name]\n\n"
+				puts "\n#{usage}\n\n"
 				exit 127 #Command now foud exit code
 		end
 	end
@@ -73,11 +72,11 @@ class Morpheus::Cli::Hosts
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus hosts logs [name]"
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:list, :json, :remote])
 		end
 		if args.count < 1
 			puts "\n#{optparse.banner}\n\n"
-			return
+			exit 1
 		end
 		optparse.parse(args)
 		connect(options)
@@ -85,7 +84,7 @@ class Morpheus::Cli::Hosts
 			host = find_host_by_name(args[0])
 			logs = @logs_interface.server_logs([host['id']], { max: options[:max] || 100, offset: options[:offset] || 0, query: options[:phrase]})
 			if options[:json]
-				puts logs
+				print JSON.pretty_generate(logs)
 			else
 				logs['data'].reverse.each do |log_entry|
 					log_level = ''
@@ -106,27 +105,22 @@ class Morpheus::Cli::Hosts
 				print reset,"\n"
 			end
 		rescue RestClient::Exception => e
-			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
 
 	def server_types(args) 
-		if args.count < 1
-			puts "\nUsage: morpheus hosts server-types CLOUD\n\n"
-			exit 1
-		end
 		options = {zone: args[0]}
-
 		optparse = OptionParser.new do|opts|
-			opts.banner = "Usage: morpheus server add CLOUD NAME -t HOST_TYPE [options]"
-			opts.on( '-t', '--type TYPE', "Host Type" ) do |server_type|
-				options[:server_type] = server_type
-			end
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			opts.banner = "Usage: morpheus hosts server-types CLOUD"
+			build_common_options(opts, options, [:json, :remote])
 		end
-
 		optparse.parse(args)
+		if args.count < 1
+			puts "\n#{optparse.banner}\n\n"
+			exit 1
+		end
 		connect(options)
 		params = {}
 		
@@ -138,23 +132,23 @@ class Morpheus::Cli::Hosts
 		end
 
 		if zone.nil?
-			puts "Cloud not found"
+			print_red_alert "Cloud not found"
 			exit 1
 		else
 			zone_type = cloud_type_for_id(zone['zoneTypeId'])
 		end
-		server_types = zone_type['serverTypes'].select{|b| b['creatable'] == true}
+		cloud_server_types = zone_type['serverTypes'].select{|b| b['creatable'] == true}
 		if options[:json]
-			print JSON.pretty_generate(server_types)
+			print JSON.pretty_generate(cloud_server_types)
 			print "\n"
 		else
 			
-			print "\n" ,red, bold, "Morpheus Server Types\n","==================", reset, "\n\n"
-			if server_types.nil? || server_types.empty?
+			print "\n" ,cyan, bold, "Morpheus Server Types\n","==================", reset, "\n\n"
+			if cloud_server_types.nil? || cloud_server_types.empty?
 				puts yellow,"No server types found for the selected cloud.",reset
 			else
-				server_types.each do |server_type|
-					print red, "=  #{server_type['code']} - #{server_type['name']}\n"
+				cloud_server_types.each do |server_type|
+					print cyan, "=  #{server_type['code']} - #{server_type['name']}\n"
 				end
 			end
 			print reset,"\n\n"
@@ -167,11 +161,11 @@ class Morpheus::Cli::Hosts
 		name = args[1]
 
 		optparse = OptionParser.new do|opts|
-			opts.banner = "Usage: morpheus hosts add CLOUD NAME -t HOST_TYPE [options]"
-			opts.on( '-t', '--type TYPE', "Host Type" ) do |server_type|
+			opts.banner = "Usage: morpheus hosts add CLOUD NAME [options]"
+			opts.on( '-t', '--type TYPE', "Server Type" ) do |server_type|
 				options[:server_type] = server_type
 			end
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:options, :json, :remote])
 		end
 		if args.count < 2
 			puts "\n#{optparse}\n\n"
@@ -190,36 +184,51 @@ class Morpheus::Cli::Hosts
 		end
 
 		if zone.nil?
-			puts  red,bold,"\nEither the cloud was not specified or was not found. Please make sure a cloud is specied at the beginning of the argument\n\n",reset
-			return
+			print_red_alert "Either the cloud was not specified or was not found. Please make sure a cloud is specified at the beginning of the argument."
+			exit 1
 		else
 			zone_type = cloud_type_for_id(zone['zoneTypeId'])
 		end
-		server_type = zone_type['serverTypes'].find{|b| b['creatable'] == true && (b['code'] == options[:server_type] || b['name'] == options[:server_type])}
+
+		cloud_server_types = zone_type['serverTypes'].select{|b| b['creatable'] == true }
+		if options[:server_type]
+			server_type_code = options[:server_type]
+		else
+			server_type_options = cloud_server_types.collect {|it| {'name' => it['name'], 'value' => it['code']} }
+			v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'type', 'type' => 'select', 'fieldLabel' => "Server Type", 'selectOptions' => server_type_options, 'required' => true, 'skipSingleOption' => true, 'description' => 'Choose a server type.'}], options[:options])
+    	server_type_code = v_prompt['type']
+		end
+		
+    server_type = cloud_server_types.find {|it| it['code'] == server_type_code }
+
+		if server_type.nil?
+			print_red_alert "Server Type #{server_type_code} not found cloud #{zone['name']}"
+			exit 1
+		end
+
 		params = Morpheus::Cli::OptionTypes.prompt(server_type['optionTypes'],options[:options],@api_client, options[:params])
 		begin
 			params['server'] = params['server'] || {}
 			server_payload = {server: {name: name, zone: {id: zone['id']}, computeServerType: [id: server_type['id']]}.merge(params['server']), config: params['config'], network: params['network']}
-			response = @servers_interface.create(server_payload)
-		rescue RestClient::Exception => e
-			if e.response.code == 400
-				error = JSON.parse(e.response.to_s)
-				::Morpheus::Cli::ErrorHandler.new.print_errors(error)
+			json_response = @servers_interface.create(server_payload)
+			if options[:json]
+				print JSON.pretty_generate(json_response)
+				print "\n"
 			else
-				puts "Error Communicating with the Appliance. Please try again later. #{e}"
+				print_green_success "Provisioning Server..."
+				list([])
 			end
+		rescue RestClient::Exception => e
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
 
 	def remove(args)
-		if args.count < 1
-			puts "\nUsage: morpheus hosts remove [name] [-c CLOUD] [-f] [-S]\n\n"
-			return
-		end
 		options = {}
 		query_params = {removeResources: 'on', force: 'off'}
 		optparse = OptionParser.new do|opts|
+			opts.banner = "Usage: morpheus hosts remove [name] [-c CLOUD] [-f] [-S]"
 			opts.on( '-c', '--cloud CLOUD', "Cloud" ) do |cloud|
 				options[:zone] = cloud
 			end
@@ -230,9 +239,13 @@ class Morpheus::Cli::Hosts
 				query_params[:removeResources] = 'off'
 			end
 			
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:auto_confirm, :json, :remote])
 		end
 		optparse.parse(args)
+		if args.count < 1
+			puts "\n#{optparse.banner}\n\n"
+			exit 1
+		end
 		connect(options)
 		zone=nil
 		if !options[:zone].nil?
@@ -264,7 +277,7 @@ class Morpheus::Cli::Hosts
 				
 			end
 			
-			if !::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to remove this server?", options)
+			unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to remove this server?", options)
 				exit 1
 			end
 
@@ -273,15 +286,11 @@ class Morpheus::Cli::Hosts
 				print JSON.pretty_generate(json_response)
 				print "\n"
 			else
-				puts "Removing Server..."
+				print_green_success "Removing Server..."
+				list([])
 			end
 		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
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
@@ -290,11 +299,12 @@ class Morpheus::Cli::Hosts
 		options = {}
 		params = {}
 		optparse = OptionParser.new do|opts|
+			opts.banner = "Usage: morpheus hosts list"
 			opts.on( '-g', '--group GROUP', "Group Name" ) do |group|
 				options[:group] = group
 			end
 			
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:list, :json, :remote])
 		end
 		optparse.parse(args)
 		connect(options)
@@ -306,22 +316,18 @@ class Morpheus::Cli::Hosts
 					params['site'] = group['id']
 				end
 			end
-			if !options[:max].nil?
-				params['max'] = options[:max]
-			end
-			if !options[:offset].nil?
-				params['offset'] = options[:offset]
-			end
-			if !options[:phrase].nil?
-				params['phrase'] = options[:phrase]
+
+			[:phrase, :offset, :max, :sort, :direction].each do |k|
+				params[k] = options[k] unless options[k].nil?
 			end
+
 			json_response = @servers_interface.get(params)
 			servers = json_response['servers']
 			if options[:json]
 				print JSON.pretty_generate(json_response)
 				print "\n"
 			else
-				print "\n" ,red, bold, "Morpheus Hosts\n","==================", reset, "\n\n"
+				print "\n" ,cyan, bold, "Morpheus Hosts\n","==================", reset, "\n\n"
 				if servers.empty?
 					puts yellow,"No hosts currently configured.",reset
 				else
@@ -330,23 +336,23 @@ class Morpheus::Cli::Hosts
 					server_table =servers.collect do |server|
 						power_state = nil
 						if server['powerState'] == 'on'
-							power_state = "#{green}ON#{red}"
+							power_state = "#{green}ON#{cyan}"
 						elsif server['powerState'] == 'off'
-							power_state = "#{red}OFF#{red}"
+							power_state = "#{red}OFF#{cyan}"
 						else
-							power_state = "#{white}#{server['powerState'].upcase}#{red}"
+							power_state = "#{white}#{server['powerState'].upcase}#{cyan}"
 						end
 						{id: server['id'], name: server['name'], platform: server['serverOs'] ? server['serverOs']['name'].upcase : 'N/A', type: server['computeServerType'] ? server['computeServerType']['name'] : 'unmanaged', status: server['status'], power: power_state}
-						# print red, "= [#{server['id']}] #{server['name']} - #{server['computeServerType'] ? server['computeServerType']['name'] : 'unmanaged'} (#{server['status']}) Power: ", power_state, "\n"
+						# print cyan, "= [#{server['id']}] #{server['name']} - #{server['computeServerType'] ? server['computeServerType']['name'] : 'unmanaged'} (#{server['status']}) Power: ", power_state, "\n"
 					end
 				end
-				print red
+				print cyan
 				tp server_table, :id, :name, :type, :platform, :status, :power
 				print reset,"\n\n"
 			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
 
@@ -355,7 +361,7 @@ class Morpheus::Cli::Hosts
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus hosts start [name]"
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:json, :remote])
 		end
 		if args.count < 1
 			puts "\n#{optparse.banner}\n\n"
@@ -374,7 +380,7 @@ class Morpheus::Cli::Hosts
 			end
 			return
 		rescue RestClient::Exception => e
-			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
@@ -383,7 +389,7 @@ class Morpheus::Cli::Hosts
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus hosts stop [name]"
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:json, :remote])
 		end
 		if args.count < 1
 			puts "\n#{optparse.banner}\n\n"
@@ -402,7 +408,7 @@ class Morpheus::Cli::Hosts
 			end
 			return
 		rescue RestClient::Exception => e
-			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
@@ -411,7 +417,7 @@ class Morpheus::Cli::Hosts
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus hosts upgrade [name]"
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:json, :remote])
 		end
 		if args.count < 1
 			puts "\n#{optparse.banner}\n\n"
@@ -430,7 +436,7 @@ class Morpheus::Cli::Hosts
 			end
 			return
 		rescue RestClient::Exception => e
-			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
@@ -440,7 +446,7 @@ class Morpheus::Cli::Hosts
 		
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus hosts run-workflow [HOST] [name] [options]"
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:json, :remote])
 		end
 		if args.count < 2
 			puts "\n#{optparse}\n\n"
@@ -484,7 +490,7 @@ class Morpheus::Cli::Hosts
 				puts "Running workflow..."
 			end
 		rescue RestClient::Exception => e
-			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end