morpheus-cli 2.12.5 → 3.1.0

data/lib/morpheus/cli/remote.rb

@@ -388,6 +388,7 @@ EOT
       opts.footer = "This can be used to update remote appliance settings.\n"
     end
     optparse.parse!(args)
+    puts "args is #{args.inspect}"
     if args.count != 1
       print_error Morpheus::Terminal.angry_prompt
       puts_error  "#{command_name} update expects argument [name]."

data/lib/morpheus/cli/roles.rb

@@ -463,10 +463,10 @@ class Morpheus::Cli::Roles
   end
 
   def update_feature_access(args)
-    usage = "Usage: morpheus roles update-feature-access [name] [code] [full|read|user|yes|no|none]"
+    usage = "Usage: morpheus roles update-feature-access [name] [code] [full|read|none]"
     options = {}
     optparse = OptionParser.new do|opts|
-      opts.banner = subcommand_usage("[name] [code] [full|read|user|yes|no|none]")
+      opts.banner = subcommand_usage("[name] [code] [full|read|none]")
       build_common_options(opts, options, [:json, :dry_run])
     end
     optparse.parse!(args)

data/lib/morpheus/cli/shell.rb

@@ -215,6 +215,9 @@ class Morpheus::Cli::Shell
         puts "For more information, see https://github.com/gomorpheus/morpheus-cli/wiki"
         #print "\n"
         return 0
+      elsif input =~ /^\s*#/
+        Morpheus::Logging::DarkPrinter.puts "comment ignored" if Morpheus::Logging.debug?
+        return 0
       elsif input =~ /^sleep/
         sleep_sec = input.sub("sleep ", "").to_f
         if (!(sleep_sec > 0))
@@ -374,8 +377,6 @@ class Morpheus::Cli::Shell
           puts_error "#{Morpheus::Terminal.angry_prompt}'#{cmd_name}' is not a morpheus command. Use 'help' to see the list of available commands."
           @history_logger.warn "Unrecognized Command #{cmd_name}" if @history_logger
         end
-        # rescue ArgumentError
-        #   puts "Argument Syntax Error..."
       rescue Interrupt
         # nothing to do
         @history_logger.warn "shell interrupt" if @history_logger

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "2.12.5"
+    VERSION = "3.1.0"
   end
 end

data/lib/morpheus/ext/hash.rb

@@ -39,4 +39,26 @@ class Hash
 
     self
   end
+
+  def deep_compact!
+    self.each_pair do |k, v|
+      if v.is_a?(Hash)
+        self[k].deep_compact!
+      elsif v.is_a?(Array)
+        self[k].each do |it|
+          if it.is_a?(Hash)
+            it.deep_compact!
+          elsif self[k] == nil || self[k] == ''
+            # meh, preserve 'empty' array elements
+          end
+        end
+      else
+        if self[k] == nil || self[k] == ''
+          self.delete(k)
+        end
+      end
+    end
+    self
+  end
+
 end

data/lib/morpheus/formatters.rb

@@ -1,4 +1,5 @@
 require 'time'
+require 'filesize'
 
 DEFAULT_TIME_FORMAT = "%x %I:%M %p %Z"
 
@@ -241,3 +242,35 @@ def filter_data(data, include_fields=nil, exclude_fields=nil)
     return data # .clone
   end
 end
+
+def format_bytes(bytes)
+  out = ""
+  if bytes
+    if bytes < 1024
+      out = "#{bytes.to_i} B"
+    else
+      out = Filesize.from("#{bytes} B").pretty.strip
+    end
+  end
+  return out
+end
+
+# returns bytes in an abbreviated format
+# eg. 3.1K instead of 3.10 KiB
+def format_bytes_short(bytes)
+  out = format_bytes(bytes)
+  if out.include?(" ")
+    val, units = out.split(" ")
+    val = val.to_f
+    # round to 0 or 1 decimal point
+    if val % 1 == 0
+      val = val.round(0).to_s
+    else
+      val = val.round(1).to_s
+    end
+    # K instead of KiB
+    units = units[0].chr
+    out = "#{val}#{units}"
+  end
+  return out
+end

data/lib/morpheus/terminal.rb

@@ -69,7 +69,7 @@ module Morpheus
     end
 
     def self.angry_prompt
-      "#{Term::ANSIColor.red}morpheus: #{Term::ANSIColor.reset}"
+      "#{Term::ANSIColor.red}morpheus:#{Term::ANSIColor.reset} "
     end
 
     def self.custom_prompt

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 2.12.5
+  version: 3.1.0
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-08 00:00:00.000000000 Z
+date: 2017-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -135,6 +135,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- Dockerfile
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -144,17 +145,21 @@ files:
 - lib/morpheus/api/api_client.rb
 - lib/morpheus/api/app_templates_interface.rb
 - lib/morpheus/api/apps_interface.rb
+- lib/morpheus/api/archive_buckets_interface.rb
+- lib/morpheus/api/archive_files_interface.rb
 - lib/morpheus/api/auth_interface.rb
 - lib/morpheus/api/checks_interface.rb
-- lib/morpheus/api/cloud_policies_interface.rb
 - lib/morpheus/api/clouds_interface.rb
 - lib/morpheus/api/containers_interface.rb
 - lib/morpheus/api/custom_instance_types_interface.rb
 - lib/morpheus/api/dashboard_interface.rb
 - lib/morpheus/api/deploy_interface.rb
 - lib/morpheus/api/deployments_interface.rb
-- lib/morpheus/api/group_policies_interface.rb
 - lib/morpheus/api/groups_interface.rb
+- lib/morpheus/api/image_builder_boot_scripts_interface.rb
+- lib/morpheus/api/image_builder_image_builds_interface.rb
+- lib/morpheus/api/image_builder_interface.rb
+- lib/morpheus/api/image_builder_preseed_scripts_interface.rb
 - lib/morpheus/api/incidents_interface.rb
 - lib/morpheus/api/instance_types_interface.rb
 - lib/morpheus/api/instances_interface.rb
@@ -166,17 +171,9 @@ files:
 - lib/morpheus/api/monitoring_contacts_interface.rb
 - lib/morpheus/api/monitoring_groups_interface.rb
 - lib/morpheus/api/monitoring_interface.rb
-- lib/morpheus/api/network_domains_interface.rb
-- lib/morpheus/api/network_groups_interface.rb
-- lib/morpheus/api/network_pool_servers_interface.rb
-- lib/morpheus/api/network_pools_interface.rb
-- lib/morpheus/api/network_proxies_interface.rb
-- lib/morpheus/api/network_services_interface.rb
-- lib/morpheus/api/networks_interface.rb
 - lib/morpheus/api/option_type_lists_interface.rb
 - lib/morpheus/api/option_types_interface.rb
 - lib/morpheus/api/options_interface.rb
-- lib/morpheus/api/policies_interface.rb
 - lib/morpheus/api/provision_types_interface.rb
 - lib/morpheus/api/roles_interface.rb
 - lib/morpheus/api/security_group_rules_interface.rb
@@ -193,6 +190,8 @@ files:
 - lib/morpheus/cli/alias_command.rb
 - lib/morpheus/cli/app_templates.rb
 - lib/morpheus/cli/apps.rb
+- lib/morpheus/cli/archives_command.rb
+- lib/morpheus/cli/boot_scripts_command.rb
 - lib/morpheus/cli/cli_command.rb
 - lib/morpheus/cli/cli_registry.rb
 - lib/morpheus/cli/clouds.rb
@@ -209,6 +208,7 @@ files:
 - lib/morpheus/cli/error_handler.rb
 - lib/morpheus/cli/groups.rb
 - lib/morpheus/cli/hosts.rb
+- lib/morpheus/cli/image_builder_command.rb
 - lib/morpheus/cli/instance_types.rb
 - lib/morpheus/cli/instances.rb
 - lib/morpheus/cli/key_pairs.rb
@@ -230,16 +230,9 @@ files:
 - lib/morpheus/cli/monitoring_contacts_command.rb
 - lib/morpheus/cli/monitoring_groups_command.rb
 - lib/morpheus/cli/monitoring_incidents_command.rb
