morpheus-cli 3.6.3 → 3.6.4

data/lib/morpheus/cli/shell.rb

@@ -45,7 +45,8 @@ class Morpheus::Cli::Shell
     @current_remote = ::Morpheus::Cli::Remote.load_active_remote()
     if @current_remote
       @appliance_name, @appliance_url = @current_remote[:name], @current_remote[:host]
-      @current_username = @current_remote[:username] || '(anonymous)'
+      # @current_username = @current_remote[:username] || '(anonymous)'
+      @current_username = @current_remote[:username] || ''
     else
       @appliance_name, @appliance_url = nil, nil
       @current_username = nil
@@ -371,7 +372,7 @@ class Morpheus::Cli::Shell
         #print "\n"
         return 0
       elsif input =~ /^\s*#/
-        Morpheus::Logging::DarkPrinter.puts "comment ignored" if Morpheus::Logging.debug?
+        Morpheus::Logging::DarkPrinter.puts "ignored comment: #{input}" if Morpheus::Logging.debug?
         return 0
       # this is a full blown command now
       # elsif input =~ /^sleep/
@@ -663,7 +664,7 @@ class Morpheus::Cli::Shell
     @last_command_number += 1
     @history[@last_command_number] = cmd
     if @history_logger
-      @history_logger.info "(cmd #{@last_command_number}) #{cmd}"
+      @history_logger.info "#{@current_username}@#{@appliance_name} : -- : (cmd #{@last_command_number}) #{cmd}"
     end
   end
 end

data/lib/morpheus/cli/source_command.rb

@@ -25,6 +25,7 @@ class Morpheus::Cli::SourceCommand
     source_files = args
     source_files.each do |source_file|
       # execute a source script
+      source_file = File.expand_path(source_file)
       if File.exists?(source_file)
         cmd_results = Morpheus::Cli::DotFile.new(source_file).execute()
       else

data/lib/morpheus/cli/storage_providers_command.rb

@@ -275,6 +275,15 @@ class Morpheus::Cli::StorageProvidersCommand
             {'fieldName' => 'bucketName', 'fieldLabel' => 'Bucket Name', 'type' => 'text', 'required' => true, 'description' => ''},
             {'fieldName' => 'createBucket', 'fieldLabel' => 'Create Bucket', 'type' => 'checkbox', 'required' => false, 'defaultValue' => false, 'description' => 'Create the bucket if it does not exist.'},
           ]
+        elsif storage_provider_type_code == 'alibaba'
+          # print_h2 "Alibaba Options"
+          provider_type_option_types = [
+            {'fieldContext' => 'config', 'fieldName' => 'accessKey', 'fieldLabel' => 'Access Key', 'type' => 'text', 'required' => true, 'description' => ''},
+            {'fieldContext' => 'config', 'fieldName' => 'secretKey', 'fieldLabel' => 'Secret Key', 'type' => 'password', 'required' => true, 'description' => ''},
+            {'fieldName' => 'bucketName', 'fieldLabel' => 'Bucket Name', 'type' => 'text', 'required' => true, 'description' => ''},
+            {'fieldName' => 'createBucket', 'fieldLabel' => 'Create Bucket', 'type' => 'checkbox', 'required' => false, 'defaultValue' => false, 'description' => 'Create the bucket if it does not exist.'},
+            {'fieldContext' => 'config', 'fieldName' => 'region', 'fieldLabel' => 'Region', 'type' => 'text', 'required' => false, 'description' => 'Optional Alibaba region if creating a new bucket.'}
+          ]
         elsif storage_provider_type_code == 'cifs'
           # print_h2 "CIFS Options"
           provider_type_option_types = [
@@ -1222,6 +1231,7 @@ class Morpheus::Cli::StorageProvidersCommand
   def get_storage_provider_types()
     [
       {'name' => 'Amazon S3', 'value' => 's3'},
+      {'name' => 'Alibaba', 'value' => 'alibaba'},
       {'name' => 'Azure', 'value' => 'azure'},
       {'name' => 'CIFS', 'value' => 'cifs'},
       {'name' => 'Local Storage', 'value' => 'local'},

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "3.6.3"
+    VERSION = "3.6.4"
   end
 end

data/lib/morpheus/formatters.rb

@@ -274,13 +274,13 @@ def filter_data(data, include_fields=nil, exclude_fields=nil)
   end
 end
 
-def format_bytes(bytes)
+def format_bytes(bytes, units="B")
   out = ""
   if bytes
-    if bytes < 1024
+    if bytes < 1024 && units == "B"
       out = "#{bytes.to_i} B"
     else
-      out = Filesize.from("#{bytes} B").pretty.strip
+      out = Filesize.from("#{bytes} #{units}").pretty.strip
     end
   end
   return out

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 3.6.3
+  version: 3.6.4
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-24 00:00:00.000000000 Z
+date: 2019-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -259,6 +259,7 @@ files:
 - lib/morpheus/cli/clouds.rb
 - lib/morpheus/cli/coloring_command.rb
 - lib/morpheus/cli/command_error.rb
+- lib/morpheus/cli/commands/standard/cat_command.rb
 - lib/morpheus/cli/commands/standard/exit_command.rb
 - lib/morpheus/cli/containers_command.rb
 - lib/morpheus/cli/credentials.rb