dtk-client 0.5.17 → 0.5.18

data/lib/parser/adapters/thor.rb

@@ -31,7 +31,7 @@ module DTK
 
       # thor command specific constants
       ALT_IDENTIFIER_SEPARATOR = ':::'
-      
+
       def initialize(args, opts, config)
         @conn = config[:conn]
         super
@@ -41,7 +41,7 @@ module DTK
         @@shell_execution = shell_execution
 
         if method_name == 'help'
-          ret = start([method_name] + context_params.method_arguments,:conn => conn)      
+          ret = start([method_name] + context_params.method_arguments,:conn => conn)
         else
           ret = start([method_name, context_params] + (thor_options||[]),:conn => conn)
         end
@@ -103,15 +103,15 @@ module DTK
         subtype ||= {}
         current_ts = Time.now.to_i
         cache_id = (subtype.empty? ? :response : generate_cached_id(subtype))
-      
+
         # if @@cache_response is empty return true if not than return time difference between
         # current_ts and ts stored in cache
-        time_difference = @@cached_response[entity_name].nil? ? true : ((current_ts - @@cached_response[entity_name][:ts]) > TIME_DIFF) 
+        time_difference = @@cached_response[entity_name].nil? ? true : ((current_ts - @@cached_response[entity_name][:ts]) > TIME_DIFF)
 
         if (@@cached_response[entity_name])
           time_difference = true if @@cached_response[entity_name][cache_id].nil?
         end
-        
+
         if (time_difference || @@invalidate_map.include?(entity_name))
           response = post rest_url(url), subtype
 
@@ -149,8 +149,8 @@ module DTK
         # symbols don't have a <=> comparison operator in ruby 1.8.7
         subtype.map do |key,value|
           values += value.to_s
-        end  
-        
+        end
+
         Digest::SHA1.hexdigest(values)
       end
 
