morpheus-cli 2.10.0 → 2.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 575e23105fe6df10494bb38dcdc54e02b582d3ac
-  data.tar.gz: fb5e3ea23fc52347ecab160d92442029f6ea3ecb
+  metadata.gz: ad4ff693efbb10952b74f63eafd3ceacfe382d5e
+  data.tar.gz: f5fc0c7184848496e5fdcfedb6f08c38d0353c81
 SHA512:
-  metadata.gz: 873500f5e460eaf1c1e56e5e223b3e1c52d83955786d7d4b5ed7642025e3001758a0dbdd5c6ca59cdf3b8385ffca0b473cf401d779a8166675f0c996d0ca6a1a
-  data.tar.gz: 667d412138a4cb25766b8a55cea03cf20749caad2ad10d97ebd39ccf4da99d5830dd5b5d4ba629f6ceb66a8e4e771a4e9ff8b06abbb8ee90731ba60d4ddd9514
+  metadata.gz: 7193e79c98e5a13b6e7f60a686167eae26872dc8d62410099aa58ded65f73ce2d77430389b822cc818504ef382c837b620ba20ffe34c46315214bc37d020070a
+  data.tar.gz: 5dd1cde1959ea0dbcc0f2ade4805b2a23959d0edf450069a558eb454f0ca48a70eac75a19695d257a457917db76f783d13098eab72bff2dbcfbe47ab66d0309d

data/bin/morpheus

@@ -1,59 +1,54 @@
 #!/usr/bin/env ruby
+require 'term/ansicolor'
 require 'optparse'
 require 'morpheus/cli'
 require 'morpheus/rest_client'
 require 'morpheus/cli/cli_registry'
+require 'morpheus/cli/config_file'
+require 'morpheus/cli/error_handler'
+
+# use colors by default
+Term::ANSIColor::coloring = STDOUT.isatty
+# include Term::ANSIColor # tempting
 
 # short circuit version switch
-if ARGV[0] == '-v' && ARGV.size == 1
+if ARGV[0] == '-v'
   version = Morpheus::Cli::VERSION
   puts version
   exit 0
 end
 
-# handle global options
-args = ARGV
-# set global log level to debug (print stack trace for bubbled exceptions)
-if args.find {|arg| arg == '-V' || arg == '--debug'}
+args = ARGV.dup
+
+# raise log level right away
+if args.find {|it| it == '-V' || it == '--debug'}
   Morpheus::Logging.set_log_level(Morpheus::Logging::Logger::DEBUG)
 end
-args = args.find_all {|arg| arg != '-V' && arg != '--debug'}
 
-# JD: figure out what to do with --insecure option
-if args.find {|arg| arg == '--insecure'}
-  Morpheus::RestClient.enable_ssl_verification = false
-end
-args = args.find_all {|arg| arg != '--insecure'}
+# load config file(s)
+Morpheus::Cli::ConfigFile.init(ENV['MORPHEUS_CLI_HOME'])
 
-# all commands should be registered commands
-if Morpheus::Cli::CliRegistry.has_command?(args[0])
+# all commands should be registered commands or aliases
+if Morpheus::Cli::CliRegistry.has_command?(args[0]) || Morpheus::Cli::CliRegistry.has_alias?(args[0])
   begin
-    Morpheus::Cli::CliRegistry.exec(args[0], args[1..-1])
-    exit 0
-  rescue OptionParser::InvalidOption => e
-    # raise e
-    print Term::ANSIColor.red, "\n", "#{e.message}", "", Term::ANSIColor.reset
-    print "\n", "Try -h for help with this command.", "\n\n"
-    if Morpheus::Logging.print_stacktrace?
-      print Term::ANSIColor.red, "\n", "#{e.class}: #{e.message}", "\n", Term::ANSIColor.reset
-      print e.backtrace.join("\n"), "\n\n"
+    cmd_result = Morpheus::Cli::CliRegistry.exec(args[0], args[1..-1])
+    if cmd_result == false
+      exit 1
+    else
+      exit 0
     end
-    exit 1
   rescue => e
-    print Term::ANSIColor.red, "\n", "Unexpected Error", "\n\n", Term::ANSIColor.reset
-    if Morpheus::Logging.print_stacktrace?
-      print Term::ANSIColor.red, "\n", "#{e.class}: #{e.message}", "\n", Term::ANSIColor.reset
-      print e.backtrace.join("\n"), "\n\n"
-    end
+    Morpheus::Cli::ErrorHandler.new.handle_error(e)
     exit 1
   end