-- lib/morpheus/cli/network_domains_command.rb
-- lib/morpheus/cli/network_groups_command.rb
-- lib/morpheus/cli/network_pool_servers_command.rb
-- lib/morpheus/cli/network_pools_command.rb
-- lib/morpheus/cli/network_proxies_command.rb
-- lib/morpheus/cli/network_services_command.rb
-- lib/morpheus/cli/networks_command.rb
 - lib/morpheus/cli/option_parser.rb
 - lib/morpheus/cli/option_types.rb
-- lib/morpheus/cli/policies_command.rb
+- lib/morpheus/cli/preseed_scripts_command.rb
 - lib/morpheus/cli/recent_activity_command.rb
 - lib/morpheus/cli/remote.rb
 - lib/morpheus/cli/roles.rb
@@ -263,7 +256,6 @@ files:
 - lib/morpheus/rest_client.rb
 - lib/morpheus/terminal.rb
 - morpheus-cli.gemspec
-- scripts/generate_morpheus_commands_help.morpheus
 homepage: http://www.morpheusdata.com
 licenses:
 - MIT

data/lib/morpheus/api/cloud_policies_interface.rb

@@ -1,47 +0,0 @@
-require 'morpheus/api/api_client'
-
-class Morpheus::CloudPoliciesInterface < Morpheus::APIClient
-  def initialize(access_token, refresh_token,expires_at = nil, base_url=nil) 
-    @access_token = access_token
-    @refresh_token = refresh_token
-    @base_url = base_url
-    @expires_at = expires_at
-  end
-
-  def get(cloud_id, id, params={})
-    raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
-    url = "#{@base_url}/api/zones/#{cloud_id}/policies/#{id}"
-    headers = { params: params, authorization: "Bearer #{@access_token}" }
-    opts = {method: :get, url: url, headers: headers}
-    execute(opts)
-  end
-
-  def list(cloud_id, params={})
-    url = "#{@base_url}/api/zones/#{cloud_id}/policies"
-    headers = { params: params, authorization: "Bearer #{@access_token}" }
-    opts = {method: :get, url: url, headers: headers}
-    execute(opts)
-  end
-
-  def create(cloud_id, payload)
-    url = "#{@base_url}/api/zones/#{cloud_id}/policies"
-    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
-    execute(opts)
-  end
-
-  def update(cloud_id, id, payload)
-    url = "#{@base_url}/api/zones/#{cloud_id}/policies/#{id}"
-    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
-    execute(opts)
-  end
-
-  def destroy(cloud_id, id, params={})
-    url = "#{@base_url}/api/zones/#{cloud_id}/policies/#{id}"
-    headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :delete, url: url, timeout: 30, headers: headers}
-    execute(opts)
-  end
-
-end

data/lib/morpheus/api/group_policies_interface.rb

@@ -1,47 +0,0 @@
-require 'morpheus/api/api_client'
-
-class Morpheus::GroupPoliciesInterface < Morpheus::APIClient
-  def initialize(access_token, refresh_token,expires_at = nil, base_url=nil) 
-    @access_token = access_token
-    @refresh_token = refresh_token
-    @base_url = base_url
-    @expires_at = expires_at
-  end
-
-  def get(group_id, id, params={})
-    raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
-    url = "#{@base_url}/api/groups/#{group_id}/policies/#{id}"
-    headers = { params: params, authorization: "Bearer #{@access_token}" }
-    opts = {method: :get, url: url, headers: headers}
-    execute(opts)
-  end
-
-  def list(group_id, params={})
-    url = "#{@base_url}/api/groups/#{group_id}/policies"
-    headers = { params: params, authorization: "Bearer #{@access_token}" }
-    opts = {method: :get, url: url, headers: headers}
-    execute(opts)
-  end
-
-  def create(group_id, payload)
-    url = "#{@base_url}/api/groups/#{group_id}/policies"
-    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
-    execute(opts)
-  end
-
-  def update(group_id, id, payload)
-    url = "#{@base_url}/api/groups/#{group_id}/policies/#{id}"
-    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
-    execute(opts)
-  end
-
-  def destroy(group_id, id, params={})
-    url = "#{@base_url}/api/groups/#{group_id}/policies/#{id}"
-    headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :delete, url: url, timeout: 30, headers: headers}
-    execute(opts)
-  end
-
-end

data/lib/morpheus/api/network_domains_interface.rb

