morpheus-cli 4.2.5 → 4.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b6ccabcdbd7fef021565aa109c55832f6e1f67e4fff957849aa31bfff81b14b
-  data.tar.gz: 4241cdcba0dfacfccfd15916340a5ffe1f876067e1565bac202e87c415603c09
+  metadata.gz: 7fa057d89b29003c127a3c53616a012aeb2c23368384b85f0bf03b10bfd5124e
+  data.tar.gz: bc219cef29503224870be7de21a626a2f98c8ed766470ee79e3001ca1c41015f
 SHA512:
-  metadata.gz: 5bda2a86a83aa395736e0fd133d6aae6dd388f474e521252ef5c4bed9855b0e8a4325881c2daa0bdf6fe0ca52f650c853385b0974f1e7d399664e9dd997d4d6f
-  data.tar.gz: 948e5582db73d74a27a270b61155a0ecb5844c0c5e6a58b5e0b6148ea6fbd5bfeb707e42592509ac4be2adab8c59978491caafef8c5e1f465b30cfad8d550529
+  metadata.gz: a93cb277435293503eddbd3abdb9f349b105298cf55820feeba7187d5c1f982b65c1cd5c2c1c4989b56f3e49c861acb8ce28e657fa4a797cd2589e193a858fd9
+  data.tar.gz: 2e11115d23a8d1d78eeb2214ca3aac06ef8ca92fd25d873c1ef02cb8350e2bfaeaeb25c7eb53c4311820c54266fb1fcd5c8a6fe1a2bacaf7d1e04308532c4821

data/Dockerfile

@@ -1,5 +1,5 @@
 FROM ruby:2.5.1
 
-RUN gem install morpheus-cli -v 4.2.5
+RUN gem install morpheus-cli -v 4.2.6
 
 ENTRYPOINT ["morpheus"]

data/lib/morpheus/cli/invoices_command.rb

@@ -153,8 +153,8 @@ class Morpheus::Cli::InvoicesCommand
       if invoices.empty?
         print cyan,"No invoices found.",reset,"\n"
       else
-        current_date = Time.now
-        current_period = "#{current_date.year}#{current_date.month.to_s.rjust(2, '0')}"
+        # current_date = Time.now
+        # current_period = "#{current_date.year}#{current_date.month.to_s.rjust(2, '0')}"
         columns = [
           {"INVOICE ID" => lambda {|it| it['id'] } },
           {"TYPE" => lambda {|it| format_invoice_ref_type(it) } },
@@ -170,7 +170,8 @@ class Morpheus::Cli::InvoicesCommand
           {"END" => lambda {|it| it['endDate'] ? format_date(it['endDate']) : '' } },
           {"MTD" => lambda {|it| format_money(it['runningCost']) } },
           {"TOTAL" => lambda {|it| 
-            if it['period'] == current_period && it['totalCost'].to_f > 0
+
+            if it['runningMultiplier'] && it['runningMultiplier'].to_i != 1 && it['totalCost'].to_f > 0
               format_money(it['totalCost']) + " (Projected)"
             else
               format_money(it['totalCost'])
@@ -178,7 +179,7 @@ class Morpheus::Cli::InvoicesCommand
           } },
           {"ACTUAL MTD" => lambda {|it| format_money(it['actualRunningCost']) } },
           {"ACTUAL TOTAL" => lambda {|it| 
-            if it['period'] == current_period && it['actualTotalCost'].to_f > 0
+            if it['runningMultiplier'] && it['runningMultiplier'].to_i != 1 && it['actualTotalCost'].to_f > 0
               format_money(it['actualTotalCost']) + " (Projected)"
             else
               format_money(it['actualTotalCost'])
@@ -196,19 +197,11 @@ class Morpheus::Cli::InvoicesCommand
         end
         if options[:show_actual_costs]
           columns += [
-            {"ACTUAL COMPUTE" => lambda {|it| format_money(it['actualComputePrice']) } },
-            # {"ACTUAL MEMORY" => lambda {|it| format_money(it['actualMemoryPrice']) } },
-            {"ACTUAL STORAGE" => lambda {|it| format_money(it['actualStoragePrice']) } },
-            {"ACTUAL NETWORK" => lambda {|it| format_money(it['actualNetworkPrice']) } },
-            {"ACTUAL OTHER" => lambda {|it| format_money(it['actualExtraPrice']) } },
-            # {"ACTUAL MTD" => lambda {|it| format_money(it['actualRunningPrice']) } },
-            # {"ACTUAL TOTAL" => lambda {|it| 
-            #   if it['period'] == current_period && it['actualTotalPrice'].to_f > 0
-            #     format_money(it['actualTotalPrice']) + " (Projected)"
-            #   else
-            #     format_money(it['actualTotalPrice'])
-            #   end
-            # } }
+            {"ACTUAL COMPUTE" => lambda {|it| format_money(it['actualComputeCost']) } },
+            # {"ACTUAL MEMORY" => lambda {|it| format_money(it['actualMemoryCost']) } },
+            {"ACTUAL STORAGE" => lambda {|it| format_money(it['actualStorageCost']) } },
+            {"ACTUAL NETWORK" => lambda {|it| format_money(it['actualNetworkCost']) } },
+            {"ACTUAL OTHER" => lambda {|it| format_money(it['actualExtraCost']) } },
           ]
         end
 
@@ -221,7 +214,7 @@ class Morpheus::Cli::InvoicesCommand
             {"OTHER PRICE" => lambda {|it| format_money(it['extraPrice']) } },
             {"MTD PRICE" => lambda {|it| format_money(it['runningPrice']) } },
             {"TOTAL PRICE" => lambda {|it| 
-              if it['period'] == current_period && it['totalPrice'].to_f > 0
+              if it['runningMultiplier'] && it['runningMultiplier'].to_i != 1 && it['totalPrice'].to_f > 0
                 format_money(it['totalPrice']) + " (Projected)"
               else
                 format_money(it['totalPrice'])
@@ -291,6 +284,7 @@ class Morpheus::Cli::InvoicesCommand
         "Ref ID" => lambda {|it| it['refId'] },
         "Ref Name" => lambda {|it| it['refName'] },
         "Plan" => lambda {|it| it['plan'] ? it['plan']['name'] : '' },
+        "Power State" => lambda {|it| format_server_power_state(it) },
         "Account" => lambda {|it| it['account'] ? it['account']['name'] : '' },
         "Active" => lambda {|it| format_boolean(it['active']) },
         "Period" => lambda {|it| format_invoice_period(it) },
@@ -301,6 +295,13 @@ class Morpheus::Cli::InvoicesCommand
         "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
         "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
       }
+      # remove columns that do not apply
+      if !invoice['plan']
+        description_cols.delete("Plan")
+      end
+      if !['ComputeServer','Instance','Container'].include?(invoice['refType'])
+        description_cols.delete("Power State")
+      end
       print_description_list(description_cols, invoice)
 =begin
       print_h2 "Costs"
@@ -330,8 +331,8 @@ class Morpheus::Cli::InvoicesCommand
       print as_pretty_table([invoice], price_columns, options)
 =end
       
-      current_date = Time.now
-      current_period = "#{current_date.year}#{current_date.month.to_s.rjust(2, '0')}"
+      # current_date = Time.now
+      # current_period = "#{current_date.year}#{current_date.month.to_s.rjust(2, '0')}"
 
       print "\n"
       # print_h2 "Costs"
@@ -350,7 +351,7 @@ class Morpheus::Cli::InvoicesCommand
         "Other".upcase => lambda {|it| format_money(it[:extra]) },
         "MTD" => lambda {|it| format_money(it[:running]) },
         "Total".upcase => lambda {|it| 
-          if invoice['period'] == current_period && it[:total].to_f > 0
+          if invoice['runningMultiplier'] && invoice['runningMultiplier'].to_i != 1 && it[:total].to_f.to_f > 0
             format_money(it[:total]) + " (Projected)"
           else
             format_money(it[:total])
@@ -483,5 +484,17 @@ class Morpheus::Cli::InvoicesCommand
       return nil
     end
   end
+  
+  def format_server_power_state(server, return_color=cyan)
+    out = ""
+    if server['powerState'] == 'on'
+      out << "#{green}ON#{return_color}"
+    elsif server['powerState'] == 'off'
+      out << "#{red}OFF#{return_color}"
+    else
+      out << "#{white}#{server['powerState'].to_s.upcase}#{return_color}"
+    end
+    out
+  end
 
 end

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "4.2.5"
+    VERSION = "4.2.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 4.2.5
+  version: 4.2.6
 platform: ruby
 authors:
 - David Estes