-  exit 0
 else
-  puts "\nUsage: morpheus [command] [options]\n"
-  puts "\nCommands:\n"
-  Morpheus::Cli::CliRegistry.all.each {|cmd,klass|
+  puts "Usage: morpheus [command] [options]"
+  puts "\nCommands:"
+  Morpheus::Cli::CliRegistry.all.keys.sort.each {|cmd|
     puts "\t#{cmd.to_s}"
   }
   puts ""
+  puts "For more information, see https://github.com/gomorpheus/morpheus-cli/wiki"
+  puts ""
   exit 127
 end

data/lib/morpheus/api/accounts_interface.rb

@@ -1,55 +1,44 @@
-require 'json'
-require 'rest-client'
+require 'morpheus/api/api_client'
 
 class Morpheus::AccountsInterface < Morpheus::APIClient
-	def initialize(access_token, refresh_token,expires_at = nil, base_url=nil) 
-		@access_token = access_token
-		@refresh_token = refresh_token
-		@base_url = base_url
-		@expires_at = expires_at
-	end
+  def initialize(access_token, refresh_token,expires_at = nil, base_url=nil) 
+    @access_token = access_token
+    @refresh_token = refresh_token
+    @base_url = base_url
+    @expires_at = expires_at
+  end
 
-	def get(id)
-		raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
-		url = "#{@base_url}/api/accounts/#{id}"
-		headers = { params: {}, authorization: "Bearer #{@access_token}" }
-		response = Morpheus::RestClient.execute(method: :get, url: url,
-                            timeout: 10, headers: headers)
-		JSON.parse(response.to_s)
-	end
+  def get(id)
+    raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
+    url = "#{@base_url}/api/accounts/#{id}"
+    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    execute(method: :get, url: url, headers: headers)
+  end
 
-	def list(options={})
-		url = "#{@base_url}/api/accounts"
-		headers = { params: {}, authorization: "Bearer #{@access_token}" }
-		headers[:params].merge!(options)
-		response = Morpheus::RestClient.execute(method: :get, url: url,
-                            timeout: 10, headers: headers)
-		JSON.parse(response.to_s)
-	end
+  def list(options={})
+    url = "#{@base_url}/api/accounts"
+    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    headers[:params].merge!(options)
+    execute(method: :get, url: url, headers: headers)
+  end
 
-	def create(options)
-		url = "#{@base_url}/api/accounts"
-		headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-		payload = options
-		response = Morpheus::RestClient.execute(method: :post, url: url,
-                            timeout: 10, headers: headers, payload: payload.to_json)
-		JSON.parse(response.to_s)
-	end
+  def create(options)
+    url = "#{@base_url}/api/accounts"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    payload = options
+    execute(method: :post, url: url, headers: headers, payload: payload.to_json)
+  end
 
-	def update(id, options)
-		url = "#{@base_url}/api/accounts/#{id}"
-		headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-		payload = options
-		response = Morpheus::RestClient.execute(method: :put, url: url,
-                            timeout: 10, headers: headers, payload: payload.to_json)
-		JSON.parse(response.to_s)
-	end
+  def update(id, options)
+    url = "#{@base_url}/api/accounts/#{id}"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    payload = options
+    execute(method: :put, url: url, headers: headers, payload: payload.to_json)
+  end
 
-	def destroy(id)
-		url = "#{@base_url}/api/accounts/#{id}"
-		headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-		response = Morpheus::RestClient.execute(method: :delete, url: url,
-                            timeout: 10, headers: headers)
-		JSON.parse(response.to_s)
-	end
+  def destroy(id)
+    url = "#{@base_url}/api/accounts/#{id}"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    execute(method: :delete, url: url, headers: headers)
+  end
 end

data/lib/morpheus/api/api_client.rb

@@ -1,118 +1,149 @@
 require 'json'
+require 'uri'
 require 'rest-client'
 
 class Morpheus::APIClient
-	def initialize(access_token, refresh_token=nil,expires_in = nil, base_url=nil) 
-		@access_token = access_token
-		@refresh_token = refresh_token
-		@base_url = base_url
-		if expires_in != nil
-			@expires_at = DateTime.now + expires_in.seconds
-		end
-	end
-
-	def whoami
-		Morpheus::WhoamiInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
-	end
-
-	def options
-		Morpheus::OptionsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
-	end
-
-	def groups
-		Morpheus::GroupsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
-	end
-
-	def clouds
-		Morpheus::CloudsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
-	end
-
-	def servers
-		Morpheus::ServersInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
-	end
-
-	def instances
-		Morpheus::InstancesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
-	end
-
-	def instance_types
-		Morpheus::InstanceTypesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
-	end
-
-	def provision_types
-		Morpheus::ProvisionTypesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
-	end
-
-	def load_balancers
-		Morpheus::LoadBalancersInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
-	end
-
-	def tasks
-		Morpheus::TasksInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
-	end
-
-	def task_sets
-		Morpheus::TaskSetsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
-	end
-
-	def virtual_images
-		Morpheus::VirtualImagesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
-	end
-
-	def apps
-		Morpheus::AppsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
-	end
-
-	def app_templates
-		Morpheus::AppTemplatesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
-	end
-
-	def deploy
-		Morpheus::DeployInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
-	end
-
-	def deployments
-		Morpheus::DeploymentsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
-	end
-
-	def security_groups
-		Morpheus::SecurityGroupsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
-	end
-
-	def security_group_rules
-		Morpheus::SecurityGroupRulesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
-	end
-
-	def accounts
-		Morpheus::AccountsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
-	end
-
-	def users
-		Morpheus::UsersInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
-	end
-
-	def logs
-		Morpheus::LogsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
-	end
-
-	def roles
-		Morpheus::RolesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
-	end
-
-	def key_pairs
-		Morpheus::KeyPairsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
-	end
-
-	def license
-		Morpheus::LicenseInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
-	end
+  def initialize(access_token, refresh_token=nil,expires_in = nil, base_url=nil) 
+    @access_token = access_token
+    @refresh_token = refresh_token
+    @base_url = base_url
+    if expires_in != nil
+      @expires_at = DateTime.now + expires_in.seconds
+    end
+  end
+
+  def dry_run(val=true)
+    @dry_run = !!val
+    self
+  end
+
+  def dry()
+    dry_run(true)
+  end
+
+  def execute(opts, parse_json=true)
+    if @dry_run
+      # JD: could return a Request object instead...
+      return opts
+    end
+    response = Morpheus::RestClient.execute(opts)
+    if parse_json
+      return JSON.parse(response.to_s)
+    else
+      return response
+    end
+  end
+
+  def auth
+    Morpheus::AuthInterface.new(@base_url, @access_token)
+  end
+
+  def whoami
+    Morpheus::WhoamiInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  end
+
+  def options
+    Morpheus::OptionsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  end
+
+  def groups
+    Morpheus::GroupsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  end
+
+  def clouds
+    Morpheus::CloudsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  end
+
+  def servers
+    Morpheus::ServersInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  end
+
+  def instances
+    Morpheus::InstancesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  end
+
+  def instance_types
+    Morpheus::InstanceTypesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  end
+
+  def provision_types
+    Morpheus::ProvisionTypesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  end
+
+  def load_balancers
+    Morpheus::LoadBalancersInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  end
+
+  def tasks
+    Morpheus::TasksInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  end
+
+  def task_sets
+    Morpheus::TaskSetsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  end
+
+  def virtual_images
+    Morpheus::VirtualImagesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  end
+
+  def apps
+    Morpheus::AppsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  end
+
+  def app_templates
+    Morpheus::AppTemplatesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  end
+
+  def deploy
+    Morpheus::DeployInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  end
+
+  def deployments
+    Morpheus::DeploymentsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  end
+
+  def security_groups
+    Morpheus::SecurityGroupsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  end
+
+  def security_group_rules
+    Morpheus::SecurityGroupRulesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  end
+
+  def accounts
+    Morpheus::AccountsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  end
+
+  def users
+    Morpheus::UsersInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  end
+
+  def logs
+    Morpheus::LogsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  end
+
+  def roles
+    Morpheus::RolesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  end
+
+  def key_pairs
+    Morpheus::KeyPairsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  end
+
+  def license
+    Morpheus::LicenseInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  end
 
-	def custom_instance_types
-		Morpheus::CustomInstanceTypesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
-	end
+  def custom_instance_types
+    Morpheus::CustomInstanceTypesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  end
 
-	def dashboard
-		Morpheus::DashboardInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
-	end
+  def dashboard
+    Morpheus::DashboardInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  end
 
+  def setup
+    Morpheus::SetupInterface.new(@base_url)
+  end
+  
 end