morpheus-cli 3.6.9 → 3.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edf4a115c224b9ee5fbdb0289bc5ed3a9338e2847461ff395c558e28c6352929
-  data.tar.gz: d3eed3cf1efe9c90679fb6c3a6e52e177fc9e78bc6bafeab4429cbe4a72308da
+  metadata.gz: a3d463857d867530a0377c41c1dc74f7ef7a70263e98d24b9a161a245c602fb6
+  data.tar.gz: b54e2067737379a676e48feefe1c347a7a5bbb1df4694651b2e55195e4c91f3c
 SHA512:
-  metadata.gz: 970a441acc7a65b6b91578f7a3d44bba995ac01f4060982a17d7ebc490ef7ddced9bb63a9dca5b1bebecb7dff7239bc352f42d6ea8a7f1a179b05fb20b312323
-  data.tar.gz: f07cc47e7ffdc6d2f754dca1551d4f122a944b6b5afe18e7a8d52bb494c870f6cc57c0a0298f42bca88f3559b878f6c7b0d408693b6e02ff9812fd4e753063db
+  metadata.gz: b23d4bcb6342da85c55c27b641a13bb6277071beb9e925774317d61c96db96d1fdabbf36ab2f344bf82dbc6cb9dabd477354a42b1e9e7c2cfb576953e5a3c891
+  data.tar.gz: fa239481d1a0498b45aaeb1db54a34620891ea308b2a386cec31483b5345bafb2b7f3b0bd34c05bbda678644c6d61c6c4b0fdbe8cdd81061adbd60fbca4be969

data/lib/morpheus/api/api_client.rb

@@ -260,10 +260,6 @@ class Morpheus::APIClient
     Morpheus::BlueprintsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
-  def app_templates
-    Morpheus::AppTemplatesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
-  end
-
   def deploy
     Morpheus::DeployInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end

data/lib/morpheus/api/deploy_interface.rb

@@ -40,20 +40,24 @@ class Morpheus::DeployInterface < Morpheus::APIClient
 
   # todo: use execute() to support @dry_run?
   def upload_file(id,path,destination=nil)
-    url_string = "#{@base_url}/api/deploy/#{id}/files"
+    url = "#{@base_url}/api/deploy/#{id}/files"
     if !destination.empty?
-      url_string += "/#{destination}"
+      url += "/#{destination}"
     end
-
-    url = URI.parse(url_string)
-    req = Net::HTTP::Post::Multipart.new url.path,
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/octet-stream' }
+    opts = { method: :post, url: url, headers: headers, payload: File.new(path,'rb')}
+    if @dry_run
+      return opts
+    end
+    uri = URI.parse(url)
+    req = Net::HTTP::Post::Multipart.new uri.path,
     "file" => UploadIO.new(File.new(path,'rb'), "image/jpeg", File.basename(path))
-
+    # todo: iterate headers and abstract th :upload_io to execute() too.
     req['Authorization'] = "Bearer #{@access_token}"
-    res = Net::HTTP.start(url.host, url.port) do |http|
+    res = Net::HTTP.start(uri.host, uri.port) do |http|
       http.request(req)
     end
-        res
+    res
   end
 
   def destroy(id)

data/lib/morpheus/cli.rb

@@ -91,7 +91,6 @@ module Morpheus
       load 'morpheus/cli/containers_command.rb'
       load 'morpheus/cli/apps.rb'
       load 'morpheus/cli/blueprints_command.rb'
-      load 'morpheus/cli/app_templates.rb' # deprecated
       load 'morpheus/cli/deploys.rb'
       load 'morpheus/cli/license.rb'
       load 'morpheus/cli/instance_types.rb'

data/lib/morpheus/cli/access_token_command.rb

@@ -42,7 +42,8 @@ class Morpheus::Cli::AccessTokenCommand
   end
 
   def handle(args)
