dtk-client 0.5.9 → 0.5.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGM2YzcyZjU0NTk3ZmY1MTUyYzJlZjQ3YmFkYzhjOGE5N2M4OTUxZQ==
+    ZDEyNmM1MGE3NzA2MzQ5OGMyMzhhNDVjZDUxY2JkMmE0MTYxNDFkYQ==
   data.tar.gz: !binary |-
-    YWJlMTcxYzE0OGQwYWJlZjZjM2E4NTIxNGY5YTZmZjY1ZTk2ZjM0NQ==
+    MWRiODEwOTRkYjNkZDRhNzI4ZjNmNjVjZmQ3ODQwMmI1Y2VjMTQwNQ==
 SHA512:
   metadata.gz: !binary |-
-    ZWY1YmJlODNlOGEzYTU5ZGFiYzlhOTdmZDNlYTM0Y2QzNjllOTQyZDZkNjM0
-    NGQ5ZDUxZDg2YjA0MmQ2NTUwNDNkNDkwNzFjZDc3NGYyZDgxMGRhZmQyY2Rh
-    MTc4Yzc2OTJjZjRkYmM3ZjEyYzRlMjBiNGQzMGM3OTM3Njk5MGQ=
+    MjE1MzUwZTNlZTMzMWY3OTRkMWJhNGJmNDQyZjU2YTM2YjkwYWFhZjczZjRh
+    ODY2NTVjOTI5M2Y2YzVkYjFhMzlhMmYzMTcwZDZiZmNjZDNmM2VhZWIzZGY3
+    MzMyYzBlZDM3ZDQxNjVlOGQ4MjYzNmY3ZWEwMmE1OTIxYjkzNDY=
   data.tar.gz: !binary |-
-    YjkxNDdhOGEwNzI0MWZhNGI4OWEzNjQ4YjM3ZWEzYzA2MWM3NGExM2Y1MGMw
-    ZWE2ZDI1NWFjYjUzODI5MDBkMDZjMTA3Y2I2ZmYyMTNiOThhOTExZWMzY2Iz
-    OTEwMWJkZDc0NDljYjY1ZDM1ZWU1MDk1ZjIwMjBkM2VmYjc0YTQ=
+    MzQwYzQ0YjhkOTRlNzkyZDJjZDQ1NzY1ZjMxYjc3ZGE5NmEyYTlmMjVmNTlj
+    NGU3NzMzMWE1ZGE5MTc0ZGMxNDY2MWQ4MTU0MjhkNjZlY2MzOWM3MjQyOWQx
+    MDYyNjMzNmI4MDlhZTkwYzIwNWQ0MWNmN2VmMzUwMWYzYzYwMDY=

data/bin/dtk

@@ -24,7 +24,7 @@ $: << "/usr/lib/ruby/1.8/" #TODO: put in to get around path problem in rvm 1.9.2
 
 
 # check if .add_direct_access file exists, if not then add direct access and create .add_direct_access file
-check_direct_access(::DTK::Client::Configurator.check_direct_access)
+resolve_direct_access(::DTK::Client::Configurator.check_direct_access)
 entries = []
 
 if ARGV.size > 0

data/bin/dtk-shell

@@ -10,6 +10,6 @@ trap("INT", "SIG_IGN")
 ::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
-check_direct_access(::DTK::Client::Configurator.check_direct_access)
+resolve_direct_access(::DTK::Client::Configurator.check_direct_access)
 
 run_shell_command()

data/lib/command_helpers/git_repo.rb

@@ -1,5 +1,6 @@
 require 'fileutils'
 dtk_require("../domain/git_adapter")
+dtk_require("../domain/git_error_handler")
 
 module DTK; module Client; class CommandHelper
   class GitRepo < self; class << self
@@ -18,15 +19,15 @@ module DTK; module Client; class CommandHelper
         begin 
           GitAdapter.clone(repo_url, target_repo_dir, opts[:branch])
         rescue => e
+          # Handling Git error messages with more user friendly messages
+          e = GitErrorHandler.handle(e)
+
           #cleanup by deleting directory
           FileUtils.rm_rf(target_repo_dir) if File.directory?(target_repo_dir)
           error_msg = "Clone to directory (#{target_repo_dir}) failed"
 
