dtk-client 0.6.8 → 0.7.0

data/lib/shell/domain/shadow_entity.rb

@@ -0,0 +1,59 @@
+##
+# This is temporary workaround to faciliate concept we are introducing
+#
+# Entity / Double Entity Identifier
+#
+
+module DTK
+  module Shell
+    class ShadowEntity
+
+      def self.resolve(context_entity)
+        entity, shadow_entity = context_entity.entity, context_entity.shadow_entity
+
+        return nil if shadow_entity.nil? || entity.nil?
+        entity_mapping = @shadow_mapping.fetch(entity.to_sym)
+
+        return entity_mapping ? entity_mapping.fetch(shadow_entity.to_sym) : nil
+      end
+
+      def self.resolve_tasks(context_entity)
+        entity, shadow_entity = context_entity.entity, context_entity.shadow_entity
+        entity_mapping = @shadow_mapping.fetch(entity.to_sym)
+
+        raise DTK::Client::DtkError, "You are missing mapping for shadow entity #{entity} / #{shadow_entity} you need to specify it" if entity_mapping.nil?
+
+        shadow_entity_mapping = entity_mapping.fetch(shadow_entity.to_sym)
+
+        # return just task names
+        return shadow_entity_mapping.collect { |se_map| se_map.first.split(' ').first }
+      end
+
+    private
+
+      @shadow_mapping = {
+        :node => {
+          :node_group => [
+            ["add-component COMPONENT", "# Add a component to the node."],
+            ["list-attributes", "# List attributes associated with service's node."],
+            ["list-components", "# List components associated with service's node."],
+            ["delete-component COMPONENT-NAME [-y]", "# Delete component from service's node"],
+            ["set-attribute ATTRIBUTE-NAME [VALUE] [-u]", "# (Un)Set attribute value. The option -u will unset the attribute's value."]
+          ],
+          :node_group_node => [
+            ["info", "# Return info about node instance belonging to given workspace."],
+            ["start", "# Start node instance."],
+            ["stop", "# Stop node instance."],
+            ["ssh REMOTE-USER [-i PATH-TO-PEM]", "# SSH into node, optional parameters are path to identity file."]
+          ]
+        }
+      }
+
+      if ::DTK::Configuration.get(:development_mode)
+        @shadow_mapping[:node][:node_group_node] << ["test-action-agent BASH-COMMAND-LINE", "# Run bash command on test action agent"]
+      end
+
+
+    end
+  end
+end

data/lib/shell/help_monkey_patch.rb

@@ -97,102 +97,107 @@ class Thor
           #
           override_tasks_obj = self.respond_to?(:override_allowed_methods) ? self.override_allowed_methods.dup : nil
 
+          shadow_list = ::DTK::Shell::ShadowEntity.resolve(active_context.last_context)
           # N-LEVEL-CONTEXT - context that has at least 2 commands and 1 or more identifiers
           # e.g. dtk:\assembly\assembly1\node>         THIS IS     N-LEVEL CONTEXT
           # e.g. dtk:\assembly\assembly1\node\node123> THIS IS     N-LEVEL CONTEXT
           # e.g. dtk:\assembly\assembly1>              THIS IS NOT N-LEVEL CONTEXT
           #
-          if (!active_context.is_n_context? || active_context.current_identifier?)
-
-            list.each do |help_item|
-              help_item.first.gsub!("^^", '') if help_item.first.include?("^^")
-
-              # 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?
-              else
-                # for help we only care about first context name / identifier
-                if !is_there_identifier
-                  # if it contains [] it is optional and will be available on both tiers
-                  if matched_data[0].include?('[')
-                    # we remove it, since there is no need to use it
-                    help_item.first.gsub!(matched_data[0],' ') unless help_item.nil?
-                    filtered_list << overriden_help(override_tasks_obj, help_item, true)
-                  end
+          unless shadow_list
+            if (!active_context.is_n_context? || active_context.current_identifier?)
+
+              list.each do |help_item|
+                help_item.first.gsub!("^^", '') if help_item.first.include?("^^")
+
+                # 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?
                 else
-                  # Adding alt identifiers here
-                  if alt_matched_data
-                    if active_context.current_alt_identifier?
-                      help_item.first.gsub!(matched_data[0],'') unless help_item.nil?
-                      filtered_list << overriden_help(override_tasks_obj, help_item, false)
+                  # for help we only care about first context name / identifier
+                  if !is_there_identifier
+                    # if it contains [] it is optional and will be available on both tiers
+                    if matched_data[0].include?('[')
+                      # we remove it, since there is no need to use it
+                      help_item.first.gsub!(matched_data[0],' ') unless help_item.nil?
+                      filtered_list << overriden_help(override_tasks_obj, help_item, true)
                     end
                   else
-                    unless active_context.current_alt_identifier?
-                      help_item.first.gsub!(matched_data[0],'') unless help_item.nil?
-                      filtered_list << overriden_help(override_tasks_obj, help_item, false)
+                    # Adding alt identifiers here
+                    if alt_matched_data
+                      if active_context.current_alt_identifier?
+                        help_item.first.gsub!(matched_data[0],'') unless help_item.nil?
+                        filtered_list << overriden_help(override_tasks_obj, help_item, false)
+                      end
+                    else
+                      unless active_context.current_alt_identifier?
+                        help_item.first.gsub!(matched_data[0],'') unless help_item.nil?
+                        filtered_list << overriden_help(override_tasks_obj, help_item, false)
+                      end
                     end
                   end
                 end
               end
             end
-          end
 
-          # This will return commands that have identifiers
-          # e.g. dtk:\assembly\assembly1\node\node123> => ['assembly','node']
-          commands_that_have_identifiers =  active_context.commands_that_have_identifiers()
-          is_n_level_context             = active_context.command_list.size > 1
-
-          # first one does not count
-          if is_n_level_context
-            # additional filter list for n-context
-            n_filter_list = []
-            # 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
-              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
+            # This will return commands that have identifiers
+            # e.g. dtk:\assembly\assembly1\node\node123> => ['assembly','node']
+            commands_that_have_identifiers =  active_context.commands_that_have_identifiers()
+            is_n_level_context             = active_context.command_list.size > 1
+
+            # first one does not count
+            if is_n_level_context
+              # additional filter list for n-context
+              n_filter_list = []
+              # 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
+                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
-            end
 
-            if override_tasks_obj && is_n_level_context
-              last_entity_name = active_context.last_context_entity_name.to_sym
+              if override_tasks_obj && is_n_level_context
+                last_entity_name = active_context.last_context_entity_name.to_sym
 
-              # we get commands task, and identifier tasks for given entity (e.g. :assembly)
-              command_o_tasks, identifier_o_tasks = override_tasks_obj.get_all_tasks(last_entity_name)
+                # we get commands task, and identifier tasks for given entity (e.g. :assembly)
+                command_o_tasks, identifier_o_tasks = override_tasks_obj.get_all_tasks(last_entity_name)
 
-              if active_context.current_identifier?
-                identifier_o_tasks.each do |o_task|
-                  n_filter_list << [o_task[1],o_task[2]]
-                end
-              else
-                command_o_tasks.each do |o_task|
-                  n_filter_list << [o_task[1],o_task[2]]
+                if active_context.current_identifier?
+                  identifier_o_tasks.each do |o_task|
+                    n_filter_list << [o_task[1],o_task[2]]
+                  end
+                else
+                  command_o_tasks.each do |o_task|
+                    n_filter_list << [o_task[1],o_task[2]]
+                  end
                 end
               end
+
+              # 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
 
-            # we have just filtered those methods that have attribute for given entity
-            # and also are last in the list
-            filtered_list = n_filter_list
+            # remove double spaces
+            list = filtered_list.each { |e| e.first.gsub!(/  /,' ') }
+          else
+            list = shadow_list
           end
-
-          # remove double spaces
-          list = filtered_list.each { |e| e.first.gsub!(/  /,' ') }
         end
       else
         # no dtk-shell just dtk, we make sure that underscore is not used '_'

data/lib/shell/message_queue.rb

@@ -1,3 +1,5 @@
+# TODO-REMOVE: Check if we need this anymore
+
 dtk_require_from_base('util/os_util')
 
 module DTK

data/lib/shell/status_monitor.rb

@@ -1,3 +1,5 @@
+# TODO-REMOVE: Check if we need this anymore
+
 require 'thread'
 require 'singleton'
 require 'colorize'
@@ -5,7 +7,7 @@ require 'colorize'
 
 # This singleton is used to check status on running processes on the server side
 # Once certain task is complete it will give notice to user da certain task has been completed
-# At the moment this only 
+# At the moment this only
 
 module DTK
   module Shell
@@ -71,12 +73,12 @@ module DTK
               # we break if there is error in response
               break unless response.ok?
             end
-            
+
             DTK::Shell::TaskStatusThread.current.finished = true
 
             if response.ok?
               DTK::Shell::TaskStatusThread.current.status = response.data['status'].upcase
-            else                
+            else
               DTK::Shell::TaskStatusThread.current.status = "RESPONSE NOT OK, RESPONSE: #{response}"
             end
 

data/lib/shell.rb

@@ -4,7 +4,7 @@ require File.expand_path('commands/thor/dtk',       File.dirname(__FILE__))
 require File.expand_path('error',                   File.dirname(__FILE__))
 
 # load all from shell directory since those are required
-Dir[File.expand_path('shell/*.rb', File.dirname(__FILE__))].each { |file| require file }
+Dir[File.expand_path('shell/**/*.rb', File.dirname(__FILE__))].each { |file| require file }
 
 require 'shellwords'
 require 'readline'
@@ -94,7 +94,9 @@ end
 def execute_shell_command(line, prompt)
    begin
     # remove single/double quotes from string because shellwords module is not able to parse it
-    line.gsub!(/['"]/, '')
+    if matched = line.scan(/['"]/)
+      line.gsub!(/['"]/, '') if matched.size.odd?
+    end
 
     # some special cases
     raise DTK::Shell::ExitSignal if line == 'exit'

data/lib/util/dtk_puppet.rb

@@ -1,8 +1,10 @@
+# TODO-REMOVE: Check if we need this anymore
+
 module DTK
   module Client
     #
     # Class is used as puppet wrapper, at the moment it will use console comamnds, later
-    # to be replaced with direct usage of puppet code, or re-implentation of their direct calls 
+    # to be replaced with direct usage of puppet code, or re-implentation of their direct calls
     #
     class DtkPuppet
 
@@ -14,16 +16,16 @@ module DTK
       # Returns: Name of directory where module is saved
       def self.install_module(module_name)
         output = nil
-        
+
         OsUtil.suspend_output do
           output = `puppet module install #{module_name} --modulepath #{MODULE_PATH} --force --render-as json`
         end
-      
+
         # extract json from output, regex will match json in string
         matched = output.match(/\{.+\}/)
 
         raise DTK::Client::DtkError, "Puppet module '#{module_name}' not found." unless matched
-        
+
         # parse matched json
         result = JSON.parse(matched[0])
 
@@ -34,13 +36,13 @@ module DTK
           filtered = filtered.split(/\n/).map(&:strip).join(', ')
           raise DTK::Client::DtkError, filtered
         end
-        
+
         # puppet uses last part of the module name, as dir for location
         dir_name = module_name.split('-').last
         puts "Successfully installed '#{module_name}' from puppet forge, location: '#{MODULE_PATH}/#{dir_name}'"
         return dir_name
       end
-      
+
     end
   end
 end

data/lib/util/os_util.rb

@@ -282,7 +282,11 @@ module DTK
             load File.expand_path('../../lib/util/ssh_util.rb', File.dirname(__FILE__))
             load File.expand_path('../../lib/util/remote_dependency_util.rb', File.dirname(__FILE__))
             load File.expand_path('../../lib/shell/help_monkey_patch.rb', File.dirname(__FILE__))
-            load File.expand_path('../../lib/shell/domain.rb', File.dirname(__FILE__))
+            load File.expand_path('../../lib/shell/domain/context_entity.rb', File.dirname(__FILE__))
+            load File.expand_path('../../lib/shell/domain/active_context.rb', File.dirname(__FILE__))
+            load File.expand_path('../../lib/shell/domain/context_params.rb', File.dirname(__FILE__))
+            load File.expand_path('../../lib/shell/domain/override_tasks.rb', File.dirname(__FILE__))
+            load File.expand_path('../../lib/shell/context.rb', File.dirname(__FILE__))
             load File.expand_path('../../lib/domain/git_adapter.rb', File.dirname(__FILE__))
             load File.expand_path('../../lib/command_helpers/git_repo.rb', File.dirname(__FILE__))
             load File.expand_path('../../lib/command_helpers/service_importer.rb', File.dirname(__FILE__))

data/lib/view_processor/table_print.rb

@@ -70,12 +70,16 @@ module DTK
         data = [data] unless data.kind_of?(Array)
 
         data.each do |data_element|
+          # special flag to filter out data not needed here
+          next if data_element['dtk_client_hidden']
+
           structured_data << to_ostruct(data_element)
         end
 
         # we use array of OpenStruct to hold our evaluated values
         @evaluated_data = []
         @error_data     = []
+        @action_data    = []
         structured_data.each do |structured_element|
           evaluated_element = DtkOpenStruct.new
           error_element     = DtkOpenStruct.new
@@ -88,7 +92,8 @@ module DTK
 
               if print_error_table && k.include?('error')
                 error_message = value_of(structured_element, v)
-                            
+                server_error = nil
+
                 # here we see if there was an error if not we will skip this
                 # if so we add it to @error_data
 
@@ -99,25 +104,58 @@ module DTK
                   error_index = ""
                   error_type = value_of(structured_element,'errors.dtk_type') || ""
 
+                  if error_type.empty?
+                    val = value_of(structured_element,'dtk_type')||''
+                    # extract e.g. 3.1.1.1 from '3.1.1.1 action' etc.
+                    error_type = val.scan( /\d+[,.]\d?[,.]?\d?[,.]?\d?[,.]?\d?/ ).first
+                  end
+
                   # we set index for each message first => [ 1 ], second => [ 2 ], etc.
                   if error_type == "user_error" || error_type == "test_error"
                     error_index = "[ #{@error_data.size + 1} ]"
+                  else
+                    server_error = true
+                    error_index = error_type
                   end
 
                   # original table takes that index
                   evaluated_element.send("#{k}=", error_index)
                   # we set new error element
                   error_element.id       = error_index
-                  if error_index.empty?  
-                    error_element.message = "[SERVER ERROR] " + error_message 
+                  # if error_index.empty?
+                  if server_error
+                    error_element.message = "[SERVER ERROR] " + error_message
                   else
                     error_element.message = "[USER ERROR] " + error_message if error_type == "user_error"
-                    error_element.message = "[TEST ERROR] " + error_message if error_type == "test_error"  
+                    error_element.message = "[TEST ERROR] " + error_message if error_type == "test_error"
                   end
 
                   # add it with other
                   @error_data << error_element
                 end
+              elsif k.include?('action')
+                error_message = value_of(structured_element, v)
+
+                # here we see if there was an error if not we will skip this
+                # if so we add it to @error_data
+
+                if error_message.empty?
+                  # no error message just add it as regular element
+                  evaluated_element.send("#{k}=",value_of(structured_element, v))
+                else
+                  error_index = "[ #{value_of(structured_element,'logs.label')} ]" || ""
+                  error_type = value_of(structured_element,'logs.dtk_type') || ""
+
+                  # original table takes that index
+                  evaluated_element.send("#{k}=", error_index)
+
+                  # we set new error element
+                  error_element.id      = error_index
+                  error_element.message = error_message
+
+                  # add it with other
+                  @action_data << error_element
+                end
               else
                 evaluated_element.send("#{k}=", value_of(structured_element, v))
                 # eval "evaluated_element.#{k}=structured_element.#{v}"
@@ -129,8 +167,12 @@ module DTK
                 # make sure when in development to disable this TODO: better solution needed
                 raise DTK::Client::DtkError,"Error with missing metadata occurred. There is a mistake in table metadata or unexpected data presented to table view."
               end
-            end 
+            end
           end
+
+          @order_definition.delete('action')
+          @order_definition.delete('errors')
+
           @evaluated_data << evaluated_element
         end
       end
@@ -178,12 +220,12 @@ module DTK
         unless (forced_metadata['order'].nil? || forced_metadata['mapping'].nil?)
           return if (forced_metadata['order'].class.eql?(Array) && forced_metadata['mapping'].class.eql?(Hash))
         end
-        
+
         raise DTK::Client::DtkError,"Provided table definition is not valid. Please review your order and mapping for provided definition: \n #{forced_metadata.inspect}"
       end
 
       def filter_remove_underscore(field)
-        
+
       end
 
       def print
@@ -196,10 +238,23 @@ module DTK
         unless @error_data.empty?
           printf "\nERRORS: \n\n"
           #table(@error_data,{:fields => [ :id, :message ]})
-          @error_data.each do |error_row| 
+          @error_data.each do |error_row|
             printf "%15s %s\n", error_row.id.colorize(:yellow), error_row.message.colorize(:red)
           end
         end
+
+        unless @action_data.empty?
+          printf " \n"
+          #table(@error_data,{:fields => [ :id, :message ]})
+          printed = []
+          @action_data.each do |action_row|
+            # printf "%15s\n"
+            # printf("  INFO: #{action_row.message.colorize(:yellow)} \n") #, action_row.id.colorize(:yellow), action_row.message.colorize(:yellow)
+            message = action_row.message
+            printf "%15s %s\n", "INFO:".colorize(:yellow), message.colorize(:yellow) unless printed.include?(message)
+            printed << message
+          end
+        end
       end
 
       private
@@ -223,7 +278,7 @@ module DTK
         case
           when command.include?('map{')
             matched_data = command.match(/\['(.+)'\]/)
-            
+
             my_lambda = lambda{|_x| _x.map{|r|r["#{matched_data[1]}"]||[]}}
             value = my_lambda.call(value)
 
@@ -242,19 +297,19 @@ module DTK
             value = value.send('[]',params)
           when command.start_with?("list_")
             matched_data = command.match(/list_(.+)/)
-            
+
             my_lambda = lambda{|_x| _x.map{|r|r["#{matched_data[1]}"]||[]}}
             value = my_lambda.call(value)
 
             raise DTK::Client::DtkError,"There is a mistake in table metadata: #{command.inspect}" if value.nil?
           when command.start_with?("count_")
             matched_data = command.match(/count_(.+)/)
-            
+
             my_lambda = lambda{|_x| _x.map{|r|r["#{matched_data[1]}"]||[]}.flatten.size}
             value = my_lambda.call(value)
 
             raise DTK::Client::DtkError,"There is a mistake in table metadata: #{command.inspect}" if value.nil?
-          else 
+          else
             value = value.send(command)
         end
         return value

data/spec/lib/spec_thor.rb

@@ -1,7 +1,10 @@
 require File.expand_path('../../lib/client', File.dirname(__FILE__))
 require File.expand_path('../../lib/parser/adapters/thor',    File.dirname(__FILE__))
 require File.expand_path('../../lib/shell/context', File.dirname(__FILE__))
-require File.expand_path('../../lib/shell/domain', File.dirname(__FILE__))
+require File.expand_path('../../lib/shell/domain/context_entity', File.dirname(__FILE__))
+require File.expand_path('../../lib/shell/domain/active_context', File.dirname(__FILE__))
+require File.expand_path('../../lib/shell/domain/context_params', File.dirname(__FILE__))
+require File.expand_path('../../lib/shell/domain/override_tasks', File.dirname(__FILE__))
 Dir[File.expand_path('../../lib/shell/parse_monkey_patch.rb', File.dirname(__FILE__))].each {|file| require file }
 
 require 'shellwords'
@@ -92,7 +95,7 @@ module SpecThor
     gsub(regex, '').chomp
   end
 
-  private 
+  private
 
   ##
   # Method will take task name from class name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.7.0
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-19 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -219,6 +219,7 @@ files:
 - lib/commands/common/thor/list_diffs.rb
 - lib/commands/common/thor/module.rb
 - lib/commands/common/thor/module/import.rb
+- lib/commands/common/thor/poller.rb
 - lib/commands/common/thor/pull_clone_changes.rb
 - lib/commands/common/thor/pull_from_remote.rb
 - lib/commands/common/thor/puppet_forge.rb
@@ -228,6 +229,7 @@ files:
 - lib/commands/common/thor/reparse.rb
 - lib/commands/common/thor/set_required_params.rb
 - lib/commands/common/thor/task_status.rb
+- lib/commands/common/thor/test_action_agent.rb
 - lib/commands/thor/account.rb
 - lib/commands/thor/assembly.rb
 - lib/commands/thor/attribute.rb
@@ -276,7 +278,11 @@ files:
 - lib/shell.rb
 - lib/shell/context.rb
 - lib/shell/context_aux.rb
-- lib/shell/domain.rb
+- lib/shell/domain/active_context.rb
+- lib/shell/domain/context_entity.rb
+- lib/shell/domain/context_params.rb
+- lib/shell/domain/override_tasks.rb
+- lib/shell/domain/shadow_entity.rb
 - lib/shell/header_shell.rb
 - lib/shell/help_monkey_patch.rb
 - lib/shell/interactive_wizard.rb