-    if args.empty?
+    # access-token get by default, except access-token -h should list the subcommands.
+    if args.empty? || (args[0] && args[0] =~ /^\-/ && !['-h', '--help'].include?(args[0]))
       print_access_token(args)
     else
       handle_subcommand(args)
@@ -124,10 +125,8 @@ class Morpheus::Cli::AccessTokenCommand
     end
 
     connect(options)
-
     if options[:dry_run]
-      auth_interface = Morpheus::AuthInterface.new(@appliance_url)
-      print_dry_run auth_interface.dry.use_refresh_token(@wallet['refresh_token'])
+      print_dry_run Morpheus::AuthInterface.new(@appliance_url).setopts(options).use_refresh_token(@wallet['refresh_token'])
       return 0
     end
     unless options[:quiet]

data/lib/morpheus/cli/account_groups_command.rb

@@ -61,7 +61,7 @@ class Morpheus::Cli::AccountGroupsCommand
       account_id = account['id']
 
       params.merge!(parse_list_options(options))
-
+      @account_groups_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @account_groups_interface.dry.list(account['id'], params)
         return
@@ -119,6 +119,7 @@ class Morpheus::Cli::AccountGroupsCommand
       account_id = account['id']
 
       if options[:dry_run]
+        @account_groups_interface.setopts(options)
         if args[0].to_s =~ /\A\d{1,}\Z/
           print_dry_run @account_groups_interface.dry.get(account_id, args[0].to_i)
         else
@@ -128,6 +129,7 @@ class Morpheus::Cli::AccountGroupsCommand
       end
 
       group = find_account_group_by_name_or_id(account_id, args[0])
+      @account_groups_interface.setopts(options)
       return 1 if group.nil?
       # skip redundant request
       # json_response = @account_groups_interface.dry.get(account_id, args[0].to_i)
@@ -215,7 +217,7 @@ class Morpheus::Cli::AccountGroupsCommand
       params = Morpheus::Cli::OptionTypes.prompt(all_option_types, options[:options], @api_client, {})
       group_payload.merge!(params)
       payload = {group: group_payload}
-
+      @account_groups_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @account_groups_interface.dry.create(account['id'], payload)
         return
@@ -279,7 +281,7 @@ class Morpheus::Cli::AccountGroupsCommand
       group_payload.merge!(params)
 
       payload = {group: group_payload}
-
+      @account_groups_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @account_groups_interface.dry.update(account['id'], group['id'], payload)
         return
@@ -335,6 +337,7 @@ class Morpheus::Cli::AccountGroupsCommand
       end
       new_zones = current_zones + [{'id' => cloud['id']}]
       payload = {group: {id: group["id"], zones: new_zones}}
+      @account_groups_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @account_groups_interface.dry.update_zones(account['id'], group["id"], payload)
         return
@@ -391,6 +394,7 @@ class Morpheus::Cli::AccountGroupsCommand
       end
       new_zones = current_zones.reject {|it| it["id"] == cloud["id"] }
       payload = {group: {id: group["id"], zones: new_zones}}
+      @account_groups_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @account_groups_interface.dry.update_zones(account['id'], group["id"], payload)
         return
@@ -441,6 +445,7 @@ class Morpheus::Cli::AccountGroupsCommand
       unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the group #{group['name']}?")
         exit
       end
+      @account_groups_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @account_groups_interface.dry.destroy(account['id'], group['id'])
         return

data/lib/morpheus/cli/apps.rb

@@ -1250,7 +1250,7 @@ class Morpheus::Cli::Apps
         print_dry_run @apps_interface.dry.apply_security_groups(app['id'], payload)
         return
       end
-      @apps_interface.apply_security_groups(app['id'], payloaad)
+      @apps_interface.apply_security_groups(app['id'], payload)
       security_groups([args[0]])
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
@@ -1273,6 +1273,11 @@ class Morpheus::Cli::Apps
       opts.on( nil, '--output', "Display process output." ) do
         options[:show_output] = true
       end
+      opts.on(nil, '--details', "Display more details. Shows everything, untruncated." ) do
+        options[:show_events] = true
+        options[:show_output] = true
+        options[:details] = true
+      end
       build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = "List historical processes for a specific app.\n" + 
                     "[app] is required. This is the name or id of an app."
@@ -1361,8 +1366,8 @@ class Morpheus::Cli::Apps
                     startDate: format_local_dt(process_event['startDate']),
                     duration: format_process_duration(process_event),
                     status: format_process_status(process_event),
-                    error: format_process_error(process_event),
-                    output: format_process_output(process_event)
+                    error: format_process_error(process_event, options[:details] ? nil : 20),
+                    output: format_process_output(process_event, options[:details] ? nil : 20)
                   }
                   history_records << event_row
                 end
@@ -1565,8 +1570,8 @@ class Morpheus::Cli::Apps
 
   def get_available_blueprints(refresh=false)
     if !@available_blueprints || refresh
-      results = @options_interface.options_for_source('appTemplates',{}) # still exists
-      #results = @options_interface.options_for_source('blueprints',{})
+      #results = @options_interface.options_for_source('appTemplates',{}) # still exists
+      results = @options_interface.options_for_source('blueprints',{})
       @available_blueprints = results['data'].collect {|it|
         {"id" => it["value"], "name" => it["name"], "value" => it["value"]}
       }

data/lib/morpheus/cli/archives_command.rb

@@ -76,7 +76,7 @@ class Morpheus::Cli::ArchivesCommand
       [:phrase, :offset, :max, :sort, :direction].each do |k|
         params[k] = options[k] unless options[k].nil?
       end
-
+      @archive_buckets_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @archive_buckets_interface.dry.list(params)
         return
@@ -170,6 +170,7 @@ class Morpheus::Cli::ArchivesCommand
     bucket_id, search_file_path  = parse_bucket_id_and_file_path(args[0])
     connect(options)
     begin
+      @archive_buckets_interface.setopts(options)
       if options[:dry_run]
         if args[0].to_s =~ /\A\d{1,}\Z/
           print_dry_run @archive_buckets_interface.dry.get(bucket_id.to_i)
@@ -292,7 +293,7 @@ class Morpheus::Cli::ArchivesCommand
         return 1 if !archive_bucket_payload
         payload = {'archiveBucket' => archive_bucket_payload}
       end
-
+      @archive_buckets_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @archive_buckets_interface.dry.create(payload)
         return
@@ -371,7 +372,7 @@ class Morpheus::Cli::ArchivesCommand
         return 1 if !archive_bucket_payload
         payload = {'archiveBucket' => archive_bucket_payload}
       end
-
+      @archive_buckets_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @archive_buckets_interface.dry.update(archive_bucket["id"], payload)
         return
@@ -422,6 +423,7 @@ class Morpheus::Cli::ArchivesCommand
       unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the archive bucket: #{archive_bucket['name']}?")
         return 9, "aborted command"
       end
+      @archive_buckets_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @archive_buckets_interface.dry.destroy(archive_bucket['id'], query_params), full_command_string
         return 0
@@ -565,6 +567,7 @@ class Morpheus::Cli::ArchivesCommand
           upload_file_list << {file: file, destination: destination}
         end
 
+        @archive_buckets_interface.setopts(options)
         if options[:dry_run]
           # print_h1 "DRY RUN"
           print "\n",cyan, bold, "Uploading #{upload_file_list.size} Files...", reset, "\n"
@@ -627,6 +630,7 @@ class Morpheus::Cli::ArchivesCommand
           return 9, "aborted command"
         end
 
+        @archive_buckets_interface.setopts(options)
         if options[:dry_run]
           #print cyan,bold, "  - Uploading #{file} to #{bucket_id}:#{destination} DRY RUN", reset, "\n"
           # print_h1 "DRY RUN"
@@ -685,6 +689,7 @@ class Morpheus::Cli::ArchivesCommand
       if params[:phrase]
         params[:fullTree] = true # these are not exclusively supported by api yet
       end
+      @archive_buckets_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @archive_buckets_interface.dry.list_files(bucket_id, search_file_path, params)
         return
@@ -766,6 +771,7 @@ class Morpheus::Cli::ArchivesCommand
       [:phrase, :offset, :max, :sort, :direction, :fullTree].each do |k|
         params[k] = options[k] unless options[k].nil?
       end
+      @archive_buckets_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @archive_buckets_interface.dry.list_files(bucket_id, search_file_path, params)
         return 0
@@ -930,6 +936,8 @@ class Morpheus::Cli::ArchivesCommand
       # archive_bucket = find_archive_bucket_by_name_or_id(bucket_id)
       # return 1 if archive_bucket.nil?
       params = {}
+      @archive_buckets_interface.setopts(options)
+      @archive_files_interface.setopts(options)
       if options[:dry_run]
         if file_id
           print_dry_run @archive_files_interface.dry.get(file_id, params), full_command_string
@@ -1065,7 +1073,7 @@ class Morpheus::Cli::ArchivesCommand
           return 9, "aborted command"
         end
       end
-      
+      @archive_files_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @archive_files_interface.dry.destroy(archive_file['id'], query_params)
         return 0
@@ -1112,6 +1120,7 @@ class Morpheus::Cli::ArchivesCommand
       [:phrase, :offset, :max, :sort, :direction].each do |k|
         params[k] = options[k] unless options[k].nil?
       end
+      @archive_files_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @archive_files_interface.dry.history(archive_file['id'], params)
         return
@@ -1174,6 +1183,7 @@ class Morpheus::Cli::ArchivesCommand
       [:phrase, :offset, :max, :sort, :direction].each do |k|
         params[k] = options[k] unless options[k].nil?
       end
+      @archive_files_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @archive_files_interface.dry.list_links(archive_file['id'], params)
         return
@@ -1287,6 +1297,7 @@ class Morpheus::Cli::ArchivesCommand
         end
       end
       begin
+        @archive_files_interface.setopts(options)
         if options[:dry_run]
           # print_dry_run @archive_files_interface.dry.download_file_by_path(full_file_path), full_command_string
           if use_public_url
@@ -1372,6 +1383,7 @@ class Morpheus::Cli::ArchivesCommand
       archive_file = find_archive_file_by_bucket_and_path(bucket_id, file_path)
       return 1 if archive_file.nil?
       full_file_path = "#{bucket_id}/#{file_path}".squeeze('/')
+      @archive_files_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @archive_files_interface.dry.download_file_by_path(full_file_path), full_command_string
         return 1
@@ -1421,6 +1433,7 @@ class Morpheus::Cli::ArchivesCommand
       if expiration_seconds.to_i > 0
         params['expireSeconds'] = expiration_seconds.to_i
       end
+      @archive_files_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @archive_files_interface.dry.create_file_link(archive_file['id'], params)
         return
@@ -1474,6 +1487,7 @@ class Morpheus::Cli::ArchivesCommand
         return 1
       end
       params = {}
+      @archive_files_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @archive_files_interface.dry.destroy_file_link(archive_file['id'], link_id, params)
         return
@@ -1561,7 +1575,7 @@ class Morpheus::Cli::ArchivesCommand
           return 1
         end
       end
-
+      @archive_files_interface.setopts(options)
       if options[:dry_run]
         # print_dry_run @archive_files_interface.dry.download_file_by_path(full_file_path), full_command_string
         print_dry_run @archive_files_interface.dry.download_file_by_link_chunked(link_key, outfile), full_command_string
@@ -1681,7 +1695,7 @@ class Morpheus::Cli::ArchivesCommand
           return 1
         end
       end
-
+      @archive_buckets_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @archive_buckets_interface.dry.download_bucket_zip_chunked(bucket_id, outfile), full_command_string
         return 1

data/lib/morpheus/cli/boot_scripts_command.rb

@@ -46,7 +46,7 @@ class Morpheus::Cli::BootScriptsCommand
       [:phrase, :offset, :max, :sort, :direction].each do |k|
         params[k] = options[k] unless options[k].nil?
       end
-
+      @boot_scripts_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @boot_scripts_interface.dry.list(params)
         return
@@ -105,6 +105,7 @@ class Morpheus::Cli::BootScriptsCommand
     end
     connect(options)
     begin
+      @boot_scripts_interface.setopts(options)
       if options[:dry_run]
         if args[0].to_s =~ /\A\d{1,}\Z/
           print_dry_run @boot_scripts_interface.dry.get(args[0].to_i)
@@ -183,6 +184,7 @@ class Morpheus::Cli::BootScriptsCommand
         payload['bootScript']['content'] = File.read(script_file)
       end
       payload['bootScript'].merge!(params)
+      @boot_scripts_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @boot_scripts_interface.dry.create(payload)
         return
@@ -253,7 +255,7 @@ class Morpheus::Cli::BootScriptsCommand
         payload['bootScript']['content'] = File.read(script_file)
       end
       payload['bootScript'].merge!(params)
-
+      @boot_scripts_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @boot_scripts_interface.dry.update(boot_script["id"], payload)
         return
@@ -296,6 +298,7 @@ class Morpheus::Cli::BootScriptsCommand
       unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the boot script: #{boot_script['fileName']}?")
         return 9, "aborted command"
       end
+      @boot_scripts_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @boot_scripts_interface.dry.destroy(boot_script['id'])
         return 0

data/lib/morpheus/cli/change_password_command.rb

@@ -117,7 +117,7 @@ class Morpheus::Cli::ChangePasswordCommand
           'password' => new_password
         } 
       }
-
+      @users_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @users_interface.dry.update(account_id, user['id'], payload)
         return 0

data/lib/morpheus/cli/cli_command.rb

@@ -567,12 +567,10 @@ module Morpheus
               options[:dry_run] = true
               options[:curl] = true
             end
-            # hide until fully supported
-            opts.add_hidden_option('--curl') if opts.is_a?(Morpheus::Cli::OptionParser)
-            opts.on(nil,'--scrub', "Mask secrets in output, such as the Authorization header. For use with --curl") do
+            opts.on(nil,'--scrub', "Mask secrets in output, such as the Authorization header. For use with --curl and --dry-run.") do
               options[:scrub] = true
             end
-            opts.add_hidden_option('--scrub') if opts.is_a?(Morpheus::Cli::OptionParser)
+            #opts.add_hidden_option('--scrub') if opts.is_a?(Morpheus::Cli::OptionParser)
           when :quiet
             opts.on('-q','--quiet', "No Output, do not print to stdout") do
               options[:quiet] = true

data/lib/morpheus/cli/cloud_datastores_command.rb

@@ -54,6 +54,7 @@ class Morpheus::Cli::CloudDatastoresCommand
       return 1 if cloud.nil?
 
       params.merge!(parse_list_options(options))
+      @cloud_datastores_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @cloud_datastores_interface.dry.list(cloud['id'], params)
         return
@@ -137,7 +138,7 @@ class Morpheus::Cli::CloudDatastoresCommand
       end
       cloud = find_cloud_by_name_or_id(cloud_id)
       return 1 if cloud.nil?
-
+      @cloud_datastores_interface.setopts(options)
       if options[:dry_run]
         if args[0].to_s =~ /\A\d{1,}\Z/
           print_dry_run @cloud_datastores_interface.dry.get(cloud['id'], args[0].to_i)
@@ -325,7 +326,7 @@ class Morpheus::Cli::CloudDatastoresCommand
         end
 
       end
-
+      @cloud_datastores_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @cloud_datastores_interface.dry.update(cloud['id'], datastore["id"], payload)
         return

data/lib/morpheus/cli/commands/standard/alias_command.rb

@@ -50,7 +50,7 @@ class Morpheus::Cli::AliasCommand
       opts.footer = <<-EOT
 Define a new alias.
 [name] is required. This is the alias name. It should be one word.
