morpheus-cli 4.2.8 → 4.2.10

data/lib/morpheus/rest_client.rb

@@ -69,16 +69,6 @@ module Morpheus
         @@ssl_verification_enabled = verify
       end
 
-      private
-
-      # unused eh?
-      def build_request_args(url, method, payload)
-        args = {url: url, method: method, payload: payload}
-        unless ssl_verification_enabled?
-          args[:verify_ssl] = OpenSSL::SSL::VERIFY_NONE
-        end
-        args
-      end
     end
   end
 end

data/lib/morpheus/terminal.rb

@@ -238,6 +238,21 @@ module Morpheus
         opts.on('--noprofile','--noprofile', "Do not read and execute the personal initialization script .morpheus_profile") do
           @noprofile = true
         end
+        # todo: make these work
+        # opts.on('--home','--home', "Morpheus client home directory, where configuration files are located. The default is MORPHEUS_CLI_HOME or HOME/.morpheus") do |val|
+        #   @use_home_directory = val
+        #   set_home_directory(@use_home_directory)
+        #   # that it? all done...
+        # end
+        # opts.on('-Z','--temporary', "Temporary shell. Use a temporary shell with the current remote configuration, credentials and commands loaded. Configuration changes and command history will not be saved.") do
+        #   @noprofile = true
+        #   @temporary_shell_mode = true
+        # end
+        # opts.on('-z','--clean', "Clean shell. Use a temporary shell without any remote configuration, credentials or command history loaded.") do
+        #   @noprofile = true
+        #   @temporary_shell_mode = true
+        #   @clean_shell_mode = true
+        # end
         opts.on('-C','--nocolor', "Disable ANSI coloring") do
           @coloring = false
           Term::ANSIColor::coloring = false
@@ -355,6 +370,29 @@ module Morpheus
       result = nil
       begin
         
+        # todo: no, this needs to be supported as --home for every darn command..
+        # add it to CliCommand build_common_options()
+        # use custom home directory from --home
+        # todo: this should happen in initialize..
+        # @use_home_directory
+        # need to get index, and delete both the switch and the arg after it
+        homedir = false
+        home_switch_index = args.index {|it| it == '--home' }
+        if args.find {|it| it == '--home' }
+          deleted_option = args.delete_at(home_switch_index)
+          home_dir = args.delete_at(home_switch_index)
+          @use_home_directory = home_dir
+          #puts "Setting home directory to #{@use_home_directory}"
+          set_home_directory(@use_home_directory)
+          # re-initialize some variables
+          # startup script
+          if File.exists? Morpheus::Cli::DotFile.morpheus_profile_filename
+            @profile_dot_file = Morpheus::Cli::DotFile.new(Morpheus::Cli::DotFile.morpheus_profile_filename)
+          else
+            @profile_dot_file = nil
+          end
+        end
+
         # execute startup script .morpheus_profile  unless --noprofile is passed
         # todo: this should happen in initialize..
         noprofile = false
@@ -363,6 +401,7 @@ module Morpheus
           args.delete_if {|it| it == '--noprofile' }
         end
 
+        
         if @profile_dot_file && !@profile_dot_file_has_run
           if !noprofile && File.exists?(@profile_dot_file.filename)
             execute_profile_script()
@@ -411,7 +450,7 @@ module Morpheus
           # all commands should be registered commands or aliases
           # ahh, but it could support expressions (), use -e for that ..
           # if !(Morpheus::Cli::CliRegistry.has_command?(cmd_name) || Morpheus::Cli::CliRegistry.has_alias?(cmd_name))
-          #   @stderr.puts "#{@angry_prompt}'#{cmd_name}' is not recognized. See 'morpheus --help'."
+          #   @stderr.puts "#{@angry_prompt}'#{cmd_name}' is not recognized"
           #   #@stderr.puts usage
           #   return 127, nil
           # end
@@ -420,6 +459,7 @@ module Morpheus
             benchmark_name = "morpheus #{formatted_cmd}"
             benchmark_name.sub!(' -B', '')
             benchmark_name.sub!(' --benchmark', '')
+            #benchmark_name << " -B"
             start_benchmark(benchmark_name)
           end
 

data/lib/morpheus/util.rb

@@ -0,0 +1,24 @@
+# Provides global utility methods
+# Such as opening a web browser to a url
+#
+module Morpheus::Util
+
+  def self.open_url_command(url)
+    cmd = nil
+    if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
+      cmd = "start #{url}"
+    elsif RbConfig::CONFIG['host_os'] =~ /darwin/
+      cmd = "open #{url}"
+    elsif RbConfig::CONFIG['host_os'] =~ /linux|bsd/
+      cmd = "xdg-open #{url}"
+    else
+      raise "open_url_command cannot determine host OS"
+    end
+    return cmd
+  end
+
+  def self.open_url(url)
+    cmd = open_url_command(url)
+    return system(cmd)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 4.2.8
+  version: 4.2.10
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-09 00:00:00.000000000 Z
+date: 2020-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -174,6 +174,7 @@ files:
 - lib/morpheus/api.rb
 - lib/morpheus/api/account_groups_interface.rb
 - lib/morpheus/api/accounts_interface.rb
+- lib/morpheus/api/activity_interface.rb
 - lib/morpheus/api/api_client.rb
 - lib/morpheus/api/appliance_settings_interface.rb
 - lib/morpheus/api/approvals_interface.rb
@@ -212,6 +213,7 @@ files:
 - lib/morpheus/api/instance_types_interface.rb
 - lib/morpheus/api/instances_interface.rb
 - lib/morpheus/api/integrations_interface.rb
