morpheus-cli 4.2.11 → 4.2.16

data/lib/morpheus/cli/remote.rb

@@ -302,15 +302,12 @@ EOT
     # secure is the default, 
     # try to only store insecure:false in the appliances config
     if url.to_s =~ /^https\:/ && secure.nil?
-      if secure != nil
-        new_appliance_map[:insecure] = !secure
-      else
-        #v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'secure', 'fieldLabel' => 'Secure', 'type' => 'checkbox', 'required' => false, 'defaultValue' => true, 'description' => 'Prevent insecure HTTPS communication, respect SSL errors.'}], options[:options])
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'insecure', 'fieldLabel' => 'Insecure (Ignore SSL Errors)', 'type' => 'checkbox', 'required' => false, 'defaultValue' => false, 'description' => 'Allow insecure HTTPS communication, ignore SSL errors.'}], options[:options])
-        if v_prompt['insecure'].to_s == 'true' || v_prompt['insecure'].to_s == 'on'
-          new_appliance_map[:insecure] = true
-        end
+      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'insecure', 'fieldLabel' => 'Insecure (Ignore SSL Errors)', 'type' => 'checkbox', 'required' => false, 'defaultValue' => false, 'description' => 'Allow insecure HTTPS communication, ignore SSL errors.'}], options[:options])
+      if v_prompt['insecure'].to_s == 'true' || v_prompt['insecure'].to_s == 'on'
+        new_appliance_map[:insecure] = true
       end
+    elsif secure != nil
+      new_appliance_map[:insecure] = !secure
     end
     
     # --use

data/lib/morpheus/cli/users.rb

@@ -698,7 +698,7 @@ EOT
       {'fieldName' => 'password', 'fieldLabel' => 'Password', 'type' => 'password', 'required' => true, 'displayOrder' => 5},
       {'fieldName' => 'passwordConfirmation', 'fieldLabel' => 'Confirm Password', 'type' => 'password', 'required' => true, 'displayOrder' => 6},
       {'fieldName' => 'role', 'fieldLabel' => 'Role', 'type' => 'text', 'description' => "Role names (comma separated)", 'displayOrder' => 7},
-      {'fieldName' => 'receiveNotifications', 'fieldLabel' => 'receiveNotifications', 'type' => 'checkbox', 'required' => false, 'defaultValue' => true, 'displayOrder' => 58},
+      {'fieldName' => 'receiveNotifications', 'fieldLabel' => 'Receive Notifications?', 'type' => 'checkbox', 'required' => false, 'defaultValue' => true, 'displayOrder' => 58},
       {'fieldName' => 'linuxUsername', 'fieldLabel' => 'Linux Username', 'type' => 'text', 'required' => false, 'displayOrder' => 9},
       # {'fieldName' => 'linuxPassword', 'fieldLabel' => 'Linux Password', 'type' => 'password', 'required' => false, 'displayOrder' => 10},
       {'fieldName' => 'windowsUsername', 'fieldLabel' => 'Windows Username', 'type' => 'text', 'required' => false, 'displayOrder' => 11},

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "4.2.11"
+    VERSION = "4.2.16"
   end
 end

data/lib/morpheus/formatters.rb

@@ -365,14 +365,8 @@ def format_number(n, opts={})
   return out
 end
 
-def format_sig_dig(n, sig_dig=3)
-  out = ""
-  parts = n.to_f.round(sig_dig).to_s.split(".")
-  if parts.size > 1 && sig_dig
-    parts[1] = parts[1].ljust(sig_dig, "0")
-  end
-  out << parts.join(".")
-  return out
+def format_sig_dig(n, sigdig=3)
+  sprintf("%.#{sigdig}f", n)
 end
 
 def currency_sym(currency)
@@ -382,22 +376,16 @@ 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={})
-  if amount.to_f == 0
+  amount = amount.to_f
+  if amount == 0
     return currency_sym(currency).to_s + "0"
   # elsif amount.to_f < 0.01
   #   # return exponent notation like 3.4e-09
   #   return currency_sym(currency).to_s + "#{amount}"
   else
-    rtn = amount.to_f.round(2).to_s
-    if rtn.index('.').nil?
-      rtn += '.00'
-    elsif rtn.split('.')[1].length < 2
-      rtn = rtn + (['0'] * (2 - rtn.split('.')[1].length) * '')
-    end
-    dollars,cents = rtn.split(".")
-    rtn = currency_sym(currency).to_s + format_number(dollars.to_i.abs) + "." + cents
-
-    if dollars.to_i < 0
+    sigdig = opts[:sigdig] ? opts[:sigdig].to_i : 2
+    rtn = currency_sym(currency).to_s + format_number(sprintf("%.#{sigdig}f", amount))
+    if amount.to_i < 0
       rtn = "(#{rtn})"
       if opts[:minus_color]
         rtn = "#{opts[:minus_color]}#{rtn}#{opts[:return_color] || cyan}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 4.2.11
+  version: 4.2.16
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-08 00:00:00.000000000 Z
+date: 2020-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler