morpheus-cli 8.0.12 → 8.0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30f5740960bec8ff3b96aa8e7da68862d310d4375fc7c48c11fd31841ac5310c
-  data.tar.gz: ae66b58b6702afeed4e30edc44b019a1e73e2ea11179f0ab6507edf250275977
+  metadata.gz: '06781ec23df17a4185834c843d6b756bc28c9ec2239dd0c97647c8d2d67addc5'
+  data.tar.gz: c075335c0e1b772e6f8a4bf35fc1186b9cf2abc18ebec73c23b19b0c4283c0c8
 SHA512:
-  metadata.gz: 795b92277a1dbc2ad7ec6a933469fcf0ab77f8c7e8d261b5502e218f3a72cfda0856bff14d94b043b4f3371ec2cbd89d8522df6c57b87477d75949e70b975436
-  data.tar.gz: cfdc201519632bf6f6b51155611b35ffe4c299733bda2c16c19109bae37174112439aa728ecebcff42c1646496060698952af332a444d7a32ab46b5e260789f7
+  metadata.gz: f6819ce4ebee4828c06dc23001532103dfbad397dc77de82c1846dbd3078f49e68c3ef84dcea19af82c38abb46b032de20c140babc38f5559457b24a40f7ef85
+  data.tar.gz: 8970d7c663daf582e01eacbfd12eb9a965f74f91813bf296fac2f49f6cb069b5c1ab6dd233578127516c5f8a84d56e646e12d6a0f23ea4229fc8aae9a8e58265

data/Dockerfile

@@ -1,5 +1,5 @@
 FROM ruby:2.7.5
 
-RUN gem install morpheus-cli -v 8.0.12
+RUN gem install morpheus-cli -v 8.0.12.2
 
 ENTRYPOINT ["morpheus"]

data/lib/morpheus/cli/commands/budgets_command.rb

@@ -1,5 +1,4 @@
 require 'morpheus/cli/cli_command'
-require 'money' # ew, let's write our own
 require 'time'
 
 class Morpheus::Cli::BudgetsCommand

data/lib/morpheus/cli/commands/clouds.rb

@@ -1599,14 +1599,14 @@ EOT
       {'fieldName' => 'affinityType', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => [{'name' => 'Keep Separate', 'value' => 'KEEP_SEPARATE'}, {'name' => 'Keep Together', 'value' => 'KEEP_TOGETHER'}], 'description' => 'Choose affinity type.', 'required' => true, 'defaultValue' => 'KEEP_SEPARATE'},
       {'fieldName' => 'active', 'fieldLabel' => 'Active', 'type' => 'checkbox', 'defaultValue' => true},
       {'fieldName' => 'pool.id', 'fieldLabel' => 'Cluster', 'type' => 'select', 'optionSourceType' => 'vmware', 'optionSource' => 'vmwareZonePoolClusters', 'description' => 'Select cluster for the affinity group.', 'required' => true},
-      {'fieldName' => 'servers', 'fieldLabel' => 'Server', 'type' => 'multiTypeahead', 'optionSource' => 'searchServers', 'description' => 'Select servers to be in the affinity group.'},
+      {'fieldName' => 'servers', 'fieldLabel' => 'Server', 'type' => 'multiTypeahead', 'optionSource' => 'searchServers', 'searchParameter' => 'phrase', 'description' => 'Select servers to be in the affinity group.'},
     ]
   end
 
   def update_cloud_affinity_group_option_types
     [
       {'fieldName' => 'active', 'fieldLabel' => 'Active', 'type' => 'checkbox'},
-      {'fieldName' => 'servers', 'fieldLabel' => 'Server', 'type' => 'multiTypeahead', 'optionSource' => 'searchServers', 'description' => 'Select servers to be in the affinity group.'},
+      {'fieldName' => 'servers', 'fieldLabel' => 'Server', 'type' => 'multiTypeahead', 'optionSource' => 'searchServers', 'searchParameter' => 'phrase', 'description' => 'Select servers to be in the affinity group.'},
     ]
   end
 

data/lib/morpheus/cli/commands/clusters.rb

@@ -5268,14 +5268,14 @@ class Morpheus::Cli::Clusters
       {'fieldName' => 'affinityType', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => [{'name' => 'Keep Separate', 'value' => 'KEEP_SEPARATE'}, {'name' => 'Keep Together', 'value' => 'KEEP_TOGETHER'}], 'description' => 'Choose affinity type.', 'required' => true, 'defaultValue' => 'KEEP_SEPARATE'},
       {'fieldName' => 'active', 'fieldLabel' => 'Active', 'type' => 'checkbox', 'defaultValue' => true},
       # {'fieldName' => 'pool.id', 'fieldLabel' => 'Cluster', 'type' => 'select', 'optionSourceType' => 'vmware', 'optionSource' => 'vmwareZonePoolClusters', 'description' => 'Select cluster for the affinity group.', 'required' => true},
-      {'fieldName' => 'servers', 'fieldLabel' => 'Server', 'type' => 'multiTypeahead', 'optionSource' => 'searchServers', 'description' => 'Select servers to be in the affinity group.'},
+      {'fieldName' => 'servers', 'fieldLabel' => 'Server', 'type' => 'multiTypeahead', 'optionSource' => 'searchServers', 'searchParameter' => 'phrase', 'description' => 'Select servers to be in the affinity group.'},
     ]
   end
 
   def update_affinity_group_option_types
     [
       {'fieldName' => 'active', 'fieldLabel' => 'Active', 'type' => 'checkbox'},
-      {'fieldName' => 'servers', 'fieldLabel' => 'Server', 'type' => 'multiTypeahead', 'optionSource' => 'searchServers', 'description' => 'Select servers to be in the affinity group.'},
+      {'fieldName' => 'servers', 'fieldLabel' => 'Server', 'type' => 'multiTypeahead', 'optionSource' => 'searchServers', 'searchParameter' => 'phrase', 'description' => 'Select servers to be in the affinity group.'},
     ]
   end
 

data/lib/morpheus/cli/commands/price_sets_command.rb

@@ -1,5 +1,4 @@
 require 'morpheus/cli/cli_command'
-require 'money'
 
 class Morpheus::Cli::PriceSetsCommand
   include Morpheus::Cli::CliCommand
@@ -153,7 +152,7 @@ class Morpheus::Cli::PriceSetsCommand
           {
               id: it['id'],
               name: it['name'],
-              pricing: (it['priceType'] == 'platform' ? '+' : '') + currency_sym(it['currency']) + (it['price'] || 0.0).to_s + (it['additionalPriceUnit'].nil? ? '' : '/' + it['additionalPriceUnit']) + '/' + (it['priceUnit'] || 'month').capitalize
+              pricing: (it['priceType'] == 'platform' ? '+' : '') + currency_symbol(it['currency']) + (it['price'] || 0.0).to_s + (it['additionalPriceUnit'].nil? ? '' : '/' + it['additionalPriceUnit']) + '/' + (it['priceUnit'] || 'month').capitalize
           }
         end
         print as_pretty_table(rows, [:id, :name, :pricing], options)
@@ -465,17 +464,13 @@ class Morpheus::Cli::PriceSetsCommand
 
   private
 
-  def currency_sym(currency)
-    Money::Currency.new((currency.to_s != '' ? currency : 'usd').to_sym).symbol
-  end
-
   def price_prefix(price)
-    (['platform', 'software'].include?(price['priceType']) ? '+' : '') + currency_sym(price['currency'])
+    (['platform', 'software'].include?(price['priceType']) ? '+' : '') + currency_symbol(price['currency'])
   end
 
   def price_markup(price)
     if price['markupType'] == 'fixed'
-      currency_sym(price['currency']) + format_amount(price['markup'] || 0)
+      currency_symbol(price['currency']) + format_amount(price['markup'] || 0)
     elsif price['markupType'] == 'percent'
       (price['markupPercent'] || 0).to_s + '%'
     else

data/lib/morpheus/cli/commands/prices_command.rb

@@ -1,5 +1,4 @@
 require 'morpheus/cli/cli_command'
-require 'money'
 
 class Morpheus::Cli::PricesCommand
   include Morpheus::Cli::CliCommand
@@ -564,22 +563,13 @@ class Morpheus::Cli::PricesCommand
     (val.to_s =~ /\A\d{1,}\Z/) ? @prices_interface.get_volume_type(val.to_i)['volumeType'] : @prices_interface.list_volume_types({'name' => val})['volumeTypes'].first
   end
 
-  def currency_sym(currency)
-    begin
-      Money::Currency.new((currency.to_s.empty? ? 'usd' : currency).to_sym).symbol
-    rescue
-      # sometimes '' is getting passed in here, so figure that out...
-      Money::Currency.new(:usd).symbol
-    end
-  end
-
   def price_prefix(price)
-    (['platform', 'software'].include?(price['priceType']) ? '+' : '') + currency_sym(price['currency'])
+    (['platform', 'software'].include?(price['priceType']) ? '+' : '') + currency_symbol(price['currency'])
   end
 
   def price_markup(price)
     if price['markupType'] == 'fixed'
-      currency_sym(price['currency']) + format_amount(price['markup'] || 0)
+      currency_symbol(price['currency']) + format_amount(price['markup'] || 0)
     elsif price['markupType'] == 'percent'
       (price['markupPercent'] || 0).to_s + '%'
     else

data/lib/morpheus/cli/option_types.rb

@@ -978,8 +978,8 @@ module Morpheus
           # query_value = (value || use_value || default_value || '')
           query_value = (input || '')
           api_params ||= {}
-          api_params['query'] = query_value
-          api_params['phrase'] = query_value
+          search_parameter = option_type['searchParameter'] || 'query'
+          api_params[search_parameter] = query_value
           # skip refresh if you just hit enter
           if !query_value.empty? || (select_options.nil? || select_options.empty?)
             select_options = load_options(option_type, api_client, api_params, query_value)

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "8.0.12"
+    VERSION = "8.0.12.2"
   end
 end

data/lib/morpheus/currency.rb

@@ -0,0 +1,184 @@
+# Provides currency symbol lookup
+#
+module Morpheus::Currency
+  SYMBOLS = {
+    "AED" => "د.إ",
+    "AFN" => "؋",
+    "ALL" => "L",
+    "AMD" => "֏",
+    "ANG" => "ƒ",
+    "AOA" => "Kz",
+    "ARS" => "$",
+    "AUD" => "$",
+    "AWG" => "ƒ",
+    "AZN" => "₼",
+    "BAM" => "КМ",
+    "BBD" => "$",
+    "BDT" => "৳",
+    "BGN" => "лв.",
+    "BHD" => "د.ب",
+    "BIF" => "Fr",
+    "BMD" => "$",
+    "BND" => "$",
+    "BOB" => "Bs.",
+    "BRL" => "R$",
+    "BSD" => "$",
+    "BTN" => "Nu.",
+    "BWP" => "P",
+    "BYN" => "Br",
+    "BYR" => "Br",
+    "BZD" => "$",
+    "CAD" => "$",
+    "CDF" => "Fr",
+    "CHF" => "CHF",
+    "CLF" => "UF",
+    "CLP" => "$",
+    "CNY" => "¥",
+    "COP" => "$",
+    "CRC" => "₡",
+    "CUC" => "$",
+    "CUP" => "$",
+    "CVE" => "$",
+    "CZK" => "Kč",
+    "DJF" => "Fdj",
+    "DKK" => "kr.",
+    "DOP" => "$",
+    "DZD" => "د.ج",
+    "EGP" => "ج.م",
+    "ERN" => "Nfk",
+    "ETB" => "Br",
+    "EUR" => "€",
+    "FJD" => "$",
+    "FKP" => "£",
+    "GBP" => "£",
+    "GEL" => "₾",
+    "GHS" => "₵",
+    "GIP" => "£",
+    "GMD" => "D",
+    "GNF" => "Fr",
+    "GTQ" => "Q",
+    "GYD" => "$",
+    "HKD" => "$",
+    "HNL" => "L",
+    "HTG" => "G",
+    "HUF" => "Ft",
+    "IDR" => "Rp",
+    "ILS" => "₪",
+    "INR" => "₹",
+    "IQD" => "ع.د",
+    "IRR" => "﷼",
+    "ISK" => "kr.",
+    "JMD" => "$",
+    "JOD" => "د.ا",
+    "JPY" => "¥",
+    "KES" => "KSh",
+    "KGS" => "som",
+    "KHR" => "៛",
+    "KMF" => "Fr",
+    "KPW" => "₩",
+    "KRW" => "₩",
+    "KWD" => "د.ك",
+    "KYD" => "$",
+    "KZT" => "₸",
+    "LAK" => "₭",
+    "LBP" => "ل.ل",
+    "LKR" => "₨",
+    "LRD" => "$",
+    "LSL" => "L",
+    "LYD" => "ل.د",
+    "MAD" => "د.م.",
+    "MDL" => "L",
+    "MGA" => "Ar",
+    "MKD" => "ден",
+    "MMK" => "K",
+    "MNT" => "₮",
+    "MOP" => "P",
+    "MRU" => "UM",
+    "MUR" => "₨",
+    "MVR" => "MVR",
+    "MWK" => "MK",
+    "MXN" => "$",
+    "MYR" => "RM",
+    "MZN" => "MTn",
+    "NAD" => "$",
+    "NGN" => "₦",
+    "NIO" => "C$",
+    "NOK" => "kr",
+    "NPR" => "Rs.",
+    "NZD" => "$",
+    "OMR" => "ر.ع.",
+    "PAB" => "B/.",
+    "PEN" => "S/",
+    "PGK" => "K",
+    "PHP" => "₱",
+    "PKR" => "₨",
+    "PLN" => "zł",
+    "PYG" => "₲",
+    "QAR" => "ر.ق",
+    "RON" => "Lei",
+    "RSD" => "RSD",
+    "RUB" => "₽",
+    "RWF" => "FRw",
+    "SAR" => "ر.س",
+    "SBD" => "$",
+    "SCR" => "₨",
+    "SDG" => "£",
+    "SEK" => "kr",
+    "SGD" => "$",
+    "SHP" => "£",
+    "SKK" => "Sk",
+    "SLE" => "Le",
+    "SLL" => "Le",
+    "SOS" => "Sh",
+    "SRD" => "$",
+    "SSP" => "£",
+    "STD" => "Db",
+    "STN" => "Db",
+    "SVC" => "₡",
+    "SYP" => "£S",
+    "SZL" => "E",
+    "THB" => "฿",
+    "TJS" => "ЅМ",
+    "TMT" => "m",
+    "TND" => "د.ت",
+    "TOP" => "T$",
+    "TRY" => "₺",
+    "TTD" => "$",
+    "TWD" => "$",
+    "TZS" => "Sh",
+    "UAH" => "₴",
+    "UGX" => "USh",
+    "USD" => "$",
+    "UYU" => "$U",
+    "UZS" => "so'm",
+    "VES" => "Bs",
+    "VND" => "₫",
+    "VUV" => "Vt",
+    "WST" => "T",
+    "XAF" => "CFA",
+    "XAG" => "oz t",
+    "XAU" => "oz t",
+    "XBA" => "",
+    "XBB" => "",
+    "XBC" => "",
+    "XBD" => "",
+    "XCD" => "$",
+    "XCG" => "Cg",
+    "XDR" => "SDR",
+    "XOF" => "Fr",
+    "XPD" => "oz t",
+    "XPF" => "Fr",
+    "XPT" => "oz t",
+    "XTS" => "",
+    "YER" => "﷼",
+    "ZAR" => "R",
+    "ZMK" => "ZK",
+    "ZMW" => "K",
+    "ZWG" => "ZiG"
+  }
+
+  def self.get_symbol(code)
+    SYMBOLS[code.upcase.to_s]
+  end
+  
+end

