morpheus-cli 2.10.1 → 2.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad4ff693efbb10952b74f63eafd3ceacfe382d5e
-  data.tar.gz: f5fc0c7184848496e5fdcfedb6f08c38d0353c81
+  metadata.gz: ecd262f3f7122ce8af78b08d5539dc450db6dafa
+  data.tar.gz: b0c4136d4746c82f05d1602f10797dd632f7c081
 SHA512:
-  metadata.gz: 7193e79c98e5a13b6e7f60a686167eae26872dc8d62410099aa58ded65f73ce2d77430389b822cc818504ef382c837b620ba20ffe34c46315214bc37d020070a
-  data.tar.gz: 5dd1cde1959ea0dbcc0f2ade4805b2a23959d0edf450069a558eb454f0ca48a70eac75a19695d257a457917db76f783d13098eab72bff2dbcfbe47ab66d0309d
+  metadata.gz: 40e0e43ff256acc748caa4577e1231b733c2c25e725a52e122b61602b092a5a541464afbcddf7010494f6e1901c973df6fce291a6961c0ed6100f5e076848f29
+  data.tar.gz: 214f1a02d4d192ec428d13a6bec8d1e33de2aa89f05cf51c8f94e7876bca9169a049fe7c8fbcf649ff357e9ec655dd1be00eec4fb5ea499e897a74e0564a8751

data/bin/morpheus

@@ -4,15 +4,18 @@ require 'optparse'
 require 'morpheus/cli'
 require 'morpheus/rest_client'
 require 'morpheus/cli/cli_registry'
-require 'morpheus/cli/config_file'
+require 'morpheus/cli/dot_file'
 require 'morpheus/cli/error_handler'
 
+# setup environment variables
+Morpheus::Cli.home_directory = ENV['MORPHEUS_CLI_HOME'] || File.join(Dir.home, ".morpheus")
+
 # use colors by default
 Term::ANSIColor::coloring = STDOUT.isatty
 # include Term::ANSIColor # tempting
 
 # short circuit version switch
-if ARGV[0] == '-v'
+if ARGV[0] == '-v' || ARGV[0] == '--version'
   version = Morpheus::Cli::VERSION
   puts version
   exit 0
@@ -20,35 +23,71 @@ end
 
 args = ARGV.dup
 
+# global options
+
 # raise log level right away
 if args.find {|it| it == '-V' || it == '--debug'}
   Morpheus::Logging.set_log_level(Morpheus::Logging::Logger::DEBUG)
 end
 
-# load config file(s)
-Morpheus::Cli::ConfigFile.init(ENV['MORPHEUS_CLI_HOME'])
+# execute startup script .morpheus_profile  unless --noprofile is passed
+noprofile = false
+if args.find {|it| it == '--noprofile' }
+  noprofile = true
+  args.delete_if {|it| it == '--noprofile' }
+end
+if !noprofile && File.exists?(Morpheus::Cli::DotFile.morpheus_profile_filename)
+  Morpheus::Cli::DotFile.new(Morpheus::Cli::DotFile.morpheus_profile_filename).execute()
+end
 
 # all commands should be registered commands or aliases
-if Morpheus::Cli::CliRegistry.has_command?(args[0]) || Morpheus::Cli::CliRegistry.has_alias?(args[0])
-  begin
-    cmd_result = Morpheus::Cli::CliRegistry.exec(args[0], args[1..-1])
-    if cmd_result == false
-      exit 1
-    else
-      exit 0
+if (args.count == 0) || !(Morpheus::Cli::CliRegistry.has_command?(args[0]) || Morpheus::Cli::CliRegistry.has_alias?(args[0]))
+  # just for printing help. todo: start using this. maybe in class Cli::MainCommand
+  optparse = Morpheus::Cli::OptionParser.new do|opts|
+    opts.banner = "Options:" # hack alert
+    opts.on('-v','--version', "Print the version.") do
+      puts Morpheus::Cli::VERSION
+      exit
+    end
+    opts.on('--noprofile','--noprofile', "Do not read and execute the personal initialization script .morpheus_profile") do
+      @noprofile = true
+    end
+    opts.on('-C','--nocolor', "Disable ANSI coloring") do
+      Term::ANSIColor::coloring = false
+    end
+    opts.on('-V','--debug', "Print extra output for debugging. ") do |json|
+      Morpheus::Logging.set_log_level(Morpheus::Logging::Logger::DEBUG)
+      ::RestClient.log = Morpheus::Logging.debug? ? STDOUT : nil
+    end
+    opts.on( '-h', '--help', "Prints this help" ) do
+      puts opts
+      exit
     end
