dtk-client 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 2817e488bead21b5b89b2a858c54a2ba8572dfa2
-  data.tar.gz: 9e06efff1beb26514abb4816bb38bc0b90f23ddd
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YzJhNmY1YjNmMTQxNzRhMzI0NmZjOGYxYjczM2EwNDc3NjdiYTAxMg==
+  data.tar.gz: !binary |-
+    YWZiMDcxNWJkYmEwMzI3NGIyMzMwY2FmZWQ4OTk1NWVmZmUzYWY5ZQ==
 SHA512:
-  metadata.gz: f0f6936dc5618b38729e7cfa3dc46666c45c71e9a4671b6fbf22d566a257659168304bbb4d468e3583797660a4e1ea4b3a41629c741a849ca33ca31c50ae8832
-  data.tar.gz: aeb6cf7b75d37b1daed90920c070e4a553b50bdb77388eca585a10263803272ea8ce39d4b5a2764475396dbd124b802be9ed19b7d7d2711a3e40679761a50eaf
+  metadata.gz: !binary |-
+    MWZlMTBiYTUwMGIwZjU5MzU0ZjNlNWY0NGVkMjcwOWZlNDk0ODU1YTM5ZWIy
+    NjY2NDQzOTBjMjFjNmQwM2U4YjQwMGFmMjU1OTVmYThiNzQ5MDZiZDg4MjY5
+    OTdkNDUwODBmMGUwZWZkMjA3Yjg4NzU1ZTI2OTdiM2NkOWZmYjg=
+  data.tar.gz: !binary |-
+    MzUzOTVmMzhlYzg2MzcwMGVmMWZmY2M2NDg1ODhlNGQ4NWMwNWIzMTJlZTQ4
+    NTNmZWRlZWU4YmI5ZTExMGQwYmE3ZGU4ZDc3NGI3ZDgzMzNmZWQyODZhMThi
+    M2M1Yjg0YmYxNmFjNTkxNDUwNWQ5ZDhjOWZmZGQzZDY5MDAwYTQ=

data/lib/command_helpers/service_importer.rb

@@ -25,7 +25,7 @@ module DTK::Client
           module_name = full_module_name(r_module)
           module_type = r_module['type']
 
-          print "Pulling latest #{module_type.gsub('_',' ')} code for '#{module_name}' ... "
+          print "Pulling #{module_type.gsub('_',' ')} content for '#{module_name}' ... "
 
           new_context_params = DTK::Shell::ContextParams.new
           new_context_params.add_context_to_params(module_type, module_type)
@@ -35,10 +35,9 @@ module DTK::Client
           response = ContextRouter.routeTask(module_type, "pull_dtkn", new_context_params, @conn)
 
           raise DTK::Client::DtkError, response.error_message unless response.ok?
-
-          # in case there are diffs there was no ouput so we add 'Done'
-          puts 'Done.' unless response.data[:diffs].empty?
         end
+
+        print "Resuming pull ... "
       end
     end
 
@@ -114,7 +113,12 @@ module DTK::Client
             new_context_params = ::DTK::Shell::ContextParams.new
             new_context_params.forward_options(thor_options)
             new_context_params.add_context_to_params(formated_name, :"component-module", m['id'])
-            response = ContextRouter.routeTask("component_module", "clone", new_context_params, @conn)
+
+            begin
+              response = ContextRouter.routeTask("component_module", "clone", new_context_params, @conn)
+            rescue DTK::Client::DtkValidationError => e
+              # ignoring this
+            end
             # puts "Done."
           end
         end

data/lib/commands/common/thor/assembly_workspace.rb

@@ -153,7 +153,7 @@ module DTK::Client
 
       edit_opts = {
         :automatically_clone => true,
-        :pull_if_needed => true,
+        :pull_if_needed => false,
         :assembly_module => {
           :assembly_name => assembly_name,
           :version => version
@@ -727,6 +727,7 @@ module DTK::Client
       }
 
       response = post(rest_url("assembly/initiate_get_netstats"),post_body)
+      raise DTK::Client::DtkValidationError, response.data(:errors) if response.data(:errors)
       return response unless response.ok?
 
       action_results_id = response.data(:action_results_id)
@@ -836,6 +837,7 @@ module DTK::Client
       }
 
       response = post(rest_url("assembly/initiate_get_ps"),post_body)
+      raise DTK::Client::DtkValidationError, response.data(:errors) if response.data(:errors)
       return response unless response.ok?
 
       action_results_id = response.data(:action_results_id)
@@ -923,6 +925,7 @@ module DTK::Client
             }
 
             response = post rest_url("assembly/initiate_get_log"), post_body
+            raise DTK::Client::DtkValidationError, response.data(:errors) if response.data(:errors)
 
             unless response.ok?
               raise DTK::Client::DtkError, "Error while getting log from server, there was no successful response."
@@ -1029,6 +1032,7 @@ module DTK::Client
         }
 
         response = post rest_url("assembly/initiate_grep"), post_body
+        raise DTK::Client::DtkValidationError, response.data(:errors) if response.data(:errors)
 
         unless response.ok?
           raise DTK::Client::DtkError, "Error while getting log from server. Message: #{response['errors'][0]['message'].nil? ? 'There was no successful response.' : response['errors'].first['message']}"
@@ -1138,6 +1142,9 @@ module DTK::Client
           when "attributes"
             data_type = (options.links? ? :workspace_attribute_w_link : :workspace_attribute)
             edit_attr_format = context_params.get_forwarded_options()[:format] if context_params.get_forwarded_options()
+            if tags = options.tags
+              post_options.merge!(:tags => tags.split(','))
+            end
             if format = (options.format || edit_attr_format)
               post_options.merge!(:format => format)
               #dont need to compute links if using a format

data/lib/commands/common/thor/module.rb

@@ -345,7 +345,7 @@ module DTK::Client
 
       # prompt to see if user is ready to continue with warnings/errors
       if are_there_warnings
-        return false unless Console.confirmation_prompt("Do you want to ignore the warnings and proceed with import"+'?')
+        return false unless Console.confirmation_prompt("Do you still want to proceed with import"+'?')
       end
 
       # case when we need to import additional components
@@ -357,10 +357,13 @@ module DTK::Client
         continue = trigger_module_auto_import(missing_components, required_components, module_opts)
         return unless continue
 
-        puts "Resuming DTK Network import for #{module_type} '#{remote_module_name}' ..."
+        print "Resuming DTK Network import for #{module_type} '#{remote_module_name}' ..."
         # repeat import call for service
         post_body.merge!(opts)
         response = post rest_url("#{module_type}/import"), post_body
+
+        # we set skip cloning since it is already done by import
+        puts " Done"
       end
 
       return response if(!response.ok? || response.data(:does_not_exist))
@@ -489,7 +492,7 @@ module DTK::Client
 
       module_location = OsUtil.module_location(module_type, module_name, version)
 
-      raise DTK::Client::DtkValidationError, "Trying to clone a #{module_type} '#{module_name}#{version && "-#{version}"}' that exists already!" if File.directory?(module_location)
+      raise DTK::Client::DtkValidationError, "#{module_type.gsub('_',' ').capitalize} '#{module_name}#{version && "-#{version}"}' already cloned!" if File.directory?(module_location)
       clone_aux(module_type.to_sym, module_id, version, internal_trigger, thor_options['omit_output'])
     end
 

data/lib/commands/common/thor/pull_from_remote.rb

@@ -91,6 +91,8 @@ module DTK::Client
         # return response unless response.ok?
         if response.data[:diffs].empty?
           puts "No changes to pull from remote."
+        else
+          puts "Changes pulled from remote"
         end
 
         return response

data/lib/commands/thor/account.rb

@@ -134,14 +134,23 @@ module DTK::Client
       response.ok? ? nil : response
     end
 
-    desc "delete-ssh-key KEYPAIR-NAME ","Deletes the named ssh key from your user account"
+    desc "delete-ssh-key KEYPAIR-NAME [-y]","Deletes the named ssh key from your user account"
+    method_option :force, :aliases => '-y', :type => :boolean, :default => false
     def delete_ssh_key(context_params)
       name = context_params.retrieve_arguments([:option_1!],method_argument_names)
-      post_body = { :username => name.chomp }
 
-      response = post rest_url("account/remove_user_direct_access"), post_body
+      unless options.force?
+        is_go = Console.confirmation_prompt("Are you sure you want to delete SSH key '#{name}'"+"?")
+        return nil unless is_go
+      end
+
+      response = post rest_url("account/remove_user_direct_access"), { :username => name.chomp }
       return response unless response.ok?
 
+      if response.ok? && !response.data(:unregistered_with_repoman)
+        OsUtil.print("Warning: We were not able to unregister your key with remote catalog!", :yellow)
+      end
+
       OsUtil.print("SSH key '#{name}' removed successfully!", :yellow)
       nil
     end

