dtk-client 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 254aaacc97b6cc8dde9c36ad4b06d0af2cda66b1
-  data.tar.gz: bb1fe62fcd2014f790ecab9a9b13aecbda698cd8
+  metadata.gz: 3981a13565726d82ae34679577877df68accfcab
+  data.tar.gz: 4dc01e0e0f1dce4285d4a8dc6faa445d1df0f66c
 SHA512:
-  metadata.gz: a7c6b9d6679aa46239b60d9db561a1532c658a10f19b1df5eb963f7f7d62ff3996944a8a33a13fddcd63b3525be8f4f008e238bea58d77533148e21a6157c68e
-  data.tar.gz: 18961ad5eb9205cfd73207d605469eeda4c0e16086a1fcbe630865cd9de40843db4871e768b8cc7034889701f8db686249cc6e7db0ad48cff765e4a013c9cf35
+  metadata.gz: f0a443fccb5533b633aeee895ead2c43c05292a2eaebf4936fc688ee2cb50a5e2b25a0a8b61199321cd29f12269f2959984bbc7ab1c86d4da6f4e4d04c95e418
+  data.tar.gz: 706bcf1c39b99602dc3409ebfb7cc0614dce6ebc693c95dd73f52ae6922d7e0f45d15fd1fc645a2dfc3e2d4cb7a6af8db44d810c16304b790b7c36a11d039d2c

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

@@ -25,12 +25,36 @@ module DTK::Client
           sc.flag Token.version
           sc.action do |_global_options, options, args|
             module_name = args[0]
-            module_ref  = module_ref_object_from_options_or_context(:module_ref => module_name, :version => options[:version])
+            version     = options[:version]
+            module_ref  = module_ref_object_from_options_or_context(:module_ref => module_name, :version => version)
+
             arg = {
-              :module_ref       => module_ref,
+              :module_ref => module_ref,
               :target_directory => args[1]
             }
-            Operation::Module.clone_module(arg)
+            repo_dir_info = Operation::Module.clone_module(arg).data
+            repo_dir      = repo_dir_info[:target_repo_dir]
+
+            # DTK-3088 - need this to pull service info for dependency module on clone
+            if repo_dir_info[:pull_service_info] && (version.nil? || version.eql?('master'))
+              repo_dir = repo_dir_info[:target_repo_dir]
+              module_ref = module_ref_object_from_options_or_context(:directory_path => repo_dir)
+
+              operation_args = {
+                :module_ref          => module_ref,
+                :base_dsl_file_obj   => @base_dsl_file_obj,
+                :has_directory_param => true,
+                :directory_path      => repo_dir,
+                :update_deps         => false,
+                :do_not_print        => true,
+                :force               => true
+              }
+
+              Operation::Module.pull_dtkn(operation_args)
+              Operation::Module.push(operation_args.merge(:method => "pulled"))
+            end
+
+            OsUtil.print_info("DTK module '#{module_ref.pretty_print}' has been successfully cloned into '#{repo_dir}'")
           end
         end
       end

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

@@ -23,9 +23,10 @@ module DTK::Client
         command_body c, :stage, 'Create a new service instance to refer to staged infrastructure that then can be deployed' do |sc|
           sc.flag Token.directory_path, :desc => 'Path to module directory where assembly is being staged from; not needed if in the module directory'
           sc.flag Token.service_name, :desc => 'If specified, name to use for new service instance; otherwise service instance name is auto-generated' 
-          sc.flag Token.parent_service_instance
+          sc.flag Token.context_service_instance
           sc.switch Token.force
-          sc.switch Token.target
+          sc.switch Token.base
+          #sc.switch Token.target
           # on useful for testing in dev mode
           # sc.switch Token.purge, :desc => 'Overwrite any content that presently exists in the service instance directory to be created'
           #  sc.flag Token.version
@@ -44,9 +45,9 @@ module DTK::Client
               :assembly_name   => assembly_name,
               :service_name    => service_name,
               :version         => version,
-              :target_service  => options[:parent_service_instance],
+              :context_service  => options[:context_service_instance],
               :remove_existing => options[:purge],
-              :is_target       => options[:target],
+              :is_target       => options[:base],
               :force           => force,
               :directory_path  => directory_path
             }

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

@@ -24,7 +24,6 @@ module DTK::Client; module CLI
         c.arg Token::Arg.service, :optional => true
         command_body c, 'link', 'List component links in the service instance.' 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.link_name
           sc.switch Token.unlink
 
           sc.action do |_global_options, options, _args|
