morpheus-cli 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 434f161f0f0e7b31eb27d2930d1944e3bf7df388
-  data.tar.gz: 1362db4a4894832d043898ced414b6e60c99a344
+  metadata.gz: 225abeec72be29393b66192db842883e5a6a0260
+  data.tar.gz: ddcee03ffae03cc3ade5f42d727bda5da4481e14
 SHA512:
-  metadata.gz: d701a012d0e66263f2d5b29c8426ecf24f627f9628cf167aecd54a30bc4ecfc6de1ee8249c012e21b93f439408d5dac4a23178d04627fd5a933cccbce7ad9ca2
-  data.tar.gz: 1415d32475a94b966ff1c1dd11d3cd79fd72d1fb37394d92dff020c85052a16b0073145058d3203817cb7ba8c1c18256b2b5a5b0e84c0fda2d99bca445e500a6
+  metadata.gz: 5396e4da45c594a30ead62e81349439edafff63faaeae9a1b11cd18d684973d313487c4a67193389c461d877ef6c4e2c0cd2d94a40aa3e04d2834e5dfcaa2bc7
+  data.tar.gz: 06b4067301d92403d0190c2290cbf02a99f1c4707a142c5162a508a3372417c060feb8ef0eafdfc25c3159e1c5c885688ad0b45e2329c96c769341d8e26ca0d4

data/lib/morpheus/cli/hosts.rb

@@ -40,7 +40,7 @@ class Morpheus::Cli::Hosts
 
 	def handle(args) 
 		if args.empty?
-			puts "\nUsage: morpheus hosts [list,add,remove,logs,start,stop,run-workflow,make-managed,upgrade-agent] [name]\n\n"
+			puts "\nUsage: morpheus hosts [list,add,remove,logs,start,stop,run-workflow,make-managed,upgrade-agent, server-types] [name]\n\n"
 			exit 1
 		end
 
@@ -64,7 +64,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] [name]\n\n"
+				puts "\nUsage: morpheus hosts [list,add,remove,logs,start,stop,run-workflow,make-managed,upgrade-agent, server-types] [name]\n\n"
 				exit 127 #Command now foud exit code
 		end
 	end

data/lib/morpheus/cli/remote.rb

@@ -113,6 +113,7 @@ class Morpheus::Cli::Remote
 		end
 		::Morpheus::Cli::Remote.save_appliances(@appliances)
 		list([])
+		@@appliance = nil
 	end
 
 	def set_active_appliance(name)
@@ -127,7 +128,7 @@ class Morpheus::Cli::Remote
 
 	# Provides the current active appliance url information
 	def self.active_appliance
-		if !defined?(@@appliance)
+		if !defined?(@@appliance) || @@appliance.nil?
 			@@appliance = load_appliance_file.select { |k,v| v[:active] == true}
 		end
 		return @@appliance.keys[0], @@appliance[@@appliance.keys[0]][:host]

data/lib/morpheus/cli/shell.rb

@@ -38,6 +38,7 @@ class Morpheus::Cli::Shell
 		optparse.parse(args)
 
 		history = []
+		remote_handler = Morpheus::Cli::Remote.new()
 		exit = false
 		while !exit do
 			print cyan,"morpheus > ",reset
@@ -73,7 +74,9 @@ class Morpheus::Cli::Shell
 							argv.push "--nocolor"
 						end
 						#puts "cmd: #{argv.join(' ')}"
-						if Morpheus::Cli::CliRegistry.has_command?(argv[0])
+						if argv[0] == 'remote'
+							remote_handler.handle(argv[1..-1])
+						elsif Morpheus::Cli::CliRegistry.has_command?(argv[0])
 							Morpheus::Cli::CliRegistry.exec(argv[0], argv[1..-1])
 						else
 							puts "Unrecognized Command."

data/lib/morpheus/cli/version.rb

@@ -1,5 +1,5 @@
 module Morpheus
   module Cli
-    VERSION = "0.9.5"
+    VERSION = "0.9.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - David Estes