-  rescue => e
-    Morpheus::Cli::ErrorHandler.new.handle_error(e)
-    exit 1
   end
-else
-  puts "Usage: morpheus [command] [options]"
-  puts "\nCommands:"
+  out = "Usage: morpheus [command] [options]\n"
+  out << "Commands:\n"
   Morpheus::Cli::CliRegistry.all.keys.sort.each {|cmd|
-    puts "\t#{cmd.to_s}"
+    out << "\t#{cmd.to_s}\n"
   }
-  puts ""
-  puts "For more information, see https://github.com/gomorpheus/morpheus-cli/wiki"
-  puts ""
+  # out << "Options:\n"
+  out << optparse.to_s
+  out << "\n"
+  out << "For more information, see https://github.com/gomorpheus/morpheus-cli/wiki"
+  out << "\n"
+  puts out
+  optparse.to_s
   exit 127
 end
+
+# ok, execute the command (or alias)
+begin
+  cmd_result = Morpheus::Cli::CliRegistry.exec(args[0], args[1..-1])
+  if cmd_result == false
+    exit 1
+  else
+    exit 0
+  end
+rescue => e
+  Morpheus::Cli::ErrorHandler.new.handle_error(e)
+  exit 1
+end

data/lib/morpheus/api/api_client.rb

@@ -26,6 +26,8 @@ class Morpheus::APIClient
       # JD: could return a Request object instead...
       return opts
     end
+    # puts "#{Term::ANSIColor.dark} #=> Morpheus::RestClient.execute(#{opts})#{Term::ANSIColor.reset}" if Morpheus::Logging.debug?
+    # instead, using ::RestClient.log = STDOUT 
     response = Morpheus::RestClient.execute(opts)
     if parse_json
       return JSON.parse(response.to_s)

data/lib/morpheus/api/instances_interface.rb

@@ -138,6 +138,14 @@ class Morpheus::InstancesInterface < Morpheus::APIClient
     execute(opts)
   end
 
+  def clone(id, options)
+    url = "#{@base_url}/api/instances/#{id}/clone"
+    headers = {:authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    payload = options
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
   def firewall_disable(id)
     url = "#{@base_url}/api/instances/#{id}/security-groups/disable"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }

data/lib/morpheus/cli.rb

@@ -10,20 +10,20 @@ module Morpheus
   module Cli
   
     # the home directory, where morpheus-cli stores things
+    def self.home_directory=(fn)
+      @@home_directory = fn
+    end
+
     def self.home_directory
-      if ENV['MORPHEUS_CLI_HOME']
-        ENV['MORPHEUS_CLI_HOME']
+      if @@home_directory
+        @@home_directory
+      elsif ENV['MORPHEUS_CLI_HOME']
+        @@home_directory = ENV['MORPHEUS_CLI_HOME']
       else
-        File.join(Dir.home, ".morpheus")
+        @@home_directory = File.join(Dir.home, ".morpheus")
       end
     end
 
-    # the location of your config file
-    # this is not configurable right now.
-    def self.config_filename
-      File.join(self.home_directory, ".morpheusrc")
-    end
-
     # load all the well known commands and utilties they need
     def self.load!()
       # load interfaces
@@ -37,10 +37,19 @@ module Morpheus
       # Dir[File.dirname(__FILE__)  + "/cli/*.rb"].each {|file| load file }
 
       # utilites