@@ -33,6 +32,7 @@ module DTK::Client; module CLI
             service             = _args[2]
             service_instance    =  service_instance_in_options_or_context(options) 
             link_name           = options[:l] unless options[:l].nil?
+            options[:d].nil? ? service_instance_dir = @base_dsl_file_obj.parent_dir : service_instance_dir = options[:d]
 
             args = {
               :service_instance    => service_instance,
@@ -40,7 +40,8 @@ module DTK::Client; module CLI
               :base_component      => base_component,
               :dependent_component => dependent_component,
               :service             => service,
-              :link_name           => link_name
+              :link_name           => link_name,
+              :service_instance_dir => service_instance_dir
             }
 
             Operation::Service.link(args)

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

@@ -21,7 +21,7 @@ module DTK::Client; module CLI
       subcommand_def 'list-components' do |c|
         command_body c, 'components', 'List components associated with the service instance.' 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.switch Token.dependencies, :desc => 'Show dependencies'
+          #sc.switch Token.dependencies, :desc => 'Show dependencies'
 
           sc.action do |_global_options, options, _args|
             service_instance = service_instance_in_options_or_context(options)

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

@@ -22,8 +22,10 @@ module DTK::Client; module CLI
         command_body c, :pull, 'Pulls any updates server made to service instance on to client directory' 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.action do |_global_options, options, _args|
+            options[:d].nil? ? service_instance_dir =  @base_dsl_file_obj.parent_dir : service_instance_dir = options[:d]
+
             service_instance =  service_instance_in_options_or_context(options)
-            Operation::Service.pull(:service_instance => service_instance)
+            Operation::Service.pull(:service_instance => service_instance, :service_instance_dir => service_instance_dir)
           end
         end
       end

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

@@ -24,9 +24,12 @@ module DTK::Client; module CLI
           sc.flag Token.commit_message
           sc.action do |_global_options, options, _args|
             service_instance = service_instance_in_options_or_context(options)
+            options[:d].nil? ? service_instance_dir =  @base_dsl_file_obj.parent_dir : service_instance_dir = options[:d]
+
             args = {
               :service_instance => service_instance,
-              :commit_message   => options[:commit_message]
+              :commit_message   => options[:commit_message],
+              :service_instance_dir => service_instance_dir
             }
             Operation::Service.commit_and_push(args)
           end

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

@@ -30,11 +30,14 @@ module DTK::Client; module CLI
 
             attribute_name = _args[0]
             options[:u] ? attribute_value = nil : attribute_value = _args[1]
-    
+
+            options[:d].nil? ? service_instance_dir =  @base_dsl_file_obj.parent_dir : service_instance_dir = options[:d]
+
             args = {
               :attribute_name   => attribute_name,
               :service_instance => service_instance,
-              :attribute_value  => attribute_value
+              :attribute_value  => attribute_value,
+              :service_instance_dir => @base_dsl_file_obj.parent_dir
             }
 
             Operation::Service.set_attribute(args)

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

@@ -19,8 +19,8 @@ module DTK::Client
   module CLI::Command
     module Service
       subcommand_def 'set-default-target' do |c|
-        c.arg Token::Arg.target_instance
-        command_body c, 'set-default-target', 'Create a new service instance to refer to staged infrastructure that then can be deployed' do |sc|
+        c.arg Token::Arg.service_name
+        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])
           end

data/lib/cli/command/token.rb

@@ -34,7 +34,8 @@ module DTK::Client
         # Flag constructor args order: key, arg_name, desc, opts={}
         :commit_message          => Flag.new(:m, 'COMMIT-MSG', 'Commit message'),
         :directory_path          => Flag.new(:d, 'DIRECTORY-PATH', 'Directory path'),
-        :parent_service_instance => Flag.new(:parent, 'PARENT', 'Parent service instance; if not specfied, the default target service instance serves as parent'),
+        :parent_service_instance => Flag.new(:parent, 'PARENT', 'Parent service instance; if not specified, the default context service instance serves as parent'),
+        :context_service_instance => Flag.new(:context, 'CONTEXT' ,'Context service instance; if not specified, the default service instance serves as 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'),
         :service_instance        => Flag.new(:s, 'SERVICE-INSTANCE', 'Service instance name'),
@@ -54,6 +55,7 @@ module DTK::Client
         # switches
         # Switch constructor args order: key, desc, opts={}
         :all          => Switch.new(:all, 'All'),