data/lib/morpheus/formatters.rb

@@ -1,7 +1,7 @@
 require 'time'
 require 'filesize'
-require 'money'
 require 'cgi'
+require 'morpheus/currency'
 
 DEFAULT_DATE_FORMAT = "%x"
 DEFAULT_TIME_FORMAT = "%x %I:%M %p"
@@ -403,8 +403,8 @@ def format_sig_dig(n, sigdig=3, min_sigdig=nil, pad_zeros=false)
   v
 end
 
-def currency_sym(currency)
-  Money::Currency.new((currency || 'USD').to_sym).symbol
+def currency_symbol(currency)
+  Morpheus::Currency.get_symbol(currency) || Morpheus::Currency.get_symbol("USD")
 end
 
 # returns currency amount formatted like "$4,5123.00". 0.00 is formatted as "$0"
@@ -418,16 +418,16 @@ def format_currency(amount, currency='USD', opts={})
 
   amount = amount.to_f
   if amount == 0
-    return currency_sym(currency).to_s + "0"
+    return currency_symbol(currency).to_s + "0"
   # elsif amount.to_f < 0.01
   #   # return exponent notation like 3.4e-09
-  #   return currency_sym(currency).to_s + "#{amount}"
+  #   return currency_symbol(currency).to_s + "#{amount}"
   else
     sigdig = opts[:sigdig] ? opts[:sigdig].to_i : 2 # max decimal digits
     min_sigdig = opts[:min_sigdig] ? opts[:min_sigdig].to_i : (sigdig || 2) # min decimal digits
     display_value = format_sig_dig(amount, sigdig, min_sigdig, opts[:pad_zeros])
     display_value = format_number(display_value) # commas
-    rtn = currency_sym(currency).to_s + display_value
+    rtn = currency_symbol(currency).to_s + display_value
     if amount.to_i < 0
       rtn = "(#{rtn})"
       if opts[:minus_color]

data/morpheus-cli.gemspec

@@ -31,6 +31,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'mime-types'
   spec.add_dependency "http"
   spec.add_dependency "rubyzip", '~> 2.3.2'
-  spec.add_dependency "money"
   spec.add_dependency "test-unit"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 8.0.12
+  version: 8.0.12.2
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-25 00:00:00.000000000 Z
+date: 2026-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tins
@@ -181,20 +181,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.2
-- !ruby/object:Gem::Dependency
-  name: money
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -637,6 +623,7 @@ files:
 - lib/morpheus/cli/option_parser.rb
 - lib/morpheus/cli/option_types.rb
 - lib/morpheus/cli/version.rb
+- lib/morpheus/currency.rb
 - lib/morpheus/ext/hash.rb
 - lib/morpheus/ext/nil_class.rb
 - lib/morpheus/ext/rest_client.rb