@@ -1,47 +0,0 @@
-require 'morpheus/api/api_client'
-
-class Morpheus::NetworkDomainsInterface < Morpheus::APIClient
-  def initialize(access_token, refresh_token,expires_at = nil, base_url=nil) 
-    @access_token = access_token
-    @refresh_token = refresh_token
-    @base_url = base_url
-    @expires_at = expires_at
-  end
-
-  def get(id, params={})
-    raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
-    url = "#{@base_url}/api/networks/domains/#{id}"
-    headers = { params: params, authorization: "Bearer #{@access_token}" }
-    opts = {method: :get, url: url, headers: headers}
-    execute(opts)
-  end
-
-  def list(params={})
-    url = "#{@base_url}/api/networks/domains"
-    headers = { params: params, authorization: "Bearer #{@access_token}" }
-    opts = {method: :get, url: url, headers: headers}
-    execute(opts)
-  end
-
-  def create(payload)
-    url = "#{@base_url}/api/networks/domains"
-    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
-    execute(opts)
-  end
-
-  def update(id, payload)
-    url = "#{@base_url}/api/networks/domains/#{id}"
-    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
-    execute(opts)
-  end
-
-  def destroy(id, params={})
-    url = "#{@base_url}/api/networks/domains/#{id}"
-    headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :delete, url: url, timeout: 30, headers: headers}
-    execute(opts)
-  end
-
-end

data/lib/morpheus/api/network_groups_interface.rb

@@ -1,47 +0,0 @@
-require 'morpheus/api/api_client'
-
-class Morpheus::NetworkGroupsInterface < Morpheus::APIClient
-  def initialize(access_token, refresh_token,expires_at = nil, base_url=nil) 
-    @access_token = access_token
-    @refresh_token = refresh_token
-    @base_url = base_url
-    @expires_at = expires_at
-  end
-
-  def get(id, params={})
-    raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
-    url = "#{@base_url}/api/networks/groups/#{id}"
-    headers = { params: params, authorization: "Bearer #{@access_token}" }
-    opts = {method: :get, url: url, headers: headers}
-    execute(opts)
-  end
-
-  def list(params={})
-    url = "#{@base_url}/api/networks/groups"
-    headers = { params: params, authorization: "Bearer #{@access_token}" }
-    opts = {method: :get, url: url, headers: headers}
-    execute(opts)
-  end
-
-  def create(payload)
-    url = "#{@base_url}/api/networks/groups"
-    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
-    execute(opts)
-  end
-
-  def update(id, payload)
-    url = "#{@base_url}/api/networks/groups/#{id}"
-    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
-    execute(opts)
-  end
-
-  def destroy(id, params={})
-    url = "#{@base_url}/api/networks/groups/#{id}"
-    headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :delete, url: url, timeout: 30, headers: headers}
-    execute(opts)
-  end
-
-end

data/lib/morpheus/api/network_pool_servers_interface.rb

@@ -1,47 +0,0 @@
-require 'morpheus/api/api_client'
-
-class Morpheus::NetworkPoolServersInterface < Morpheus::APIClient
-  def initialize(access_token, refresh_token,expires_at = nil, base_url=nil) 
-    @access_token = access_token
-    @refresh_token = refresh_token
-    @base_url = base_url
-    @expires_at = expires_at
-  end
-
-  def get(id, params={})
-    raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
-    url = "#{@base_url}/api/networks/pool-servers/#{id}"
-    headers = { params: params, authorization: "Bearer #{@access_token}" }
-    opts = {method: :get, url: url, headers: headers}
-    execute(opts)
-  end
-
-  def list(params={})
-    url = "#{@base_url}/api/networks/pool-servers"
-    headers = { params: params, authorization: "Bearer #{@access_token}" }
-    opts = {method: :get, url: url, headers: headers}
-    execute(opts)
-  end
-
-  def create(payload)
-    url = "#{@base_url}/api/networks/pool-servers"
-    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
-    execute(opts)
-  end
-
-  def update(id, payload)
-    url = "#{@base_url}/api/networks/pool-servers/#{id}"
-    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
-    execute(opts)
-  end
-
-  def destroy(id, params={})
-    url = "#{@base_url}/api/networks/pool-servers/#{id}"
-    headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :delete, url: url, timeout: 30, headers: headers}
-    execute(opts)
-  end
-
-end