morpheus-cli 4.1.4 → 4.1.5

data/lib/morpheus/cli/whoami.rb

@@ -222,7 +222,7 @@ class Morpheus::Cli::Whoami
           print reset,"\n"
         else
           print "\n", reset
-          print "No active group. See `groups use`\n",reset
+          print cyan, "No active group. See `groups use`\n",reset
           print reset,"\n"
         end
 

data/lib/morpheus/cli/workflows.rb

@@ -368,7 +368,7 @@ class Morpheus::Cli::Workflows
   end
 
   def find_workflow_by_name(name)
-    workflows = @task_sets_interface.get({name: name.to_s})['taskSets']
+    workflows = @task_sets_interface.list({name: name.to_s})['taskSets']
     if workflows.empty?
       print_red_alert "Workflow not found by name #{name}"
       return nil
@@ -404,7 +404,7 @@ class Morpheus::Cli::Workflows
   end
 
   def find_task_by_name(name)
-    tasks = @tasks_interface.get({name: name.to_s})['tasks']
+    tasks = @tasks_interface.list({name: name.to_s})['tasks']
     if tasks.empty?
       print_red_alert "Task not found by name #{name}"
       return nil

data/lib/morpheus/terminal.rb

@@ -85,10 +85,10 @@ module Morpheus
     # the global Morpheus::Terminal instance
     # This should go away, but it needed for now...
     def self.instance
-      @morphterm
+      @morphterm # ||= self.new({})
     end
 
-    # hack alert! This should go away, but it needed for now...
+    # hack alert! This should go away, but is needed for now...
     def self.new(*args)
       obj = super(*args)
       @morphterm = obj
@@ -107,12 +107,14 @@ module Morpheus
     # @param [IO] stderr
     # @stderr = stderr
     def initialize(stdin=STDIN,stdout=STDOUT, stderr=STDERR, homedir=nil)
-      # todo: establish config context for executing commands, 
-    #       so you can run them in parallel within the same process
-    #       that means not using globals and class instance vars
-    #       just return an exit code / err, instead of raising SystemExit
-    
-      
+      attrs = {}
+      if stdin.is_a?(Hash)
+        attrs = stdin.clone()
+        stdin = attrs[:stdin] || STDIN
+        stdout = attrs[:stdout] || STDOUT
+        stderr = attrs[:stderr] || STDERR
+        homedir = attrs[:homedir] || attrs[:home] || attrs[:home_directory]
+      end
       # establish IO
       # @stdin, @stdout, @stderr = stdin, stdout, stderr
       set_stdin(stdin)
@@ -140,6 +142,14 @@ module Morpheus
       @angry_prompt ||= Morpheus::Terminal.angry_prompt
     end
 
+    def to_s
+      "<##{self.class}:#{self.object_id.to_s(8)} @stdin=#{@stdin} @stdout=#{@base_url} @stderr=#{@stderr} @home=#{@home_directory} @prompt=#{@prompt} >"
+    end
+
+    def inspect
+      to_s
+    end
+
     # execute .morpheus_profile startup script
     def execute_profile_script(rerun=false)
       if @profile_dot_file
@@ -181,6 +191,10 @@ module Morpheus
       @stderr
     end
 
+    def home_directory=(homedir)
+      set_home_directory(homedir)
+    end
+
     def set_home_directory(homedir)
       full_homedir = File.expand_path(homedir)
       # if !Dir.exists?(full_homedir)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 4.1.4
+  version: 4.1.5
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-15 00:00:00.000000000 Z
+date: 2019-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -156,10 +156,12 @@ files:
 - README.md
 - Rakefile
 - bin/morpheus
+- lib/morpheus.rb
 - lib/morpheus/api.rb
 - lib/morpheus/api/account_groups_interface.rb
 - lib/morpheus/api/accounts_interface.rb
 - lib/morpheus/api/api_client.rb
+- lib/morpheus/api/appliance_settings_interface.rb
 - lib/morpheus/api/apps_interface.rb
 - lib/morpheus/api/archive_buckets_interface.rb
 - lib/morpheus/api/archive_files_interface.rb
@@ -200,6 +202,7 @@ files:
 - lib/morpheus/api/license_interface.rb
 - lib/morpheus/api/load_balancers_interface.rb
 - lib/morpheus/api/logs_interface.rb
+- lib/morpheus/api/monitoring_alerts_interface.rb
 - lib/morpheus/api/monitoring_apps_interface.rb
 - lib/morpheus/api/monitoring_checks_interface.rb
 - lib/morpheus/api/monitoring_contacts_interface.rb
@@ -244,6 +247,7 @@ files:
 - lib/morpheus/api/user_sources_interface.rb
 - lib/morpheus/api/users_interface.rb
 - lib/morpheus/api/virtual_images_interface.rb
+- lib/morpheus/api/whitelabel_settings_interface.rb
 - lib/morpheus/api/whoami_interface.rb
 - lib/morpheus/api/wiki_interface.rb
 - lib/morpheus/benchmarking.rb
@@ -251,6 +255,7 @@ files:
 - lib/morpheus/cli/access_token_command.rb
 - lib/morpheus/cli/account_groups_command.rb
 - lib/morpheus/cli/accounts.rb
+- lib/morpheus/cli/appliance_settings_command.rb
 - lib/morpheus/cli/apps.rb
 - lib/morpheus/cli/archives_command.rb
 - lib/morpheus/cli/auth_command.rb
@@ -318,14 +323,17 @@ files:
 - lib/morpheus/cli/load_balancers.rb
 - lib/morpheus/cli/login.rb
 - lib/morpheus/cli/logout.rb
+- lib/morpheus/cli/logs_command.rb
 - lib/morpheus/cli/mixins/accounts_helper.rb
 - lib/morpheus/cli/mixins/infrastructure_helper.rb
 - 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/print_helper.rb
 - lib/morpheus/cli/mixins/processes_helper.rb
 - lib/morpheus/cli/mixins/provisioning_helper.rb
 - lib/morpheus/cli/mixins/whoami_helper.rb
+- lib/morpheus/cli/monitoring_alerts_command.rb
 - lib/morpheus/cli/monitoring_apps_command.rb
 - lib/morpheus/cli/monitoring_checks_command.rb
 - lib/morpheus/cli/monitoring_contacts_command.rb
@@ -362,6 +370,7 @@ files:
 - lib/morpheus/cli/users.rb
 - lib/morpheus/cli/version.rb
 - lib/morpheus/cli/virtual_images.rb
+- lib/morpheus/cli/whitelabel_settings_command.rb
 - lib/morpheus/cli/whoami.rb
 - lib/morpheus/cli/wiki_command.rb
 - lib/morpheus/cli/workflows.rb