morpheus-cli 0.9.9 → 0.9.10

data/lib/morpheus/cli/cli_command.rb

@@ -1,4 +1,5 @@
 require 'morpheus/cli/cli_registry'
+require 'morpheus/cli/mixins/print_helper'
 
 module Morpheus
   module Cli
@@ -7,19 +8,24 @@ module Morpheus
 
       def self.included(klass)
         Morpheus::Cli::CliRegistry.add(klass)
+        klass.include Morpheus::Cli::PrintHelper
         klass.extend ClassMethods
       end
 
-      def self.accountScopeOptions(opts,options)
-        opts.on('-a','--account ACCOUNT', "Account Name") do |val|
-          options[:account_name] = val
-        end
-        opts.on('-A','--account-id ID', "Account ID") do |val|
-          options[:account_id] = val
-        end
-      end
+      def build_common_options(opts, options, includes=[])
+        includes = includes.clone
+        while (option_key = includes.shift) do
+          case option_key.to_sym
+
+          when :account
+            opts.on('-a','--account ACCOUNT', "Account Name") do |val|
+              options[:account_name] = val
+            end
+            opts.on('-A','--account-id ID', "Account ID") do |val|
+              options[:account_id] = val
+            end
 
-      def self.genericOptions(opts,options)
+          when :options
             opts.on( '-O', '--option OPTION', "Option" ) do |option|
               custom_option_args = option.split('=')
               custom_options = options[:options] || {}
@@ -40,19 +46,14 @@ module Morpheus
               
               options[:options] = custom_options
             end
-            opts.on('-C','--nocolor', "ANSI") do
-              Term::ANSIColor::coloring = false
-            end
-            opts.on( '-h', '--help', "Prints this help" ) do
-              puts opts
-              exit
-            end
-            opts.on('-j','--json', "JSON Output") do |json|
-              options[:json] = true
-            end
-            opts.on( '-y', '--yes', "Auto Confirm" ) do
-              options[:yes] = true
+            opts.on('-N','--no-prompt', "Skip prompts. Use default values for all optional fields.") do |val|
+              options[:no_prompt] = true
+              # ew, stored in here for now because options[:options] is what is passed into OptionTypes.prompt() everywhere!
+              options[:options] ||= {}
+              options[:options][:no_prompt] = true
             end
+          when :list
+            
             opts.on( '-m', '--max MAX', "Max Results" ) do |max|
               options[:max] = max.to_i
             end
@@ -61,6 +62,19 @@ module Morpheus
               options[:offset] = offset.to_i
             end
 
+            opts.on( '-s', '--search PHRASE', "Search Phrase" ) do |phrase|
+              options[:phrase] = phrase
+            end
+
+            opts.on( '-S', '--sort ORDER', "Sort Order" ) do |v|
+              options[:sort] = v
+            end
+
+            opts.on( '-D', '--desc', "Reverse Sort Order" ) do |v|
+              options[:direction] = "desc"
+            end
+
+          when :remote
             opts.on( '-r', '--remote REMOTE', "Remote Appliance" ) do |remote|
               options[:remote] = remote
             end
@@ -80,18 +94,31 @@ module Morpheus
             opts.on( '-T', '--token ACCESS_TOKEN', "Access Token" ) do |remote|
               options[:remote_token] = remote
             end
-
-            opts.on( '-s', '--search PHRASE', "Search Phrase" ) do |phrase|
-              options[:phrase] = phrase
+          
+          when :auto_confirm
+            opts.on( '-y', '--yes', "Auto Confirm" ) do
+              options[:yes] = true
             end
-
-            opts.on( '', '--sort ORDER', "Sort Order" ) do |v|
-              options[:sort] = v
+          
+          when :json
+            opts.on('-j','--json', "JSON Output") do |json|
+              options[:json] = true
             end
+          
+          else
+            raise "Unknown common_option key: #{option_key}"
+          end
+        end
+
+        # options that are always included
+        opts.on('-C','--nocolor', "ANSI") do
+          Term::ANSIColor::coloring = false
+        end
+        opts.on('-h', '--help', "Prints this help" ) do
+          puts opts
+          exit
+        end
 
-            opts.on( '', '--desc', "Reverse Sort Order" ) do |v|
-              options[:direction] = "desc"
-            end
       end
       
 

data/lib/morpheus/cli/clouds.rb

@@ -1,7 +1,6 @@
 # require 'yaml'
 require 'io/console'
 require 'rest_client'
-require 'term/ansicolor'
 require 'optparse'
 require 'morpheus/cli/cli_command'
 require 'morpheus/cli/option_types'
@@ -9,7 +8,7 @@ require 'json'
 
 class Morpheus::Cli::Clouds
 	include Morpheus::Cli::CliCommand
-	include Term::ANSIColor
+
 	def initialize() 
 		@appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
 
@@ -29,7 +28,7 @@ class Morpheus::Cli::Clouds
 		@groups_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).groups
 		@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."
 			return 1
 		end
 	end
@@ -63,13 +62,10 @@ class Morpheus::Cli::Clouds
 	end
 
 	def add(args)
-		if args.count < 1
-			puts "\nUsage: morpheus clouds add [name] --group GROUP --type TYPE\n\n"
-			exit 1
-		end
 		options = {}
 		params = {zone_type: 'standard'}
 		optparse = OptionParser.new do|opts|
+			opts.banner = "Usage: morpheus clouds add [name] --group GROUP --type TYPE"
 			opts.on( '-g', '--group GROUP', "Group Name" ) do |group|
 				params[:group] = group
 			end
@@ -79,9 +75,15 @@ class Morpheus::Cli::Clouds
 			opts.on( '-d', '--description DESCRIPTION', "Description (optional)" ) do |desc|
 				params[:description] = desc
 			end
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:options, :json, :remote])
 		end
 		optparse.parse!(args)
+
+		if args.count < 1
+			puts "\n#{optparse.banner}\n\n"
+			exit 1
+		end
+
 		connect(options)
 		zone = {name: args[0], description: params[:description]}
 		if !params[:group].nil?
@@ -98,44 +100,42 @@ class Morpheus::Cli::Clouds
 		
 		begin
 			zone.merge!(Morpheus::Cli::OptionTypes.prompt(cloud_type['optionTypes'],options[:options],@api_client))
-			@clouds_interface.create(zone)
-		rescue => e
-			if e.response and e.response.code == 400
-				error = JSON.parse(e.response.to_s)
-				if options[:json]
-					print JSON.pretty_generate(error)
-				else
-					::Morpheus::Cli::ErrorHandler.new.print_errors(error)
-				end
+			json_response = @clouds_interface.create(zone)
+			if options[:json]
+				print JSON.pretty_generate(json_response)
+				print "\n"
 			else
-				puts "Error Communicating with the Appliance. Please try again later. #{e}"
+				list([])
 			end
+		rescue RestClient::Exception => e
+			print_rest_exception(e, options)
 			exit 1
 		end
-		list([])
 	end
 
 	def remove(args)
-		if args.count < 2
-			puts "\nUsage: morpheus clouds remove [name] --group GROUP\n\n"
-			return
-		end
-
-		params = {}
+		options = {}
 		optparse = OptionParser.new do|opts|
+			opts.banner = "Usage: morpheus clouds remove [name] --group GROUP"
 			opts.on( '-g', '--group GROUP', "Group Name" ) do |group|
-				params[:group] = group
+				options[:group] = group
 			end
-			Morpheus::Cli::CliCommand.genericOptions(opts,params)
+			build_common_options(opts, options, [:auto_confirm, :json, :remote])
 		end
 		optparse.parse(args)
-		connect(params)
-		if !params[:group].nil?
-			group = find_group_by_name(params[:group])
+
+		if args.count < 2
+			puts "\n#{optparse.banner}\n\n"
+			return
+		end
+
+		connect(options)
+		if !options[:group].nil?
+			group = find_group_by_name(options[:group])
 			if !group.nil?
-				params[:groupId] = group['id']
+				options[:groupId] = group['id']
 			else
-				puts "\nGroup #{params[:group]} not found!"
+				puts "\nGroup #{options[:group]} not found!"
 				exit 1
 			end
 		end
@@ -147,15 +147,19 @@ class Morpheus::Cli::Clouds
 				puts "Zone not found by name #{args[0]}"
 				exit 1
 			end
-			@clouds_interface.destroy(zone_results['zones'][0]['id'])
-			list([])
-		rescue RestClient::Exception => e
-			if e.response.code == 400 or e.response.code == 500
-				error = JSON.parse(e.response.to_s)
-				::Morpheus::Cli::ErrorHandler.new.print_errors(error,params)
+			cloud = zone_results['zones'][0]
+			unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the cloud #{cloud['name']}?")
+				exit
+			end
+			json_response = @clouds_interface.destroy(cloud['id'])
+			if options[:json]
+				print JSON.pretty_generate(json_response)
+				print "\n"
 			else
-				puts "Error Communicating with the Appliance. Please try again later. #{e}"
+				list([])
 			end
+		rescue RestClient::Exception => e
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
@@ -163,10 +167,11 @@ class Morpheus::Cli::Clouds
 	def list(args)
 		options={}
 		optparse = OptionParser.new do|opts|
+			opts.banner = "Usage: morpheus clouds 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)
@@ -199,7 +204,7 @@ class Morpheus::Cli::Clouds
 							status = "#{red}#{cloud['status'] ? cloud['status'].upcase : 'N/A'}#{cloud['statusMessage'] ? "#{cyan} - #{cloud['statusMessage']}" : ''}#{cyan}"
 						end
 						{id: cloud['id'], name: cloud['name'], type: cloud_type_for_id(cloud['zoneTypeId']), location: cloud['location'], status: status}
-						# 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
 					print cyan
 					tp clouds_table, :id, :name, :type, :location, :status
@@ -229,12 +234,7 @@ class Morpheus::Cli::Clouds
 			@clouds_interface.firewall_disable(zone_results['zones'][0]['id'])
 			security_groups([args[0]])
 		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
