dtk-client 0.12.1 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd3532222d39184fd4e4b3dabe6089082d66997065b60710dac9315669f0bdb1
-  data.tar.gz: 1a596bb53b1fa93c2dfc24a792836a5377fac27947acbaeea54bf069a45dce5b
+  metadata.gz: 42bebff35a619d489e4ad704b1782e3d6cf17c9ffa3750f4461ab0da5125efa3
+  data.tar.gz: 8dd31d44f79e12576c85f32535c6f62b008a78f92e58a8e79bad3795e4535143
 SHA512:
-  metadata.gz: 6be78d166a7b90eddd422a3e39fc2f5cc12ac382a896c5bf6813bc9c85ddfbb8aaac111a6e963eb4bcad14c0d7c2ff569122d204194d8721ef17bcaf9b56a5e1
-  data.tar.gz: 1fad3c04de2c251f96f84a3ba729e1713024d9bdb0891c6ab2b6c8bc0eb25ae3247c0aee258933c4b9ba4aa0daf72d35e026b94db5b949427a804c640cc37c17
+  metadata.gz: a0ea576d32dfeeb527c87dc7b863bcc8f44a6d56998994349943643dd05b570a3a62dac340b9168f77b7ab1d8912e6fc76f23a38092e6f6f4a1d85a50cf1058f
+  data.tar.gz: 730004649953bdf45399fd1b7a14a5f47208904fe8ea920ce4ee1fc9ee21efe1dc0069ccbb2ec2da6c98f629698cf7db10a3010af52ba4eb19a0c9b44bb29d0f

data/dtk-client.gemspec

@@ -25,5 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'hirb', '0.7.3'
   spec.add_dependency 'mime-types', '~> 2.99.3'
   spec.add_dependency 'dtk-dsl', '~> 1.1.4'
-  spec.add_dependency 'dtk-network-client', '1.0.3'
+  spec.add_dependency 'dtk-network-client', '1.0.4'
 end

data/lib/cli/command/module/install.rb

@@ -30,6 +30,7 @@ module DTK::Client
           end
           sc.switch Token.update_deps
           sc.switch Token.update_lock
+          sc.switch Token.download_if_fail
           
           sc.action do |_global_options, options, args|
             module_name         = args[0]
@@ -42,7 +43,8 @@ module DTK::Client
               version: options[:version],
               update_deps: options[:update_deps],
               has_directory_param: has_directory_param,
-              update_lock_file: options['update-lock']
+              update_lock_file: options['update-lock'],
+              download_if_fail: options[:download_if_fail]
             }
             Install.execute(self, opts_hash)
             nil
@@ -59,6 +61,7 @@ module DTK::Client
             @directory_path      = opts[:directory_path]
             @has_directory_param = opts[:has_directory_param]
             @update_lock_file    = opts[:update_lock_file]
+            @download_if_fail    = opts[:download_if_fail]
           end
           
           def self.execute(context, opts = {})
@@ -81,6 +84,10 @@ module DTK::Client
           
           attr_reader :context
 
+          def download_if_fail
+            @download_if_fail ||= false
+          end
+
           def module_ref
             @module_ref ||= ret_module_ref
           end
@@ -104,7 +111,7 @@ module DTK::Client
             # server (the later step Operation::Module.install does this)
             
             # TODO: 3070: handle sitution where response is not ok