data/lib/commands/thor/component_module.rb

@@ -9,14 +9,11 @@ module DTK::Client
     end
 
     def self.valid_children()
-      # [:"component-template"]
       [:component]
     end
 
     # this includes children of children - has to be sorted by n-level access
     def self.all_children()
-      # [:"component-template", :attribute] # Amar: attribute context commented out per Rich suggeston
-      # [:"component-template"]
       [:component]
     end
 
@@ -39,9 +36,6 @@ module DTK::Client
               ["list","list","# List all component templates."],
               ["list-attributes","list-attributes", "# List all attributes for given component."]
             ]
-            #:attribute => [
-            #  ['list',"list","List attributes for given component"]
-            #]
           },
           :identifier_only => {
             :"component" => [
@@ -56,31 +50,6 @@ module DTK::Client
       return :component_module, "component_module/list", nil
     end
 
-#TODO: in for testing; may remove
-    # desc "MODULE-NAME/ID test-generate-dsl", "Test generating DSL from implementation"
-    # def test_generate_dsl(context_params)
-    #   component_module_id = context_params.retrieve_arguments([:module_id!],method_argument_names)
-    #   post rest_url("component_module/test_generate_dsl"),{:component_module_id => component_module_id}
-    # end
-
-    # desc "MODULE-NAME/ID dsl-upgrade [UPGRADE-VERSION] [-v MODULE-VERSION]","Component module DSL upgrade"
-    # version_method_option
-    # def dsl_upgrade(context_params)
-    #   component_module_id, dsl_version = context_params.retrieve_arguments([:module_id, :option_1],method_argument_names)
-    #   dsl_version ||= MostRecentDSLVersion
-    #   post_body = {
-    #     :component_module_id => component_module_id,
-    #     :dsl_version => dsl_version
-    #   }
-    #   post_body.merge!(:version => options["version"]) if options["version"]
-    #    post rest_url("component_module/create_new_dsl_version"),post_body
-    # end
-    # MostRecentDSLVersion = 2
-### end
-
-    #### create and delete commands ###
-    # desc "delete COMPONENT-MODULE-NAME [-v VERSION] [-y] [-p]", "Delete component module or component module version and all items contained in it. Optional parameter [-p] is to delete local directory."
-    # version_method_option
     desc "delete COMPONENT-MODULE-NAME [-y] [-p]", "Delete component module and all items contained in it. Optional parameter [-p] is to delete local directory."
     method_option :force, :aliases => '-y', :type => :boolean, :default => false
     method_option :purge, :aliases => '-p', :type => :boolean, :default => false
@@ -91,29 +60,11 @@ module DTK::Client
       response
     end
 
-
     desc "COMPONENT-MODULE-NAME/ID set-attribute ATTRIBUTE-ID VALUE", "Set value of component module attributes"
     def set_attribute(context_params)
       set_attribute_module_aux(context_params)
     end
 
-    #### end: create and delete commands ###
-
-=begin
-TODO: might deprecate
-    #### list and info commands ###
-    desc "COMPONENT-MODULE-NAME/ID info", "Get information about given component module."
-    def info(context_params)
-      component_module_id = context_params.retrieve_arguments([:component_module_id!],method_argument_names)
-
-      post_body = {
-        :component_module_id => component_module_id
-      }
-
-      response = post rest_url("component_module/info"), post_body
-      response.render_custom_info("module")
-    end
-=end
     desc "list [--remote] [--diff] [-n NAMESPACE]", "List loaded or remote component modules. Use --diff to compare loaded and remote component modules."
     method_option :remote, :type => :boolean, :default => false
     method_option :diff, :type => :boolean, :default => false
@@ -132,27 +83,12 @@ TODO: might deprecate
       post_body[:diff] = options.diff? ? options.diff : {}
       post_body.merge!(:module_namespace => options.namespace) if options.namespace
 
-      response = post rest_url("component_module/#{action}"),post_body
+      response = post rest_url("component_module/#{action}"), post_body
 
       return response unless response.ok?
       response.render_table()
     end
 
-=begin
-    desc "COMPONENT-MODULE-NAME/ID list-versions","List all versions associated with this component module."
-    def list_versions(context_params)
-      component_module_id = context_params.retrieve_arguments([:component_module_id!],method_argument_names)
-      post_body = {
-        :component_module_id => component_module_id,
-        :detail_to_include => ["remotes"],
-        :rsa_pub_key => SSHUtil.rsa_pub_key_content()
-      }
-      response = post rest_url("component_module/versions"), post_body
-
-      response.render_table(:module_version)
-    end
-=end
-
     desc "COMPONENT-MODULE-NAME/ID list-components", "List all components for given component module."
     def list_components(context_params)
       module_info_about(context_params, :components, :component)
@@ -165,14 +101,9 @@ TODO: might deprecate
 
     desc "COMPONENT-MODULE-NAME/ID list-instances", "List all instances for given component module."
     def list_instances(context_params)
-      module_info_about(context_params, :instances, :component)
+      module_info_about(context_params, :instances, :component_instances)
     end
 
-    #### end: list and info commands ###
-
-    #### commands to interact with remote repo ###
-
-
     desc "import [NAMESPACE:]COMPONENT-MODULE-NAME", "Create new component module from local clone"
     def import(context_params)
       response = import_module_aux(context_params)
@@ -181,6 +112,25 @@ TODO: might deprecate
       response
     end
 
+=begin
+    desc "import-puppet-forge PUPPET-MODULE-NAME [NAMESPACE:]COMPONENT-MODULE-NAME", "Install puppet module from puppet forge"
+    def import_puppet_forge(context_params)
+      pf_module_name, full_module_name = context_params.retrieve_arguments([:option_1!, :option_2!],method_argument_names)
+      namespace, module_name = get_namespace_and_name(full_module_name, ModuleUtil::NAMESPACE_SEPERATOR)
+
+      response = post rest_url("component_module/install_puppet_module"), {
+        :puppetf_module_name => pf_module_name,
+        :module_name => module_name,
+        :module_namespace => namespace
+      }
+
+      return response unless response.ok?
+
+      @@invalidate_map << :component_module
+      response
+    end
+=end
+
     #
     # Creates component module from input git repo, removing .git dir to rid of pointing to user github, and creates component module
     #
@@ -394,6 +344,20 @@ TODO: might deprecate
       clone_aux(:component_module,component_module_id,version,internal_trigger,omit_output)
     end
 =end
+=begin
+    desc "COMPONENT-MODULE-NAME/ID list-versions","List all versions associated with this component module."
+    def list_versions(context_params)
+      component_module_id = context_params.retrieve_arguments([:component_module_id!],method_argument_names)
+      post_body = {
+        :component_module_id => component_module_id,
+        :detail_to_include => ["remotes"],
+        :rsa_pub_key => SSHUtil.rsa_pub_key_content()
+      }
+      response = post rest_url("component_module/versions"), post_body
+
+      response.render_table(:module_version)
+    end
+=end
 
     ##
     #

data/lib/commands/thor/component_template.rb

@@ -27,7 +27,11 @@ module DTK::Client
         component_module_id = context_params.retrieve_arguments([:component_module_id!])
         res = get_cached_response(:component_template, "component_module/info_about", { :component_module_id => component_module_id, :about => :components})
       else
-        get_cached_response(:component_template, "component/list", {:subtype => 'template', :ignore => 'test_module'})
+        post_body = {:subtype => 'template', :ignore => 'test_module'}
+        if assembly_id = context_params.retrieve_arguments([[:service_id, :workspace_id]])
+          post_body.merge!(:assembly_id => assembly_id)
+        end
+        get_cached_response(:component_template, "component/list", post_body)
       end
     end
 

data/lib/commands/thor/service.rb

@@ -341,8 +341,9 @@ TODO: will put in dot release and will rename to 'extend'
       list_components_aux(context_params)
     end
 
-    desc "SERVICE-NAME/ID list-attributes [-f FORMAT] [--links]","List attributes associated with service."
-    method_option :format,:aliases => '-f'
+    desc "SERVICE-NAME/ID list-attributes [-f FORMAT] [-t TAG,..] [--links]","List attributes associated with service."
+    method_option :format, :aliases => '-f'
+    method_option :tags, :aliases => '-t'
     method_option :links, :type => :boolean, :default => false, :aliases => '-l'
     def list_attributes(context_params)
       list_attributes_aux(context_params)

data/lib/commands/thor/service_module.rb

@@ -133,7 +133,7 @@ module DTK::Client
         if about
           case about
           when "assembly"
-            data_type        = :assembly_template
+            data_type        = :assembly_template_description
             action           = "list_assemblies"
           when "modules"
             data_type        = options.remote? ? :component_remote : :component_module

data/lib/commands/thor/workspace.rb

@@ -383,8 +383,9 @@ module DTK::Client
       end
     end
 
-    desc "WORKSPACE-NAME/ID list-attributes [-f FORMAT] [--links]","List attributes associated with workspace."
-    method_option :format,:aliases => '-f' 
+    desc "WORKSPACE-NAME/ID list-attributes [-f FORMAT] [-t TAG,..] [--links]","List attributes associated with workspace."
+    method_option :format, :aliases => '-f' 
+    method_option :tags, :aliases => '-t'
     method_option :links, :type => :boolean, :default => false, :aliases => '-l'
     def list_attributes(context_params)
       list_attributes_aux(context_params)

data/lib/core.rb

@@ -16,6 +16,7 @@ dtk_require_from_base('util/common_util')
 dtk_require_from_base('util/permission_util')
 dtk_require_from_base('util/remote_dependency_util')
 dtk_require_from_base('util/module_util')
+dtk_require_from_base('shell/message_queue')
 
 dtk_require("config/configuration")
 
@@ -62,7 +63,6 @@ def top_level_execute_core(entity_name, method_name, context_params=nil, options
     if print = response_ruby_obj.render_data()
       print = [print] unless print.kind_of?(Array)
       print.each do |el|
-
         if el.kind_of?(String)
           el.each_line{|l| STDOUT << l}
         else
@@ -70,6 +70,10 @@ def top_level_execute_core(entity_name, method_name, context_params=nil, options
         end
       end
     end
+
+    # process/print queued message from server
+    DTK::Shell::MessageQueue.print_messages()
+
   rescue DTK::Client::DtkLoginRequiredError => e
     # this error is handled in method above
     raise e
@@ -377,7 +381,12 @@ module DTK
           response = rest_method_func.call
         end
 
-        Response.new(command_class, response)
+        response_obj = Response.new(command_class, response)
+
+        # queue messages from server to be displayed later
+        DTK::Shell::MessageQueue.process_response(response_obj)
+
+        response_obj
       end
 
 

data/lib/dtk-client/version.rb

@@ -1,3 +1,3 @@
 module DtkClient
-  VERSION="0.6.6"
+  VERSION="0.6.7"
 end

data/lib/parser/adapters/thor.rb

@@ -469,6 +469,10 @@ module DTK
             namespace, name = [$1,$2]
 
             return [nil, component_full_name] if (name.include?(':') && !name.include?('::'))
+
+            # to be robust to user putting in ns::x::y which splits to ns=ns name=:x::y
+            name.gsub!(/^:/,'')
+
             component_full_name = name
           end
 

data/lib/shell/context.rb

@@ -110,11 +110,7 @@ module DTK
         begin
           # check if we are doing switch context
           if args.join("").match(/\A\-\Z/)
-            if @previous_context
-              # swap 2 variables
-              @active_context, @previous_context = @previous_context, @active_context
-            end
-            load_context(active_context.last_context_name)
+            revert_context()
             return
           end
 
@@ -143,7 +139,10 @@ module DTK
 
           load_context(active_context.last_context_name)
 
-          raise DTK::Client::DtkValidationError, error_message if error_message
+          if error_message
+            revert_context()
+            raise DTK::Client::DtkValidationError, error_message
+          end
         rescue DTK::Client::DtkValidationError => e
           DTK::Client::OsUtil.print(e.message, :yellow)
         rescue DTK::Shell::Error, Exception => e
@@ -213,12 +212,14 @@ module DTK
 
       # TODO: this is hack used this to hide 'node' context and use just node_identifier
       # we should rethink the design of shell context if we are about to use different behaviors like this
-      def self.check_invisible_context(acc, entries, is_root, line_buffer=[], args=[])
+      def self.check_invisible_context(acc, entries, is_root, line_buffer=[], args=[], current_context_clazz=nil)
+        check = nil
         entries.reject! { |e| e.empty? }
         goes_from_root = args.first.start_with?('/')
 
-        unless line_buffer.empty?
-          command = line_buffer.split(' ').first
+        unless (line_buffer.empty? && args.empty?)
+          command = line_buffer.empty? ? args.first : line_buffer.split(' ').first
+          # command = line_buffer.split(' ').first
           current_c_name = acc.last_command_name
           current_context = acc.last_context
           clazz = DTK::Shell::Context.get_command_class(current_c_name)
@@ -229,12 +230,23 @@ module DTK
             clazz_from_args = DTK::Shell::Context.get_command_class(command_from_args) if command_from_args
           end
 
+          check = (command.eql?('cd') || command.eql?('cc') || command.eql?('popc') || command.eql?('pushc') || command.eql?('delete-node'))
+          # used when calling node commands from service or workspace context
+          # e.g. service/service_name>node1 info will display info about nodes instead of service instance
+          unless check
+            if current_c_name.eql?('service') || current_c_name.eql?('workspace')
+              context_hash_data, error_message, invalid_context = current_context_clazz.validate_value('node', command, acc)
+              check = true if context_hash_data && !error_message
+            end
+          end
+
           # this delete-node is a hack because we need autocomplete when there is node with name 'node'
-          if (command.eql?('cd') || command.eql?('cc') || command.eql?('popc') || command.eql?('pushc') || command.eql?('delete-node'))
+          # if (command.eql?('cd') || command.eql?('cc') || command.eql?('popc') || command.eql?('pushc') || command.eql?('delete-node'))
+          if check
             if is_root
               if entries.size >= 3
                 node = entries[2]
-                if (node && clazz_from_args.respond_to?(:valid_child?))
+                if (node && clazz_from_args.respond_to?(:valid_child?) && !clazz_from_args.invisible_context_list.empty?)
                   unless clazz_from_args.valid_children().first.to_s.include?(node)
                     entries[2] = ["node", node]
                     entries.flatten!
@@ -281,7 +293,7 @@ module DTK
 
         # transform alias to full path
         entries = Context.check_for_sym_link(entries) if root?
-        entries = Context.check_invisible_context(active_context_copy, entries, root?, line_buffer, args)
+        entries = Context.check_invisible_context(active_context_copy, entries, root?, line_buffer, args, self)
 
         # if only '/' or just cc skip validation
         return active_context_copy if entries.empty?
@@ -535,6 +547,14 @@ module DTK
         load_context()
       end
 
+      def revert_context()
+        if @previous_context
+          # swap 2 variables
+          @active_context, @previous_context = @previous_context, @active_context
+        end
+        load_context(active_context.last_context_name)
+      end
+
       # when e.g assembly is deleted we want it to be removed from list without
       # exiting dtk-shell
       def reload_cached_tasks(command_name)

data/lib/shell/message_queue.rb

@@ -0,0 +1,44 @@
+dtk_require_from_base('util/os_util')
+
+module DTK
+  module Shell
+    class MessageQueue
+      include Singleton
+
+      MESSAGE_TYPES = [:info, :warn, :error]
+
+      def initialize
+        @queue = {}
+        init_or_clear()
+      end
+
+      def self.process_response(response_obj)
+        self.instance.process_response(response_obj)
+      end
+
+      def self.print_messages()
+        self.instance.print_messages()
+      end
+
+      def init_or_clear()
+        MESSAGE_TYPES.each { |msg_type| @queue[msg_type] = [] }
+      end
+
+      def print_messages()
+        @queue[:info].each  { |msg| DTK::Client::OsUtil.print(msg, :white) }
+        @queue[:warn].each  { |msg| DTK::Client::OsUtil.print(msg, :yellow) }
+        @queue[:error].each { |msg| DTK::Client::OsUtil.print(msg, :red) }
+
+        init_or_clear()
+      end
+
+      def process_response(response_obj)
+        MESSAGE_TYPES.each do |msg_type|
+          msg = response_obj[msg_type.to_s] || response_obj[msg_type]
+          @queue[msg_type] << msg if msg
+        end
+      end
+
+    end
+  end
+end

data/lib/util/os_util.rb

@@ -197,7 +197,7 @@ module DTK
           component_module_dir = component_clone_location()
 
           directories = Dir.entries(component_module_dir).map do |entry|
-            next if (entry =='.' || entry == '..' || entry.index('.') == 0)
+            next if (entry =='.' || entry == '..' || entry.index('.') == 0 || !File.directory?(entry))
 
             Dir.entries("#{component_module_dir}/#{entry}").map do |m_entry|
               next unless File.directory? File.join(component_module_dir,entry,m_entry)

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2014-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.4
 - !ruby/object:Gem::Dependency
@@ -278,6 +278,7 @@ files:
 - lib/shell/header_shell.rb
 - lib/shell/help_monkey_patch.rb
 - lib/shell/interactive_wizard.rb
+- lib/shell/message_queue.rb
 - lib/shell/parse_monkey_patch.rb
 - lib/shell/status_monitor.rb
 - lib/util/common_util.rb
@@ -328,12 +329,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []