dtk-client 0.5.10 → 0.5.12

data/lib/commands/thor/service_module.rb

@@ -1,6 +1,5 @@
 #TODO: putting in version as hidden coption that can be enabled when code ready
 #TODO: may be consistent on whether service module id or service module name used as params
-dtk_require_from_base('command_helpers/ssh_processing')
 dtk_require_from_base('command_helpers/service_importer')
 dtk_require_common_commands('thor/clone')
 dtk_require_common_commands('thor/push_to_remote')
@@ -14,6 +13,7 @@ dtk_require_from_base("commands/thor/assembly")
 dtk_require_common_commands('thor/task_status')
 dtk_require_common_commands('thor/set_required_params')
 dtk_require_common_commands('thor/purge_clone')
+dtk_require_common_commands('thor/common')
 
 module DTK::Client
   class ServiceModule < CommandBaseThor
@@ -49,8 +49,8 @@ module DTK::Client
       PPColumns.get(:service_module)
     end
 
-    def self.whoami()
-      return :service_module, "service_module/list", nil
+    def self.validation_list(context_params)
+      get_cached_response(:service_module, "service_module/list", {})
     end
 
     def self.override_allowed_methods()
@@ -84,7 +84,6 @@ module DTK::Client
     ##MERGE-QUESTION: need to add options of what info is about
     desc "SERVICE-MODULE-NAME/ID info", "Provides information about specified service module"
     def info(context_params)
-      #TODO Aldin
       if context_params.is_there_identifier?(:assembly)
         response = DTK::Client::ContextRouter.routeTask("assembly", "info", context_params, @conn)
       else  
@@ -131,8 +130,7 @@ module DTK::Client
       # If user is on service level, list task can't have about value set
       if (context_params.last_entity_name == :"service-module") and about.nil?
         action    = options.remote? ? "list_remote" : "list"
-        # post_body = (options.remote? ? { :rsa_pub_key => SshProcessing.rsa_pub_key_content() } : {:detail_to_include => ["remotes","versions"]})
-        post_body = (options.remote? ? { :rsa_pub_key => SshProcessing.rsa_pub_key_content() } : {:detail_to_include => ["remotes"]})
+        post_body = (options.remote? ? { :rsa_pub_key => SSHUtil.rsa_pub_key_content() } : {:detail_to_include => ["remotes"]})
         post_body[:diff] = options.diff? ? options.diff : {}
         
         response = post rest_url("service_module/#{action}"), post_body
@@ -180,7 +178,7 @@ module DTK::Client
     #   post_body = {
     #     :service_module_id => service_module_id,
     #     :detail_to_include => ["remotes"],
-    #     :rsa_pub_key => SshProcessing.rsa_pub_key_content()
+    #     :rsa_pub_key => SSHUtil.rsa_pub_key_content()
     #   }
     #   response = post rest_url("service_module/versions"), post_body
 
@@ -207,7 +205,7 @@ module DTK::Client
       post_body = {
         :remote_module_name => remote_module_name,
         :local_module_name => local_module_name,
-        :rsa_pub_key => SshProcessing.rsa_pub_key_content()
+        :rsa_pub_key => SSHUtil.rsa_pub_key_content()
       }
       
       response = post rest_url("service_module/import"), post_body
@@ -216,8 +214,10 @@ module DTK::Client
       if (response.ok? && (missing_components = response.data(:missing_module_components)))
         opts = {:do_not_raise=>true}
         module_opts = ignore_component_error ? opts.merge(:ignore_component_error => true) : opts.merge(:additional_message=>true)
-        trigger_module_component_import(missing_components,module_opts)
-        puts "Resuming DTK network import for service module '#{remote_module_name}' ..."
+        continue = trigger_module_component_import(missing_components,module_opts)
+        return unless continue
+
+        puts "Resuming DTK Network import for service module '#{remote_module_name}' ..."
         # repeat import call for service
         post_body.merge!(opts)
         response = post rest_url("service_module/import"), post_body
@@ -289,7 +289,7 @@ module DTK::Client
     #   post_body = {
     #    :service_module_id => service_module_id,
     #    :remote_component_name => input_remote_name,
-    #    :rsa_pub_key => SshProcessing.rsa_pub_key_content()
+    #    :rsa_pub_key => SSHUtil.rsa_pub_key_content()
     #   }
 
     #   post rest_url("service_module/export"), post_body
@@ -302,7 +302,7 @@ module DTK::Client
       post_body = {
        :service_module_id => service_module_id,
        :remote_component_name => input_remote_name,
-       :rsa_pub_key => SshProcessing.rsa_pub_key_content()
+       :rsa_pub_key => SSHUtil.rsa_pub_key_content()
       }
 
       post rest_url("service_module/export"), post_body
@@ -347,34 +347,13 @@ module DTK::Client
     #   push_to_remote_aux(:service_module, service_module_id, service_module_name, options["namespace"], options["version"])
     # end
 
-    # desc "SERVICE-MODULE-NAME/ID pull-from-dtkn [-v VERSION]", "Update local service module from remote repository."
-    # version_method_option
-    # desc "SERVICE-MODULE-NAME/ID pull-from-dtkn", "Update local service module from remote repository."
-    # def pull_from_dtkn(context_params)
-    #   service_module_id, service_module_name = context_params.retrieve_arguments([:service_module_id!,:service_module_name],method_argument_names)
-    #   version = options["version"]
-
-    #   response = pull_from_remote_aux(:service_module,service_module_id,version)
-    #   return response unless response.ok?
-
-    #   if service_module_name.to_s =~ /^[0-9]+$/
-    #     service_module_id   = service_module_name
-    #     service_module_name = get_service_module_name(service_module_id)
-    #   end
-
-    #   modules_path    = OsUtil.service_clone_location()
-    #   module_location = "#{modules_path}/#{service_module_name}#{version && "-#{version}"}"
-
-    #   # server repo needs to be sync with local clone, so we will use push-clone-changes when pull changes from remote to local
-    #   # to automatically sync local with server repo
-    #   push_clone_changes_aux(:service_module,service_module_id,version,nil,true) if File.directory?(module_location)
-    #   Response::Ok.new()
-    # end
-
-#    desc "SERVICE-MODULE-NAME/ID pull dtkn", "Update local service module from remote repository."
-    desc "SERVICE-MODULE-NAME/ID pull-dtkn", "Update local service module from remote repository."
+    # desc "SERVICE-MODULE-NAME/ID pull-from-dtkn [-n NAMESPACE] [-v VERSION]", "Update local service module from remote repository."
+    desc "SERVICE-MODULE-NAME/ID pull-dtkn [-n NAMESPACE]", "Update local service module from remote repository."
+    method_option "namespace",:aliases => "-n",
+      :type => :string, 
+      :banner => "NAMESPACE",
+      :desc => "Remote namespace"
     def pull_dtkn(context_params)
-#      service_module_id, service_module_name, catalog = context_params.retrieve_arguments([:service_module_id!,:service_module_name, :option_1],method_argument_names)
       service_module_id, service_module_name = context_params.retrieve_arguments([:service_module_id!,:service_module_name],method_argument_names)
       catalog = 'dtkn'
       version = options["version"]
@@ -382,7 +361,8 @@ module DTK::Client
       raise DtkValidationError, "You have to provide valid catalog to pull changes from! Valid catalogs: #{PullCatalogs}" unless catalog
 
       if catalog.to_s.eql?("dtkn")
-        response = pull_from_remote_aux(:service_module,service_module_id,version)
+        opts = {:version => version, :remote_namespace => options.namespace}
+        response = pull_from_remote_aux(:service_module,service_module_id,opts)
         return response unless response.ok?
 
         if service_module_name.to_s =~ /^[0-9]+$/
@@ -453,7 +433,7 @@ module DTK::Client
     #   service_module_id,version = context_params.retrieve_arguments([:service_module_id!,:option_1!],method_argument_names)
     #   post_body = {
     #     :service_module_id => service_module_id,
-    #     :rsa_pub_key => SshProcessing.rsa_pub_key_content()
+    #     :rsa_pub_key => SSHUtil.rsa_pub_key_content()
     #   }
     #   response = post rest_url("service_module/versions"), post_body
     #   return response unless response.ok?
@@ -632,24 +612,23 @@ module DTK::Client
       modules_path    = OsUtil.service_clone_location()
       module_location = "#{modules_path}/#{service_module_name}#{version && "-#{version}"}"
       reparse_aux(module_location) unless internal_trigger
+
       if catalog.to_s.eql?("dtkn")
+        remote_module_info = get_remote_module_info_aux(:service_module, service_module_id, options["namespace"], version)
+        return remote_module_info unless remote_module_info.ok?
+
         unless File.directory?(module_location)
-          if Console.confirmation_prompt("Unable to push to remote because module '#{service_module_name}#{version && "-#{version}"}' has not been cloned. Would you like to clone module now"+'?')
-            response = clone_aux(:service_module,service_module_id,version,false)
-            
-            if(response.nil? || response.ok?)
-              reparse_aux(module_location)
-              push_to_remote_aux(:service_module, service_module_id, service_module_name, options["namespace"], version) if Console.confirmation_prompt("Would you like to push changes to remote"+'?')
-            end
+          response = clone_aux(:service_module, service_module_id, version, true, true)
 
-            return response
-          else
-            # user choose not to clone needed module
-            return
+          if(response.nil? || response.ok?)
+            reparse_aux(module_location)
+            response = push_to_remote_aux(remote_module_info, :service_module)
           end
+
+          return response
         end
         
-        push_to_remote_aux(:service_module, service_module_id, service_module_name, options["namespace"], options["version"])
+        push_to_remote_aux(remote_module_info, :service_module)
       else
         raise DtkValidationError, "You have to provide valid catalog to push changes to!"
       end
@@ -719,7 +698,7 @@ module DTK::Client
 
       post_body = {
        :remote_service_name => remote_service_name,
-       :rsa_pub_key => SshProcessing.rsa_pub_key_content()
+       :rsa_pub_key => SSHUtil.rsa_pub_key_content()
       }
       response = post rest_url("service_module/delete_remote"), post_body
       @@invalidate_map << :module_service

data/lib/commands/thor/workspace.rb

@@ -134,8 +134,9 @@ module DTK::Client
             ['set-attribute',"set-attribute ATTRIBUTE-NAME [VALUE] [-u]","# (Un)Set attribute value. The option -u will unset the attribute's value."],
             ['start', "start", "# Start node instance."],
             ['stop', "stop", "# Stop node instance."],
-            ['ssh', "ssh [--keypair] [--remote-user]", "# SSH into node, optional parameters are path to keypair and remote user."]
+            ['ssh', "ssh REMOTE-USER [--keypair PATH-TO-PEM]", "# SSH into node, optional parameters are path to keypair and remote user."]
           ],