-      load 'morpheus/cli/credentials.rb'
+      require 'morpheus/cli/cli_registry.rb'
+      require 'morpheus/cli/dot_file.rb'
       load 'morpheus/cli/cli_command.rb'
       load 'morpheus/cli/option_types.rb'
+      load 'morpheus/cli/credentials.rb'
       
+      # shell scripting commands
+      load 'morpheus/cli/source_command.rb'
+      load 'morpheus/cli/echo_command.rb'
+      load 'morpheus/cli/coloring_command.rb'
+      load 'morpheus/cli/log_level_command.rb'
+      load 'morpheus/cli/ssl_verification_command.rb'
+
       # all the known commands
       load 'morpheus/cli/remote.rb'
       load 'morpheus/cli/login.rb'

data/lib/morpheus/cli/accounts.rb

@@ -33,7 +33,7 @@ class Morpheus::Cli::Accounts
     options = {}
     optparse = OptionParser.new do|opts|
       opts.banner = subcommand_usage()
-      build_common_options(opts, options, [:list, :json])
+      build_common_options(opts, options, [:list, :json, :remote, :dry_run])
     end
     optparse.parse!(args)
     connect(options)
@@ -42,7 +42,10 @@ class Morpheus::Cli::Accounts
       [:phrase, :offset, :max, :sort, :direction].each do |k|
         params[k] = options[k] unless options[k].nil?
       end
-
+      if options[:dry_run]
+        print_dry_run @accounts_interface.dry.list(params)
+        return
+      end
       json_response = @accounts_interface.list(params)
       accounts = json_response['accounts']
       if options[:json]
@@ -68,7 +71,7 @@ class Morpheus::Cli::Accounts
     options = {}
     optparse = OptionParser.new do|opts|
       opts.banner = subcommand_usage("[name]")
-      build_common_options(opts, options, [:json])
+      build_common_options(opts, options, [:json, :remote, :dry_run])
     end
     optparse.parse!(args)
     if args.count < 1
@@ -77,7 +80,14 @@ class Morpheus::Cli::Accounts
     end
     connect(options)
     begin
-
+      if options[:dry_run]
+        if args[0].to_s =~ /\A\d{1,}\Z/
+          print_dry_run @accounts_interface.dry.get(args[0].to_i)
+        else
+          print_dry_run @accounts_interface.dry.list({name:args[0]})
+        end
+        return
+      end
       account = find_account_by_name_or_id(args[0])
       exit 1 if account.nil?
 
@@ -119,7 +129,8 @@ class Morpheus::Cli::Accounts
     options = {}
     optparse = OptionParser.new do|opts|
       opts.banner = subcommand_usage("[options]")
-      build_common_options(opts, options, [:options, :json])
+      build_option_type_options(opts, options, add_account_option_types)
+      build_common_options(opts, options, [:options, :json, :remote, :dry_run])
     end
     optparse.parse!(args)
     connect(options)
@@ -141,6 +152,10 @@ class Morpheus::Cli::Accounts
         account_payload['role'] = {id: role['id']}
       end
       request_payload = {account: account_payload}
+      if options[:dry_run]
+        print_dry_run @accounts_interface.dry.create(request_payload)
+        return
+      end
       json_response = @accounts_interface.create(request_payload)
       if options[:json]
         print JSON.pretty_generate(json_response)
@@ -160,10 +175,12 @@ class Morpheus::Cli::Accounts
     options = {}
     optparse = OptionParser.new do|opts|
       opts.banner = subcommand_usage("[name] [options]")
-      build_common_options(opts, options, [:options, :json])
+      build_option_type_options(opts, options, update_account_option_types)
+      build_common_options(opts, options, [:options, :json, :remote, :dry_run])
     end
     optparse.parse!(args)
     if args.count < 1
+      print_red_alert "Specify atleast one option to update"
       puts optparse
       exit 1
     end
@@ -177,8 +194,6 @@ class Morpheus::Cli::Accounts
 
       if params.empty?
         puts optparse
-        option_lines = update_account_option_types.collect {|it| "\t-O #{it['fieldName']}=\"value\"" }.join("\n")
-        puts "\nAvailable Options:\n#{option_lines}\n\n"
         exit 1
       end
 