-[command] is required. This is the full command or or expression wrapped in quotes.
+[command] is required. This is the full command wrapped in quotes.
 Aliases can be exported for future use with the -e option.
 The `alias add` command can be invoked with `alias [name]=[command]`
 
@@ -58,9 +58,6 @@ Examples:
     alias cloud=clouds
     alias ij='instances get -j'
     alias new-hosts='hosts list -S id -D'
-    alias infra='clouds list -m 5; networks list -m 5; hosts list -m 5'
-    alias find-answer='(instances get 42 || instances add) || echo "oh dear..."' -e
-    
 For more information, see https://github.com/gomorpheus/morpheus-cli/wiki/Alias
 EOT
       
@@ -210,9 +207,8 @@ EOT
     end
     optparse.parse!(args)
 
-    #my_aliases = Morpheus::Cli::CliRegistry.all_aliases
     my_aliases = Morpheus::Cli::CliRegistry.all_aliases.collect {|k,v|
-      {name: k, command_string: v}
+      {name: k, command: v}
     }
 
     # todo: generic support :list options on a local Array
@@ -220,7 +216,7 @@ EOT
       # my_aliases = my_aliases.grep(/^#{Regexp.escape(options[:phrase])}/)
       match_regex = /#{Regexp.escape(options[:phrase])}/
       my_aliases = my_aliases.select {|it| 
-        it[:name].to_s =~ match_regex || it[:command_string].to_s =~ match_regex
+        it[:name].to_s =~ match_regex || it[:command].to_s =~ match_regex
       }
     end
 
@@ -228,11 +224,11 @@ EOT
     options[:direction] ||= 'asc'
 
     if options[:sort]
-      if options[:sort].to_s == 'name'
+      if options[:sort].to_s == 'name' || options[:sort].to_s == 'alias'
         my_aliases = my_aliases.sort {|x,y| x[:name].to_s.downcase <=> y[:name].to_s.downcase }
-      elsif options[:sort].to_s == 'ts'
+      elsif options[:sort].to_s == 'command' || options[:sort].to_s == 'command_string'
         # just relies on the order they were registered in, heh...
-        my_aliases = my_aliases.sort {|x,y| x[:command_string].to_s.downcase <=> y[:command_string].to_s.downcase }
+        my_aliases = my_aliases.sort {|x,y| x[:command].to_s.downcase <=> y[:command].to_s.downcase }
       else
         # a-z is the default, and the best
       end
@@ -255,7 +251,7 @@ EOT
     if options[:format] == 'json' || options[:json]
       alias_json = {}
       my_aliases.each do |it|
-        alias_json[it[:name]] = it[:command_string]
+        alias_json[it[:name]] = it[:command]
       end
       out << JSON.pretty_generate({aliases: alias_json})
       out << "\n"
@@ -263,7 +259,7 @@ EOT
       # out << "# morpheus aliases for #{`whoami`}\n" # windows!
       #out << "# morpheus aliases\n"
       my_aliases.each do |it|
-        out <<  "alias #{it[:name]}='#{it[:command_string]}'"
+        out <<  "alias #{it[:name]}='#{it[:command]}'"
         if do_export
           out << " -e"
         end
@@ -271,7 +267,7 @@ EOT
       end
     elsif options[:format] == 'list'
       my_aliases.each do |it|
-        out <<  "#{cyan}#{it[:name]}#{reset}='#{it[:command_string]}'"
+        out <<  "#{cyan}#{it[:name]}#{reset}='#{it[:command]}'"
         out << "\n"
       end
       out << reset
@@ -279,7 +275,7 @@ EOT
       # table (default)
       alias_columns = {
         "ALIAS" => lambda {|it| it[:name] },
-        "COMMAND" => lambda {|it| it[:command_string] }
+        "COMMAND" => lambda {|it| it[:command] }
       }
       out << "\n"
       out << cyan