+          
           :component => [
             ['info',"info","# Return info about component instance belonging to given node."],
             ['edit',"edit","# Edit component module related to given component."],

data/lib/configurator.rb

@@ -22,15 +22,20 @@ module DTK
 	    end
 
 			def self.check_config_exists
+				exists = true
 				if !File.exists?(CONFIG_FILE)
 					puts "", "Please enter the DTK server address (example: dtk.r8network.com)"
 					header = File.read(File.expand_path('../lib/config/client.conf.header', File.dirname(__FILE__)))
 					generate_conf_file(CONFIG_FILE, [['server_host', 'Server address']], header)
+					exists = false
 				end
 				if !File.exists?(CRED_FILE)
 					puts "", "Please enter your DTK login details"
 					generate_conf_file(CRED_FILE, [['username', 'Username'], ['password', 'Password']], '')
+					exists = false
 				end
+
+				exists
 			end
 
 			def self.check_git
@@ -45,7 +50,7 @@ module DTK
 			# return true/false, .add_direct_access file location and ssk key file location
 			def self.check_direct_access
 				username_exists  = check_for_username_entry(client_username())
-				ssh_key_path = SshProcessing.default_rsa_pub_key_path()
+				ssh_key_path = SSHUtil.default_rsa_pub_key_path()
 				
 				{:username_exists => username_exists, :file_path => DIRECT_ACCESS, :ssh_key_path => ssh_key_path}
 			end

data/lib/core.rb

@@ -11,6 +11,7 @@ require 'pp'
 
 dtk_require_from_base('domain/response')
 dtk_require_from_base('util/os_util')
+dtk_require_from_base('util/ssh_util')
 dtk_require("config/configuration")
 
 def top_level_execute(entity_name, method_name, context_params=nil, options_args=nil, shell_execute=false)
@@ -111,15 +112,15 @@ def validate_connection(connection)
 end
 
 # check if .add_direct_access file exists, if not then add direct access and create .add_direct_access file
-def resolve_direct_access(params)
+def resolve_direct_access(params, config_exists=nil)
   return if params[:username_exists]
 
-  puts "Adding direct access for current user..."
+  puts "Processing..." if config_exists
   # response = DTK::Client::Account.add_access(params[:ssh_key_path])
   response, matched_pub_key, matched_username = DTK::Client::Account.add_key(params[:ssh_key_path])
   
   if !response.ok?
-    DTK::Client::OsUtil.print("We were not able to add direct access for current user. #{response.error_message}. In order to properly use dtk-shell you will have to add access manually ('dtk account add-ssh-key').\n", :yellow) 
+    DTK::Client::OsUtil.print("We were not able to add access for current user. #{response.error_message}. In order to properly use dtk-shell you will have to add access manually ('dtk account add-ssh-key').\n", :yellow) 
   elsif matched_pub_key
     # message will be displayed by add key # TODO: Refactor this flow
     DTK::Client::OsUtil.print("Provided SSH PUB key has already been added.", :yellow)
@@ -405,8 +406,7 @@ module DTK
         response = post_raw rest_url("user/process_login"),creds
         errors = response['errors']
 
-        if response.kind_of?(Common::Response) and not response.ok?    
-          puts errors.first['code']
+        if response.kind_of?(Common::Response) and not response.ok?
           if (errors && errors.first['code']=="pg_error")
             DTK::Client::OsUtil.print(errors.first['message'].gsub!("403 Forbidden", "[PG_ERROR]"), :red)
             exit

data/lib/domain/git_error_handler.rb

@@ -35,6 +35,8 @@ module DTK
           "Destination folder #{$1.strip()} already exists"
         when /Authentication failed for (.*)$/i
           "Authentication failed for given repository #{$1.strip()}"
+        when /timed out/
+          "Timeout - not able to contact remote"
         else
           message
         end

data/lib/domain/response.rb

@@ -63,7 +63,8 @@ module DTK
           "size:" => "SIZE:",
           "os_type:" => "OS:",
           "op_status:" => "OP STATUS:",
-          "dns_name:" => "DNS NAME:"
+          "dns_name:" => "DNS NAME:",
+          "target:" => "TARGET:"
         }
         
         mappings[column]

data/lib/dtk-client/version.rb

@@ -1,3 +1,3 @@
 module DtkClient
-  VERSION="0.5.10"
+  VERSION="0.5.12"
 end

data/lib/parser/adapters/thor.rb

@@ -39,8 +39,7 @@ module DTK
 
       def self.execute_from_cli(conn,method_name,context_params,thor_options,shell_execution=false)
         @@shell_execution = shell_execution
-        
-        # I am sorry!
+
         if method_name == 'help'
           ret = start([method_name] + context_params.method_arguments,:conn => conn)      
         else

data/lib/shell/domain.rb

@@ -332,6 +332,14 @@ module DTK
         @context_list.size > 2
       end
 
+      def is_base_context?
+        @context_list.size == 1
+      end
+
+      def is_root_context?
+        @context_list.size == 0
+      end
+
       def current_command?
         return @context_list.empty? ? true : @context_list.last.is_command?
       end
@@ -388,7 +396,6 @@ module DTK
       def last_context()
         return @context_list.empty? ? nil : @context_list.last
       end
-
     end
 
     class CachedTasks < Hash

data/lib/shell/help_monkey_patch.rb

@@ -67,13 +67,15 @@ class Thor
       if @@shell_context
         unless @@shell_context.root?
 
+          active_context = @@shell_context.active_context
+
           # first command we are using:
           # e.g. dtk:\assembly\assembly1\node\node123> => command would be :assembly
-          command             = @@shell_context.active_context.first_command_name.upcase
+          command             = active_context.first_command_name.upcase
 
           # is there identifier for given commands (first)
           # e.g. dtk:\assembly\assembly1\node\node123> => identifier here would be 'assembly1'
-          is_there_identifier = @@shell_context.active_context.is_there_identifier_for_first_context?
+          is_there_identifier = active_context.is_there_identifier_for_first_context?
 
           # alternative providers
           alt_identifiers = get_alternative_identifiers(command)
@@ -100,7 +102,7 @@ class Thor
           # e.g. dtk:\assembly\assembly1\node\node123> THIS IS     N-LEVEL CONTEXT
           # e.g. dtk:\assembly\assembly1>              THIS IS NOT N-LEVEL CONTEXT
           #
