dtk-client 0.5.14 → 0.5.15

data/lib/dtk_logger.rb

@@ -25,7 +25,7 @@ class DtkLogger
         file = File.open(file_path(), "a")
         file.sync = true
         @logger = Logger.new(file, LOG_NUMBER_OF_OLD_FILES, LOG_MB_SIZE * 1024000)
-        
+
         @logger.formatter = proc do |severity, datetime, progname, msg|
           "[#{datetime}] #{severity} -- : #{msg}\n"
         end
@@ -63,14 +63,14 @@ class DtkLogger
 
   def error_pp(message, backtrace, sttdout_out = true)
     error(message, sttdout_out)
-    # we do not print this to STDOUT (will be overriden with DEVELOPMENT_MODE)
-    error(PP.pp(backtrace, ""), false) if backtrace
+    # we do not print this to STDOUT (will be overriden with DEVELOPMENT_MODE)s
+    error("#{message}\n" + PP.pp(backtrace, ""), false) if backtrace
   end
 
   def fatal_pp(message, backtrace, sttdout_out = true)
     fatal(message, sttdout_out)
     # we do not print this to STDOUT (will be overriden with DEVELOPMENT_MODE)
-    fatal(PP.pp(backtrace, ""), false) if backtrace
+    fatal("#{message}\n" + PP.pp(backtrace, ""), false) if backtrace
   end
 
 

data/lib/shell/context.rb

@@ -7,7 +7,7 @@ module DTK
 
     class Context
       include DTK::Client::Auxiliary
-      
+
       # client commands
       CLIENT_COMMANDS       = ['cc','exit','clear','pushc','popc','dirs','help']
       # CLIENT_COMMANDS       = ['cc','exit','clear','help']
@@ -80,7 +80,7 @@ module DTK
             end
           end
         end
-        
+
         entries
       end
 
@@ -96,7 +96,7 @@ module DTK
           init_context = context_list.first.name
           command_clazz = Context.get_command_class(init_context)
           invisible_context = command_clazz.respond_to?(:invisible_context) ? command_clazz.invisible_context() : {}
