morpheus-cli 0.9.9 → 0.9.10

data/lib/morpheus/cli/key_pairs.rb

@@ -1,7 +1,5 @@
-# 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 +7,6 @@ require 'morpheus/cli/mixins/accounts_helper'
 require 'json'
 
 class Morpheus::Cli::KeyPairs
-  include Term::ANSIColor
   include Morpheus::Cli::CliCommand
   include Morpheus::Cli::AccountsHelper
   
@@ -20,7 +17,7 @@ class Morpheus::Cli::KeyPairs
   def connect(opts)
     @access_token = Morpheus::Cli::Credentials.new(@appliance_name,@appliance_url).request_credentials()
     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
     @api_client = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url)
@@ -53,12 +50,12 @@ class Morpheus::Cli::KeyPairs
   end
 
   def list(args)
+    usage = "Usage: morpheus key-pairs list [options]"
     options = {}
     params = {}
-    account = nil
     optparse = OptionParser.new do|opts|
-      Morpheus::Cli::CliCommand.accountScopeOptions(opts,options)
-      Morpheus::Cli::CliCommand.genericOptions(opts,options)
+      opts.banner = usage
+      build_common_options(opts, options, [:account, :list, :json])
     end
     optparse.parse(args)
     connect(options)
@@ -86,27 +83,27 @@ class Morpheus::Cli::KeyPairs
         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
 
   def details(args)
     usage = "Usage: morpheus key-pairs details [name] [options]"
-    if args.count < 1
-      puts "\n#{usage}\n\n"
-      exit 1
-    end
-    account = nil
-    name = args[0]
     options = {}
     params = {}
     optparse = OptionParser.new do|opts|
       opts.banner = usage
-      Morpheus::Cli::CliCommand.accountScopeOptions(opts,options)
-      Morpheus::Cli::CliCommand.genericOptions(opts,options)
+      build_common_options(opts, options, [:account, :json])
     end
     optparse.parse(args)
+
+    if args.count < 1
+      puts "\n#{usage}\n\n"
+      exit 1
+    end
+    name = args[0]
+
     connect(options)
     begin
     
@@ -121,7 +118,7 @@ class Morpheus::Cli::KeyPairs
       exit 1 if key_pair.nil?
 
       if options[:json]
-        print JSON.pretty_generate(key_pair)
+        print JSON.pretty_generate({keyPair: key_pair})
         print "\n"
       else
         print "\n" ,cyan, bold, "Key Pair Details\n","==================", reset, "\n\n"
@@ -137,27 +134,17 @@ class Morpheus::Cli::KeyPairs
 
       end
     rescue RestClient::Exception => e
-      ::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+      print_rest_exception(e, options)
       exit 1
     end
   end
 
   def add(args)
-    # if args.count > 0
-    #   puts "\nUsage: morpheus hosts add [options]\n\n"
-    #   exit 1
-    # end
-    account_name = nil
-    keypair_name = args[0]
     options = {}
     optparse = OptionParser.new do|opts|
       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|
+      opts.on('', '--public-key-file FILENAME', "Public Key File" ) do |filename|
         if File.exists?(File.expand_path(filename))
           options['publicKey'] = File.read(File.expand_path(filename))
           options[:options] ||= {}
@@ -168,13 +155,13 @@ class Morpheus::Cli::KeyPairs
         end
       end
 
-      opts.on( '', '--public-key TEXT', "Public Key Text" ) do |val|
+      opts.on('', '--public-key TEXT', "Public Key Text" ) do |val|
         options['publicKey'] = val
         options[:options] ||= {}
         options[:options]['publicKey'] = options['publicKey']
       end
 
-      opts.on( '', '--private-key-file FILENAME', "Private Key File" ) do |filename|
+      opts.on('', '--private-key-file FILENAME', "Private Key File" ) do |filename|
         if File.exists?(File.expand_path(filename))
           options['privateKey'] = File.read(File.expand_path(filename))
           options[:options] ||= {}
@@ -185,14 +172,15 @@ class Morpheus::Cli::KeyPairs
         end
       end
 
-      opts.on( '', '--private-key TEXT', "Private Key Text" ) do |val|
+      opts.on('', '--private-key TEXT', "Private Key Text" ) do |val|
         options['privateKey'] = val
         options[:options] ||= {}
         options[:options]['privateKey'] = options['privateKey']
       end
 
-      Morpheus::Cli::CliCommand.genericOptions(opts,options)
+      build_common_options(opts, options, [:account, :options, :json])
     end
+    
     if args.count < 1
       puts "\n#{optparse}\n\n"
       exit 1
@@ -203,15 +191,10 @@ class Morpheus::Cli::KeyPairs
     
     begin
 
-      # current user account by default
-      account = nil
-      if !account_name.nil?
-        account = find_account_by_name(account_name)
-        exit 1 if account.nil?
-      end
+      account = find_account_from_options(options)
       account_id = account ? account['id'] : nil
 
-      params = Morpheus::Cli::OptionTypes.prompt(add_key_pair_option_types, options[:options], @api_client, options[:params]) # options[:params] is mysterious
+      params = Morpheus::Cli::OptionTypes.prompt(add_key_pair_option_types, options[:options], @api_client, options[:params])
 
       if !params['publicKey']
         print_red_alert "publicKey is required"
@@ -225,49 +208,45 @@ class Morpheus::Cli::KeyPairs
       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, "Keypair #{key_pair_payload['name']} added", reset, "\n\n"
+      json_response = @key_pairs_interface.create(account_id, request_payload)
+      if options[:json]
+        print JSON.pretty_generate(json_response)
+        print "\n"
+      else
+        print_green_success "Key Pair #{key_pair_payload['name']} added"
+      end
     rescue RestClient::Exception => e
-      ::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+      print_rest_exception(e, options)
       exit 1
     end
   end
 
   def update(args)
-    usage = "Usage: morpheus hosts update [name] [options]"
-    if args.count < 1
-      puts "\n#{usage}\n\n"
-      exit 1
-    end
-    account_name = nil
-    name = args[0]
+    usage = "Usage: morpheus key-pairs update [name] [options]"
     options = {}
     optparse = OptionParser.new do|opts|
       opts.banner = usage
-
-      opts.on( '-a', '--account ACCOUNT', "Account Name" ) do |val|
-        account_name = val
-      end
-
-      Morpheus::Cli::CliCommand.genericOptions(opts,options)
+      build_common_options(opts, options, [:account, :options, :json])
     end
     optparse.parse(args)
 
+    if args.count < 1
+      puts "\n#{usage}\n\n"
+      exit 1
+    end
+    name = args[0]
+
     connect(options)
     
     begin
 
-      account_id = nil 
-      if !account_name.nil?
-        account = find_account_by_name(account_name)
-        exit 1 if account.nil?
-        account_id = account['id']
-      end
+      account = find_account_from_options(options)
+      account_id = account ? account['id'] : nil
 
       key_pair = ((name.to_s =~ /\A\d{1,}\Z/) ? find_key_pair_by_id(account_id, name) : find_key_pair_by_name(account_id, name) )
       exit 1 if key_pair.nil?
 
-      #params = Morpheus::Cli::OptionTypes.prompt(update_key_pair_option_types, options[:options], @api_client, options[:params]) # options[:params] is mysterious
+      #params = Morpheus::Cli::OptionTypes.prompt(update_key_pair_option_types, options[:options], @api_client, options[:params])
       params = options[:options] || {}
 
       if params.empty?
@@ -279,51 +258,55 @@ class Morpheus::Cli::KeyPairs
 
       key_pair_payload = params.select {|k,v| ['name'].include?(k) }
       request_payload = {keyPair: key_pair_payload}
-      response = @key_pairs_interface.update(account_id, key_pair['id'], request_payload)
-      print "\n", cyan, "Key Pair #{key_pair_payload['name'] || key_pair['name']} updated", reset, "\n\n"
+      json_response = @key_pairs_interface.update(account_id, key_pair['id'], request_payload)
+      if options[:json]
+        print JSON.pretty_generate(json_response)
+        print "\n"
+      else
+        print_green_success "Key Pair #{key_pair_payload['name'] || key_pair['name']} updated"
+      end
     rescue RestClient::Exception => e
-      ::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+      print_rest_exception(e, options)
       exit 1
     end
   end
 
   def remove(args)
     usage = "Usage: morpheus key-pairs remove [name]"
+    options = {}
+    optparse = OptionParser.new do|opts|
+      opts.banner = usage
+      build_common_options(opts, options, [:account, :auto_confirm, :json])
+    end
+    optparse.parse(args)
+
     if args.count < 1
       puts "\n#{usage}\n\n"
       exit 1
     end
-    account_name = nil
     name = args[0]
-    options = {}
-    optparse = OptionParser.new do|opts|
-      opts.banner = usage
 
-      opts.on( '-a', '--account ACCOUNT', "Account Name or ID" ) do |val|
-        account_name = val
-      end
-
-      Morpheus::Cli::CliCommand.genericOptions(opts,options)
-    end
-    optparse.parse(args)
     connect(options)
     begin
       # current user account by default
-      account = nil
-      if !account_name.nil?
-        account = find_account_by_name(account_name)
-        exit 1 if account.nil?
-      end
+      account = find_account_from_options(options)
       account_id = account ? account['id'] : nil
       # allow finding by ID since name is not unique!
       key_pair = ((name.to_s =~ /\A\d{1,}\Z/) ? find_key_pair_by_id(account_id, name) : find_key_pair_by_name(account_id, name) )
       exit 1 if key_pair.nil?
-      exit unless Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the key pair #{key_pair['name']}?")
-      @key_pairs_interface.destroy(account_id, key_pair['id'])
-      # list([])
-      print "\n", cyan, "Key Pair #{key_pair['name']} removed", reset, "\n\n"
+      unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the key pair #{key_pair['name']}?")
+        exit
+      end
+      json_response = @key_pairs_interface.destroy(account_id, key_pair['id'])
+      if options[:json]
+        print JSON.pretty_generate(json_response)
+        print "\n"
+      else
+        print_green_success "Key Pair #{key_pair['name']} removed"
+        # list([])
+      end
     rescue RestClient::Exception => e
