morpheus-cli 3.6.8 → 3.6.9

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "3.6.8"
+    VERSION = "3.6.9"
   end
 end

data/lib/morpheus/cli/whoami.rb

@@ -38,6 +38,7 @@ class Morpheus::Cli::Whoami
 
   def show(args)
     options = {}
+    params = {}
     username_only = false
     access_token_only = false
     optparse = Morpheus::Cli::OptionParser.new do |opts|
@@ -81,10 +82,14 @@ class Morpheus::Cli::Whoami
         return 1
       end
       
+      if options[:dry_run]
+        print_dry_run @api_client.whoami.dry.get(params, options)
+        return 0
+      end
 
-      creds = Morpheus::Cli::Credentials.new(@appliance_name, @appliance_url).load_saved_credentials()
-      
-      if !creds
+      wallet = Morpheus::Cli::Credentials.new(@appliance_name, @appliance_url).load_saved_credentials()
+      token = wallet ? wallet['access_token'] : nil
+      if !token
         if options[:quiet]
           return 1
         elsif access_token_only
@@ -97,7 +102,6 @@ class Morpheus::Cli::Whoami
         end
       end
 
-
       json_response = load_whoami()
       
       user = @current_user # from load_whoami()  meh
@@ -146,7 +150,7 @@ class Morpheus::Cli::Whoami
           exit 1
         end
 
-        print_h1 "Current User"
+        print_h1 "Current User", options
         print cyan
         print_description_list({
           "ID" => 'id',
@@ -163,7 +167,7 @@ class Morpheus::Cli::Whoami
 
         if options[:include_feature_access]
           if @user_permissions
-            print_h2 "Feature Permissions"
+            print_h2 "Feature Permissions", options
             print cyan
             rows = @user_permissions.collect do |code, access|
               {code: code, access: get_access_string(access) }
@@ -174,7 +178,7 @@ class Morpheus::Cli::Whoami
           end
         end
 
-        print_h1 "Remote Appliance"
+        print_h1 "Remote Appliance", options
         print cyan
         appliance_data = {
           'name' => @appliance_name,
@@ -189,16 +193,18 @@ class Morpheus::Cli::Whoami
 
         if active_group
           print cyan
-          # print_h1 "Active Group"
+          # print_h1 "Active Group", options
           # print cyan
           # print_description_list({
           #   "ID" => 'id',
           #   "Name" => 'name'
           # }, active_group)
           print cyan, "\n# => Currently using group #{active_group['name']}\n", reset
+          print reset,"\n"
         else
           print "\n", reset
           print "No active group. See `groups use`\n",reset
+          print reset,"\n"
         end
 
         # save pertinent session info to the appliance
@@ -214,8 +220,6 @@ class Morpheus::Cli::Whoami
         rescue => err
           puts "failed to save remote appliance info"
         end
-
-        print reset,"\n"
       end
       return 0
     rescue RestClient::Exception => e

data/lib/morpheus/formatters.rb

@@ -1,7 +1,7 @@
 require 'time'
 require 'filesize'
 
-DEFAULT_TIME_FORMAT = "%x %I:%M %p %Z"
+DEFAULT_TIME_FORMAT = "%x %I:%M %p"
 
 # returns an instance of Time
 def parse_time(dt, format=nil)
@@ -115,11 +115,11 @@ def format_human_duration(seconds)
   #seconds = seconds.round
   days, hours, minutes = (seconds / (60*60*24)).floor, (seconds / (60*60)).floor, (seconds / (60)).floor
   if days > 365
-    out << "#{days.floor} days (over a year)"
+    out << "#{days.floor} days"
   elsif days > 61
-    out << "#{days.floor} days (many months)"
+    out << "#{days.floor} days"
   elsif days > 31
-    out << "#{days.floor} days (over a month)"
+    out << "#{days.floor} days"
   elsif days > 0
     if days.floor == 1
       out << "1 day"

data/lib/morpheus/logging.rb

@@ -76,6 +76,21 @@ module Morpheus::Logging
     self.debug?
   end
 
+  # mask well known secrets and password patterns
+  def self.scrub_message(msg)
+    if msg.is_a?(String)
+      msg = msg.clone
+      msg.gsub!(/Authorization\"\s?\=\>\s?\"Bearer [^"]+/, 'Authorization"=>"Bearer ************')
+      msg.gsub!(/Authorization\:\s?Bearer [^"'']+/, 'Authorization: Bearer ************')
+      msg.gsub!(/password\"\s?\=\>\s?\"[^"]+/, 'password"=>"************')
+      msg.gsub!(/password\=\"[^"]+/, 'password="************')
+      msg.gsub!(/password\=[^"'&\Z]+/, 'password=************') # buggy, wont work with ampersand or quotes in passwords! heh
+      msg.gsub!(/passwordConfirmation\=[^" ]+/, 'passwordConfirmation="************')
+      msg.gsub!(/passwordConfirmation\=[^" ]+/, 'passwordConfirmation=************')
+    end
+    msg
+  end
+
   # An IO class for printing debugging info
   # This is used as a proxy for ::RestClient.log printing right now.
   class DarkPrinter
@@ -110,15 +125,8 @@ module Morpheus::Logging
       @is_dark = is_dark
     end
 
-    # mask well known secrets
     def scrub_message(msg)
-      if msg.is_a?(String)
-        msg.gsub!(/Authorization\"\s?\=\>\s?\"Bearer [^"]+/, 'Authorization"=>"Bearer ************')
-        msg.gsub!(/Authorization\:\s?Bearer [^"]+/, 'Authorization"=>"Bearer ************')
-        msg.gsub!(/password\"\s?\=\>\s?\"[^"]+/, 'password"=>"************')
-        msg.gsub!(/password\=\"[^"]+/, 'password="************')
-      end
-      msg
+      Morpheus::Logging.scrub_message(msg)
     end
 
     def print_with_color(&block)

data/lib/morpheus/terminal.rb

@@ -7,6 +7,7 @@ require 'morpheus/cli/cli_registry'
 require 'morpheus/cli/dot_file'
 require 'morpheus/cli/error_handler'
 require 'morpheus/logging'
+require 'morpheus/benchmarking'
 require 'morpheus/cli'
 
 module Morpheus
@@ -30,7 +31,7 @@ module Morpheus
   #    puts File.read("/tmp/host23.json")
   #
   class Terminal
-    
+    include Morpheus::Benchmarking::HasBenchmarking
     # todo: this can be combined with Cli::Shell
 
     class Blackhole # < IO
@@ -76,6 +77,10 @@ module Morpheus
       #export MORPHEUS_PS1='\[\e[1;32m\]\u@\h:\w${text}$\[\e[m\] '
     end
 
+    # def self.benchmarking=(v)
+    #   @benchmarking = !!v
+    # end
+
     # the global Morpheus::Terminal instance
     # This should go away, but it needed for now...
     def self.instance
@@ -90,6 +95,7 @@ module Morpheus
     end
 
     attr_accessor :prompt #, :angry_prompt
+    attr_accessor :benchmarking
     attr_reader :stdin, :stdout, :stderr, :home_directory
 
 
@@ -221,12 +227,16 @@ module Morpheus
           @coloring = false
           Term::ANSIColor::coloring = false
         end
+        opts.on('-B','--benchmark', "Print benchmark time after the command is finished.") do
+          @benchmarking = true
+          #Morpheus::Benchmarking.enabled = true
+        end
         opts.on('-V','--debug', "Print extra output for debugging.") do |json|
           @terminal_log_level = Morpheus::Logging::Logger::DEBUG
           Morpheus::Logging.set_log_level(Morpheus::Logging::Logger::DEBUG)
           ::RestClient.log = Morpheus::Logging.debug? ? Morpheus::Logging::DarkPrinter.instance : nil
         end
-        opts.on( '-h', '--help', "Prints this help" ) do
+        opts.on( '-h', '--help', "Print this help" ) do
           @stdout.puts opts
           # exit
         end
@@ -317,42 +327,55 @@ module Morpheus
         ::RestClient.log = Morpheus::Logging.debug? ? Morpheus::Logging::DarkPrinter.instance : nil
       end
 
-      # execute startup script .morpheus_profile  unless --noprofile is passed
-      # todo: this should happen in initialize..
-      noprofile = false
-      if args.find {|it| it == '--noprofile' }
-        noprofile = true
-        args.delete_if {|it| it == '--noprofile' }
-      end
-
-      if @profile_dot_file && !@profile_dot_file_has_run
-        if !noprofile && File.exists?(@profile_dot_file.filename)
-          execute_profile_script()
-        end
-      end
-
-      # not enough arguments?
-      if args.count == 0
-        @stderr.puts "#{@angry_prompt}[command] argument is required."
-        #@stderr.puts "No command given, here's some help:"
-        @stderr.print usage
-        return 2, nil # CommandError.new("morpheus requires a command")
-      end
-      
-      cmd_name = args[0]
-      cmd_args = args[1..-1]
-
-      # unknown command?
-      # all commands should be registered commands or aliases
-      if !(Morpheus::Cli::CliRegistry.has_command?(cmd_name) || Morpheus::Cli::CliRegistry.has_alias?(cmd_name))
-        @stderr.puts "#{@angry_prompt}'#{cmd_name}' is not a morpheus command. See 'morpheus --help'."
-        #@stderr.puts usage
-        return 127, nil
-      end
+      # start benchmark right away?
+      # if args.find {|it| it == '-B' || it == '--benchmark'}
+      #   #start_benchmark(args.join(' '))
+      #   @benchmarking = true
+      # end
 
       # ok, execute the command (or alias)
       result = nil
       begin
+      
+        # execute startup script .morpheus_profile  unless --noprofile is passed
+        # todo: this should happen in initialize..
+        noprofile = false
+        if args.find {|it| it == '--noprofile' }
+          noprofile = true
+          args.delete_if {|it| it == '--noprofile' }
+        end
+
+        if @profile_dot_file && !@profile_dot_file_has_run
+          if !noprofile && File.exists?(@profile_dot_file.filename)
+            execute_profile_script()
+          end
+        end
+
+        # not enough arguments?
+        if args.count == 0
+          @stderr.puts "#{@angry_prompt}[command] argument is required."
+          #@stderr.puts "No command given, here's some help:"
+          @stderr.print usage
+          return 2, nil # CommandError.new("morpheus requires a command")
+        end
+        
+        cmd_name = args[0]
+        cmd_args = args[1..-1]
+
+        # unknown command?
+        # all commands should be registered commands or aliases
+        if !(Morpheus::Cli::CliRegistry.has_command?(cmd_name) || Morpheus::Cli::CliRegistry.has_alias?(cmd_name))
+          @stderr.puts "#{@angry_prompt}'#{cmd_name}' is not recognized. See 'morpheus --help'."
+          #@stderr.puts usage
+          return 127, nil
+        end
+        
+        if @benchmarking || args.include?('-B') || args.include?('--benchmark')
+          benchmark_name = "morpheus " + args.reject {|it| it == '-B' || it == '--benchmark' }.join(' ')
+          #benchmark_name = args.reject {|it| it == '-B' || it == '--benchmark' }.join(' ')
+          start_benchmark(benchmark_name)
+        end
+
         # shell is a Singleton command class
         if args[0] == "shell"
           result = Morpheus::Cli::Shell.instance.handle(args[1..-1])
@@ -373,6 +396,12 @@ module Morpheus
       rescue => e
         exit_code = Morpheus::Cli::ErrorHandler.new(@stderr).handle_error(e)
         err = e
+      ensure
+        # should always try to stop it
+        # if @benchmarking
+          benchmark_record = stop_benchmark(exit_code, err)
+          Morpheus::Logging::DarkPrinter.puts(Term::ANSIColor.cyan + Term::ANSIColor.dark + benchmark_record.msg) if benchmark_record
+        # end
       end
 
       return exit_code, err

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 3.6.8
+  version: 3.6.9
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-12 00:00:00.000000000 Z
+date: 2019-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -222,6 +222,7 @@ files:
 - lib/morpheus/api/network_proxies_interface.rb
 - lib/morpheus/api/network_services_interface.rb
 - lib/morpheus/api/networks_interface.rb
+- lib/morpheus/api/old_cypher_interface.rb
 - lib/morpheus/api/option_type_lists_interface.rb
 - lib/morpheus/api/option_types_interface.rb
 - lib/morpheus/api/options_interface.rb
@@ -244,34 +245,51 @@ files:
 - lib/morpheus/api/users_interface.rb
 - lib/morpheus/api/virtual_images_interface.rb
 - lib/morpheus/api/whoami_interface.rb
+- lib/morpheus/benchmarking.rb
 - lib/morpheus/cli.rb
+- lib/morpheus/cli/access_token_command.rb
 - lib/morpheus/cli/account_groups_command.rb
 - lib/morpheus/cli/accounts.rb
-- lib/morpheus/cli/alias_command.rb
 - lib/morpheus/cli/app_templates.rb
 - lib/morpheus/cli/apps.rb
 - lib/morpheus/cli/archives_command.rb
+- lib/morpheus/cli/auth_command.rb
 - lib/morpheus/cli/blueprints_command.rb
 - lib/morpheus/cli/boot_scripts_command.rb
+- lib/morpheus/cli/change_password_command.rb
 - lib/morpheus/cli/cli_command.rb
 - lib/morpheus/cli/cli_registry.rb
 - lib/morpheus/cli/cloud_datastores_command.rb
 - lib/morpheus/cli/clouds.rb
-- lib/morpheus/cli/coloring_command.rb
 - lib/morpheus/cli/command_error.rb
+- lib/morpheus/cli/commands/standard/alias_command.rb
+- lib/morpheus/cli/commands/standard/benchmark_command.rb
 - lib/morpheus/cli/commands/standard/cat_command.rb
+- lib/morpheus/cli/commands/standard/coloring_command.rb
+- lib/morpheus/cli/commands/standard/curl_command.rb
+- lib/morpheus/cli/commands/standard/debug_command.rb
+- lib/morpheus/cli/commands/standard/echo_command.rb
+- lib/morpheus/cli/commands/standard/edit_profile_command.rb
+- lib/morpheus/cli/commands/standard/edit_rc_command.rb
 - lib/morpheus/cli/commands/standard/exit_command.rb
+- lib/morpheus/cli/commands/standard/get_prompt_command.rb
+- lib/morpheus/cli/commands/standard/history_command.rb
+- lib/morpheus/cli/commands/standard/log_level_command.rb
+- lib/morpheus/cli/commands/standard/man_command.rb
+- lib/morpheus/cli/commands/standard/rm_command.rb
+- lib/morpheus/cli/commands/standard/set_prompt_command.rb
+- lib/morpheus/cli/commands/standard/sleep_command.rb
+- lib/morpheus/cli/commands/standard/source_command.rb
+- lib/morpheus/cli/commands/standard/ssl_verification_command.rb
+- lib/morpheus/cli/commands/standard/tee_command.rb
+- lib/morpheus/cli/commands/standard/version_command.rb
 - lib/morpheus/cli/containers_command.rb
 - lib/morpheus/cli/credentials.rb
-- lib/morpheus/cli/curl_command.rb
 - lib/morpheus/cli/cypher_command.rb
 - lib/morpheus/cli/dashboard_command.rb
 - lib/morpheus/cli/deployments.rb
 - lib/morpheus/cli/deploys.rb
 - lib/morpheus/cli/dot_file.rb
-- lib/morpheus/cli/echo_command.rb
-- lib/morpheus/cli/edit_profile_command.rb
-- lib/morpheus/cli/edit_rc_command.rb
 - lib/morpheus/cli/error_handler.rb
 - lib/morpheus/cli/execute_schedules_command.rb
 - lib/morpheus/cli/execution_request_command.rb
@@ -294,10 +312,8 @@ files:
 - lib/morpheus/cli/library_upgrades_command.rb
 - lib/morpheus/cli/license.rb
 - lib/morpheus/cli/load_balancers.rb
-- lib/morpheus/cli/log_level_command.rb
 - lib/morpheus/cli/login.rb
 - lib/morpheus/cli/logout.rb
-- lib/morpheus/cli/man_command.rb
 - lib/morpheus/cli/mixins/accounts_helper.rb
 - lib/morpheus/cli/mixins/infrastructure_helper.rb
 - lib/morpheus/cli/mixins/library_helper.rb
@@ -318,6 +334,7 @@ files:
 - lib/morpheus/cli/network_proxies_command.rb
 - lib/morpheus/cli/network_services_command.rb
 - lib/morpheus/cli/networks_command.rb
+- lib/morpheus/cli/old_cypher_command.rb
 - lib/morpheus/cli/option_parser.rb
 - lib/morpheus/cli/option_types.rb
 - lib/morpheus/cli/packages_command.rb
@@ -330,19 +347,15 @@ files:
 - lib/morpheus/cli/roles.rb
 - lib/morpheus/cli/security_group_rules.rb
 - lib/morpheus/cli/security_groups.rb
-- lib/morpheus/cli/set_prompt_command.rb
 - lib/morpheus/cli/shell.rb
-- lib/morpheus/cli/sleep_command.rb
-- lib/morpheus/cli/source_command.rb
-- lib/morpheus/cli/ssl_verification_command.rb
 - lib/morpheus/cli/storage_providers_command.rb
 - lib/morpheus/cli/tasks.rb
+- lib/morpheus/cli/tenants_command.rb
 - lib/morpheus/cli/user_groups_command.rb
 - lib/morpheus/cli/user_settings_command.rb
 - lib/morpheus/cli/user_sources_command.rb
 - lib/morpheus/cli/users.rb
 - lib/morpheus/cli/version.rb
-- lib/morpheus/cli/version_command.rb
 - lib/morpheus/cli/virtual_images.rb
 - lib/morpheus/cli/whoami.rb
 - lib/morpheus/cli/workflows.rb

data/lib/morpheus/cli/coloring_command.rb

@@ -1,45 +0,0 @@
-require 'optparse'
-require 'morpheus/cli/cli_command'
-require 'json'
-
-# This is for use in dotfile scripts
-# It allows you to turn colors on or off globally
-class Morpheus::Cli::ColoringCommand
-  include Morpheus::Cli::CliCommand
-  set_command_name :coloring
-  set_command_hidden
-
-  def handle(args)
-    append_newline = true
-    options = {}
-    optparse = Morpheus::Cli::OptionParser.new do|opts|
-      opts.banner = "Usage: morpheus #{command_name} [on|off]"
-      #build_common_options(opts, options, [])
-      opts.on('-h', '--help', "Prints this help" ) do
-        puts opts
-        exit
-      end
-      opts.footer = "Enable [on] or Disable [off] ANSI Colors for all output."
-    end
-    optparse.parse!(args)
-    if args.count > 1
-      puts optparse
-      exit 1
-    end
-    if args.count == 1
-      is_on = ["on","true", "1"].include?(args[0].to_s.strip.downcase)
-      is_off = ["off","false", "0"].include?(args[0].to_s.strip.downcase)
-      if !is_on && !is_off
-        puts optparse
-        exit 1
-      end
-      Term::ANSIColor::coloring = is_on
-    end
-    if Term::ANSIColor::coloring?
-      puts "#{cyan}coloring is #{bold}#{green}on#{reset}"
-    else
-      puts "coloring is off"
-    end
-  end
-
-end