-          # additional data about this exception
-          if DTK::Configuration.get(:development_mode)
-            DtkLogger.instance.error_pp(e.message, e.backtrace)
-          end
-
+          DtkLogger.instance.error_pp(e.message, e.backtrace)
+          
           raise ErrorUsage.new(error_msg,:log_error=>false)
         end
         {"module_directory" => target_repo_dir}

data/lib/command_helpers/ssh_processing.rb

@@ -3,7 +3,7 @@ module DTK; module Client
     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}`
+        `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()

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

@@ -476,16 +476,22 @@ module DTK::Client
 
     def info_aux(context_params)
       assembly_or_workspace_id, node_id, component_id, attribute_id = context_params.retrieve_arguments([REQ_ASSEMBLY_OR_WS_ID, :node_id, :component_id, :attribute_id],method_argument_names)
+      is_json_return = context_params.get_forwarded_option(:json_return) || false 
  
       post_body = {
         :assembly_id => assembly_or_workspace_id,
         :node_id     => node_id,
         :component_id => component_id,
         :attribute_id => attribute_id,
-        :subtype     => :instance
+        :subtype     => :instance,
+        :json_return => is_json_return      
       }
 
       resp = post rest_url("assembly/info"), post_body
+
+      # if waiting for json response we do not need to render rest of data
+      return resp if is_json_return
+
       if (component_id.nil? && !node_id.nil?)
         resp.render_workspace_node_info("node")
       elsif (component_id && node_id)
@@ -715,6 +721,74 @@ module DTK::Client
       response.render_table(:netstat_data)
     end
 
+    def execute_tests_aux(context_params)
+      execute_test_tries = 6
+      execute_test_sleep = 0.5
+
+      assembly_or_workspace_id,node_id = context_params.retrieve_arguments([REQ_ASSEMBLY_OR_WS_ID,:node_id],method_argument_names)
+
+      #Get list of components on particular node
+      post_body = {
+        :assembly_id => assembly_or_workspace_id,
+        :node_id => node_id,
+        :subtype => "instance",
+        :about => "components"
+      }
+
+      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
+
+      post_body = {
+        :assembly_id => assembly_or_workspace_id,
+        :node_id => node_id,
+        :components => components
+      }  
+
+      response = post(rest_url("assembly/initiate_execute_tests"),post_body)
+      return response unless response.ok?
+
+      action_results_id = response.data(:action_results_id)
+      end_loop, response, count, ret_only_if_complete = false, nil, 0, true
+
+      until end_loop do
+        post_body = {
+          :action_results_id => action_results_id,
+          :return_only_if_complete => ret_only_if_complete,
+          :disable_post_processing => false,
+          :sort_key => "module_name"
+        }
+        response = post(rest_url("assembly/get_action_results"),post_body)
+        count += 1
+        if count > execute_test_tries or response.data(:is_complete)
+          end_loop = true
+        else
+          #last time in loop return whetever is there
+          if count == execute_test_tries
+            ret_only_if_complete = false
+          end
+          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.render_table(:execute_tests_data)
+    end
+
     def get_ps_aux(context_params)
       get_ps_tries = 6
       get_ps_sleep = 0.5

data/lib/commands/thor/account.rb

@@ -10,14 +10,26 @@ module DTK::Client
     KEY_EXISTS_ALREADY_CONTENT = 'key exists already'
 
     no_tasks do
-      def password_prompt(message, add_options=true)        
+      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
-          while line = Readline.readline("#{message}: ", add_hist = false)
+          # while line = Readline.readline("#{message}: ", add_hist = false)
+          # using 'ask' from highline gem to be able to hide input for key and secret
+          while line = (HighLine.ask("#{message}") { |q| q.echo = false})
             raise Interrupt if line.empty?
             return line
           end
-        rescue Interrupt => e
-          retry
+        rescue Interrupt
+          return nil
         ensure
           puts "\n" if line.nil?
         end
@@ -35,17 +47,17 @@ module DTK::Client
       match, matched_username = nil, nil
 
       unless File.file?(path_to_key)
-        OsUtil.put_warning "[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`)", :red
-        abort
+        # OsUtil.put_warning "[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`)", :red
+        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)
 
       post_body = { :rsa_pub_key => rsa_pub_key.chomp }
-            
       post_body.merge!(:username => name.chomp) if name
-      proper_response = nil
 
+      proper_response = nil
       response, key_exists_already = Account.internal_add_user_access("account/add_user_direct_access", post_body, 'service module')
 
       return response unless (response.ok? || key_exists_already)
@@ -56,7 +68,8 @@ 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)
-        OsUtil.print("Ssh key added successfully!", :yellow)
+        name ||= response.data["new_username"]
+        OsUtil.print("SSH key '#{name}' added successfully!", :yellow)
       end
 
       return response, match, matched_username
@@ -75,16 +88,16 @@ module DTK::Client
       end
 
       3.times do
-        old_pass_prompt = password_prompt("Enter old password")
+        old_pass_prompt = password_prompt("Enter old password: ")
 
         break if (old_pass.eql?(old_pass_prompt) || old_pass_prompt.nil?)
         OsUtil.print("Incorrect old password!", :yellow)
       end
       return unless old_pass.eql?(old_pass_prompt)
 
-      new_pass_prompt = password_prompt("Enter new password")
+      new_pass_prompt = password_prompt("Enter new password: ")
       return if new_pass_prompt.nil?
-      confirm_pass_prompt = password_prompt("Confirm new password")
+      confirm_pass_prompt = password_prompt("Confirm new password: ")
       
       if new_pass_prompt.eql?(confirm_pass_prompt)
         post_body = {:new_password => new_pass_prompt}
@@ -99,7 +112,7 @@ module DTK::Client
       end
     end
 
-    desc "list-ssh-keys", "Show list of keys that your account profile has saved"
+    desc "list-ssh-keys", "Show list of key pairs that your account profile has saved"
     def list_ssh_keys(context_params)
       username  = parse_key_value_file(::DTK::Client::Configurator.CRED_FILE)[:username]
       post_body = {:username => username}
@@ -108,7 +121,7 @@ module DTK::Client
       response.render_table(:account_ssh_keys)
     end
 
-    desc "add-ssh-key NAME [PATH-TO-RSA-PUB-KEY]","Adds direct access to modules. Optional parameters is path to a ssh rsa public key and default is <user-home-dir>/.ssh/id_rsa.pub"
+    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()
@@ -116,26 +129,25 @@ module DTK::Client
       response, matched, matched_username = Account.add_key(path_to_key, name)
 
       if matched
-        DTK::Client::OsUtil.print("Provided SSH PUB key has already been added.", :yellow)
+        DTK::Client::OsUtil.print("Provided ssh pub key has already been added.", :yellow)
       elsif matched_username
         DTK::Client::OsUtil.print("User ('#{matched_username}') already exists.", :yellow)
       else        
-        FileUtils.touch(DTK::Client::Configurator::DIRECT_ACCESS) if response.ok?
+        DTK::Client::Configurator.add_current_user_to_direct_access() if response.ok?
       end
+
+      response
     end
 
-    desc "remove-ssh-key NAME ","Removes user and direct access to modules."
-    def remove_ssh_key(context_params)
+    desc "delete-ssh-key KEYPAIR-NAME ","Deletes the named ssh key from your user account"
+    def delete_ssh_key(context_params)
       name = context_params.retrieve_arguments([:option_1!],method_argument_names)
       post_body = {:username => name.chomp}
 
-      response = post rest_url("component_module/remove_user_direct_access"), post_body
-      return response unless response.ok?
-
-      response = post rest_url("service_module/remove_user_direct_access"), post_body
+      response = post rest_url("account/remove_user_direct_access"), post_body
       return response unless response.ok?
 
-      OsUtil.print("SSH key removed successfully!", :yellow)
+      OsUtil.print("Ssh key '#{name}' removed successfully!", :yellow)
       response
     end
 

data/lib/commands/thor/component_module.rb

@@ -356,7 +356,7 @@ TODO: might deprecate
       :desc => "DTK Repo Manager from which to resolve requested module."
     def install(context_params)
       create_missing_clone_dirs()
-      check_direct_access(::DTK::Client::Configurator.check_direct_access)
+      resolve_direct_access(::DTK::Client::Configurator.check_direct_access)
       remote_module_name, version = context_params.retrieve_arguments([:option_1!, :option_2],method_argument_names)
       # in case of auto-import via service import, we skip cloning to speed up a process
       skip_cloning = context_params.get_forwarded_options()['skip_cloning'] if context_params.get_forwarded_options()

data/lib/commands/thor/node.rb

@@ -2,6 +2,9 @@ dtk_require_common_commands('thor/task_status')
 dtk_require_common_commands('thor/set_required_params')
 module DTK::Client
   class Node < CommandBaseThor
+
+    include AssemblyWorkspaceMixin
+
     no_tasks do
       include TaskStatusMixin
       include SetRequiredParamsMixin
@@ -73,15 +76,58 @@ module DTK::Client
     
     desc "NODE-NAME/ID info","Info about node"
     def info(context_params)
-
       node_id = context_params.retrieve_arguments([:node_id!],method_argument_names)
       post_body = {
         :node_id => node_id,
         :subtype => 'instance',
       }
+
        post rest_url("node/info"), post_body
     end
 
+    desc "NODE-NAME/ID ssh [--keypair] [--remote-user]","SSH into node, optional parameters are path to keypair and remote user."
+    method_option "--keypair",:type => :string, :desc => "Keypair used for connection, if not provided default is used", :banner => "KEYPAIR"
+    method_option "--remote-user",:type => :string, :desc => "Remote user used for connection", :banner => "REMOTE USER"
+    def ssh(context_params)
+      if OsUtil.is_windows?
+        puts "[NOTICE] SSH functionality is currenly not supported on Windows."
+        return
+      end
+
+      node_id = context_params.retrieve_arguments([:node_id!],method_argument_names)
+
+
+      keypair_location = options.keypair || OsUtil.dtk_keypair_location()
+
+
+      remote_user = options.send('remote-user') || 'ubuntu'
+
+      unless File.exists?(keypair_location||'')
+        error_message = keypair_location ? "Not able to find keypair, '#{keypair_location}'" : "Default keypair not set, please provide one in 'ssh' command"
+        raise ::DTK::Client::DtkError, error_message
+      end
+
+      context_params.forward_options({ :json_return => true })
+      response = info_aux(context_params)
+
+
+      if response.ok?
+        node_info = response.data['nodes'].find { |n| node_id == n['node_id'] }
+        public_dns = node_info ? node_info['external_ref']['ec2_public_address'] : nil
+
+        raise ::DTK::Client::DtkError, "Not able to resolve instance address, has instance been stopped?" unless public_dns
+
+        connection_string = "#{remote_user}@#{public_dns}"
+        ssh_command = "ssh  -o \"StrictHostKeyChecking no\" -o \"UserKnownHostsFile /dev/null\" -i #{keypair_location} #{connection_string}"
+
+        OsUtil.print("You are entering SSH terminal (#{connection_string}) ...", :yellow)
+        Kernel.system(ssh_command)
+        OsUtil.print("You are leaving SSH terminal, and returning to DTK Shell ...", :yellow)
+      else
+        return response
+      end
+    end
+
     desc "NODE-NAME/ID list-components","List components that are on the node instance."
     method_option :list, :type => :boolean, :default => false
     def list_components(context_params)

data/lib/commands/thor/service.rb