-          if (!@@shell_context.active_context.is_n_context? || @@shell_context.active_context.current_identifier?)
+          if (!active_context.is_n_context? || active_context.current_identifier?)
 
             list.each do |help_item|
               help_item.first.gsub!("^^", '') if help_item.first.include?("^^")
@@ -127,12 +129,12 @@ class Thor
                 else
                   # Adding alt identifiers here
                   if alt_matched_data
-                    if @@shell_context.active_context.current_alt_identifier?
+                    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 @@shell_context.active_context.current_alt_identifier?
+                    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
@@ -144,8 +146,8 @@ class Thor
 
           # This will return commands that have identifiers
           # e.g. dtk:\assembly\assembly1\node\node123> => ['assembly','node']
-          commands_that_have_identifiers =  @@shell_context.active_context.commands_that_have_identifiers()
-          is_n_level_context             = @@shell_context.active_context.command_list.size > 1
+          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
@@ -166,12 +168,12 @@ class Thor
             end
             
             if override_tasks_obj && is_n_level_context
-              last_entity_name = @@shell_context.active_context.last_context_entity_name.to_sym
+              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)
 
-              if @@shell_context.active_context.current_identifier?
+              if active_context.current_identifier?
                 identifier_o_tasks.each do |o_task|
                   n_filter_list << [o_task[1],o_task[2]]
                 end
@@ -216,14 +218,30 @@ class Thor
       shell.print_table(list, :indent => 2, :truncate => true)
       shell.say
 
+
       # print sub context information
-      # if @@shell_context && @@shell_context.active_context.current_identifier?
-      #   sub_children  = self.respond_to?(:valid_children) ? self.valid_children() : []
-      #   sub_children += self.invisible_context_list()
+      sub_children = []
+
+      # current active context clazz
+      if @@shell_context
+        last_command_name = @@shell_context.active_context.last_command_name
+        command_clazz = DTK::Shell::Context.get_command_class(last_command_name)
+
+        if @@shell_context && @@shell_context.active_context.current_identifier?
+          sub_children += command_clazz.valid_children() if command_clazz.respond_to?(:valid_children)
+          sub_children += command_clazz.invisible_context_list()
+        else
+          if command_clazz.respond_to?(:validation_list)
+            sub_children += ["#{last_command_name}-identifier"]
+          end
+        end
+
+        unless sub_children.empty?
+          shell.say("  Change context (cc) to: #{sub_children.join(', ')}", :BOLD) 
+          shell.say
+        end
+      end
 
-      #   shell.say("  Change context (cc) to: #{sub_children.join(', ')}", :BOLD) unless sub_children.empty?
-      #   shell.say
-      # end
 
       class_options_help(shell)
     end

data/lib/util/console.rb

@@ -120,7 +120,8 @@ module DTK::Client
                 reparse_aux(path)
                 push_clone_changes_aux(module_type, module_id, version, commit_msg)
               else
-                system(line)        
+                # we are sending stderr to stdout
+                system("#{line} 2>&1")
               end
             rescue Exception => e
               DtkLogger.instance.error_pp(e.message, e.backtrace)

data/lib/util/os_util.rb

@@ -233,6 +233,7 @@ module DTK
         def dev_reload_shell()
           suspend_output do
             load File.expand_path('../../lib/util/os_util.rb', File.dirname(__FILE__))
+            load File.expand_path('../../lib/util/ssh_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/domain/git_adapter.rb', File.dirname(__FILE__))

data/lib/util/ssh_util.rb

