morpheus-cli 4.2.18 → 5.0.0

data/lib/morpheus/formatters.rb

@@ -365,8 +365,21 @@ def format_number(n, opts={})
   return out
 end
 
-def format_sig_dig(n, sigdig=3)
-  sprintf("%.#{sigdig}f", n)
+def format_sig_dig(n, sigdig=3, min_sigdig=nil, pad_zeros=false)
+  v = sprintf("%.#{sigdig}f", n)
+  if pad_zeros != true
+    v = v.to_f.to_s
+  end
+  if min_sigdig
+    v_parts =  v.split(".")
+    decimal_str = v_parts[1]
+    if decimal_str == nil
+      v = v + "." + ('0' * min_sigdig)
+    elsif decimal_str.size < min_sigdig
+      v = v + ('0' * (min_sigdig - decimal_str.size))
+    end
+  end
+  v
 end
 
 def currency_sym(currency)
@@ -375,7 +388,7 @@ end
 
 # returns currency amount formatted like "$4,5123.00". 0.00 is formatted as "$0"
 # this is not ideal
-def format_money(amount, currency='usd', opts={})
+def format_currency(amount, currency='usd', opts={})
   amount = amount.to_f
   if amount == 0
     return currency_sym(currency).to_s + "0"
@@ -383,8 +396,10 @@ def format_money(amount, currency='usd', opts={})
   #   # return exponent notation like 3.4e-09
   #   return currency_sym(currency).to_s + "#{amount}"
   else
-    sigdig = opts[:sigdig] ? opts[:sigdig].to_i : 2
-    rtn = currency_sym(currency).to_s + format_number(sprintf("%.#{sigdig}f", amount))
+    sigdig = opts[:sigdig] ? opts[:sigdig].to_i : 2 # max decimal digits
+    min_sigdig = opts[:min_sigdig] ? opts[:min_sigdig].to_i : 2 # min decimal digits
+    display_value = format_sig_dig(amount, sigdig, min_sigdig, opts[:pad_zeros])
+    rtn = currency_sym(currency).to_s + display_value
     if amount.to_i < 0
       rtn = "(#{rtn})"
       if opts[:minus_color]
@@ -394,3 +409,9 @@ def format_money(amount, currency='usd', opts={})
     rtn
   end
 end
+
+alias :format_money :format_currency
+
+# def format_money(amount, currency='usd', opts={})
+#   format_currency(amount, currency, opts)
+# end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 4.2.18
+  version: 5.0.0
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-18 00:00:00.000000000 Z
+date: 2020-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -185,8 +185,10 @@ files:
 - lib/morpheus/api/backup_jobs_interface.rb
 - lib/morpheus/api/backup_settings_interface.rb
 - lib/morpheus/api/backups_interface.rb
+- lib/morpheus/api/billing_interface.rb
 - lib/morpheus/api/blueprints_interface.rb
 - lib/morpheus/api/budgets_interface.rb
+- lib/morpheus/api/catalog_item_types_interface.rb
 - lib/morpheus/api/cloud_datastores_interface.rb
 - lib/morpheus/api/cloud_folders_interface.rb
 - lib/morpheus/api/cloud_policies_interface.rb
@@ -305,6 +307,7 @@ files:
 - lib/morpheus/cli/blueprints_command.rb
 - lib/morpheus/cli/boot_scripts_command.rb
 - lib/morpheus/cli/budgets_command.rb
+- lib/morpheus/cli/catalog_command.rb
 - lib/morpheus/cli/change_password_command.rb
 - lib/morpheus/cli/cli_command.rb
 - lib/morpheus/cli/cli_registry.rb
@@ -333,6 +336,7 @@ files:
 - 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/update_command.rb
 - lib/morpheus/cli/commands/standard/version_command.rb
 - lib/morpheus/cli/containers_command.rb
 - lib/morpheus/cli/credentials.rb
@@ -380,6 +384,7 @@ files:
 - lib/morpheus/cli/logs_command.rb
 - lib/morpheus/cli/mixins/accounts_helper.rb
 - lib/morpheus/cli/mixins/backups_helper.rb
+- lib/morpheus/cli/mixins/catalog_helper.rb
 - lib/morpheus/cli/mixins/deployments_helper.rb
 - lib/morpheus/cli/mixins/infrastructure_helper.rb
 - lib/morpheus/cli/mixins/library_helper.rb
@@ -432,6 +437,7 @@ files:
 - lib/morpheus/cli/subnets_command.rb
 - lib/morpheus/cli/tasks.rb
 - lib/morpheus/cli/tenants_command.rb
+- lib/morpheus/cli/usage_command.rb
 - lib/morpheus/cli/user_groups_command.rb
 - lib/morpheus/cli/user_settings_command.rb
 - lib/morpheus/cli/user_sources_command.rb