dtk-client 0.5.10 → 0.5.12

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDEyNmM1MGE3NzA2MzQ5OGMyMzhhNDVjZDUxY2JkMmE0MTYxNDFkYQ==
+    NTZhMDBlMWM1ZWUzYjFiNWFlNTg2NDJmZTE2MjQ2ZGU4YmFjYmZiMQ==
   data.tar.gz: !binary |-
-    MWRiODEwOTRkYjNkZDRhNzI4ZjNmNjVjZmQ3ODQwMmI1Y2VjMTQwNQ==
+    NWNkODg5NjU2NWJmN2Q4YzkzNDZmZTE1NzU1OTE5YWExZmJhNzVmZA==
 SHA512:
   metadata.gz: !binary |-
-    MjE1MzUwZTNlZTMzMWY3OTRkMWJhNGJmNDQyZjU2YTM2YjkwYWFhZjczZjRh
-    ODY2NTVjOTI5M2Y2YzVkYjFhMzlhMmYzMTcwZDZiZmNjZDNmM2VhZWIzZGY3
-    MzMyYzBlZDM3ZDQxNjVlOGQ4MjYzNmY3ZWEwMmE1OTIxYjkzNDY=
+    MzQ0ZmVmYmM0NmY4NmJlMGZiYWFmODY0NWYyOTI5YWFmYmJjZWViZDliNGY5
+    YTFlMjRmZTZlZTI0NWI3OTFlNDIyZGNkZmIyYTZlODgyMWZhNGRmZDNlNDZj
+    NzRmMzMyYzgzMTllOWMyOTZlZTFhMWJkNGQwM2VhZjI1NmIyZGQ=
   data.tar.gz: !binary |-
-    MzQwYzQ0YjhkOTRlNzkyZDJjZDQ1NzY1ZjMxYjc3ZGE5NmEyYTlmMjVmNTlj
-    NGU3NzMzMWE1ZGE5MTc0ZGMxNDY2MWQ4MTU0MjhkNjZlY2MzOWM3MjQyOWQx
-    MDYyNjMzNmI4MDlhZTkwYzIwNWQ0MWNmN2VmMzUwMWYzYzYwMDY=
+    MTUwYzA1Y2E0NzEwY2Y0ZGZkMDcwNzRkNTVlOWNmZDBkZTkwY2M5NjQ3NzUz
+    MWY5ZTEzMmNlOGQ5NGNlY2EwYzg3ZTU3ZjQ2M2ExNTcyNzA0YmZmOGY5ZmIy
+    YTkxNzQ0OGVkMTYxZmI3MDZiZmRkYzk1Y2I3YjM5M2M3N2RkYTQ=

data/bin/dtk

@@ -9,7 +9,6 @@ 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/commands/thor/account', File.dirname(__FILE__))
-require File.expand_path('../lib/command_helpers/ssh_processing', File.dirname(__FILE__))
 require File.expand_path('../lib/shell/parse_monkey_patch', File.dirname(__FILE__))
 require File.expand_path('../lib/shell/help_monkey_patch', File.dirname(__FILE__))
 
@@ -18,13 +17,13 @@ require 'shellwords'
 
 $: << "/usr/lib/ruby/1.8/" #TODO: put in to get around path problem in rvm 1.9.2 environment
 
-::DTK::Client::Configurator.check_config_exists
+config_exists = ::DTK::Client::Configurator.check_config_exists
 ::DTK::Client::Configurator.check_git
 ::DTK::Client::Configurator.create_missing_clone_dirs
 
 
 # check if .add_direct_access file exists, if not then add direct access and create .add_direct_access file
-resolve_direct_access(::DTK::Client::Configurator.check_direct_access)
+resolve_direct_access(::DTK::Client::Configurator.check_direct_access, config_exists)
 entries = []
 
 if ARGV.size > 0

data/bin/dtk-shell

@@ -1,15 +1,14 @@
 #!/usr/bin/env ruby
 require File.expand_path('../lib/shell', File.dirname(__FILE__))
 require File.expand_path('../lib/commands/thor/account', File.dirname(__FILE__))
-require File.expand_path('../lib/command_helpers/ssh_processing', File.dirname(__FILE__))
 
 trap("INT", "SIG_IGN")
 
-::DTK::Client::Configurator.check_config_exists
+config_exists = ::DTK::Client::Configurator.check_config_exists
 ::DTK::Client::Configurator.check_git
 ::DTK::Client::Configurator.create_missing_clone_dirs
 
 # check if .add_direct_access file exists, if not then add direct access and create .add_direct_access file
-resolve_direct_access(::DTK::Client::Configurator.check_direct_access)
+resolve_direct_access(::DTK::Client::Configurator.check_direct_access, config_exists)
 
 run_shell_command()

data/dtk-client.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'hirb','~> 0.7.0'
   gem.add_dependency 'thor','~> 0.15.4'
   gem.add_dependency 'erubis','~> 2.7.0'
-  gem.add_dependency 'dtk-common-core','~> 0.5.4'
+  gem.add_dependency 'dtk-common-core','~> 0.5.10'
   gem.add_dependency 'git','~> 1.2.6'
   gem.add_dependency 'colorize','~> 0.5.8'
   gem.add_dependency 'highline', '1.6.16'

data/lib/auxiliary.rb

@@ -9,5 +9,37 @@ module DTK
         command_class.to_s.gsub(/^.*::/, '').gsub(/Command$/,'').scan(/[A-Z][a-z]+/).map{|w|w.downcase}.join(seperator)
       end
     end
+
+    #TODO: probably move this
+    class PostBody < Hash
+      def initialize(raw={})
+        super()
+        unless raw.empty?
+          replace(convert(raw))
+        end
+      end
+      def merge(raw)
+        super(convert(raw))
+      end
+      def merge!(raw)
+        super(convert(raw))
+      end
+
+     private
+      def convert(raw)
+        raw.inject(Hash.new) do |h,(k,v)|
+          if non_null_var = is_only_non_null_var?(k)
+            v.nil? ? h : h.merge(non_null_var => v)
+          else
+            h.merge(k => v)
+          end
+        end
+      end
+      def is_only_non_null_var?(k)
+        if k.to_s =~ /\?$/
+          k.to_s.gsub(/\?$/,'').to_sym
+        end
+      end
+    end
   end
 end

data/lib/command_helpers/service_importer.rb

@@ -20,11 +20,18 @@ module DTK::Client
     #
     def trigger_module_component_import(missing_component_list,opts={})      
       puts "Auto-importing missing component module(s)"
+      does_not_exist, modules_to_import = validate_missing_components(missing_component_list)
 
-      missing_component_list.each do |m_module|
-        print "Importing component module '#{m_module['name']}' ... "
+      unless does_not_exist.empty?
+        module_names = does_not_exist.collect{|x| "#{x['namespace']}/#{x['name']}"}
+        OsUtil.print("Component modules '#{module_names}' required by service module does not exist on repo manager and will not be imported!", :yellow)
+        return false unless Console.confirmation_prompt("Do you want to continue with import of available component modules and service module"+'?')
+      end
+      
+      modules_to_import.each do |m_module|
         module_name = "#{m_module['namespace']}/#{m_module['name']}"
-        module_name += "/#{m_module['version']}" if m_module['version']
+        module_name += "-#{m_module['version']}" if m_module['version']
+        print "Importing component module '#{module_name}' ... "
         new_context_params = ::DTK::Shell::ContextParams.new([module_name])
         new_context_params.override_method_argument!('option_2', m_module['version'])
         new_context_params.forward_options( { "skip_cloning" => true}).merge!(opts)
@@ -37,14 +44,47 @@ module DTK::Client
       Response::Ok.new()
     end
 
+    # check if component modules dependencies specified in service module exist on repo manager
+    def validate_missing_components(missing_component_list)
+      thor_options = {}
+      thor_options["remote"] = true
+      new_context_params = ::DTK::Shell::ContextParams.new
+      new_context_params.forward_options(thor_options)
+      new_context_params.add_context_to_params(:"component-module", :"component-module")
+      response = ContextRouter.routeTask("component_module", "list", new_context_params, @conn)
+      return response unless response.ok?
+
+      does_not_exist, modules_to_import = [], []
+
+      missing_component_list.each do |missing_cmp|
+        cmp = response.data.select{|x| x['display_name'].eql?("#{missing_cmp['namespace']}/#{missing_cmp['name']}")}
+        if cmp.empty?
+          does_not_exist << missing_cmp
+        else
+          cmp = cmp.first
+          if remote_version = cmp['versions']
+            missing_version = missing_cmp['version']||'CURRENT'
+            does_not_exist << missing_cmp unless (remote_version.include?(missing_version))
+          else
+            does_not_exist << missing_cmp if missing_cmp['version']
+          end
+        end
+      end
+
+      modules_to_import = missing_component_list - does_not_exist
+      return does_not_exist, modules_to_import
+    end
+
     def resolve_missing_components(service_module_id, service_module_name, namespace_to_use, force_clone=false)
       # Get dependency component modules and cross reference them with local component modules
       module_component_list = post rest_url("service_module/list_component_modules"), { :service_module_id => service_module_id }
       local_modules, needed_modules = OsUtil.local_component_module_list(), Array.new
 
-      module_component_list.data.each do |dependency_module|
-        unless local_modules.include?(formated_name = formulate_module_name(dependency_module['display_name'], dependency_module['version']))
-          needed_modules << dependency_module.merge({'formated_name' => formated_name})
+      if module_component_list
+        module_component_list.data.each do |dependency_module|
+          unless local_modules.include?(formated_name = formulate_module_name(dependency_module['display_name'], dependency_module['version']))
+            needed_modules << dependency_module.merge({'formated_name' => formated_name})
+          end
         end
       end
 

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

@@ -0,0 +1,52 @@
+module DTK
+  module Client
+    module ActionResultHandler
+
+      def print_action_results(action_results_id, number_of_retries=8)
+        response = action_results(action_results_id, number_of_retries)
+
+        if response.ok? && response.data['results']
+          response.data['results'].each do |k,v|
+            if v['error']
+              OsUtil.print("#{v['error']} (#{k})", :red)
+            else
+              OsUtil.print("#{v['message']} (#{k})", :yellow)
+            end
+          end
+        else
+          OsUtil.print("Not able to process given request, we apologise for inconvenience", :red)
+        end
+
+        nil
+      end
+
+      def action_results(action_results_id, number_of_retries=8)
+        action_body = {
+          :action_results_id => action_results_id,
+          :return_only_if_complete => true,
+          :disable_post_processing => true
+        }
+        response = nil
+
+        number_of_retries.times do
+          response = post(rest_url("assembly/get_action_results"),action_body)
+
+          # server has found an error
+          unless response.data(:results).nil?
+            if response.data(:results)['error']
+              raise DTK::Client::DtkError, response.data(:results)['error']
+            end
+          end
+
+          break if response.data(:is_complete)
+
+          sleep(1.5)
+        end
+
+        response
+
+      end
+      
+    end
+  end
+end

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

@@ -722,8 +722,8 @@ module DTK::Client
     end
 
     def execute_tests_aux(context_params)
-      execute_test_tries = 6
-      execute_test_sleep = 0.5
+      execute_test_tries = 10
+      execute_test_sleep = 1
 
       assembly_or_workspace_id,node_id = context_params.retrieve_arguments([REQ_ASSEMBLY_OR_WS_ID,:node_id],method_argument_names)
 
@@ -738,13 +738,28 @@ module DTK::Client
       response = post(rest_url("assembly/info_about"),post_body)
 
       components = []
-
       if !response['data'].nil?
         response['data'].each do |c|
           components << c['display_name']
         end
       end
 
+      #Filter out request per specific component
+      #Filter works for two types of component notation provided: node/component and component
+      if !options["component"].nil?
+          components.reject! do |c|
+            if options["component"].include? "/" 
+              c != options["component"] 
+            else
+              c.split("/").last != options["component"]
+            end
+          end
+      end
+
+      if components.empty?
+        components = nil 
+      end
+
       post_body = {
         :assembly_id => assembly_or_workspace_id,
         :node_id => node_id,
@@ -752,6 +767,7 @@ module DTK::Client
       }  
 
       response = post(rest_url("assembly/initiate_execute_tests"),post_body)
+      raise DTK::Client::DtkValidationError, response.data(:errors).first if response.data(:errors)
       return response unless response.ok?
 
       action_results_id = response.data(:action_results_id)
@@ -776,16 +792,8 @@ module DTK::Client
           sleep execute_test_sleep
         end
       end
-      filtered = response.data(:results)
-
-      #Filter out results per specific component
-      if !options["component"].nil?
-          filtered.reject! do |element|
-            element["component_name"] != options["component"]
-          end
-      end
 
-      response.set_data(*filtered)
+      response.set_data(*response.data(:results))
       response.render_table(:execute_tests_data)
     end
 
@@ -1161,6 +1169,7 @@ module DTK::Client
 
       post_body[:about] = about
       response = post rest_url(rest_endpoint), post_body
+
       # set render view to be used
       unless format
         response.render_table(data_type, use_default)

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

@@ -30,5 +30,22 @@ module DTK::Client
       end
       post_body
     end
+
+    def get_remote_module_info_aux(module_type,module_id,remote_namespace,version=nil)
+      id_field      = "#{module_type}_id"
+      rsa_pub_value = SSHUtil.rsa_pub_key_content()
+
+      post_body = {
+        id_field => module_id,
+        :rsa_pub_key => rsa_pub_value,
+        :access_rights => "rw",
+        :action => "push"
+      }
+      post_body.merge!(:version => version) if version
+      post_body.merge!(:remote_namespace => remote_namespace) if remote_namespace
+
+      post(rest_url("#{module_type}/get_remote_module_info"),post_body)
+    end
+
   end
 end

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

@@ -2,7 +2,7 @@ module DTK::Client
   module ListDiffsMixin
   	def list_diffs_aux(module_type,module_id,remote,version=nil)
   		id_field    = "#{module_type}_id"
-      path_to_key = SshProcessing.default_rsa_pub_key_path()
+      path_to_key = SSHUtil.default_rsa_pub_key_path()
       rsa_pub_key = File.file?(path_to_key) && File.open(path_to_key){|f|f.read}.chomp
 
       post_body = {

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

@@ -1,39 +1,20 @@
 module DTK::Client
   module PullFromRemoteMixin
-
-    ##
-    #
-    # module_type: will be :component_module or :service_module
-    def import_module_component_dependencies(module_id)
-      post_body = {
-        :service_module_id => module_id
-      }
-      response = post(rest_url("service_module/resolve_pull_from_remote"),post_body)
-
-      print "Resolving dependencies please wait ... "
-      
-      if (response.ok? && !(missing_components = response.data(:missing_modules)).empty?)
-        puts " New dependencies found, Installing."
-
-        trigger_module_component_import(missing_components)
-        puts "Resuming pull from remote ..."
-      else
-        puts 'Done.'
-      end
-    end
-
-    def pull_from_remote_aux(module_type,module_id,version=nil)
+    def pull_from_remote_aux(module_type,module_id,opts={})
+      version = opts[:version]
+      remote_namespace = opts[:remote_namespace]
       #get remote module info, errors raised if remote is not linked or access errors
-      path_to_key = SshProcessing.default_rsa_pub_key_path()
+      path_to_key = SSHUtil.default_rsa_pub_key_path()
       rsa_pub_key = File.file?(path_to_key) && File.open(path_to_key){|f|f.read}.chomp
 
-      post_body = {
+      post_body = PostBody.new(
         PullFromRemote.id_field(module_type) => module_id,
         :access_rights => "r",
-        :action => "pull"
-      }
-      post_body.merge!(:version => version) if version
-      post_body.merge!(:rsa_pub_key => rsa_pub_key) if rsa_pub_key
+        :action => "pull",
+        :version? => version,
+        :remote_namespace? => remote_namespace,
+        :rsa_pub_key? => rsa_pub_key
+      )
       response = post(rest_url("#{module_type}/get_remote_module_info"),post_body)      
       return response unless response.ok?
       module_name = response.data(:module_name)
@@ -41,8 +22,9 @@ module DTK::Client
       remote_params.merge!(:version => version) if version
 
       #check and import component module dependencies before importing service itself
-      import_module_component_dependencies(module_id) if (module_type == :service_module)
-
+      if (module_type == :service_module)
+        import_module_component_dependencies(module_id,remote_namespace) 
+      end
       # check whether a local module exists to determine whether pull from local clone or try to pull from server
       if Helper(:git_repo).local_clone_exists?(module_type,module_name,version)
         unless rsa_pub_key
@@ -53,14 +35,37 @@ module DTK::Client
         PullFromRemote.perform_on_server(self,module_type,module_id,module_name,remote_params)
       end
     end
+
    private
+
+    ##
+    #
+    # module_type: will be :component_module or :service_module
+    def import_module_component_dependencies(module_id,remote_namespace=nil)
+      post_body = PostBody.new(
+        :service_module_id => module_id,
+        :remote_namespace? => remote_namespace
+      )
+      response = post(rest_url("service_module/resolve_pull_from_remote"),post_body)
+
+      print "Resolving dependencies please wait ... "
+      
+      if (response.ok? && !(missing_components = response.data(:missing_modules)).empty?)
+        puts " New dependencies found, Installing."
+
+        trigger_module_component_import(missing_components)
+        puts "Resuming pull from remote ..."
+      else
+        puts 'Done.'
+      end
+    end
+
     module PullFromRemote 
       extend CommandBase
       def self.perform_locally(cmd_obj,module_type,module_id,module_name,remote_params)
         opts = remote_params
         response = cmd_obj.Helper(:git_repo).pull_changes(module_type,module_name,opts)
         # return response unless response.ok?
-
         if response.data[:diffs].empty?
           raise DtkError, "No changes to pull from remote"
         end
@@ -77,6 +82,8 @@ module DTK::Client
       end
 
       def self.perform_on_server(cmd_obj,module_type,module_id,module_name,remote_params)
+        #TODO: this does not handle different namespaces; so suggesting workaround for now
+        raise DtkError, "Module must be cloned to perform this operation; execute 'clone' command and then retry."
         post_body = {
           id_field(module_type) => module_id,
           :remote_repo => remote_params[:remote_repo],

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

@@ -1,37 +1,39 @@
+dtk_require_common_commands('thor/common')
 module DTK::Client
   module PushToRemoteMixin
 
     ##
     #
     # module_type: will be :component_module or :service_module
+    # def push_to_remote_aux(module_type,module_id, module_name,remote_namespace,version=nil)
+    def push_to_remote_aux(remote_module_info, module_type)
+      # commented out, because we perform this check before calling 'push_to_remote_aux' from service-module/component-module
+      # id_field = "#{module_type}_id"
 
-    def push_to_remote_aux(module_type,module_id, module_name,remote_namespace,version=nil)       
-      id_field = "#{module_type}_id"
+      # rsa_pub_value = SSHUtil.rsa_pub_key_content()
 
-      rsa_pub_value = SshProcessing.rsa_pub_key_content()
+      # post_body = {
+      #   id_field => module_id,
+      #   :rsa_pub_key => rsa_pub_value,
+      #   :access_rights => "rw",
+      #   :action => "push"
+      # }
+      # post_body.merge!(:version => version) if version
+      # post_body.merge!(:remote_namespace => remote_namespace) if remote_namespace
 
-      post_body = {
-        id_field => module_id,
-        :rsa_pub_key => rsa_pub_value,
-        :access_rights => "rw",
-        :action => "push"
-      }
-      post_body.merge!(:version => version) if version
-      post_body.merge!(:remote_namespace => remote_namespace) if remote_namespace
-      response = post(rest_url("#{module_type}/get_remote_module_info"),post_body)
+      # response = post(rest_url("#{module_type}/get_remote_module_info"),post_body)
+      # return response unless response.ok?
 
-      return response unless response.ok?
+      returned_module_name = remote_module_info.data(:module_name)
+      version = remote_module_info.data(:version)
 
-      returned_module_name = response.data(:module_name)
       opts = {
-        :remote_repo_url => response.data(:remote_repo_url),
-        :remote_repo => response.data(:remote_repo),
-        :remote_branch => response.data(:remote_branch),
-        :local_branch => response.data(:workspace_branch)
+        :remote_repo_url => remote_module_info.data(:remote_repo_url),
+        :remote_repo => remote_module_info.data(:remote_repo),
+        :remote_branch => remote_module_info.data(:remote_branch),
+        :local_branch => remote_module_info.data(:workspace_branch)
       }
 
-      version = response.data(:version)
-
       response = Helper(:git_repo).push_changes(module_type,returned_module_name,version,opts)
       return response unless response.ok?
       if response.data(:diffs).empty?

data/lib/commands/thor/account.rb

@@ -1,4 +1,3 @@
-dtk_require_from_base('command_helpers/ssh_processing')
 dtk_require_from_base("dtk_logger")
 dtk_require_from_base("util/os_util")
 dtk_require_from_base('configurator')
@@ -10,15 +9,6 @@ module DTK::Client
     KEY_EXISTS_ALREADY_CONTENT = 'key exists already'
 
     no_tasks do
-      def self.is_ssh_key_valid(path_to_key, rsa_pub_key)
-        unless path_to_key.include?(".pub")
-          raise DtkError, "[ERROR] Invalid public key file path (#{path_to_key}). Please provide valid path and try again."
-        end
-
-        if(rsa_pub_key.empty? || !rsa_pub_key.include?("AAAAB3NzaC1yc2EA"))
-          raise DtkError, "[ERROR] SSH public key (#{path_to_key}) does not have valid content. Please check your key and try again."
-        end
-      end
 
       def password_prompt(message, add_options=true)
         begin
@@ -51,8 +41,7 @@ module DTK::Client
         raise DtkError,"[ERROR] No ssh key file found at (#{path_to_key}). Path is wrong or it is necessary to generate the public rsa key (e.g., run `ssh-keygen -t rsa`)."
       end
 
-      rsa_pub_key = File.open(path_to_key){|f|f.read}
-      is_ssh_key_valid(path_to_key, rsa_pub_key)
+      rsa_pub_key = SSHUtil.read_and_validate_pub_key(path_to_key)
 
       post_body = { :rsa_pub_key => rsa_pub_key.chomp }
       post_body.merge!(:username => name.chomp) if name
@@ -67,9 +56,11 @@ module DTK::Client
 
       if response && !match
         repo_manager_fingerprint,repo_manager_dns = response.data_ret_and_remove!(:repo_manager_fingerprint,:repo_manager_dns)
-        SshProcessing.update_ssh_known_hosts(repo_manager_dns,repo_manager_fingerprint)
+
+        SSHUtil.update_ssh_known_hosts(repo_manager_dns,repo_manager_fingerprint)
         name ||= response.data["new_username"]
         OsUtil.print("SSH key '#{name}' added successfully!", :yellow)
+
       end
 
       return response, match, matched_username
@@ -124,7 +115,7 @@ module DTK::Client
     desc "add-ssh-key KEYPAIR-NAME [PATH-TO-RSA-PUB-KEY]","Adds a named ssh key to your user account to access modules from the catalog. Optional parameters is path to a ssh rsa public key and default is <user-home-dir>/.ssh/id_rsa.pub"
     def add_ssh_key(context_params)
       name, path_to_key = context_params.retrieve_arguments([:option_1!, :option_2],method_argument_names)
-      path_to_key ||= SshProcessing.default_rsa_pub_key_path()
+      path_to_key ||= SSHUtil.default_rsa_pub_key_path()
 
       response, matched, matched_username = Account.add_key(path_to_key, name)
 
@@ -136,7 +127,7 @@ module DTK::Client
         DTK::Client::Configurator.add_current_user_to_direct_access() if response.ok?
       end
 
-      response
+      nil
     end
 
     desc "delete-ssh-key KEYPAIR-NAME ","Deletes the named ssh key from your user account"
@@ -148,7 +139,7 @@ module DTK::Client
       return response unless response.ok?
 
       OsUtil.print("Ssh key '#{name}' removed successfully!", :yellow)
-      response
+      nil
     end
 
 
@@ -177,7 +168,7 @@ module DTK::Client
     #   # if either of request passed we will add to known hosts
     #   if proper_response
     #     repo_manager_fingerprint,repo_manager_dns = proper_response.data_ret_and_remove!(:repo_manager_fingerprint,:repo_manager_dns)
-    #     SshProcessing.update_ssh_known_hosts(repo_manager_dns,repo_manager_fingerprint)
+    #     SSHUtil.update_ssh_known_hosts(repo_manager_dns,repo_manager_fingerprint)
     #     return proper_response
     #   else
     #     nil
@@ -188,7 +179,7 @@ module DTK::Client
     # def add_direct_access(context_params)
     #   return
     #   path_to_key = context_params.retrieve_arguments([:option_1],method_argument_names)
-    #   path_to_key ||= SshProcessing.default_rsa_pub_key_path()
+    #   path_to_key ||= SSHUtil.default_rsa_pub_key_path()
     #   access_granted = Account.add_access(path_to_key)
 
     #   FileUtils.touch(DTK::Client::Configurator::DIRECT_ACCESS) if access_granted
@@ -198,7 +189,7 @@ module DTK::Client
     # desc "remove-direct-access [PATH-TO-RSA-PUB-KEY]","Removes direct access to modules. Optional paramaeters is path to a ssh rsa public key and default is <user-home-dir>/.ssh/id_rsa.pub"
     # def remove_direct_access(context_params)
     #   path_to_key = context_params.retrieve_arguments([:option_1],method_argument_names)
-    #   path_to_key ||= SshProcessing.default_rsa_pub_key_path()
+    #   path_to_key ||= SSHUtil.default_rsa_pub_key_path()
 
     #   # path_to_key ||= "#{ENV['HOME']}/.ssh/id_rsa.pub" #TODO: very brittle
     #   unless File.file?(path_to_key)

data/lib/commands/thor/component.rb

@@ -2,7 +2,8 @@ module DTK::Client
   class Component < CommandBaseThor
 
     def self.valid_children()
-      [:attribute]
+      # [:attribute]
+      []
     end
 
     def self.valid_child?(name_of_sub_context)