morpheus-cli 0.9.9 → 0.9.10

data/lib/morpheus/cli/version.rb

@@ -1,5 +1,5 @@
 module Morpheus
   module Cli
-    VERSION = "0.9.9"
+    VERSION = "0.9.10"
   end
 end

data/lib/morpheus/cli/virtual_images.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::VirtualImages
 	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::VirtualImages
 		@virtual_images_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).virtual_images
 		
 		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
@@ -73,20 +72,14 @@ class Morpheus::Cli::VirtualImages
 			opts.on( '', '--system', "System Images" ) do |val|
 				options[:filterType] = 'System'
 			end
-			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
 			if options[:imageType]
 				params[:imageType] = options[:imageType]
@@ -114,12 +107,7 @@ class Morpheus::Cli::VirtualImages
 			
 			
 		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
@@ -129,7 +117,7 @@ class Morpheus::Cli::VirtualImages
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus virtual-images 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"
@@ -152,12 +140,7 @@ class Morpheus::Cli::VirtualImages
 				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
@@ -168,7 +151,7 @@ class Morpheus::Cli::VirtualImages
 		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"
@@ -218,12 +201,7 @@ class Morpheus::Cli::VirtualImages
 				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
@@ -233,7 +211,7 @@ class Morpheus::Cli::VirtualImages
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus virtual-images lb-types"
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:json, :remote])
 		end
 		optparse.parse(args)
 		connect(options)
@@ -258,13 +236,8 @@ class Morpheus::Cli::VirtualImages
 			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
@@ -278,7 +251,7 @@ class Morpheus::Cli::VirtualImages
 			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"
@@ -307,7 +280,7 @@ class Morpheus::Cli::VirtualImages
 				print "\n", cyan, "LB #{json_response['virtualImage']['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
@@ -317,7 +290,7 @@ class Morpheus::Cli::VirtualImages
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus virtual-images 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"
@@ -328,7 +301,9 @@ class Morpheus::Cli::VirtualImages
 		begin
 			image = find_image_by_name(image_name)
 			exit 1 if image.nil?
-			exit unless Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the virtual image #{image['name']}?")
+			unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the virtual image #{image['name']}?")
+				exit
+			end
 			json_response = @virtual_images_interface.destroy(image['id'])
 			if options[:json]
 					print JSON.pretty_generate(json_response)
@@ -336,12 +311,7 @@ class Morpheus::Cli::VirtualImages
 				print "\n", cyan, "Virtual Image #{image['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
@@ -382,4 +352,4 @@ private
 		return result
 	end
 
-end
+end

data/lib/morpheus/cli/workflows.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::Workflows
 	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::Workflows
 		@tasks_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).tasks
 		@task_sets_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).task_sets
 		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
@@ -56,20 +55,14 @@ class Morpheus::Cli::Workflows
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus workflows 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 = @task_sets_interface.get(params)
 			if options[:json]
@@ -89,7 +82,7 @@ class Morpheus::Cli::Workflows
 				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
@@ -102,7 +95,7 @@ class Morpheus::Cli::Workflows
 			opts.on("--tasks x,y,z", Array, "List of tasks to run in order") do |list|
 				options[:task_names]= list
 			end
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:json, :remote])
 		end
 		if args.count < 1
 			puts "\n#{optparse.banner}\n\n"
@@ -124,12 +117,7 @@ class Morpheus::Cli::Workflows
 				print "\n", cyan, "Workflow #{json_response['taskSet']['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
@@ -142,7 +130,7 @@ class Morpheus::Cli::Workflows
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus workflows 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"
@@ -153,7 +141,9 @@ class Morpheus::Cli::Workflows
 		begin
 			workflow = find_workflow_by_name_or_code_or_id(workflow_name)
 			exit 1 if workflow.nil?
-			exit unless Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the workflow #{workflow['name']}?")
+			unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the workflow #{workflow['name']}?")
+				exit 1
+			end
 			json_response = @tasks_interface.destroy(task['id'])
 			if options[:json]
 					print JSON.pretty_generate(json_response)