@@ -198,6 +213,10 @@ class Morpheus::Cli::Accounts
         account_payload['role'] = {id: role['id']}
       end
       request_payload = {account: account_payload}
+      if options[:dry_run]
+        print_dry_run @accounts_interface.dry.update(account['id'], request_payload)
+        return
+      end
       json_response = @accounts_interface.update(account['id'], request_payload)
 
       if options[:json]
@@ -218,7 +237,7 @@ class Morpheus::Cli::Accounts
     options = {}
     optparse = OptionParser.new do|opts|
       opts.banner = subcommand_usage("[name]")
-      build_common_options(opts, options, [:auto_confirm, :json])
+      build_common_options(opts, options, [:auto_confirm, :json, :remote, :dry_run])
     end
     optparse.parse!(args)
     if args.count < 1
@@ -233,6 +252,10 @@ class Morpheus::Cli::Accounts
       unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the account #{account['name']}?")
         exit
       end
+      if options[:dry_run]
+        print_dry_run @accounts_interface.dry.destroy(account['id'])
+        return
+      end
       json_response = @accounts_interface.destroy(account['id'])
       if options[:json]
         print JSON.pretty_generate(json_response)

data/lib/morpheus/cli/alias_command.rb

@@ -5,12 +5,12 @@ require 'json'
 
 # This command allows the creation of an alias
 # these aliases are stored in the $MORPHEUS_CLI_HOME/.morpheusrc
-# See Morpheus::Cli::ConfigFile
+# See Morpheus::Cli::DotFile
 #
 class Morpheus::Cli::AliasCommand
   include Morpheus::Cli::CliCommand
   set_command_name :alias
-  register_subcommands :add, :remove, :list
+  register_subcommands :add, :export, :remove, :list
   #set_default_subcommand :add
 
   def initialize() 
@@ -37,12 +37,15 @@ class Morpheus::Cli::AliasCommand
   
   def add(args)
     options = {}
-    do_remove = false
+    do_export = false
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = usage
       #build_common_options(opts, options, [])
+      opts.on( '-e', '--export', "Export this alias to your .morpheus_profile for future use" ) do
+        do_export = true
+      end
       opts.on('-h', '--help', "Prints this help" ) do