+- lib/morpheus/api/invoice_line_items_interface.rb
 - lib/morpheus/api/invoices_interface.rb
 - lib/morpheus/api/jobs_interface.rb
 - lib/morpheus/api/key_pairs_interface.rb
@@ -252,11 +254,13 @@ files:
 - lib/morpheus/api/option_types_interface.rb
 - lib/morpheus/api/options_interface.rb
 - lib/morpheus/api/packages_interface.rb
+- lib/morpheus/api/ping_interface.rb
 - lib/morpheus/api/policies_interface.rb
 - lib/morpheus/api/power_schedules_interface.rb
 - lib/morpheus/api/price_sets_interface.rb
 - lib/morpheus/api/prices_interface.rb
 - lib/morpheus/api/processes_interface.rb
+- lib/morpheus/api/projects_interface.rb
 - lib/morpheus/api/provision_types_interface.rb
 - lib/morpheus/api/provisioning_license_types_interface.rb
 - lib/morpheus/api/provisioning_licenses_interface.rb
@@ -286,6 +290,7 @@ files:
 - lib/morpheus/cli.rb
 - lib/morpheus/cli/access_token_command.rb
 - lib/morpheus/cli/account_groups_command.rb
+- lib/morpheus/cli/activity_command.rb
 - lib/morpheus/cli/appliance_settings_command.rb
 - lib/morpheus/cli/approvals_command.rb
 - lib/morpheus/cli/apps.rb
@@ -303,7 +308,6 @@ files:
 - lib/morpheus/cli/cloud_resource_pools_command.rb
 - lib/morpheus/cli/clouds.rb
 - lib/morpheus/cli/clusters.rb
-- lib/morpheus/cli/command_error.rb
 - lib/morpheus/cli/commands/standard/alias_command.rb
 - lib/morpheus/cli/commands/standard/benchmark_command.rb
 - lib/morpheus/cli/commands/standard/cat_command.rb
@@ -334,6 +338,7 @@ files:
 - lib/morpheus/cli/dot_file.rb
 - lib/morpheus/cli/environments_command.rb
 - lib/morpheus/cli/error_handler.rb
+- lib/morpheus/cli/errors.rb
 - lib/morpheus/cli/execute_schedules_command.rb
 - lib/morpheus/cli/execution_request_command.rb
 - lib/morpheus/cli/expression_parser.rb
@@ -371,9 +376,12 @@ files:
 - lib/morpheus/cli/mixins/library_helper.rb
 - lib/morpheus/cli/mixins/logs_helper.rb
 - lib/morpheus/cli/mixins/monitoring_helper.rb
+- lib/morpheus/cli/mixins/operations_helper.rb
+- lib/morpheus/cli/mixins/option_source_helper.rb
 - lib/morpheus/cli/mixins/print_helper.rb
 - lib/morpheus/cli/mixins/processes_helper.rb
 - lib/morpheus/cli/mixins/provisioning_helper.rb
+- lib/morpheus/cli/mixins/remote_helper.rb
 - lib/morpheus/cli/mixins/whoami_helper.rb
 - lib/morpheus/cli/monitoring_alerts_command.rb
 - lib/morpheus/cli/monitoring_apps_command.rb
@@ -392,12 +400,14 @@ files:
 - lib/morpheus/cli/option_parser.rb
 - lib/morpheus/cli/option_types.rb
 - lib/morpheus/cli/packages_command.rb
+- lib/morpheus/cli/ping.rb
 - lib/morpheus/cli/policies_command.rb
 - lib/morpheus/cli/power_schedules_command.rb
 - lib/morpheus/cli/preseed_scripts_command.rb
 - lib/morpheus/cli/price_sets_command.rb
 - lib/morpheus/cli/prices_command.rb
 - lib/morpheus/cli/processes_command.rb
+- lib/morpheus/cli/projects_command.rb
 - lib/morpheus/cli/provisioning_licenses_command.rb
 - lib/morpheus/cli/provisioning_settings_command.rb
 - lib/morpheus/cli/recent_activity_command.rb
@@ -407,6 +417,7 @@ files:
 - lib/morpheus/cli/security_group_rules.rb
 - lib/morpheus/cli/security_groups.rb
 - lib/morpheus/cli/service_plans_command.rb
+- lib/morpheus/cli/setup.rb
 - lib/morpheus/cli/shell.rb
 - lib/morpheus/cli/storage_providers_command.rb
 - lib/morpheus/cli/subnets_command.rb
@@ -424,11 +435,13 @@ files:
 - lib/morpheus/cli/workflows.rb
 - lib/morpheus/ext/hash.rb
 - lib/morpheus/ext/nil_class.rb
+- lib/morpheus/ext/rest_client.rb
 - lib/morpheus/formatters.rb
 - lib/morpheus/logging.rb
 - lib/morpheus/morpkg.rb
 - lib/morpheus/rest_client.rb
 - lib/morpheus/terminal.rb
+- lib/morpheus/util.rb
 - morpheus-cli.gemspec
 homepage: 
 licenses:

data/lib/morpheus/cli/command_error.rb

@@ -1,22 +0,0 @@
-# A standard error to raise in your CliCommand classes.
-class Morpheus::Cli::CommandError < StandardError
-  
-  attr_reader :args, :exit_code
-    
-  # def initialize(msg, args=[], options={})
-  #   @args = args
-  #   @options = options
-  #   super(msg)
-  # end
-
-  def initialize(msg, args=[], exit_code=nil)
-    @args = args
-    @exit_code = exit_code
-    super(msg)
-  end
-
-  # def inspect
-  #   to_s
-  # end
-
-end