-            install_response = Operation::Module.install_from_catalog(module_ref: self.module_ref, version: self.version, directory_path: self.directory_path?)
+            install_response = Operation::Module.install_from_catalog(module_ref: self.module_ref, version: self.version, directory_path: self.directory_path?, download_if_fail: self.download_if_fail)
 
             if client_installed_modules = (install_response && install_response.data[:installed_modules])
               opts_server_install = {

data/lib/cli/command/options.rb

@@ -27,8 +27,20 @@ module DTK::Client
         
         def [](canonical_name_or_opt)
           key = Token.opt?(canonical_name_or_opt) || canonical_name_or_opt
-          @opts_hash[key]
+          # TODO: check why this switch to below was needed was needed
+          #@opts_hash[key]
+          case key
+          when ::String, ::Symbol
+            @opts_hash[key]
+          when ::Array
+            if matching_key = key.find { |k| @opts_hash.has_key?(k) }
+              @opts_hash[matching_key]
+            end
+          else
+            raise Eroor, "Unexpected value of key.class: #{key.class}"
+          end
         end
+
       end
     end
   end

data/lib/cli/command/service.rb

@@ -53,7 +53,7 @@ module DTK::Client
           'task-status',
           'uninstall',
           'describe',
-          # 'add',
+          'add',
           'add-component'
         ]
 

data/lib/cli/command/service/add.rb

@@ -26,7 +26,8 @@ module DTK::Client; module CLI
             args = {
               service_instance: service_instance_in_options_or_context(options),
               path: options[:path],
-              relative_path: options[:relative_path]
+              relative_path: options[:relative_path],
+              service_instance_dir: @base_dsl_file_obj.parent_dir
             }
             Operation::Service.add(args)
           end

data/lib/cli/command/service/add_link.rb

@@ -44,10 +44,10 @@ module DTK::Client; module CLI
               :service_instance_dir => service_instance_dir
             }
 
-            Operation::Service.link(args)
+            Operation::Service.add_link(args)
           end
         end
       end
     end
   end
-end; end
+end; end

data/lib/cli/command/service/delete.rb

@@ -22,7 +22,7 @@ module DTK::Client; module CLI
         command_body c, :delete, 'Destroys the running infrastructure associated with the service instance' do |sc|
           sc.flag Token.delete_service_name
           sc.flag Token.directory_path, :desc => 'Absolute or relative path to service instance directory associated; not needed if executed in service instance directory'
-          # sc.flag Token.path, :desc => "Delete specific part of service instance. Supported paths are 'dependencies/[name]', 'components/[name]', 'actions/[name]'"
+          sc.flag Token.path, :desc => "Delete specific part of service instance. Supported paths are 'dependencies/[name]', 'components/[name]', 'actions/[name]'"
 
           sc.switch Token.skip_prompt, :desc => 'Skip prompt that checks if user wants to delete the service instance'
           sc.switch Token.recursive, :desc => 'Delete all service instances staged into specified target'
@@ -40,7 +40,7 @@ module DTK::Client; module CLI
               :skip_prompt      => options[:skip_prompt],
               :recursive        => recursive,
               :force            => force,
-              # :path             => options[:path]
+              :path             => options[:path]
             }
             args[:directory_path] = directory_path || base_dsl_file_obj.parent_dir unless name
             Operation::Service.delete(args)

data/lib/cli/command/service/describe.rb

@@ -19,13 +19,13 @@ module DTK::Client; module CLI
   module Command
     module Service
       subcommand_def 'describe' do |c|
+       c.arg Token::Arg.path
         command_body c, 'describe', 'Describe service instance content' do |sc|
-          sc.flag Token.path, :desc => "supported paths are 'dependencies', 'components/[name]', 'actions/[name]' "
           sc.switch Token.show_steps, :desc => 'Show steps that will be executed when action is executed'
           sc.action do |_global_options, options, _args|
             args = {
               service_instance: service_instance_in_options_or_context(options),
-              path: options[:path],
+              path: _args[0],
               show_steps: options['show-steps']
             }
             Operation::Service.describe(args)

data/lib/cli/command/service/exec.rb

@@ -21,7 +21,7 @@ module DTK::Client
       subcommand_def 'exec' do |c|
         c.arg Token::Arg.action
         c.arg Token::Arg.action_params, :optional => true