@@ -0,0 +1,76 @@
+module DTK
+  module Client
+    module SSHUtil
+
+      def self.read_and_validate_pub_key(path_to_pub_key)
+        is_ssh_key_path_valid?(path_to_pub_key)
+        rsa_pub_key = File.open(path_to_pub_key) { |f| f.read }
+        is_ssh_key_content_valid?(rsa_pub_key)
+        rsa_pub_key
+      end
+
+      def self.update_ssh_known_hosts(server_dns,server_fingerprint)
+        known_hosts_path = ssh_known_hosts_path()
+        if File.file?(known_hosts_path)
+          `ssh-keygen -f #{known_hosts_path} -R #{server_dns} 2> /dev/null`
+          File.open(known_hosts_path,"a"){|f|f << server_fingerprint}
+        else
+          ssh_base_dir = ssh_base_dir()
+          unless File.directory?(ssh_base_dir)
+            Dir.mkdir(ssh_base_dir)
+          end
+          File.open(known_hosts_path,"w"){|f|f << server_fingerprint}
+        end
+      end
+      
+      def self.default_rsa_pub_key_path()
+        "#{ssh_base_dir()}/id_rsa.pub"
+      end
+
+      def self.rsa_pub_key_content()
+        path_to_key = self.default_rsa_pub_key_path()
+        unless File.file?(path_to_key)
+          raise DtkError,"No 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
+
+        content = File.open(path_to_key){ |f| f.read }
+        content.chomp
+      end
+
+      def self.ssh_reachable?(user, server, timeout = 3)
+        output = `ssh -o ConnectTimeout=#{timeout} -o \"StrictHostKeyChecking no\" -o \"UserKnownHostsFile /dev/null\" -q #{user}@#{server} exit; echo $?`
+
+        # if response 0 than it is able to connect
+        "0".eql?(output.strip())
+      end
+
+
+    private
+
+      def self.ssh_base_dir()
+        "#{ENV['HOME']}/.ssh" #TODO: very brittle
+      end
+      
+      def self.ssh_known_hosts_path()
+        "#{ssh_base_dir()}/known_hosts"
+      end
+
+      def self.is_ssh_key_path_valid?(path_to_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
+
+        unless File.exists?(path_to_key)
+          raise DtkError, "[ERROR] Not able to find provided key (#{path_to_key}). Please provide valid path and try again."
+        end
+      end
+
+      def self.is_ssh_key_content_valid?(rsa_pub_key)
+        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
+
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.5.10
+  version: 0.5.12
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-17 00:00:00.000000000 Z
+date: 2014-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.5.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.5.10
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -202,7 +202,7 @@ files:
 - lib/command_helpers/jenkins_client.rb
 - lib/command_helpers/service_importer.rb
 - lib/command_helpers/service_link.rb
-- lib/command_helpers/ssh_processing.rb
+- lib/commands/common/thor/action_result_handler.rb
 - lib/commands/common/thor/assembly_workspace.rb
 - lib/commands/common/thor/clone.rb
 - lib/commands/common/thor/common.rb
@@ -273,6 +273,7 @@ files:
 - lib/util/console.rb
 - lib/util/dtk_puppet.rb
 - lib/util/os_util.rb
+- lib/util/ssh_util.rb
 - lib/view_processor/augmented_simple_list.rb
 - lib/view_processor/hash_pretty_print.rb
 - lib/view_processor/simple_list.rb
@@ -326,7 +327,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.1.9
 signing_key: 
 specification_version: 4
 summary: DTK CLI client for DTK server interaction.

data/lib/command_helpers/ssh_processing.rb

@@ -1,43 +0,0 @@
-module DTK; module Client
-  class SshProcessing
-    def self.update_ssh_known_hosts(server_dns,server_fingerprint)
-      known_hosts_path = ssh_known_hosts_path()
-      if File.file?(known_hosts_path)
-        `ssh-keygen -f #{known_hosts_path} -R #{server_dns} 2> /dev/null`
-        File.open(known_hosts_path,"a"){|f|f << server_fingerprint}
-      else
-        ssh_base_dir = ssh_base_dir()
-        unless File.directory?(ssh_base_dir)
-          Dir.mkdir(ssh_base_dir)
-        end
-        File.open(known_hosts_path,"w"){|f|f << server_fingerprint}
-      end
-    end
-    def self.default_rsa_pub_key_path()
-      "#{ssh_base_dir()}/id_rsa.pub" 
-    end
-
-    def self.rsa_pub_key_content()
-      path_to_key = self.default_rsa_pub_key_path()
-      unless File.file?(path_to_key)
-        raise DtkError,"No 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
-
-      content = File.open(path_to_key){ |f| f.read }
-      content.chomp
-    end
-
-
-   private
-    def self.ssh_base_dir()
-      "#{ENV['HOME']}/.ssh" #TODO: very brittle
-    end
-    
-    def self.ssh_known_hosts_path()
-      "#{ssh_base_dir()}/known_hosts"
-    end
-  end
-end; end
- 
-
-