@@ -232,7 +232,7 @@ module DTK
             alternate_identifiers.each do |a_provider|
               if matched_alt_identifiers_data = task[1].usage.match(/\[?#{a_provider}.?(NAME\/ID|ID\/NAME)\]?/)
                 command_alt_sym = "#{command}_#{a_provider}".downcase.to_sym
-                cached_tasks[command_alt_sym] = cached_tasks.fetch(command_alt_sym,[]) 
+                cached_tasks[command_alt_sym] = cached_tasks.fetch(command_alt_sym,[])
                 cached_tasks[command_alt_sym] << task_name
                 # when found break
                 break
@@ -254,7 +254,7 @@ module DTK
               # if there are '[' it means it is optinal identifiers so it is tier 1 and tier 2 task
               cached_tasks[command_sym] << task_name if matched_data[0].include?('[')
             end
-            
+
             # n-level matching
             all_children.each do |child|
               current_children = []
@@ -268,7 +268,7 @@ module DTK
                 # n-context matching
                 matched_data = task[1].usage.match(/^\[?#{c.to_s.upcase}.?(NAME\/ID|ID\/NAME|ID|NAME)(\-?PATTERN)?\]?/)
                 if matched_data
-                  cached_tasks[child_id_sym] = cached_tasks.fetch(child_id_sym,[]) << task_name 
+                  cached_tasks[child_id_sym] = cached_tasks.fetch(child_id_sym,[]) << task_name
                 end
 
                 # override method list, we add these methods only once
@@ -290,7 +290,7 @@ module DTK
             end
           end
         end
-        
+
         # there is always help, and in all cases this is exception to the rule
         cached_tasks[command_id_sym] << 'help'
 
@@ -303,18 +303,18 @@ module DTK
 
         context_list = self.get_identifiers(conn, context_params)
         results = context_list.select { |e| e[:name].eql?(value) || e[:identifier].eql?(value.to_i)}
-        
+
         return results.empty? ? nil : results.first
       end
 
       def self.get_identifiers(conn, context_params)
         @conn    = conn if @conn.nil?
-  
+
         # we force raw output
         # options = Thor::CoreExt::HashWithIndifferentAccess.new({'list' => true})
 
         3.downto(1) do
-          # get list data from one of the methods             
+          # get list data from one of the methods
           if respond_to?(:validation_list)
             response = validation_list(context_params)
           else
@@ -324,12 +324,12 @@ module DTK
 
           unless (response.nil? || response.empty?)
             unless response['data'].nil?
-              identifiers = []           
+              identifiers = []
               response['data'].each do |element|
                 identifiers << { :name => element['display_name'], :identifier => element['id'] }
               end
               return identifiers
-            end          
+            end
           end
           unless response.nil?
             break if response["status"].eql?('ok')
@@ -343,6 +343,14 @@ module DTK
 
       no_tasks do
 
+        #
+        # Run shell command directly from main, use with CAUTION
+        #
+
+        def run_shell_command(line)
+          TOPLEVEL_BINDING.eval('self').execute_shell_command_internal(line)
+        end
+
         ##
         # Block that allows users to specify part of the code which is expected to run for longer duration
         #
@@ -379,7 +387,7 @@ module DTK
           name, usage = current_method_info
           results = usage.split(name.gsub(/_/,'-')).last || ""
           return results.split(' ')
-        end 
+        end
 
         #TODO: can make more efficient by having rest call that returns name from id, rather than using 'list path'
         #entity_id can be a name as well as an id
@@ -397,12 +405,12 @@ module DTK
             match = response['data'].find{|entity|entity_id == entity['id']}
           end
           unless match
-            raise DTK::Client::DtkError, "Not able to resolve entity name, please provide #{entity_type} name." 
+            raise DTK::Client::DtkError, "Not able to resolve entity name, please provide #{entity_type} name."
           end
           match['display_name']
         end
 
-        def is_numeric_id?(possible_id)             
+        def is_numeric_id?(possible_id)
           !possible_id.to_s.match(/^[0-9]+$/).nil?
         end
 
@@ -414,9 +422,9 @@ module DTK
               trap("INT", false)
               return line
             end
-          end          
+          end
         end
-        
+
         def get_type_and_raise_error_if_invalid(about, default_about, type_options)
           about ||= default_about
           raise DTK::Client::DtkError, "Not supported type '#{about}' for list for current context level. Possible type options: #{type_options.join(', ')}" unless type_options.include?(about)
@@ -425,8 +433,22 @@ module DTK
 
         # check for delimiter '/', if present returns namespace and name for module/service
         # returns: namespace, name
-        def get_namespace_and_name(input_remote_name)
-          (input_remote_name||'').include?('/') ? input_remote_name.split('/') : [nil, input_remote_name]
+        def get_namespace_and_name(input_remote_name, delimiter)
+          (input_remote_name||'').include?(delimiter) ? input_remote_name.split(delimiter) : [nil, input_remote_name]
+        end
+
+        def get_namespace_and_name_for_component(component_full_name)
+          namespace, name = nil, ''
+
+          if (component_full_name||'').include?(':')
+            match = component_full_name.match(/(\w*\-?\w*):{1}(.*)/)
+            namespace, name = [$1,$2]
+
+            return [nil, component_full_name] if (name.include?(':') && !name.include?('::'))
+            component_full_name = name
+          end
+
+          [namespace, component_full_name]
         end
       end
 
@@ -448,7 +470,7 @@ module DTK
       end
 
       #
-      # Returns list of invisible contexts with sufix provided (if any) 
+      # Returns list of invisible contexts with sufix provided (if any)
       #
 
       def self.invisible_context_list(sufix = 'identifier')
@@ -459,7 +481,7 @@ module DTK
       def help(*args)
         puts # pretty print
         not_dtk_clazz = true
-        
+
         if defined?(DTK::Client::Dtk)
           not_dtk_clazz = !self.class.eql?(DTK::Client::Dtk)
         end

data/lib/shell/context.rb

@@ -748,13 +748,21 @@ module DTK
       def load_extended_context_commands(extended_context_commands, active_context_copy)
         candidates = []
         entity_name = active_context_copy.last_context
+        parent_entity = active_context_copy.context_list[1]
 
         if entity_name.is_identifier?
           endpoint = extended_context_commands[:endpoint]
           url = extended_context_commands[:url]
           opts = extended_context_commands[:opts]||{}
 
-          id_label = "#{endpoint}_id".to_sym
+          if (parent_entity && parent_entity.is_identifier? && (parent_entity != entity_name))
+            parent_id_label = "#{endpoint}_id".to_sym
+            parent_id = parent_entity.identifier
+            opts[parent_id_label] = parent_id
+            id_label = "#{entity_name.entity}_id".to_sym
+          end
+
+          id_label ||= "#{endpoint}_id".to_sym
           id = entity_name.identifier
           opts[id_label] = id
 
@@ -968,7 +976,7 @@ module DTK
       private
 
       # list of commands that should be excluded from history
-      EXCLUDE_COMMAND_LIST = ['create-provider']
+      EXCLUDE_COMMAND_LIST = ['create-provider','create-ec2-provider','create-physical-provider']
 
       def self.is_allowed_command?(full_command_entry)
         found = EXCLUDE_COMMAND_LIST.find { |cmd| full_command_entry.include?(cmd) }

data/lib/shell.rb

@@ -17,7 +17,7 @@ require 'thor'
 $shell_mode = true
 
 ALIAS_COMMANDS = {
-  'ls' => 'list', 
+  'ls' => 'list',
   'cd' => 'cc',
   'rm' => 'delete'
 }
@@ -45,7 +45,7 @@ def run_shell_command()
     puts "\n"
     raise Interrupt
   }
-  
+
   # runtime part
   begin
     while line = Readline.readline(prompt, true)
@@ -75,7 +75,7 @@ def init_shell_context()
   begin
     @context      = DTK::Shell::Context.new
     @shell_header = DTK::Shell::HeaderShell.new
-    # loads root context 
+    # loads root context
     @context.load_context()
 
     @t1   = nil
@@ -121,10 +121,10 @@ def execute_shell_command(line, prompt)
       end
     end
 
-    
+
     if ('cc' == cmd)
       # in case there is no params we just reload command
-      args << "/" if args.empty?      
+      args << "/" if args.empty?
       prompt = @context.change_context(args, cmd)
     elsif ('popc' == cmd)
         @context.dirs.shift()
@@ -149,9 +149,9 @@ def execute_shell_command(line, prompt)
 
       # get all next-context-candidates (e.g. for assembly get all assembly_names)
       context_candidates = @context.get_ac_candidates_for_context(@context.active_context.last_context(), @context.active_context())
-      
+
       # this part of the code is used for calling of nested commands from base context (dtk:/>assembly/assembly_id converge)
-      # base_command is used to check if first command from n-level is valid e.g. 
+      # base_command is used to check if first command from n-level is valid e.g.
       # (dtk:/>assembly/assembly_id converge - chech if 'assembly' exists in context_candidates)
       # revert_context is used to return to context which command is called from after command is executed
       base_command = cmd.split('/').first
@@ -165,12 +165,12 @@ def execute_shell_command(line, prompt)
 
       if cmd.nil?
         prompt = @context.change_context(["-"]) if revert_context
-        raise DTK::Client::DtkValidationError, "You have to provide command after context name. Usage: CONTEXT-TYPE/CONTEXT-NAME COMMAND [ARG1] .. [ARG2]." 
+        raise DTK::Client::DtkValidationError, "You have to provide command after context name. Usage: CONTEXT-TYPE/CONTEXT-NAME COMMAND [ARG1] .. [ARG2]."
       end
 
       # send monkey patch class information about context
       Thor.set_context(@context)
-      
+
       # we get command and hash params, will return Validation error if command is not valid
       entity_name, method_name, context_params, thor_options, invalid_options = @context.get_command_parameters(cmd,args)
 
@@ -178,7 +178,7 @@ def execute_shell_command(line, prompt)
       if context_candidates.include?(method_name)
         context_params.add_context_to_params(method_name, entity_name, method_name)
         method_name = context_params.method_arguments.shift if context_params.method_arguments.size > 0
-      else        
+      else
         unless @context.method_valid?(method_name)
           prompt = @context.change_context(["-"]) if revert_context
           raise DTK::Client::DtkValidationError, "Method '#{method_name}' is not valid in current context."
@@ -194,7 +194,7 @@ def execute_shell_command(line, prompt)
       # when 'delete' or 'delete-and-destroy' command is executed reload cached tasks with latest commands
       unless (args.nil? || args.empty?)
         @context.reload_cached_tasks(entity_name) if (method_name.include?('delete') || method_name.include?('import'))
-      end       
+      end
 
       # check execution status, prints status to sttout
       DTK::Shell::StatusMonitor.check_status()
@@ -210,10 +210,16 @@ def execute_shell_command(line, prompt)
   rescue DTK::Shell::Error => e
     DtkLogger.instance.error(e.message, true)
   end
-  
+
   return prompt
 end
 
+public
+
+def execute_shell_command_internal(line)
+  execute_shell_command(line, DTK::Shell::Context::DTK_ROOT_PROMPT)
+end
+
 
 
 

data/lib/util/module_util.rb

@@ -0,0 +1,41 @@
+module DTK
+  module Client
+    module ModuleUtil
+
+      NAMESPACE_SEPERATOR = ':'
+
+      def self.resolve_name(module_name, module_namespace)
+        is_invalid = module_name.nil? || module_namespace.nil? || module_name.empty? || module_namespace.empty?
+        raise DtkError, "Failed to provide module name (#{module_name}) or namespace (#{module_namespace})" if is_invalid
+        "#{module_namespace}#{NAMESPACE_SEPERATOR}#{module_name}"
+      end
+
+      def self.join_name(module_name, module_namespace)
+        module_namespace ? resolve_name(module_name, module_namespace) : module_name
+      end
+
+      # returns [namespace,name]; namespace can be null if cant determine it
+      def self.full_module_name_parts?(name_or_full_module_name)
+        if name_or_full_module_name.nil?
+          return [nil,nil]
+        end
+        if name_or_full_module_name =~ Regexp.new("(^.+)#{NAMESPACE_SEPERATOR}(.+$)")
+          namespace,name = [$1,$2]
+        else
+          namespace,name = [nil,name_or_full_module_name]
+        end
+        [namespace,name]
+      end
+
+      def self.filter_module_name(name_or_full_module_name)
+        full_module_name_parts?(name_or_full_module_name).last
+      end
+
+      def self.check_format!(module_identifier)
+        return module_identifier if module_identifier.match(/^[0-9]+$/)
+        DtkLogger.instance.debug(caller)
+        raise DtkError, "Module name should be in following format NAMESPACE#{NAMESPACE_SEPERATOR}MODULE_NAME" unless module_identifier.match(Regexp.new("^.+#{NAMESPACE_SEPERATOR}.+$"))
+      end
+    end
+  end
+end

data/lib/util/os_util.rb

@@ -100,7 +100,8 @@ module DTK
 
         def module_location(module_type,module_name,version=nil,opts={})
           # compact used because module_name can be nil
-          module_location_parts(module_type,module_name,version,opts).compact.join('/')
+          location = module_location_parts(module_type,module_name,version,opts).compact.join('/')
+          location
         end
 
         # if module location is /a/b/d/mod it returns ['/a/b/d','mod']
@@ -116,7 +117,12 @@ module DTK
               ["#{base_all_types}/#{type}", module_name]
             end
           else
-            [base_path, "#{module_name}#{version && "-#{version}"}"]
+            # we detect if we are using full name
+            if (module_name.match(/(.*)#{ModuleUtil::NAMESPACE_SEPERATOR}(.*)/))
+              [base_path, "#{$1}", "#{$2}#{version && "-#{version}"}"]
+            else
+              [base_path, "#{module_name}#{version && "-#{version}"}"]
+            end
           end
         end
 
@@ -127,7 +133,7 @@ module DTK
         end
 
         def module_clone_location(module_type)
-          case module_type
+          case module_type.to_s
             when "component_module"
               return component_clone_location
             when "service_module"
@@ -135,7 +141,7 @@ module DTK
             when "test_module"
               test_clone_location
             else
-              raise Client::DtkError, "Unexpected module_type (#{module_type})"
+              raise Client::DtkError, "Unexpected module_type (#{module_type}) when determining module location"
             end
         end
 
@@ -158,12 +164,12 @@ module DTK
         def clone_base_path(module_type)
 
           path =
-            case module_type
+            case module_type.to_sym
               when :service_module then Config[:service_location]
               when :component_module then Config[:module_location]
               when :test_module then Config[:test_module_location]
               when :assembly_module then Config[:assembly_module_base_location]
-              else raise Client::DtkError, "Unexpected module_type (#{module_type})"
+              else raise Client::DtkError, "Unexpected module_type (#{module_type}) when determining base path"
             end
 
 
@@ -189,7 +195,19 @@ module DTK
         #
         def local_component_module_list()
           component_module_dir = component_clone_location()
-          Dir.entries(component_module_dir).select {|entry| File.directory? File.join(component_module_dir,entry) and !(entry =='.' || entry == '..') }
+
+          directories = Dir.entries(component_module_dir).map do |entry|
+            next if (entry =='.' || entry == '..' || entry.index('.') == 0)
+
+            Dir.entries("#{component_module_dir}/#{entry}").map do |m_entry|
+              next unless File.directory? File.join(component_module_dir,entry,m_entry)
+              next if (m_entry =='.' || m_entry == '..' || m_entry.index('.') == 0)
+
+              ModuleUtil.join_name(m_entry, entry)
+            end
+          end
+
+          directories.flatten.select { |d| !d.nil? }
         end
 
         # Public method will convert given string, to string with colorize output

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.5.17
+  version: 0.5.18
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2014-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -210,6 +210,7 @@ files:
 - lib/commands.rb
 - lib/commands/common/thor/access_control.rb
 - lib/commands/common/thor/action_result_handler.rb
+- lib/commands/common/thor/assembly_template.rb
 - lib/commands/common/thor/assembly_workspace.rb
 - lib/commands/common/thor/clone.rb
 - lib/commands/common/thor/common.rb
@@ -282,6 +283,7 @@ files:
 - lib/util/common_util.rb
 - lib/util/console.rb
 - lib/util/dtk_puppet.rb
+- lib/util/module_util.rb
 - lib/util/os_util.rb
 - lib/util/permission_util.rb
 - lib/util/remote_dependency_util.rb