+        :base         => Switch.new(:base, 'Create base service instance'),
         :delete       => Switch.new(:delete, 'Delete'),
         :force        => Switch.new([:f, :force], 'Force'),
         :purge        => Switch.new(:purge, 'Purge'),
@@ -85,7 +87,8 @@ module DTK::Client
         :format           => 'FORMAT',
         :base_cmp         => 'BASE-COMPONENT',
         :deps_on_cmp      => 'DEPENDS-ON-COMPONENT',
-        :service          => 'SERVICE'
+        :service          => 'SERVICE',
+        :service_name     => 'SERVICE-NAME'
       }
       
     end

data/lib/cli/version.rb

@@ -18,7 +18,7 @@
 module DTK
   module Client
     module CLI
-      VERSION="0.11.1"
+      VERSION="0.11.2"
     end
   end
 end

data/lib/client/load_source/component_info.rb

@@ -19,8 +19,15 @@ module DTK::Client
   class LoadSource
     class ComponentInfo < self
       def fetch_and_cache_info
+        updated = false
         fetch_remote
-        transform_from_component_info if merge_from_remote
+
+        if merge_from_remote
+          transform_from_component_info
+          updated = true
+        end
+
+        updated
       end
 
       def fetch_info

data/lib/client/load_source.rb

@@ -48,10 +48,10 @@ module DTK::Client
 
       if component_info = remote_module_info.data(:component_info)
         begin
-          ComponentInfo.fetch_and_cache_info(transform_helper, component_info['remote_repo_url'], parent, force, use_theirs)
+          updated = ComponentInfo.fetch_and_cache_info(transform_helper, component_info['remote_repo_url'], parent, force, use_theirs)
           info_types_processed << ComponentInfo.info_type
 
-          if parent.is_a?(Operation::Module::PullDtkn)
+          if parent.is_a?(Operation::Module::PullDtkn) && updated
             stage_and_commit(target_repo_dir, commit_msg([ComponentInfo.info_type]))
             delete_diffs(target_repo_dir)
           end

data/lib/client/operation/client_module_dir/git_repo/internal.rb

@@ -85,7 +85,8 @@ module DTK::Client
           service_instance = args.required(:service_instance)
           commit_message   = args[:commit_message]
 
-          repo_dir = ret_base_path(:service, service_instance)
+          #repo_dir = ret_base_path(:service, service_instance)
+          repo_dir = args[:service_instance_dir] || ret_base_path(:service, service_instance)
           repo = git_repo.new(repo_dir, :branch => branch)
           repo.stage_and_commit
           # TODO: want to switch over to using Dtk_Server::GIT_REMOTE rather than 'origin'
@@ -205,8 +206,9 @@ module DTK::Client
           repo_url         = args.required(:repo_url)
           remote_branch    = args.required(:branch)
           service_instance = args.required(:service_instance)
-          
-          repo_dir = ret_base_path(:service, service_instance)
+
+          #repo_dir = ret_base_path(:service, service_instance)
+          repo_dir = args[:service_instance_dir] || ret_base_path(:service, service_instance)
           repo = git_repo.new(repo_dir, :branch => remote_branch)
           
           repo.pull(repo.remotes.first, remote_branch)

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

@@ -62,7 +62,13 @@ module DTK::Client
           LoadSource.fetch_from_remote(module_info, self)
         end
 
-        OsUtil.print_info("DTK module '#{@module_ref.pretty_print}' has been successfully cloned into '#{ret.required(:target_repo_dir)}'")
+        # OsUtil.print_info("DTK module '#{@module_ref.pretty_print}' has been successfully cloned into '#{ret.required(:target_repo_dir)}'")
+        target_repo_dir = ret.required(:target_repo_dir)
+        pull_service_info = check_if_pull_needed
+        {
+          target_repo_dir: target_repo_dir,
+          pull_service_info: pull_service_info
+        }
       end
 
       def version
@@ -79,6 +85,19 @@ module DTK::Client
         self.class.module_ref_post_body(@module_ref)
       end
 
+      def check_if_pull_needed
+        query_string_hash = QueryStringHash.new(
+          :module_name => @module_ref.module_name,
+          :namespace   => @module_ref.namespace,
+          :rsa_pub_key => SSHUtil.rsa_pub_key_content,
+          :version     => version||'master'
+        )
+        remote_module_info = rest_get "#{BaseRoute}/remote_module_info", query_string_hash
+        if remote_module_info.data(:service_info)
+          !module_version_exists?(@module_ref, :type => :service_module)
+        end
+      end
+
     end
   end
 end

data/lib/client/operation/module/install/dependent_modules/component_dependency_tree/resolve_modules.rb

@@ -18,15 +18,16 @@
 module DTK::Client; class Operation::Module
   class Install::DependentModules::ComponentDependencyTree
     class ResolveModules
-      def initialize(parent)
+      def initialize(parent, opts = {})
         @print_helper    = parent.print_helper
         @base_module_ref = parent.module_ref
         @cache           = parent.cache
+        @opts            = opts
       end
       private :initialize
 
-      def self.resolve_conflicts(parent)
-        new(parent).resolve_conflicts
+      def self.resolve_conflicts(parent, opts = {})
+        new(parent, opts).resolve_conflicts
       end
       def resolve_conflicts
         # TODO: change this simplistic method which does not take into accunt the nested structure.
@@ -46,7 +47,7 @@ module DTK::Client; class Operation::Module
 
       def process_when_base_module(module_ref)
         if @base_module_ref.exact_match?(module_ref)
-          @print_helper.print_warning("Removing dependency '#{module_ref.pretty_print}' that referred to base module")
+          @print_helper.print_warning("Removing dependency '#{module_ref.pretty_print}' that referred to base module") unless @opts[:do_not_print]
         else
           @print_helper.print_warning("Removing conflicting dependency '#{module_ref.pretty_print}' that referred to base module '#{@base_module_ref.pretty_print}'")
         end

data/lib/client/operation/module/install/dependent_modules/component_dependency_tree.rb

@@ -53,10 +53,10 @@ module DTK::Client; class Operation::Module
       end
 
       # resolves conflicts and returns an array of unified module_refs
-      def resolve_conflicts_and_versions
+      def resolve_conflicts_and_versions(opts = {})
         # TODO: currently module refs al nailed as opposed to version contraints; when there are
         #       version contraints; this methdo will take care of them
-        ResolveModules.resolve_conflicts(self)
+        ResolveModules.resolve_conflicts(self, opts)
       end
 
       attr_reader :module_ref, :cache

data/lib/client/operation/module/install/dependent_modules.rb

@@ -136,7 +136,7 @@ module DTK::Client
       def get_unified_dependent_module_refs
         component_dependency_tree = ComponentDependencyTree.create(@base_module_ref, @component_module_refs, @print_helper)
         # returns an array of module_refs that have been unified so only one version and namespace per module name
-        component_dependency_tree.resolve_conflicts_and_versions
+        component_dependency_tree.resolve_conflicts_and_versions(@opts)
       end
 
       def get_local_modules_info

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

@@ -44,6 +44,7 @@ module DTK::Client
           skip_prompt         = args[:skip_prompt]
           force               = args[:force]
           update_deps         = args[:update_deps]
+          do_not_print        = args[:do_not_print]
 
           case update_deps
           when "prompt"
@@ -58,7 +59,7 @@ module DTK::Client
             file_obj = base_dsl_file_obj.raise_error_if_no_content
           end
 
-          new('dtkn', module_ref, directory_path, version, file_obj).pull_dtkn(:update_deps => update_deps, :no_update_deps => no_update_deps, :force => force)
+          new('dtkn', module_ref, directory_path, version, file_obj).pull_dtkn(:update_deps => update_deps, :no_update_deps => no_update_deps, :force => force, :do_not_print => do_not_print)
         end
       end
       
@@ -86,7 +87,7 @@ module DTK::Client
 
         unless dependent_modules.empty?
           begin
-            Install::DependentModules.install(@module_ref, dependent_modules, :update_deps => opts[:update_deps], :no_update_deps => opts[:no_update_deps] , :mode => 'pull')
+            Install::DependentModules.install(@module_ref, dependent_modules, :update_deps => opts[:update_deps], :no_update_deps => opts[:no_update_deps] , :mode => 'pull', :do_not_print => opts[:do_not_print])
             # Install::DependentModules.install(@module_ref, dependent_modules, :skip_prompt => false, :mode => 'pull')
           rescue Install::TerminateInstall
             @print_helper.print_terminated_pulling
@@ -94,7 +95,7 @@ module DTK::Client
           end
         end
 
-        @print_helper.print_continuation_pulling_base_module
+        @print_helper.print_continuation_pulling_base_module unless opts[:do_not_print]
         LoadSource.fetch_transform_and_merge(remote_module_info, self, :stage_and_commit_steps => true, :force => opts[:force], :use_theirs => true)
 
         nil

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

@@ -73,14 +73,17 @@ module DTK::Client
           end
 
           diffs = response.data(:diffs)
-          if diffs && !diffs.empty?
-            print = process_semantic_diffs(diffs, method)
-          else
-            print = process_semantic_diffs(existing_diffs, method)
+          unless args[:do_not_print]
+            if diffs && !diffs.empty?
+              print = process_semantic_diffs(diffs, method)
+            else
+              print = process_semantic_diffs(existing_diffs, method)
+            end
+
+            # if diffs is nil then indicate no diffs, otherwise render diffs in yaml
+            OsUtil.print_info("No Diffs to be #{method}.") if response.data(:diffs).nil? || !print
           end
 
-          # if diffs is nil then indicate no diffs, otherwise render diffs in yaml
-          OsUtil.print_info("No Diffs to be #{method}.") if response.data(:diffs).nil? || !print
           nil
         end
       end

data/lib/client/operation/module/push_dtkn/convert_source.rb

@@ -58,6 +58,8 @@ module DTK::Client; class Operation::Module
           args = [transform_helper, ServiceInfo.info_type, service_info['remote_repo_url'], parent]
           service_file_path__content_array.each { |file| Operation::ClientModuleDir.create_file_with_content("#{service_file_path(target_repo_dir, file, *args)}", file[:content]) }
 
+          delete_assemblies?(service_file_path__content_array, target_repo_dir)
+
           commit_and_push_to_remote(repo, target_repo_dir, "master", "dtkn")
         end
       end
@@ -173,6 +175,14 @@ module DTK::Client; class Operation::Module
         msg
       end
 
+      def self.delete_assemblies?(service_file_path__content_array, target_repo_dir)
+        assembly_regex     = Regexp.new("\.dtk\.assembly\.(yml|yaml)$")
+        assemblies         = Dir.entries("#{target_repo_dir}/assemblies/").select { |file| file.match(assembly_regex) }
+        current_assemblies = assemblies.map { |assembly| "assemblies/#{assembly}" }
+        to_delete          = current_assemblies - service_file_path__content_array.map { |file| file[:path] }
+        to_delete.each { |file| Operation::ClientModuleDir.rm_f("#{target_repo_dir}/#{file}") }
+      end
+
       def self.git_repo_operation
         Operation::ClientModuleDir::GitRepo
       end

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

@@ -31,7 +31,7 @@ module DTK::Client
             :module_name     => module_ref.module_name,
             :assembly_name?  => args.required(:assembly_name),
             :version?        => args[:version],
-            :target_service? => args[:target_service],
+            :target_service? => args[:context_service],
             :is_target?      => args[:is_target]
           )
           

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

@@ -22,14 +22,15 @@ module DTK::Client
       def self.execute(args = Args.new)
         wrap_operation(args) do |args|
           service_instance = args.required(:service_instance)
-
+          
           response = rest_get("#{BaseRoute}/#{service_instance}/repo_info")
 
           repo_info_args = Args.new(
             :service_instance => service_instance,
             :commit_message   => args[:commit_message] || default_commit_message(service_instance),
             :branch           => response.required(:branch, :name),
-            :repo_url         => response.required(:repo, :url)
+            :repo_url         => response.required(:repo, :url),
+            :service_instance_dir => args[:service_instance_dir]
           )
 
           response = ClientModuleDir::GitRepo.commit_and_push_to_service_repo(repo_info_args)

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

@@ -40,7 +40,8 @@ module DTK::Client
           repo_info_args = Args.new(
             :service_instance => service_instance,
             :branch           => response.required(:branch, :name),
-            :repo_url         => response.required(:repo, :url)
+            :repo_url         => response.required(:repo, :url),
+            :service_instance_dir => args[:service_instance_dir]
           )
           ClientModuleDir::GitRepo.pull_from_service_repo(repo_info_args)
           nil

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

@@ -25,7 +25,7 @@ module DTK::Client
             :include_namespaces => true
           )
           rest_get("#{BaseRoute}/list", query_string_hash)
-        end.set_render_as_table!
+        end.set_render_as_table!(nil, '* denotes that service instance is default context')
       end
     end
   end

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

@@ -26,7 +26,8 @@ module DTK::Client
           pull_args = {
             :service_instance => service_instance,
             :repo_url         => response.required(:repo, :url),
-            :branch           => response.required(:branch, :name)
+            :branch           => response.required(:branch, :name),
+            :service_instance_dir => args[:service_instance_dir]
           }
           ClientModuleDir::GitRepo.pull_from_service_repo(pull_args)
         end

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

@@ -23,7 +23,7 @@ module DTK::Client
           service_instance = args.required(:service_instance)
           attribute_name   = args[:attribute_name]
           attribute_value  = args[:attribute_value]
-          
+      
           query_string_hash = QueryStringHash.new(
             :pattern?  => attribute_name,
             :value?    => attribute_value
@@ -34,9 +34,10 @@ module DTK::Client
             repo_info_args = Args.new(
              :service_instance => service_instance,
              :branch           => response.required(:branch, :name),
-             :repo_url         => response.required(:repo, :url)
+             :repo_url         => response.required(:repo, :url),
+             :service_instance_dir => args[:service_instance_dir]
            )
-
+ 
            ClientModuleDir::GitRepo.pull_from_service_repo(repo_info_args)
          end
          nil

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

@@ -88,7 +88,7 @@ pp info_hash
         end
 
         unless remote_user ||= node_info[:default_login_user]
-          raise Error::Usage, "Retry command with a specfic login user (a default login user could not be computed)"
+          raise Error::Usage, "A default Linux login user could not be computed. Retry the command with a specified login using the '-u LINUX-USER' option."
         end
 
         connection_string = "#{remote_user}@#{dns_address}"

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

@@ -27,13 +27,20 @@ module DTK::Client
             response = rest_call(opts)
             return response unless response.ok?
             
-            # stop pulling when top level task succeds, fails or timeout
+            # TODO: clean this up
+            # stop polling when top level task succeeds, fails or timeout
             if response and response.data and response.data.first
+              if debug_mode?(response)
+                response.print_error_table!(true)
+                add_info_if_debug_mode!(response)
+                return response
+              end
+
               top_task_failed = response.data.first['status'].eql?('failed')
-              is_pending   = (response.data.select {|r|r["status"].nil? }).size > 0
-              is_executing = (response.data.select {|r|r["status"].eql? "executing"}).size > 0
-              is_failed    = (response.data.select {|r|r["status"].eql? "failed"}).size > 0
-              is_cancelled = response.data.first["status"].eql?("cancelled")
+              is_pending        = (response.data.select {|r|r['status'].nil? }).size > 0
+              is_executing      = (response.data.select {|r|r['status'].eql? 'executing'}).size > 0
+              is_failed         = (response.data.select {|r|r['status'].eql? 'failed'}).size > 0
+              is_cancelled      = response.data.first['status'].eql?('cancelled')
 
               is_cancelled = true if top_task_failed
               

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

@@ -21,7 +21,8 @@ module DTK::Client
       def task_status(opts = {})
         response = rest_call(opts)
         response.print_error_table!(true)
-        response.set_render_as_table!
+        add_info_if_debug_mode!(response)
+        response
       end
     end
   end

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

@@ -31,24 +31,21 @@ module DTK::Client
         wrap_operation(args) do |args|
           service_instance = args.required(:service_instance)
           task_status_mode = args[:mode]
-          
-          if task_status_mode
-            task_status_with_mode(task_status_mode.to_sym, service_instance)
-          else
-            response = rest_call(service_instance)
-            response.print_error_table!(true)
-            response.set_render_as_table!
-          end
+          info             = nil
+
+          task_status_mode ||=  DEFAULT_MODE 
+          task_status_with_mode(task_status_mode.to_sym, service_instance)
         end
       end
 
       def rest_call(opts = {})
         self.class.rest_call(@service_instance, opts)
       end
-      
+
       private
 
-      LEGAL_MODES = [:refresh, :snapshot, :stream]
+      DEFAULT_MODE = :snapshot
+      LEGAL_MODES  = [:refresh, :snapshot, :stream]
       def self.task_status_with_mode(mode, service_instance, opts = {})
         case mode
         when :refresh
@@ -74,6 +71,24 @@ module DTK::Client
         )
       end
       
+      def add_info_if_debug_mode!(response)
+        debug_info_rows = debug_mode_rows(response).select { |row| (row['info'] || {})['message'] }
+        if debug_info_rows.size > 0
+          info_message = debug_info_rows.last['info']['message']
+          response.set_render_as_table!(nil, info_message)
+        else
+          response.set_render_as_table!
+        end
+      end
+      
+      def debug_mode?(response)
+        debug_mode_rows(response).size > 0
+      end
+
+      def debug_mode_rows(response)
+        response['data'].select { |data_row| data_row['status'] == 'debugging' }
+      end
+
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Reactor8
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-22 00:00:00.000000000 Z
+date: 2017-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dtk-common-core