@@ -253,12 +253,7 @@ class Morpheus::Cli::Clouds
 			@clouds_interface.firewall_enable(zone_results['zones'][0]['id'])
 			security_groups([args[0]])
 		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
@@ -291,12 +286,7 @@ class Morpheus::Cli::Clouds
 			print reset,"\n\n"
 
 		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
@@ -344,12 +334,7 @@ EOF
 			@clouds_interface.apply_security_groups(zone_results['zones'][0]['id'], options)
 			security_groups([args[0]])
 		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

data/lib/morpheus/cli/deployments.rb

@@ -1,14 +1,12 @@
-# require 'yaml'
 require 'io/console'
 require 'rest_client'
-require 'term/ansicolor'
 require 'optparse'
 require 'table_print'
 require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::Deployments
 	include Morpheus::Cli::CliCommand
-	include Term::ANSIColor
+
 	def initialize() 
 		@appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance	
 	end
@@ -24,7 +22,7 @@ class Morpheus::Cli::Deployments
 		@api_client = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url)		
 		@deployments_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).deployments
 		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
@@ -57,7 +55,7 @@ class Morpheus::Cli::Deployments
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus deployments list [-s] [-o] [-m]"
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:list, :json, :remote])
 		end
 		optparse.parse(args)
 		connect(options)
@@ -86,7 +84,7 @@ class Morpheus::Cli::Deployments
 			
 			
 		rescue RestClient::Exception => e
-			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
@@ -95,7 +93,7 @@ class Morpheus::Cli::Deployments
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus deployments versions [deployment] [-s] [-o] [-m]"
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:list, :json, :remote])
 		end
 		optparse.parse(args)
 		if args.count < 1
@@ -130,7 +128,7 @@ class Morpheus::Cli::Deployments
 				print reset,"\n\n"
 			end
 		rescue RestClient::Exception => e
-			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
@@ -141,7 +139,7 @@ class Morpheus::Cli::Deployments
 		account_name = nil
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus deployments update [deployment] [options]"
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:options, :json, :remote])
 		end
 		if args.count < 1
 			puts "\n#{optparse.banner}\n\n"
@@ -185,12 +183,7 @@ class Morpheus::Cli::Deployments
 				print "\n", cyan, "Deployment #{response['deployment']['name']} updated", reset, "\n\n"
 			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
@@ -203,7 +196,7 @@ class Morpheus::Cli::Deployments
 			opts.on( '-d', '--description DESCRIPTION', "Description" ) do |val|
 				options[:description] = val
 			end
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:options, :json, :remote])
 		end
 		if args.count < 1
 			puts "\n#{optparse.banner}\n\n"
@@ -221,12 +214,7 @@ class Morpheus::Cli::Deployments
 				print "\n", cyan, "Deployment #{json_response['deployment']['name']} created successfully", reset, "\n\n"			
 			end
 		rescue RestClient::Exception => e
-			if e.response.code == 400
-				error = JSON.parse(e.response.to_s)
-				::Morpheus::Cli::ErrorHandler.new.print_errors(error,options)
-			else
-				puts "Error Communicating with the Appliance. Please try again later. #{e}"
-			end
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
@@ -236,7 +224,7 @@ class Morpheus::Cli::Deployments
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus deployments remove [deployment]"
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:auto_confirm, :json, :remote])
 		end
 		if args.count < 1
 			puts "\n#{optparse.banner}\n\n"
@@ -247,7 +235,9 @@ class Morpheus::Cli::Deployments
 		begin
 			deployment = find_deployment_by_name_or_code_or_id(deployment_name)
 			exit 1 if deployment.nil?
-			exit unless Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the deployment #{deployment['name']}?")
+			unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the deployment #{deployment['name']}?")
+				exit
+			end
 			json_response = @deployments_interface.destroy(deployment['id'])
 			if options[:json]
 					print JSON.pretty_generate(json_response)
@@ -255,12 +245,7 @@ class Morpheus::Cli::Deployments
 				print "\n", cyan, "Deployment #{deployment['name']} removed", reset, "\n\n"
 			end
 		rescue RestClient::Exception => e
-			if e.response.code == 400
-				error = JSON.parse(e.response.to_s)
-				::Morpheus::Cli::ErrorHandler.new.print_errors(error,options)
-			else
-				puts "Error Communicating with the Appliance. Please try again later. #{e}"
-			end
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
@@ -278,7 +263,7 @@ private
 			result = results['deployment']
 		end
 		if result.nil?
-			print red,bold, "\nDeployment not found by '#{val}'\n\n",reset
+			print_red_alert "Deployment not found by '#{val}'"
 			return nil
 		end
 		return result
@@ -295,7 +280,7 @@ private
 			result = results['deploymentType']
 		end
 		if result.nil?
-			print red,bold, "\nDeployment Type not found by '#{val}'\n\n",reset
+			print_red_alert "Deployment Type not found by '#{val}'"
 			return nil
 		end
 		return result
@@ -307,4 +292,4 @@ private
 			{'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'required' => false, 'displayOrder' => 1}
 		]
 	end
-end
+end