@@ -140,6 +140,7 @@ TODO: overlaps with different meaning
             ['list-components',"list-components","# List components."]
           ],
           :utils => [
+            ['execute-tests',"execute-tests [--component COMPONENT-NAME]","# Execute tests. --component filters results per component."],
             ['get-netstats',"get-netstats","# Get netstats."],
             ['get-ps',"get-ps [--filter PATTERN]","# Get ps."],
             ['grep',"grep LOG-PATH NODE-ID-PATTERN GREP-PATTERN [--first]","# Grep log from multiple nodes. --first option returns first match (latest log entry)."],
@@ -156,7 +157,8 @@ TODO: overlaps with different meaning
             ['list-components',"list-components","# List components associated with service's node."],
             ['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."]
+            ['stop', "stop", "# Stop node instance."],
+            ['ssh', "ssh [--keypair] [--remote-user]", "# SSH into node, optional parameters are path to keypair and remote user."]
           ],
           :component => [
             ['info',"info","# Return info about component instance belonging to given node."],
@@ -632,6 +634,13 @@ TODO: will put in dot release and will rename to 'extend'
       get_netstats_aux(context_params)
     end
 
+    # using HIDE_FROM_BASE to hide this command from base context (dtk:/assembly>)
+    desc "HIDE_FROM_BASE execute-tests [--component COMPONENT-NAME]", "Execute tests. --component filters results per component"
+    method_option :component, :type => :string, :desc => "Component name" 
+    def execute_tests(context_params)
+      execute_tests_aux(context_params)
+    end
+
     # using HIDE_FROM_BASE to hide this command from base context (dtk:/assembly>)
     desc "HIDE_FROM_BASE get-ps [--filter PATTERN]", "Get ps"
     method_option :filter, :type => :boolean, :default => false, :aliases => '-f'

data/lib/commands/thor/service_module.rb

@@ -193,7 +193,7 @@ module DTK::Client
     method_option :ignore, :aliases => '-i', :type => :boolean, :default => false
     def install(context_params)
       create_missing_clone_dirs()
-      check_direct_access(::DTK::Client::Configurator.check_direct_access)
+      resolve_direct_access(::DTK::Client::Configurator.check_direct_access)
       remote_module_name = context_params.retrieve_arguments([:option_1!],method_argument_names)
       ignore_component_error = options.ignore?
       

data/lib/commands/thor/workspace.rb

@@ -116,6 +116,7 @@ module DTK::Client
             ['list-components',"list-components","# List components."]
           ],
           :utils => [
+            ['execute-tests',"execute-tests [--component COMPONENT-NAME]","# Execute tests. --component filters results per component."],
             ['get-netstats',"get-netstats","# Get netstats."],
             ['get-ps',"get-ps [--filter PATTERN]","# Get ps."],
             ['grep',"grep LOG-PATH NODE-ID-PATTERN GREP-PATTERN [--first]","# Grep log from multiple nodes. --first option returns first match (latest log entry)."],
@@ -132,7 +133,8 @@ module DTK::Client
             ['list-components',"list-components","# List components associated with workspace's node."],
             ['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."]
+            ['stop', "stop", "# Stop node instance."],
+            ['ssh', "ssh [--keypair] [--remote-user]", "# SSH into node, optional parameters are path to keypair and remote user."]
           ],
           :component => [
             ['info',"info","# Return info about component instance belonging to given node."],
@@ -311,6 +313,13 @@ module DTK::Client
       get_netstats_aux(context_params)
     end
 
+    # using HIDE_FROM_BASE to hide this command from base context (dtk:/workspace>)
+    desc "HIDE_FROM_BASE execute-tests [--component COMPONENT-NAME]", "Execute tests. --component filters results per component"
+    method_option :component, :type => :string, :desc => "Component name"
+    def execute_tests(context_params)
+      execute_tests_aux(context_params)
+    end
+
     # using HIDE_FROM_BASE to hide this command from base context (dtk:/workspace>)
     desc "HIDE_FROM_BASE get-ps [--filter PATTERN]", "Get ps"
     method_option :filter, :type => :boolean, :default => false, :aliases => '-f'

data/lib/configurator.rb

@@ -6,12 +6,12 @@ module DTK
 	module Client
 		class Configurator
 
-		CONFIG_FILE   = File.join(OsUtil.dtk_local_folder, "client.conf")
+			CONFIG_FILE   = File.join(OsUtil.dtk_local_folder, "client.conf")
 	  	CRED_FILE 	  = File.join(OsUtil.dtk_local_folder, ".connection")
 	  	DIRECT_ACCESS = File.join(OsUtil.dtk_local_folder, ".add_direct_access")
 
-		require 'fileutils'
-		FileUtils.mkdir(OsUtil.dtk_local_folder) unless File.directory?(OsUtil.dtk_local_folder)
+			require 'fileutils'
+			FileUtils.mkdir(OsUtil.dtk_local_folder) unless File.directory?(OsUtil.dtk_local_folder)
 
 	    def self.CONFIG_FILE
 	    	CONFIG_FILE
@@ -44,10 +44,10 @@ module DTK
 
 			# return true/false, .add_direct_access file location and ssk key file location
 			def self.check_direct_access
-				file_exists  = File.exists?(DIRECT_ACCESS)
+				username_exists  = check_for_username_entry(client_username())
 				ssh_key_path = SshProcessing.default_rsa_pub_key_path()
 				
-				{:file_exists => file_exists, :file_path => DIRECT_ACCESS, :ssh_key_path => ssh_key_path}
+				{:username_exists => username_exists, :file_path => DIRECT_ACCESS, :ssh_key_path => ssh_key_path}
 			end
 
 			def self.generate_conf_file(file_path, properties, header)
@@ -86,6 +86,53 @@ module DTK
 				FileUtils.mkdir(OsUtil.module_clone_location) unless File.directory?(OsUtil.module_clone_location)
 				FileUtils.mkdir(OsUtil.service_clone_location) unless File.directory?(OsUtil.service_clone_location)
 			end
+
+
+			def self.parse_key_value_file(file)
+				#adapted from mcollective config
+				ret = Hash.new
+				raise DTK::Client::DtkError,"Config file (#{file}) does not exists" unless File.exists?(file)
+				File.open(file).each do |line|
+				  # strip blank spaces, tabs etc off the end of all lines
+				  line.gsub!(/\s*$/, "")
+				  unless line =~ /^#|^$/
+				    if (line =~ /(.+?)\s*=\s*(.+)/)
+				      key = $1
+				      val = $2
+				      ret[key.to_sym] = val
+				    end
+				  end
+				end
+				ret
+			end
+			def self.add_current_user_to_direct_access()
+				username = client_username()
+
+				File.open(DIRECT_ACCESS, 'a') do |file|
+				  file.puts(username)
+				end
+
+				true
+			end
+
+			def self.client_username()
+        parse_key_value_file(CRED_FILE)[:username]
+      end
+
+			#
+			# Method will check if there is username entry in DIRECT_ACCESS file
+			#
+			def self.check_for_username_entry(username)
+				if File.exists?(DIRECT_ACCESS)
+					File.open(DIRECT_ACCESS).each do |line|
+						if line.strip.eql?(username)
+							return true
+						end
+					end
+				end
+
+				return false
+			end
 		end
 	end
 end

data/lib/core.rb

@@ -111,24 +111,25 @@ 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 check_direct_access(params)
-  return if params[:file_exists]
+def resolve_direct_access(params)
+  return if params[:username_exists]
 
   puts "Adding direct access for current user..."
   # 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, server error '#{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 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) 
   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)
-    FileUtils.touch(params[:file_path])
+    DTK::Client::Configurator.add_current_user_to_direct_access()
   elsif matched_username
     DTK::Client::OsUtil.print("User with provided name already exists.", :yellow)
   else
-    DTK::Client::OsUtil.print("Your SSH PUB key has been successfully added.", :yellow)
-    FileUtils.touch(params[:file_path])
+    # commented out because 'add_key' method called above will also print the same message
+    # DTK::Client::OsUtil.print("Your SSH PUB key has been successfully added.", :yellow)
+    DTK::Client::Configurator.add_current_user_to_direct_access()
   end
   
 
@@ -218,22 +219,9 @@ module DTK
     module ParseFile
 
       def parse_key_value_file(file)
-        #adapted from mcollective config
-        ret = Hash.new
-        raise DTK::Client::DtkError,"Config file (#{file}) does not exists" unless File.exists?(file)
-        File.open(file).each do |line|
-          # strip blank spaces, tabs etc off the end of all lines
-          line.gsub!(/\s*$/, "")
-          unless line =~ /^#|^$/
-            if (line =~ /(.+?)\s*=\s*(.+)/)
-              key = $1
-              val = $2
-              ret[key.to_sym] = val
-            end
-          end
-        end
-        ret
+        DTK::Client::Configurator.parse_key_value_file(file)
       end
+
     end
     class Config < Hash
       include Singleton
@@ -270,6 +258,7 @@ module DTK
         missing_keys = REQUIRED_KEYS - keys
         raise DTK::Client::DtkError,"Missing config keys (#{missing_keys.join(",")}). Please check your configuration file #{CONFIG_FILE} for required keys!" unless missing_keys.empty?
       end
+
     end
 
 

data/lib/domain/git_adapter.rb

@@ -18,10 +18,13 @@ module DTK
         @git_repo.add(untracked())
         @git_repo.add(added())
         @git_repo.add(changed())
-        deleted().each do |file, status|
-          # this indicates that change has not been staged
-          if status.stage
+        deleted().each do |file|
+          begin
             @git_repo.remove(file)
+          rescue
+            # ignore this error means file has already been staged
+            # we cannot support status of file, in 1.8.7 so this is 
+            # solution for that
           end
         end
       end

data/lib/domain/git_error_handler.rb

@@ -0,0 +1,45 @@
+
+module DTK
+  module Client
+
+    class GitHandledException < Exception
+      def initialize(msg, backtrace)
+        super(msg)
+        set_backtrace(backtrace)
+      end
+    end
+
+    class GitErrorHandler
+
+      # due to problems with git logging messages which are not user friendly we are going to wrap their error and try to produce more readable results
+      def self.handle(exception)
+        handled_exception = exception
+
+        if exception.is_a? Git::GitExecuteError
+          error_message = user_friendly_message(exception.message)
+          handled_exception = GitHandledException.new(error_message, exception.backtrace)
+        end
+
+        handled_exception
+      end
+
+    private
+
+      def self.user_friendly_message(message)
+        case message
+        when /repository not found/i
+          "Repository not found"
+        when /repository (.*) not found/i
+          "Repository #{$1.strip()} not found"
+        when /destination path (.*) already exists/i
+          "Destination folder #{$1.strip()} already exists"
+        when /Authentication failed for (.*)$/i
+          "Authentication failed for given repository #{$1.strip()}"
+        else
+          message
+        end
+      end
+
+    end
+  end
+end

data/lib/dtk-client/version.rb

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

data/lib/dtk_logger.rb

@@ -61,14 +61,14 @@ class DtkLogger
     @logger.error(log_text) if log_created?
   end
 
-  def error_pp(message, backtrace)
-    error(message, true)
+  def error_pp(message, backtrace, sttdout_out = true)
+    error(message, sttdout_out)
     # we do not print this to STDOUT (will be overriden with DEVELOPMENT_MODE)
     error(PP.pp(backtrace, ""), false) if backtrace
   end
 
-  def fatal_pp(message, backtrace)
-    fatal(message, true)
+  def fatal_pp(message, backtrace, sttdout_out = true)
+    fatal(message, sttdout_out)
     # we do not print this to STDOUT (will be overriden with DEVELOPMENT_MODE)
     fatal(PP.pp(backtrace, ""), false) if backtrace
   end

data/lib/parser/adapters/thor.rb

@@ -25,8 +25,8 @@ module DTK
 
       @@cached_response = {}
       @@invalidate_map  = []
-      TIME_DIFF         = 60   #second(s)
-      EXTENDED_TIMEOUT  = 360  #second(s)
+      TIME_DIFF         = 60   # second(s)
+      EXTENDED_TIMEOUT  = 360  # second(s)
       HIDE_FROM_BASE_CONTEXT = "HIDE_FROM_BASE"
 
       # thor command specific constants
@@ -289,40 +289,6 @@ module DTK
                 end
               end
             end
-
-            # will leave this commented for now until we check if new code works properly
-            # if children
-            #   current_children = []
-            #   children.each do |child|
-            #     current_children << child.to_s
-
-            #     # create entry e.g. assembly_node_id
-            #     child_id_sym = (command.downcase + '_' + current_children.join('_') + '_wid').to_sym
-
-            #     # n-context matching
-            #     matched_data = task[1].usage.match(/\[?#{child.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 
-            #     end
-
-            #     # override method list, we add these methods only once
-            #     if override_task_obj && !override_task_obj.is_completed?(child)
-            #       command_o_tasks, identifier_o_tasks = override_task_obj.get_all_tasks(child)
-            #       child_sym    = (command.downcase + '_' + current_children.join('_')).to_sym
-
-            #       command_o_tasks.each do |o_task|
-            #         cached_tasks[child_sym] = cached_tasks.fetch(child_sym,[]) << o_task[0]
-            #       end
-
-            #       identifier_o_tasks.each do |o_task|
-            #         cached_tasks[child_id_sym] = cached_tasks.fetch(child_id_sym,[]) << o_task[0]
-            #       end
-
-            #       override_task_obj.add_to_completed(child)
-            #     end
-            #   end
-            # end
-
           end
         end
         
@@ -482,6 +448,14 @@ module DTK
         return basename
       end
 
+      #
+      # Returns list of invisible contexts with sufix provided (if any) 
+      #
+
+      def self.invisible_context_list(sufix = 'identifier')
+        self.respond_to?(:invisible_context) ? self.invisible_context.collect { |i| "#{i}-#{sufix}" } : []
+      end
+
       desc "help [SUBCOMMAND]", "Describes available subcommands or one specific subcommand"
       def help(*args)
         puts # pretty print

data/lib/shell/context.rb

@@ -740,7 +740,7 @@ module DTK
           opts[id_label] = id
 
           response_ruby_obj = DTK::Client::CommandBaseThor.get_cached_response(endpoint.to_sym, url, opts)
-          return [] unless response_ruby_obj.ok?
+          return [] if(response_ruby_obj.nil? || !response_ruby_obj.ok?)
 
           response_ruby_obj.data.each do |d|
             candidates << d["display_name"]
@@ -840,7 +840,7 @@ module DTK
         clazz = Context.get_command_class(entity_name)
         current_context_command = active_context_copy.last_command_name
 
-        if (current_context_command != entity_name)
+        if ((current_context_command != entity_name) && !current_context_command.eql?("utils"))
           current_context_clazz = Context.get_command_class(current_context_command)
           options = Context.get_thor_options(current_context_clazz, cmd) unless current_context_command.nil?
         else

data/lib/shell/domain.rb

@@ -24,6 +24,10 @@ module DTK
         @thor_options
       end
 
+      def get_forwarded_option(key)
+        @thor_options ? @thor_options[key] : nil
+      end
+
       def get_forwarded_thor_option(option_key)
         return @thor_options ? @thor_options[option_key] : nil
       end
@@ -79,6 +83,16 @@ module DTK
             id = matched[1].to_i - 1
             element = @method_arguments[id]
 
+            # used if last parameter has more than one word
+            # e.g. set-attribute attr_name "some value" (thor separates 'some value' as two parameters but we need it as one)
+            if(mapping.last.to_s.eql?(key_mapping.to_s))
+              new_id = id+1
+              while @method_arguments[new_id] do
+                element << " #{@method_arguments[new_id]}"
+                new_id += 1;
+              end
+            end
+
             unless method_info.empty?
               unless element
                 errors << method_info[id] if required

data/lib/shell/help_monkey_patch.rb

@@ -215,6 +215,16 @@ class Thor
       # monkey patching here => END
       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()
+
+      #   shell.say("  Change context (cc) to: #{sub_children.join(', ')}", :BOLD) unless sub_children.empty?
+      #   shell.say
+      # end
+
       class_options_help(shell)
     end
   end

data/lib/shell/interactive_wizard.rb

@@ -1,5 +1,6 @@
 require 'colorize'
 require 'readline'
+require 'highline/import'
 
 module DTK
   module Shell
@@ -100,7 +101,9 @@ module DTK
           prompt_input = ">> "
         end
         
-        while line = Readline.readline(prompt_input, true)
+        # while line = Readline.readline(prompt_input, true)
+        #using 'ask' from highline gem to be able to hide input for key and secret
+        while line = ask("#{prompt_input}") { |q| q.echo = false}
           if is_required && line.empty?
             puts INVALID_INPUT
             next

data/lib/util/os_util.rb

@@ -9,6 +9,8 @@ module DTK
 
       extend Auxiliary
 
+      DTK_KEYPAIR = 'dtk.pem'
+
       class << self
         def is_mac?
           RUBY_PLATFORM.downcase.include?('darwin')
@@ -147,6 +149,18 @@ module DTK
           # remove last slash if set in configuration by mistake
           final_path.gsub(/\/$/,'')
         end
+
+        #
+        # Checks to find dtk.pem in configuration node, if not found displays tip message
+        #
+        def dtk_keypair_location()
+          path_to_keypair = "#{dtk_local_folder}#{DTK_KEYPAIR}"
+          return path_to_keypair if File.exists?(path_to_keypair)
+          print("TIP: You can save your keypair as '#{path_to_keypair}' and it will be used as default keypair.", :yellow)
+          nil
+        end
+
+
         private :clone_base_path
         #
         #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.5.10
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -249,6 +249,7 @@ files:
 - lib/context_router.rb
 - lib/core.rb
 - lib/domain/git_adapter.rb
+- lib/domain/git_error_handler.rb
 - lib/domain/response.rb
 - lib/dtk-client/version.rb
 - lib/dtk_constants.rb
@@ -325,7 +326,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: DTK CLI client for DTK server interaction.