-        puts opts.banner
+        puts opts
         puts "Commands:"
         subcommands.sort.each {|cmd, method|
             puts "\t#{cmd.to_s}"
@@ -53,7 +56,7 @@ class Morpheus::Cli::AliasCommand
               "The [command] must be quoted if it is more than one word.\n" + 
               "The [command] may include multiple commands, semicolon delimited.\n" + 
               #"Example: alias cloud='clouds' .\n" + 
-              "Aliases are preserved for future use in your config.\n" + 
+              "Aliases can be exported for future use with the -e option.\n" + 
               "You can use just `alias` instead of `alias add`.\n" +
               "For more information, see https://github.com/gomorpheus/morpheus-cli/wiki/Alias"
         exit
@@ -76,24 +79,31 @@ class Morpheus::Cli::AliasCommand
       begin
         Morpheus::Cli::CliRegistry.instance.add_alias(alias_name, command_string)
         #print "registered alias #{alias_name}", "\n"
+        if do_export
+          puts "exporting alias '#{alias_name}' now..."
+          morpheus_profile = Morpheus::Cli::DotFile.new(Morpheus::Cli::DotFile.morpheus_profile_filename)
+          morpheus_profile.export_aliases({(alias_name) => command_string})
+        end
       rescue => err
+        raise err
         print_red_alert "#{err.message}"
         return false
       end
-      Morpheus::Cli::ConfigFile.instance.save_file()
     end
 
-    Morpheus::Cli::Shell.instance.recalculate_auto_complete_commands()
+    if Morpheus::Cli::Shell.instance
+      Morpheus::Cli::Shell.instance.recalculate_auto_complete_commands()
+    end
 
   end
   
-  def remove(args)
+  def export(args)
     options = {}
-    do_remove = false
+    do_export = false
     optparse = Morpheus::Cli::OptionParser.new do|opts|
-      opts.banner = subcommand_usage("[alias1] [alias2]")
+      opts.banner = subcommand_usage("[alias] [alias2] [alias3]")
       build_common_options(opts, options, [])
-      opts.footer = "This is how you remove alias definitions from your config."
+      opts.footer = "Export an alias, saving it to your .morpheus_profile for future use"
     end
     optparse.parse!(args)
     if args.count < 1
@@ -104,20 +114,56 @@ class Morpheus::Cli::AliasCommand
     alias_names.each do |arg|
       if !Morpheus::Cli::CliRegistry.has_alias?(arg)
         print_red_alert "alias not found by name '#{arg}'"
-        exit 1
+        return false
       end
     end
+    alias_definitions = {}
+    alias_names.each do |alias_name|
+      alias_definitions[alias_name] = Morpheus::Cli::CliRegistry.instance.get_alias(alias_name)
+    end
+    morpheus_profile = Morpheus::Cli::DotFile.new(Morpheus::Cli::DotFile.morpheus_profile_filename)
+    morpheus_profile.export_aliases(alias_definitions)
+    
+    # Morpheus::Cli::Shell.instance.recalculate_auto_complete_commands() if Morpheus::Cli::Shell.instance
 
+  end
+
+  def remove(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do|opts|
+      opts.banner = subcommand_usage("[alias1] [alias2]")
+      build_common_options(opts, options, [])
+      opts.footer = "This is how you remove alias definitions from your .morpheus_profile" + "\n"
+                    "Pass one or more alias names to remove."
+    end
+    optparse.parse!(args)
+    if args.count < 1
+      puts optparse
+      exit 1
+    end
+    alias_names = args
     alias_names.each do |arg|
-      Morpheus::Cli::CliRegistry.instance.remove_alias(arg)
+      if !Morpheus::Cli::CliRegistry.has_alias?(arg)
+        print_red_alert "alias not found by name '#{arg}'"
+        return false
+      end
     end
+    morpheus_profile = Morpheus::Cli::DotFile.new(Morpheus::Cli::DotFile.morpheus_profile_filename)
+    morpheus_profile.remove_aliases(alias_names)
 
-    Morpheus::Cli::ConfigFile.instance.save_file()
-    if args.count == 1
-      puts "removed alias '#{alias_names[0]}'"
-    else
-      puts "removed aliases '#{alias_names.join(', ')}'"
+    # unregister them
+    alias_names.each do |alias_name|
+      Morpheus::Cli::CliRegistry.instance.remove_alias(alias_name)
     end
+
+    # if args.count == 1
+    #   puts "removed alias '#{alias_names[0]}'"
+    # else
+    #   puts "removed aliases '#{alias_names.join(', ')}'"
+    # end
+
+    Morpheus::Cli::Shell.instance.recalculate_auto_complete_commands() if Morpheus::Cli::Shell.instance
+
   end
 
   def list(args)
@@ -125,8 +171,8 @@ class Morpheus::Cli::AliasCommand
     do_remove = false
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = subcommand_usage()
-      opts.on( '-E', '--export', "Generate output that can be used verbatim in a .morpheusrc config file." ) do
-        options[:format] = 'export'
+      opts.on( '-f', '--format FORMAT', "The format for the output: export, json, friendly (default)." ) do |val|
+        options[:format] = val
       end
       build_common_options(opts, options, [:list, :json])
       opts.footer = "This outputs a list of your defined aliases."
@@ -184,9 +230,9 @@ class Morpheus::Cli::AliasCommand
       out << "\n"
     elsif options[:format] == 'export' || options[:format] == 'config'
       # out << "# morpheus aliases for #{`whoami`}\n" # windows!
-      out << "# morpheus aliases\n"
+      #out << "# morpheus aliases\n"
       my_aliases.each do |it|
-        out <<  "#{it[:name]}='#{it[:command_string]}'"
+        out <<  "alias #{it[:name]}='#{it[:command_string]}'"
         out << "\n"
       end
     else