-      ::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+      print_rest_exception(e, options)
       exit 1
     end
   end

data/lib/morpheus/cli/license.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::License
 	include Morpheus::Cli::CliCommand
-	include Term::ANSIColor
+
 	def initialize() 
 		@appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance	
 	end
@@ -25,7 +23,7 @@ class Morpheus::Cli::License
 		@license_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).license
 		
 		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
@@ -53,7 +51,7 @@ class Morpheus::Cli::License
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus license details"
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:json, :remote])
 		end
 		optparse.parse(args)
 		connect(options)
@@ -80,7 +78,7 @@ class Morpheus::Cli::License
 				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
@@ -91,7 +89,7 @@ class Morpheus::Cli::License
 		account_name = nil
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus license apply [key]"
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:json, :remote])
 		end
 		if args.count < 1
 			puts "\n#{optparse.banner}\n\n"
@@ -110,9 +108,9 @@ class Morpheus::Cli::License
 				puts "License applied successfully!"
 			end
 		rescue RestClient::Exception => e
-			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
 
-end
+end

data/lib/morpheus/cli/load_balancers.rb

@@ -1,14 +1,13 @@
 # require 'yaml'
 require 'io/console'
 require 'rest_client'
-require 'term/ansicolor'
 require 'optparse'
 require 'table_print'
 require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::LoadBalancers
 	include Morpheus::Cli::CliCommand
-	include Term::ANSIColor
+
 	def initialize() 
 		@appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance	
 	end
@@ -25,7 +24,7 @@ class Morpheus::Cli::LoadBalancers
 		@load_balancers_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).load_balancers
 		
 		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
@@ -60,20 +59,14 @@ class Morpheus::Cli::LoadBalancers
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus load-balancers list [-s] [-o] [-m]"
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:list, :json, :remote])
 		end
 		optparse.parse(args)
 		connect(options)
 		begin
 			params = {}
-			if options[:offset]
-				params[:offset] = options[:offset]
-			end
-			if options[:max]
-				params[:max] = options[:max]
-			end
-			if options[:phrase]
-				params[:phrase] = options[:phrase]
+			[:phrase, :offset, :max, :sort, :direction].each do |k|
+				params[k] = options[k] unless options[k].nil?
 			end
 			json_response = @load_balancers_interface.get(params)
 			if options[:json]
@@ -95,12 +88,7 @@ class Morpheus::Cli::LoadBalancers
 			
 			
 		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
@@ -110,7 +98,7 @@ class Morpheus::Cli::LoadBalancers
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus load-balancers details [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"
@@ -133,12 +121,7 @@ class Morpheus::Cli::LoadBalancers
 				print 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
@@ -149,7 +132,7 @@ class Morpheus::Cli::LoadBalancers
 		account_name = nil
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus tasks update [task] [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"
@@ -199,12 +182,7 @@ class Morpheus::Cli::LoadBalancers
 				print "\n", cyan, "Task #{response['task']['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
@@ -214,7 +192,7 @@ class Morpheus::Cli::LoadBalancers
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus load-balancers lb-types"
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:json, :remote])
 		end
 		optparse.parse(args)
 		connect(options)
@@ -239,13 +217,8 @@ class Morpheus::Cli::LoadBalancers
 			end
 			
 			
-		rescue => 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
+		rescue RestClient::Exception => e
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
@@ -259,7 +232,7 @@ class Morpheus::Cli::LoadBalancers
 			opts.on( '-t', '--type LB_TYPE', "Lb Type" ) do |val|
 				lb_type_name = 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"
@@ -288,7 +261,7 @@ class Morpheus::Cli::LoadBalancers
 				print "\n", cyan, "LB #{json_response['loadBalancer']['name']} created successfully", 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
@@ -298,7 +271,7 @@ class Morpheus::Cli::LoadBalancers
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus load-balancers remove [name]"
-			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"
@@ -309,7 +282,9 @@ class Morpheus::Cli::LoadBalancers
 		begin
 			lb = find_lb_by_name(lb_name)
 			exit 1 if lb.nil?
-			exit unless Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the load balancer #{lb['name']}?")
+			unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the load balancer #{lb['name']}?")
+				exit
+			end
 			json_response = @load_balancers_interface.destroy(lb['id'])
 			if options[:json]
 					print JSON.pretty_generate(json_response)
@@ -317,12 +292,7 @@ class Morpheus::Cli::LoadBalancers
 				print "\n", cyan, "Load Balancer #{lb['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
@@ -340,7 +310,7 @@ private
 			result = results['loadBalancer']
 		end
 		if result.nil?
-			print red,bold, "\nLB not found by '#{val}'\n\n",reset
+			print_red_alert "LB not found by '#{val}'"
 			return nil
 		end
 		return result
@@ -357,10 +327,10 @@ private
 			result = results['loadBalancerType']
 		end
 		if result.nil?
-			print red,bold, "\nLB Type not found by '#{val}'\n\n",reset
+			print_red_alert "LB Type not found by '#{val}'"
 			return nil
 		end
 		return result
 	end
 
-end
+end