@@ -161,12 +151,7 @@ class Morpheus::Cli::Workflows
 				print "\n", cyan, "Workflow #{workflow['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
@@ -206,4 +191,4 @@ private
 		end
 		return result
 	end
-end
+end

data/lib/morpheus/ext/nil_class.rb

@@ -0,0 +1,5 @@
+class NilClass
+  def empty?
+    true
+  end
+end

data/lib/morpheus/formatters.rb

@@ -17,6 +17,7 @@ end
 
 def format_dt(dt, options={})
   dt = parse_time(dt)
+  return "" if dt.nil?
   if options[:local]
     dt = dt.getlocal
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 0.9.10
 platform: ruby
 authors:
 - David Estes
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2016-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -141,6 +141,7 @@ files:
 - bin/morpheus
 - lib/morpheus/api/accounts_interface.rb
 - lib/morpheus/api/api_client.rb
+- lib/morpheus/api/app_templates_interface.rb
 - lib/morpheus/api/apps_interface.rb
 - lib/morpheus/api/clouds_interface.rb
 - lib/morpheus/api/deploy_interface.rb
@@ -164,6 +165,7 @@ files:
 - lib/morpheus/api/virtual_images_interface.rb
 - lib/morpheus/cli.rb
 - lib/morpheus/cli/accounts.rb
+- lib/morpheus/cli/app_templates.rb
 - lib/morpheus/cli/apps.rb
 - lib/morpheus/cli/cli_command.rb
 - lib/morpheus/cli/cli_registry.rb
@@ -171,7 +173,6 @@ files:
 - lib/morpheus/cli/credentials.rb
 - lib/morpheus/cli/deployments.rb
 - lib/morpheus/cli/deploys.rb
-- lib/morpheus/cli/error_handler.rb
 - lib/morpheus/cli/groups.rb
 - lib/morpheus/cli/hosts.rb
 - lib/morpheus/cli/instance_types.rb
@@ -180,6 +181,8 @@ files:
 - lib/morpheus/cli/license.rb
 - lib/morpheus/cli/load_balancers.rb
 - lib/morpheus/cli/mixins/accounts_helper.rb
+- lib/morpheus/cli/mixins/print_helper.rb
+- lib/morpheus/cli/mixins/provisioning_helper.rb
 - lib/morpheus/cli/option_types.rb
 - lib/morpheus/cli/remote.rb
 - lib/morpheus/cli/roles.rb
@@ -191,6 +194,7 @@ files:
 - lib/morpheus/cli/version.rb
 - lib/morpheus/cli/virtual_images.rb
 - lib/morpheus/cli/workflows.rb
+- lib/morpheus/ext/nil_class.rb
 - lib/morpheus/formatters.rb
 - lib/morpheus/rest_client.rb
 - morpheus-cli.gemspec

data/lib/morpheus/cli/error_handler.rb

@@ -1,44 +0,0 @@
-require 'yaml'
-require 'rest_client'
-require 'term/ansicolor'
-require 'optparse'
-require 'json'
-
-
-class Morpheus::Cli::ErrorHandler
-	include Term::ANSIColor
-
-	def print_errors(response, options = {})
-		if options[:json]
-			print JSON.pretty_generate(response)
-		else
-			if !response['success']
-				print red,bold, "\n"
-				if response['msg']
-					puts response['msg']
-				end
-				if response['errors']
-					response['errors'].each do |key, value|
-						print "* #{key}: #{value}\n"
-					end
-				end
-				print reset, "\n"
-			end
-		end
-	end
-
-	def print_rest_exception(e, options={})
-		if e.response.code == 400
-			json_response = JSON.parse(e.response.to_s)
-			if options[:json]
-				print JSON.pretty_generate(json_response)
-				print "\n"
-			else
-				::Morpheus::Cli::ErrorHandler.new.print_errors(json_response)
-			end
-		else
-			puts "Error Communicating with the Appliance. Please try again later. #{e}"
-		end
-	end
-
-end