-          
+
           invisible_context.each do |ic|
             path = path.gsub(/\/#{ic}\//,'/')
           end
@@ -104,7 +104,7 @@ module DTK
 
         path
       end
-      
+
       # Validates and changes context
       def change_context(args, cmd=[])
         begin
@@ -123,7 +123,7 @@ module DTK
 
           # jump to root
           reset if args.join('').match(/^\//)
-          
+
           # begin
           # hack: used just to avoid entering assembly/id/node or workspace/node context (remove when include this contexts again)
           first_c, warning_message = nil, nil
@@ -163,34 +163,52 @@ module DTK
         active_context_copy.clear if goes_from_root
         # Invalid context is user leftover to be matched; i.e. 'cc /assembly/te' - 'te' is leftover
         invalid_context = ""
-        
+
         # Validate and change context; skip step if user's input is empty or it is equal to '/'
         active_context_copy, error_message, invalid_context = prepare_context_change([readline_input], active_context_copy, nil, line_buffer) unless (readline_input.empty? || readline_input == "/")
-        
+
         # using extended_context when we want to use autocomplete from other context
-        # e.g. we are in assembly/apache context and want to create-component we will use extended context to add 
+        # e.g. we are in assembly/apache context and want to create-component we will use extended context to add
         # component-templates to autocomplete
-        extended_candidates, new_context = {}, nil
+        extended_candidates, new_context, line_buffer_first = {}, nil, nil
         command_clazz = Context.get_command_class(active_context_copy.last_command_name)
-        
+        # require 'debugger'
+        # Debugger.start
+        # debugger
+        # unless (line_buffer.empty? || line_buffer.strip().empty?)
+        #   line_buffer_last = line_buffer.split(' ').last
+        #   line_buffer = line_buffer.split(' ').first
+        #   line_buffer.gsub!('-','_') unless (line_buffer.nil? || line_buffer.empty?)
+        # end
+
         unless (line_buffer.empty? || line_buffer.strip().empty?)
-          line_buffer = line_buffer.split(' ').first
-          line_buffer.gsub!('-','_') unless (line_buffer.nil? || line_buffer.empty?)
+          line_buffer = line_buffer.split(' ')
+          line_buffer_last = line_buffer.last
+          line_buffer_first = line_buffer.first
+          line_buffer_first.gsub!('-','_') unless (line_buffer_first.nil? || line_buffer_first.empty?)
         end
 
         unless command_clazz.nil?
           extended_context = command_clazz.respond_to?(:extended_context) ? command_clazz.extended_context() : {}
-          
+
           unless extended_context.empty?
             extended_context = extended_context[:context]
-            extended_context.reject!{|k,v| k.to_s!=line_buffer}
-
-            new_context = extended_context[line_buffer.to_sym] unless line_buffer.nil? || line_buffer.empty?
+            # extended_context.reject!{|k,v| k.to_s!=line_buffer}
+            # extended_context.select!{|k,v| k.to_s.eql?(line_buffer_first) || k.to_s.eql?(line_buffer_last)}
+            extended_context.select!{|k,v| line_buffer.include?(k.to_s)} if extended_context.respond_to?(:select!)
+
+            if (extended_context[line_buffer_last] && !line_buffer_first.eql?(line_buffer_last))
+              new_context = extended_context[line_buffer_last]
+            elsif (extended_context[line_buffer[line_buffer.size-2]] && !line_buffer_first.eql?(extended_context[line_buffer[line_buffer.size-2]]))
+              new_context = extended_context[line_buffer[line_buffer.size-2]]
+            else
+              new_context = extended_context[line_buffer_first.to_sym] unless line_buffer_first.nil? || line_buffer_first.empty?
+            end
             active_context_copy.push_new_context(new_context, new_context) unless new_context.nil?
           end
         end
-        
-        return get_ac_candidates(active_context_copy, readline_input, invalid_context, goes_from_root, line_buffer)
+
+        return get_ac_candidates(active_context_copy, readline_input, invalid_context, goes_from_root, line_buffer_first||{})
       end
 
       # TODO: this is hack used this to hide 'node' context and use just node_identifier
@@ -210,7 +228,7 @@ module DTK
             command_from_args = goes_from_root ? args.first.split('/')[1] : args.first.split('/').first
             clazz_from_args = DTK::Shell::Context.get_command_class(command_from_args) if command_from_args
           end
-          
+
           if (command.eql?('cd') || command.eql?('cc') || command.eql?('popc') || command.eql?('pushc'))
             if is_root
               if entries.size >= 3
@@ -224,7 +242,7 @@ module DTK
               end
             else
               double_dots_count = DTK::Shell::ContextAux.count_double_dots(entries)
-              
+
               unless double_dots_count > 0
                 if clazz.respond_to?(:invisible_context)
                   if current_context.is_command?
@@ -251,7 +269,7 @@ module DTK
           end
 
         end
-        
+
         entries
       end
 
@@ -270,9 +288,9 @@ module DTK
         current_context_clazz, error_message, current_index = nil, nil, 0
         double_dots_count = DTK::Shell::ContextAux.count_double_dots(entries)
 
-        # we remove '..' from our entries 
+        # we remove '..' from our entries
         entries = entries.select { |e| !(e.empty? || DTK::Shell::ContextAux.is_double_dot?(e)) }
-        
+
         # we go back in context based on '..'
         active_context_copy.pop_context(double_dots_count)
 
@@ -287,23 +305,23 @@ module DTK
           count_workspaces = active_context_copy.name_list.inject(Hash.new(0)) {|h,i| h[i] += 1; h }
           active_context_copy.pop_context(1) if count_workspaces['workspace']==1
         end
-        
+
         # we add active commands array to begining, using dup to avoid change by ref.
         context_name_list = active_context_copy.name_list
         entries = context_name_list + entries
 
         # we check the size of active commands
         ac_size = context_name_list.size
-        
+
         invalid_context = ""
         # check each par for command / value
         (0..(entries.size-1)).step(2) do |i|
           command       = entries[i]
           value         = entries[i+1]
-          
+
           clazz = DTK::Shell::Context.get_command_class(command)
           error_message, invalid_context = validate_command(clazz, current_context_clazz, command, active_context_copy)
-          
+
           break if error_message
           # if we are dealing with new entries add them to active_context
           active_context_copy.push_new_context(command, command) if (i >= ac_size)
@@ -319,7 +337,7 @@ module DTK
               end
               break
             end
-            
+
             active_context_copy.push_new_context(context_hash_data[:name], command, context_hash_data[:identifier]) if ((i+1) >= ac_size)
           end
         end
@@ -336,7 +354,7 @@ module DTK
           error_message = "Context for '#{command}' could not be loaded.";
           invalid_context = command
         end
-          
+
         # check if previous context support this one as a child
         unless current_context_clazz.nil?
           # valid child method is necessery to define parent-child relet.
@@ -346,10 +364,10 @@ module DTK
 
             valid_all_children = (root_clazz != current_context_clazz) ? all_children.include?(command.to_sym) : true
             unless (current_context_clazz.valid_child?(command) && valid_all_children)
-              
+
               error_message = "'#{command}' context is not valid."
               invalid_context = command
-              
+
               if current_context_clazz.respond_to?(:invisible_context)
                 ic = current_context_clazz.invisible_context()
                 ic.each do |c|
@@ -374,7 +392,7 @@ module DTK
         entries = args.first.split(/\//)
         invalid_context = ["workspace/node", "service/node"]
         double_dots_count = DTK::Shell::ContextAux.count_double_dots(entries)
-        only_double_dots = entries.select{|e| e.to_s!=".."}||[]
+        only_double_dots = entries.select{|e| !e.to_s.include?('..')}||[]
         back_flag = false
 
         last_from_current, message = nil, nil
@@ -384,7 +402,7 @@ module DTK
           last_from_current = test_c.last_context_name
           back_flag = true
         end
-        
+
         unless args.empty?
           first_c ||= entries.first
           last_c = last_from_current||entries.last
@@ -400,14 +418,14 @@ module DTK
               end
               message = "'#{last_c}' context is not valid."
               is_valid_id = check_for_id(first_c, last_c, tmp_active_context, args)
-              
+
               # if ../ to node context, add one more .. to go to previous context (assembly/id or workspace)
               if back_flag
                 message = nil
                 entries << ".." if is_valid_id==false
               else
                 if is_valid_id==false
-                  entries.pop 
+                  entries.pop
                 else
                   message = nil
                 end
@@ -424,7 +442,7 @@ module DTK
             end
           end
         end
-        
+
         return {:args => args, :message => message}
       end
 
@@ -432,26 +450,26 @@ module DTK
         command_clazz = Context.get_command_class(context)
         invisible_context = command_clazz.respond_to?(:invisible_context) ? command_clazz.invisible_context.map { |e| e.to_s } : []
         entries = args.first.split(/\//)
-        
+
         entries = Context.check_for_sym_link(entries) if root?
         unless invisible_context.empty?
           if root?
             tmp_active_context.push_new_context(entries[0], entries[0])
             context_hash_data, error_message, invalid_context = validate_value(entries[0], entries[1], tmp_active_context)
-            
+
             return if error_message
             tmp_active_context.push_new_context(context_hash_data[:name], entries[0], context_hash_data[:identifier])
             context_hash_data, error_message, invalid_context = validate_value(command, command, tmp_active_context)
-            
+
             return if error_message
             tmp_active_context.push_new_context(context_hash_data[:name], command, context_hash_data[:identifier])
           end
 
-          
+
           node_ids = get_command_identifiers(invisible_context.first.to_s, tmp_active_context)
           node_names = node_ids ? node_ids.collect { |e| e[:name] } : []
         end
-        
+
         return node_names.include?(command)
       end
 
@@ -480,10 +498,10 @@ module DTK
         # e.g. cc library/public, we are caching context under library_1, library_2
         # so getting context for 'public' will not work and we use than library
         command_name = root? ? 'dtk' : @active_context.last_command_name
-        
+
         # if there is no new context (current) we use old one
         @current = current_context_task_names() || @current
-        
+
         client_commands = CLIENT_COMMANDS
         client_commands.concat(DEV_COMMANDS) if DTK::Configuration.get(:development_mode)
 
@@ -495,7 +513,7 @@ module DTK
 
         # we load thor command class identifiers for autocomplete context list
         command_context = get_command_identifiers(command_name)
-        
+
         command_name_list = command_context ? command_context.collect { |e| e[:name] } : []
         @context_commands.concat(command_name_list) if current_command?
 
@@ -538,7 +556,7 @@ module DTK
       def root?
         return @active_context.empty?
       end
-      
+
       def current_command?
         return @active_context.current_command?
       end
@@ -557,7 +575,7 @@ module DTK
       end
 
       # checks if method name is valid in current context
-      def method_valid?(method_name)           
+      def method_valid?(method_name)
         # validate method, see if we support given method in current tasks
         (current_context_task_names() + ['help']).include?(method_name)
       end
@@ -575,15 +593,15 @@ module DTK
 
       # calls 'valid_id?' method in Thor class to validate ID/NAME
       def valid_id?(thor_command_name,value, override_context_params=nil, active_context_copy=nil)
-         
+
         command_clazz = Context.get_command_class(thor_command_name)
-        if command_clazz.list_method_supported?          
+        if command_clazz.list_method_supported?
           if override_context_params
             context_params = override_context_params
           else
             context_params = get_command_parameters(thor_command_name, [], active_context_copy)[2]
           end
-          
+
           tmp = command_clazz.valid_id?(value, @conn, context_params)
           return tmp
         end
@@ -597,13 +615,13 @@ module DTK
         # input string segment used to filter results candidates
         results_filter = (readline_input.match(/\/$/) && invalid_context.empty?) ? "" : readline_input.split("/").last
         results_filter ||= ""
-        
+
         command_clazz = Context.get_command_class(active_context_copy.last_command_name)
         extended_context_commands = nil
 
         unless command_clazz.nil?
           extended_context = command_clazz.respond_to?(:extended_context) ? command_clazz.extended_context() : {}
-          
+
           unless extended_context.empty?
             extended_context = extended_context[:command]
             extended_context.reject!{|k,v| k.to_s!=line_buffer} if extended_context
@@ -625,18 +643,18 @@ module DTK
             context_candidates = get_ac_candidates_for_context(active_context_copy.last_context(), active_context_copy)
           end
         end
-        
+
         # checking if results will contain context candidates based on input string segment
         context_candidates = context_candidates.grep( /^#{Regexp.escape(results_filter)}/ )
-        
-        # Show all context tasks if active context orignal and it's copy are on same context, and are not on root, 
+
+        # Show all context tasks if active context orignal and it's copy are on same context, and are not on root,
         # and if readline has one split result indicating user is not going trough n-level, but possibly executing a task
         task_candidates = []
 
         #task_candidates = @context_commands if (active_context_copy.last_context_name() == @active_context.last_context_name() && !active_context_copy.empty?)
         task_candidates = @context_commands if (active_context_copy.last_context_name() == @active_context.last_context_name() && !active_context_copy.empty? && readline_input.split("/").size <= 1)
-        
-        # create results object filtered by user input segment (results_filter) 
+
+        # create results object filtered by user input segment (results_filter)
         task_candidates = task_candidates.grep( /^#{Regexp.escape(results_filter)}/ )
 
         # autocomplete candidates are both context and task candidates; remove duplicates in results
@@ -653,7 +671,7 @@ module DTK
         # remove duplicate context or task candidates
         results.uniq!
 
-        # Send system beep if there are no candidates 
+        # Send system beep if there are no candidates
         if results.empty?
           print "\a"
           return []
@@ -662,7 +680,7 @@ module DTK
         # default value of input user string
         input_context_path = readline_input
 
-        # cut off last context if it is leftover (invalid_context), 
+        # cut off last context if it is leftover (invalid_context),
         # or if last context is not finished with '/' and it can have more than option for current context
         # i.e. dtk> cc assembly - have 2 candidates: 'assembly' and 'assembly-template'
         if !invalid_context.empty? || cutoff_forcely
@@ -681,7 +699,7 @@ module DTK
 
       end
 
-      def get_ac_candidates_for_context(context, active_context_copy)        
+      def get_ac_candidates_for_context(context, active_context_copy)
         # If last context is command, load all identifiers, otherwise, load next possible context command; if no contexts, load root tasks
         if context
           if context.is_command?
@@ -695,11 +713,11 @@ module DTK
 
             n_level_ac_candidates.select {|v| valid_all_children.include?(v.to_sym)} unless valid_all_children.empty?
             invisible_context = command_clazz.respond_to?(:invisible_context) ? command_clazz.invisible_context.map { |e| e.to_s } : []
-            
+
             unless invisible_context.empty?
               node_ids = get_command_identifiers(invisible_context.first.to_s, active_context_copy)
               node_names = node_ids ? node_ids.collect { |e| e[:name] } : []
-              
+
               n_level_ac_candidates.concat(node_names)
             end
 
@@ -714,13 +732,14 @@ module DTK
       def get_command_identifiers(thor_command_name, active_context_copy=nil)
         begin
           command_clazz = Context.get_command_class(thor_command_name)
-          if command_clazz.list_method_supported?             
+
+          if command_clazz && command_clazz.list_method_supported?
             # take just hashed arguemnts from multi return method
             hashed_args = get_command_parameters(thor_command_name, [], active_context_copy)[2]
             return command_clazz.get_identifiers(@conn, hashed_args)
           end
         rescue DTK::Client::DtkValidationError => e
-          # TODO Check if handling needed. Error should happen only when autocomplete ID search illigal 
+          # TODO Check if handling needed. Error should happen only when autocomplete ID search illigal
         end
 
         return []
@@ -734,7 +753,7 @@ module DTK
           endpoint = extended_context_commands[:endpoint]
           url = extended_context_commands[:url]
           opts = extended_context_commands[:opts]||{}
-        
+
           id_label = "#{endpoint}_id".to_sym
           id = entity_name.identifier
           opts[id_label] = id
@@ -750,7 +769,7 @@ module DTK
         candidates
       end
 
-      # changes command and argument if argument is plural of one of 
+      # changes command and argument if argument is plural of one of
       # the possible commands on tier1 e.g. libraries, assemblies
       # return 2 values cmd, args
       def reverse_commands(cmd, args)
@@ -786,8 +805,8 @@ module DTK
         # if no method specified use help
         method_name ||= 'help'
 
-        context_params.add_context_to_params(entity_name, entity_name) 
-        
+        context_params.add_context_to_params(entity_name, entity_name)
+
         if entity_name_id
           identifier_response = valid_id?(entity_name, entity_name_id, context_params)
           if identifier_response
@@ -824,7 +843,7 @@ module DTK
         entity_name, method_name, option_types = nil, nil, nil
 
         context_params = ContextParams.new
-        
+
         if root? && !args.empty?
           # this means that somebody is calling command with assembly/.. method_name
           entity_name = cmd
@@ -842,11 +861,11 @@ module DTK
 
         if ((current_context_command != entity_name) && !current_context_command.eql?("utils"))
           current_context_clazz = Context.get_command_class(current_context_command)
-          options = Context.get_thor_options(current_context_clazz, cmd) unless current_context_command.nil?
+          options = Context.get_thor_options(current_context_clazz, cmd) if current_context_clazz
         else
-          options = Context.get_thor_options(clazz, cmd) unless clazz.nil?
+          options = Context.get_thor_options(clazz, cmd) if clazz
         end
-        
+
         # set rest of arguments as method options
         args, thor_options, invalid_options = Context.parse_thor_options(args, options)
         context_params.method_arguments = args
@@ -861,7 +880,7 @@ module DTK
       #
       def self.parse_thor_options(args, options=nil)
         type, invalid_options = nil, []
-        
+
         # options to handle thor options -m MESSAGE and --list
         options_param_args = []
         args.each_with_index do |e,i|
@@ -889,13 +908,13 @@ module DTK
         command = command.gsub('-','_')
         options = nil
         options = clazz.all_tasks[command].options.collect{|k,v|{:alias=>v.aliases,:name=>v.name,:type=>v.type,:switch=>v.switch_name}} unless clazz.all_tasks[command].nil?
-        
+
         return options
       end
 
-      def self.get_option_type(options, option)       
+      def self.get_option_type(options, option)
         @ret = nil
-        
+
         options.each do |opt|
           @ret = opt[:type] if(opt[:alias].first == option || opt[:switch] == option)
         end
@@ -925,7 +944,7 @@ module DTK
           puts "[INFO] History file is missing, shell history will be disabled. To enable it create file: '#{HISTORY_LOCATION}'"
           return []
         end
-   
+
         content = File.open(HISTORY_LOCATION,'r').read
         return (content.empty? ? [] : JSON.parse(content))
       end
@@ -937,7 +956,7 @@ module DTK
         array_of_commands.each_with_index do |a,i|
           filtered_commands << a if (a != array_of_commands[i+1] && is_allowed_command?(a))
         end
-             
+
         # make sure we only save up to 'COMMAND_HISTORY_LIMIT' commands
         if filtered_commands.size > COMMAND_HISTORY_LIMIT
           filtered_commands = filtered_commands[-COMMAND_HISTORY_LIMIT,COMMAND_HISTORY_LIMIT+1]

data/lib/shell/help_monkey_patch.rb

@@ -80,10 +80,10 @@ class Thor
           # alternative providers
           alt_identifiers = get_alternative_identifiers(command)
 
-          
+
           filtered_list = []
 
-          # case when we are not on first level and it is not identifier we skip help 
+          # case when we are not on first level and it is not identifier we skip help
           # since it needs to be empty
           # e.g. assembly/bootstrap1/node> ... HELP IS EMPTY FOR THIS
 
@@ -106,14 +106,14 @@ class Thor
 
             list.each do |help_item|
               help_item.first.gsub!("^^", '') if help_item.first.include?("^^")
-              
-              # this will match entity_name (command) and alternative identifiers  
+
+              # this will match entity_name (command) and alternative identifiers
               identifers = [command] + alt_identifiers
 
               # matches identifiers for ID/NAME
               matched_data          = help_item.first.match(/^\s\[?(#{identifers.join('|')}).?(NAME\/ID|ID\/NAME)\]?\s/)
               alt_matched_data      = help_item.first.match(/^\s\[?(#{alt_identifiers.join('|')}).?(NAME\/ID|ID\/NAME)\]?\s/)
-        
+
               if matched_data.nil?
                 # not found and tier 1 we add it to help list
                 filtered_list << overriden_help(override_tasks_obj, help_item, true) if @@shell_context.current_command?
@@ -156,17 +156,19 @@ class Thor
             # we do not need first one, since above code takes care of that one
             filtered_list = filtered_list.select do |filtered_help_item|
               #next unless filtered_help_item
-              commands_that_have_identifiers[1..-1].each_with_index do |entity,i|                 
-                matched = match_help_item_changes(filtered_help_item, entity)
-                filtered_help_item = replace_if_matched!(filtered_help_item, matched)
-
-                # if it is last command, and there were changes                 
-                if (i == (commands_that_have_identifiers.size - 2) && matched)
-                  n_filter_list << filtered_help_item
+              unless commands_that_have_identifiers.empty?
+                commands_that_have_identifiers[1..-1].each_with_index do |entity,i|
+                  matched = match_help_item_changes(filtered_help_item, entity)
+                  filtered_help_item = replace_if_matched!(filtered_help_item, matched)
+
+                  # if it is last command, and there were changes
+                  if (i == (commands_that_have_identifiers.size - 2) && matched)
+                    n_filter_list << filtered_help_item
+                  end
                 end
               end
             end
-            
+
             if override_tasks_obj && is_n_level_context
               last_entity_name = active_context.last_context_entity_name.to_sym
 
@@ -184,7 +186,7 @@ class Thor
               end
             end
 
-            # we have just filtered those methods that have attribute for given entity 
+            # we have just filtered those methods that have attribute for given entity
             # and also are last in the list
             filtered_list = n_filter_list
           end
@@ -198,7 +200,7 @@ class Thor
 
           #
           # e.g.
-          # dtk assembly_template info 
+          # dtk assembly_template info
           # dtk assembly-template info
           #
           item[0] = item[0].gsub(/^dtk ([a-zA-Z]+)_([a-zA-Z]+) /,'dtk \1-\2 ')
@@ -208,7 +210,7 @@ class Thor
 
       if list.empty?
         shell.say ""
-        shell.say "No tasks for current context '#{@@shell_context.active_context.full_path}'." 
+        shell.say "No tasks for current context '#{@@shell_context.active_context.full_path}'."
       end
 
       # remove helper 3. element in help item list
@@ -237,7 +239,7 @@ class Thor
         end
 
         unless sub_children.empty?
-          shell.say("  Change context (cc) to: #{sub_children.join(', ')}", :BOLD) 
+          shell.say("  Change context (cc) to: #{sub_children.join(', ')}", :BOLD)
           shell.say
         end
       end