-        command_body c, :exec, 'Execute action asynchronously' do |sc|
+        command_body c, :exec, 'Execute action asynchronously. Parameters need to be within quotes (\'\' or "").' do |sc|
           sc.flag Token.directory_path, :desc => 'Absolute or relative path to service instance directory containing updates to pull; not need if in the service instance directory'
           sc.flag Token.attempts,  :desc => "Number of attempts"
           sc.flag Token.sleep, :desc => "Number of sleep in seconds"

data/lib/cli/command/service/exec_sync.rb

@@ -21,7 +21,7 @@ module DTK::Client
       subcommand_def 'exec-sync' do |c|
         c.arg Token::Arg.action
         c.arg Token::Arg.action_params, :optional => true
-        command_body c, 'exec-sync', 'Execute action synchronously' do |sc|
+        command_body c, 'exec-sync', 'Execute action synchronously. Parameters need to be within quotes (\'\' or "").' do |sc|
          sc.flag Token.directory_path, :desc => 'Absolute or relative path to service instance directory containing updates to pull; not need if in the service instance directory'
          sc.flag Token.attempts, :desc => "Number of attempts"
          sc.flag Token.sleep, :desc => "Number of sleep in seconds"

data/lib/cli/command/service/set_attribute.rb

@@ -19,31 +19,117 @@ module DTK::Client; module CLI
   module Command
     module Service
       subcommand_def 'set-attribute' do |c|
-        c.arg Token::Arg.attribute_name
+        c.arg Token::Arg.attribute_name, :optional => true
         c.arg Token::Arg.attribute_value, :optional => true
-        command_body c, 'set-attribute',  'Edit specific attribute.' do |sc|
+        command_body c, 'set-attribute',  'Set attribute value(s).' do |sc|
           sc.switch Token.u
           sc.flag Token.directory_path
-          sc.action do |_global_options, options, _args|
+          sc.flag Token.param_file
+          sc.action do |_global_options, options, args|
+            service_instance     = service_instance_in_options_or_context(options)
+            service_instance_dir = options[:d] || @base_dsl_file_obj.parent_dir
 
-            service_instance = service_instance_in_options_or_context(options)
+            helper = SetAttributeHelper.new(service_instance, service_instance_dir)
 
-            attribute_name = _args[0]
-            options[:u] ? attribute_value = nil : attribute_value = _args[1]
+            attribute_name = args[0]
+            # if attribute_name not given then expected that a YAML file is given that has attribute values
+            unless attribute_name
+              name_value_pairs = helper.get_name_value_pairs_from_yaml_file(options)
+              # TODO: should extend the server-side to take list of attributes to set; hack to return a value ret
+              name_value_pairs.each_pair do |attribute_name, attribute_value|
+                begin
+                  helper.set_single_attribute(attribute_name, attribute_value)
+                rescue Error 
+                  raise Error::Usage, "Error trying to set attribute '#{attribute_name}' from YAML file"
+                end
+              end
+              nil
+            else
+              attribute_value = 
+                unless options[:u]
+                  if ruby_obj_value = helper.get_yaml_from_file?(options)
+                    ::JSON.generate(ruby_obj_value)
+                  else
+                    args[1] || raise(Error::Usage, "Either argument VALUE or -f option must be given to specify a value")
+                  end
+                end
+              helper.set_single_attribute(attribute_name, attribute_value)
+            end
+          end
+        end
+      end
 
-            options[:d].nil? ? service_instance_dir =  @base_dsl_file_obj.parent_dir : service_instance_dir = options[:d]
+      class SetAttributeHelper
+        def initialize(service_instance, service_instance_dir)
+          @service_instance     = service_instance
+          @service_instance_dir = service_instance_dir
+        end
 
-            args = {
-              :attribute_name   => attribute_name,
-              :service_instance => service_instance,
-              :attribute_value  => attribute_value,
-              :service_instance_dir => @base_dsl_file_obj.parent_dir
-            }
+        def set_single_attribute(attribute_name, attribute_value)
+          Operation::Service.set_attribute(
+            :attribute_name   => attribute_name,
+            :attribute_value  => attribute_value,
+            :service_instance => self.service_instance,
+            :service_instance_dir => self.service_instance_dir
+          )
+        end
 
-            Operation::Service.set_attribute(args)
+        def get_yaml_from_file?(cli_options)
+          if param_file_path = cli_options[:f]
+            param_file = check_and_return_file_content(param_file_path)
+            yaml_to_ruby_obj(param_file, param_file_path)
           end
         end
+
+        def get_name_value_pairs_from_yaml_file(options)
+          unless ruby_obj = get_yaml_from_file?(options)
+            raise Error::Usage, "If NAME argument is not given then -f option must be given to specify a value"
+          end
+
+          # check that gile is form
+          #attributes:
+          # name1: val1
+          # ...
+          unless ruby_obj.kind_of?(::Hash) and ruby_obj.size == 1 and ruby_obj.keys.first == 'attributes'
+            raise Error::Usage, "If NAME argument is not given, the parameter file content must be YAML hash starting with key 'attributes'"
+          end
+          name_value_pairs = ruby_obj['attributes']
+          unless name_value_pairs.kind_of?(::Hash)
+            raise Error::Usage, "If NAME argument is not given, the parameter file content must be YAML hash with name/attribute values"
+          end
+          name_value_pairs.inject({}) do |h, (k, v)| 
+            value = 
+              case v
+              when ::Hash, ::Array
+                ::JSON.generate(v)
+              else
+                v
+              end
+            h.merge(k => value)
+          end
+        end
+
+        private
+        
+        def check_and_return_file_content(path)
+          raise Error::Usage, "The file at path '#{path}' does not exist" unless File.file?(path)
+          File.open(path).read
+        end
+
+        def yaml_to_ruby_obj(text, path)
+          begin
+            ::YAML.load(text)
+          rescue
+            raise Error::Usage, "Content in file '#{path}' is ill-formed YAML"
+          end
+        end
+
+        protected
+
+        attr_reader :service_instance, :service_instance_dir
+
       end
+
     end
   end
-end; end
+end; end

data/lib/cli/command/service/set_default_target.rb

@@ -19,10 +19,13 @@ module DTK::Client
   module CLI::Command
     module Service
       subcommand_def 'set-default-target' do |c|
-        c.arg Token::Arg.service_name
+       c.arg Token::Arg.service_name, optional: true
         command_body c, 'set-default-context', 'Create a new service instance to refer to staged infrastructure that then can be deployed' do |sc|
-          sc.action do |_global_options, options, args|
-            Operation::Service.set_default_target(:service_instance => args[0])
+          sc.flag Token.directory_path, :desc => 'Absolute or relative path to service instance directory containing updates to pull; not need if in the service instance directory'
+           sc.action do |_global_options, options, args|
+            service_instance = args[0]
+            service_instance ||= service_instance_in_options_or_context(options)
+            Operation::Service.set_default_target(:service_instance => service_instance)
           end
         end
       end

data/lib/cli/command/service/task_status.rb

@@ -21,11 +21,9 @@ module DTK::Client; module CLI
       subcommand_def 'task-status' do |c|
         command_body c, 'task-status', "Get task status of the running or last running service instance task." do |sc|
           sc.flag Token.directory_path, :desc => 'Absolute or relative path to service instance directory; not needed if executed in the service instance directory'
-          sc.flag Token.mode, :desc => 'Task status mode.'
-
+          sc.flag Token.mode, :desc => 'Task status mode (snapshot, refresh, stream).'
           sc.action do |_global_options, options, _args|
             service_instance = service_instance_in_options_or_context(options)
-
             args = {
               :service_instance => service_instance,
               :mode             => options[:mode]

data/lib/cli/command/token.rb

@@ -37,6 +37,7 @@ module DTK::Client
         :comma_seperated_contexts  => Flag.new(:context, 'CONTEXT1,CONTEXT2,...' ,'Comma-seperated context service instance(s); if not specified, the default service instance serves as the context'),
         :module_ref                => Flag.new(:m, ModuleRef::NamespaceModuleName.legal_form, 'Module name with namespace; not needed if command is executed from within the module directory'),
         :relative_path             => Flag.new(:f, 'RELATIVE-FILE-PATH', 'Relative file path'),
+        :param_file                => Flag.new(:f, 'PARAM-FILE', 'YAML file with command argument value'),
         :service_instance          => Flag.new(:s, 'SERVICE-INSTANCE', 'Service instance name'),
         :service_name              => Flag.new(:n, 'SERVICE-NAME', 'Service name'),
         :version                   => Flag.new(:v, 'VERSION', 'Version'),
@@ -76,7 +77,8 @@ module DTK::Client
         :update_deps  => Switch.new('update-deps', "Skip prompt and update all dependencies or skip prompt and don't update all dependencies  (on master)", :negatable => true, :default_value => 'prompt'),
         :skip_server  => Switch.new('skip-server', 'Do not install module on server'),
         :update_lock  => Switch.new([:u, 'update-lock'], 'Update lock file with new dependencies'),
-        :show_steps   => Switch.new('show-steps', 'Show steps')
+        :show_steps   => Switch.new('show-steps', 'Show steps'),
+        :download_if_fail => Switch.new('download-if-fail', 'Download module content from dtkn if there is a runtime error.')
       }
 
       ARG_TOKENS = {
@@ -102,6 +104,7 @@ module DTK::Client
         :user             => 'USER',
         :permissions      => 'PERMISSIONS',
         :group            => 'GROUP',
+        :path             => 'PATH',
       }
       
     end

data/lib/cli/version.rb

@@ -18,7 +18,7 @@
 module DTK
   module Client
     module CLI
-      VERSION="0.12.1"
+      VERSION="0.12.2"
     end
   end
 end

data/lib/client/operation/module/install_from_catalog.rb

@@ -19,7 +19,7 @@ module DTK::Client
   class Operation::Module
     class InstallFromCatalog < self
       attr_reader :version, :module_ref, :target_repo_dir
-      def initialize(catalog, module_ref, directory_path, version, remote_module_info, type)
+      def initialize(catalog, module_ref, directory_path, version, remote_module_info, type, download_if_fail)
         @type               = type
         @catalog            = catalog
         @module_ref         = module_ref
@@ -27,6 +27,7 @@ module DTK::Client
         @target_repo_dir    = OsUtil.current_dir unless type == :dependency #ClientModuleDir.create_module_dir_from_path(directory_path || OsUtil.current_dir)
         @version            = version # if nil wil be dynamically updated along with version attribute of @module_ref
         @remote_module_info = remote_module_info
+        @download_if_fail   = download_if_fail
       end
       private :initialize
 
@@ -37,8 +38,9 @@ module DTK::Client
           directory_path     = args[:directory_path]
           remote_module_info = args[:remote_module_info]
           type               = args[:type]
+          download_if_fail   = args[:download_if_fail]
           # will create different classes for different catalog types when we add support for them
-          new('dtkn', module_ref, directory_path, version, remote_module_info, type).install_from_catalog
+          new('dtkn', module_ref, directory_path, version, remote_module_info, type, download_if_fail).install_from_catalog
         end
       end
       
@@ -50,7 +52,7 @@ module DTK::Client
           explicit_path: @directory_path,
           repo_dir:      @directory_path || @target_repo_dir
         }
-        installed_modules = DtkNetworkClient::Install.run(module_info, type: @type)
+        installed_modules = DtkNetworkClient::Install.run(module_info, type: @type, download_if_fail: @download_if_fail )
 
         { :installed_modules => installed_modules }
       end

data/lib/client/operation/service/add.rb

@@ -20,14 +20,27 @@ module DTK::Client
     class Add < self
       def self.execute(args = Args.new)
         wrap_operation(args) do |args|
-          service_instance = args.required(:service_instance)
-          path             = args.required(:path)
-          relative_path    = args.required(:relative_path)
-
-          content = yaml_to_hash(FileHelper.get_content?(relative_path))
+          service_instance     = args.required(:service_instance)
+          path                 = args.required(:path)
+          relative_path        = args.required(:relative_path)
+          service_instance_dir = args[:service_instance_dir]
+          content              = FileHelper.get_content?(relative_path)
 
           query_string_hash = QueryStringHash.new(:service_instance => service_instance, path: path, content: content)
-          rest_post "#{BaseRoute}/add_by_path", query_string_hash
+          response = rest_post "#{BaseRoute}/add_by_path", query_string_hash
+
+          if path.include?('actions/')
+            repo_info_args = Args.new(
+              :service_instance     => service_instance,
+              :commit_message       => "Updating changes to service instance '#{service_instance}'",
+              :branch               => response.required(:base_module, :branch, :name),
+              :repo_url             => response.required(:base_module, :repo, :url),
+              :service_instance_dir => service_instance_dir
+            )
+            ClientModuleDir::GitRepo.pull_from_service_repo(repo_info_args)
+          end
+
+          response
         end
       end
     end

data/lib/client/operation/service/add_link.rb

@@ -17,7 +17,7 @@
 #
 module DTK::Client
   class Operation::Service
-    class Link < self
+    class AddLink < self
       def self.execute(args = Args.new)
         wrap_operation(args) do |args|
           service_instance = args.required(:service_instance)

data/lib/client/operation/service/describe.rb

@@ -25,20 +25,19 @@ module DTK::Client
           show_steps        = args[:show_steps]
           query_string_hash = QueryStringHash.new
 
-          raise Error, 'Option --show-steps can only be used with actions path' if show_steps && !actions_path_valid?(path)
+          error_msg = 'Option --show-steps can only be used with actions path. The pattern must have form actions/ACTION-NAME.'
+          raise Error, error_msg if show_steps && !actions_path_valid?(path)
 
           query_string_hash.merge!(path: path) if path
           query_string_hash.merge!(show_steps: show_steps) if show_steps
           response = rest_get "#{BaseRoute}/#{service_instance}/describe", query_string_hash
-
           response.set_render_as_table! if show_steps
           response
         end
       end
-
       def self.actions_path_valid?(path)
         prefix, suffix = (path||'').split('/')
-        prefix.eql? 'actions'
+        prefix.eql?('actions') && suffix && !suffix.empty?
       end
 
     end

data/lib/client/operation/service/exec.rb

@@ -26,9 +26,10 @@ module DTK::Client
           directory_path   = args[:directory_path]
           breakpoint       = args[:breakpoint]
           attempts         = args[:attempts] || ""
-          sleep            = args[:sleep] || ""
-          # parse params and return format { 'p_name1' => 'p_value1' , 'p_name2' => 'p_value2' }
-          task_params = parse_params?(action_params)||{}
+          sleep            = args[:sleep] || ""    
+
+          task_params = {}
+          process_action_params(action_params, task_params) unless action_params.eql? nil
 
           # this is temporary fix to handle new node as component format ec2::node[node_name]/action
           # will transform ec2::node[node_name]/action to node_name/action
@@ -80,17 +81,42 @@ module DTK::Client
 
       private
 
-      def self.parse_params?(params_string)
-        if params_string
-          params_string.split(',').inject(Hash.new) do |h,av|
-            av_split = av.split('=')
-            unless av_split.size == 2
-              raise Error::Usage, "The parameter string (#{params_string}) is ill-formed"
-            end
-            h.merge(av_split[0] => av_split[1])
+      def self.process_action_params(action_params, params)
+        if match = action_params.match(/([^=]+)=(.+)/)
+          extracted_value, new_params = extract_action_value(match[2])
+          params.merge!(match[1] => extracted_value)
+          process_action_params(new_params, params) unless new_params.empty?
+        end
+      end
+
+      def self.extract_action_value(ac_params)
+        if ac_params.start_with?('[')
+          match_and_return(ac_params, :array)
+        elsif ac_params.start_with?('{')
+          match_and_return(ac_params, :hash)
+        else
+          if match = ac_params.match(/([^,]+),(.*)/)
+            return [match[1], match[2]]
+          else
+            return [ac_params, ""]
           end
         end
       end
+
+      def self.match_and_return(ac_params, type)
+        match = ac_params.match(RegexTypes[type])
+        return [match[1], prettify(match[2])]
+      end
+
+      RegexTypes = {
+        array: Regexp.new(/([^\]]+\])(.*)/),
+        hash: Regexp.new(/([^\}]+\})(.*)/)
+      }
+
+      def self.prettify(remaining)
+        remaining.sub!(",", "") unless remaining.empty?
+        remaining
+      end
     end
   end
 end

data/lib/client/operation/service/task_status.rb

@@ -59,7 +59,11 @@ module DTK::Client
         when :snapshot 
           SnapshotMode.new(mode, service_instance).task_status(opts)
         when :stream
+          begin
           StreamMode.new(mode, service_instance).get_and_render(opts)
+          rescue Interrupt => e
+            puts "Exiting ..."
+          end
         else
           raise Error::Usage.new("Illegal mode '#{mode}'; legal modes are: #{LEGAL_MODES.join(', ')}")
         end

data/lib/client/operation/service/task_status/stream_mode/element/hierarchical_task/result.rb

@@ -26,6 +26,7 @@ module DTK::Client; class Operation::Service::TaskStatus::StreamMode::Element
         super
         @errors = hash['errors'] || []
         @info = hash['info'] || []
+        @action_results = hash['action_results'] || []
       end
 
       # This can be over-written
@@ -44,9 +45,12 @@ module DTK::Client; class Operation::Service::TaskStatus::StreamMode::Element
 
       attr_reader :errors
       attr_reader :info
+      attr_reader :action_results
 
       def render_errors(results_per_node)
-        return unless results_per_node.find { |result| not result.errors.empty?}
+        return unless results_per_node.find do |result|  
+          not result.errors.empty?
+        end
         first_time = true
         results_per_node.each do |result| 
           if first_time
@@ -72,6 +76,20 @@ module DTK::Client; class Operation::Service::TaskStatus::StreamMode::Element
         end
       end
 
+      def render_output(results_per_node)
+        return unless results_per_node.find do |result|
+          not result.action_results.empty?
+        end
+        first_time = true
+        results_per_node.each do |result|
+          if first_time
+            render_line 'OUTPUT:'
+            first_time = false
+          end
+          result.render_node_output
+        end
+      end
+
       def render_node_errors
         return if @errors.empty?
         render_node_term
@@ -94,6 +112,34 @@ module DTK::Client; class Operation::Service::TaskStatus::StreamMode::Element
         end
       end
 
+      def render_node_output
+        return if @action_results.empty?
+        @action_results.each do |output|
+          if dynamic_attrs = output['dynamic_attributes']
+            render_dynamic_attrs(dynamic_attrs)
+          end
+        end
+      end
+
+      def render_dynamic_attrs(dynamic_attrs)
+        dynamic_attrs.each do |name, opts|
+          next unless opts['value'] 
+          out = opts['value']
+
+          if disp_form = opts['display_format']
+            out = 
+              case disp_form
+              when 'yaml'
+                out.to_yaml
+              when 'json'
+                out.to_json
+              end
+          end
+          render_output_line(name + ':', out)
+          render_empty_line
+        end
+      end
+
       def render_error_line(line, opts = {})
         render_line(line, ErrorRenderOpts.merge(opts))
       end
@@ -101,8 +147,15 @@ module DTK::Client; class Operation::Service::TaskStatus::StreamMode::Element
       def render_info_line(line, opts = {})
         render_line(line)
       end
-      ErrorRenderOpts = { :tabs => 1}
-      
+
+      def render_output_line(attr_name, attr_value)
+        render_line attr_name, RenderAttrNameOpts
+        render_line attr_value, RenderAttrValOpts
+      end
+      ErrorRenderOpts = { :tabs => 1 }
+      RenderAttrNameOpts = { :tabs => 1 }
+      RenderAttrValOpts = { :tabs => 2 }
+
     end
   end
 end; end

data/lib/client/operation/service/task_status/stream_mode/element/hierarchical_task/result/action.rb

@@ -26,12 +26,12 @@ module DTK::Client; class Operation::Service::TaskStatus::StreamMode::Element::H
       attr_reader :action_results
       
       def render_results(results_per_node)
+        render_info(results_per_node)
         if any_results?(results_per_node)
           render_line 'RESULTS:'
           render_empty_line
           results_per_node.each { |result| result.render }
         else
-          render_info(results_per_node)
           render_errors(results_per_node)
         end
       end
@@ -72,6 +72,10 @@ module DTK::Client; class Operation::Service::TaskStatus::StreamMode::Element::H
           render_line 'STDERR:'
           render_action_output stderr
         end
+        if dynamic_attrs = action_result['dynamic_attributes']
+          render_line 'OUTPUT:'
+          render_dynamic_attrs(dynamic_attrs)
+        end
       end
       
       def render_action_output(line)

data/lib/client/operation/service/task_status/stream_mode/element/hierarchical_task/result/components.rb

@@ -21,6 +21,7 @@ module DTK::Client; class Operation::Service::TaskStatus::StreamMode::Element::H
       def render_results(results_per_node)
         render_errors(results_per_node)
         render_info(results_per_node)
+        render_output(results_per_node)
       end
     end
   end

data/lib/client/operation/service/task_status/stream_mode/element/hierarchical_task/result/node_level.rb

@@ -18,6 +18,16 @@
 module DTK::Client; class Operation::Service::TaskStatus::StreamMode::Element::HierarchicalTask
   class Results
     class NodeLevel < self
+      def render
+        not_first_time = nil
+        render_node_term
+        @action_results.each do |action_result| 
+          render_action_result_lines(action_result, :first_time => not_first_time.nil?) 
+          not_first_time ||= true
+        end
+        render_empty_line
+      end
+
       def render_results(results_per_node)
         render_errors(results_per_node)
       end

data/lib/client/operation/service/uninstall.rb

@@ -51,14 +51,15 @@ module DTK::Client
             :force       => force
           )
           response = rest_post("#{BaseRoute}/uninstall", post_body)
-
+          path = ClientModuleDir.ret_base_path(:service, service_instance) unless path
           ClientModuleDir.rm_f(path) if args[:purge]
-
           if message = response.data(:message) || "DTK service '#{service_instance}' has been uninstalled successfully."
-            Dir.glob("*", File::FNM_DOTMATCH).each do |f|
-              ClientModuleDir.rm_f(f) if f.include? '.task_id_'
+            if Dir.exists?(path) && !args[:purge]
+              Dir.entries(path).each do |f|
+                ClientModuleDir.rm_f("#{path}/#{f}") if f.include? '.task_id_'
+              end
+              ClientModuleDir.create_file_with_content("#{path}/.task_id_#{response.data(:task_id)}", '') if response.data(:task_id)
             end
-            ClientModuleDir.create_file_with_content(".task_id_#{response.data(:task_id)}", '') if response.data(:task_id)
             OsUtil.print_info(message)
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
 platform: ruby
 authors:
 - Reactor8
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-18 00:00:00.000000000 Z
+date: 2019-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dtk-common-core
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.4
 description: Command line tool to interact with a DTK Server and DTK Service Catalog.
 email: support@reactor8.com
 executables:
@@ -429,8 +429,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: DTK CLI client for DTK server interaction.