dtk-client 0.5.6.1 → 0.5.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmMzODFiMDI1NjJjZTJlNGEwM2U1Yzc1MTgyNDRkMjZkMWU5NjZkZA==
+    NWFhMGY3ZWUzYzgxMjM3MjJlZmI2MDJmMTdlOTkzZjFkYmQ2ODJiMQ==
   data.tar.gz: !binary |-
-    MmNmNmQxMDlmNTIxMTYxZjZmM2Y1NjU5ZjI5MTNjZWZiY2I1MjA5ZQ==
+    YWVjMmRiMGE4NWFjN2U4M2QyYTJkN2Q5YTgxNWU5NmJkN2Q2MmIxNQ==
 SHA512:
   metadata.gz: !binary |-
-    Nzg5NWQ5NTkxOWNlYTdhNmJiNmU4MzYxMDBlMjM4MmE2MTYxYTdlZmZhNjQy
-    M2EwZGJjZmM1M2U0ZjdkYWU2N2Q3NjhlZGFjNTRiZGU4ZmE3NDRjMmMxODQ1
-    ZDM3NTU1OThkZmM4YmExNWJjN2Y3NWM4YzBiOWVmYTYzMDEyYzI=
+    MmNhNTcwYzllZmY5MTRhMTdlZDRhOTg0ZGQxNTNkMzU0YWMzMTdlZDUyZjg3
+    NzIwYWIwMzk0MmMzNGE1ZmExMWY1YmJiZTk5YmZlM2QzMjQ0MGE0OTRhZDE2
+    Yzg3ZGJiYWVhNTcyYjA2OWIwMTZlMTU3YTFmMjQwY2VmNGE3YTA=
   data.tar.gz: !binary |-
-    NjI0M2MzMmRiY2ZiNzI0ZjMxOGVmZGUxZjE3NWUyNzlkYzIwMTE0MWI2NGFi
-    OTZlMzIyNWE0NmY1ODQyODIyZTFkN2Y4YjQ0MzljNjAyZjU3MjRiNjYzYzgx
-    YjdhN2Y5Nzg2NGI2NDllMjU0MTc1OGRiMGVhOTkxNDEwNzY4NjE=
+    OTczZjRiOWI4NDBkZDNiZGMzMWFhNjAyNWU3NDZmZjVmZDQ1NjM4ZTEyODIy
+    MDIyZjUxMTkwZDE3Yzg0NDBkYTUwYjAyNzljZDcxMzIwNWE2ZThiMzk3Y2I1
+    YWRlNTg5YWJiOTM0MzBkOTg1OTYxMWE5ZDE2NDUzY2NkNjZjYTc=

data/lib/command_helpers/git_repo.rb

@@ -250,7 +250,6 @@ module DTK; module Client; class CommandHelper
 
         diffs = DiffSummary.diff(repo,local_branch, remote_branch_ref)
 
-        # DEBUG SNIPPET >>> REMOVE <<<
     
         if diffs.any_diffs?()
           repo.push(remote_branch_ref)

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

@@ -618,6 +618,18 @@ module DTK::Client
       response = post(rest_url("assembly/purge"),post_body)
     end
 
+    def destroy_and_reset_nodes_aux(context_params)
+      assembly_or_workspace_id = context_params.retrieve_arguments([REQ_ASSEMBLY_OR_WS_ID],method_argument_names)
+      unless options.force?
+        return unless Console.confirmation_prompt("Are you sure you want to destroy and reset all nodes in the workspace"+'?')
+      end
+
+      post_body = {
+        :assembly_id => assembly_or_workspace_id
+      }
+      response = post(rest_url("assembly/destroy_and_reset_nodes"),post_body)
+    end
+
     def delete_aux(context_params)
       if context_params.is_last_command_eql_to?(:node)
         delete_node_aux(context_params) 
@@ -829,26 +841,32 @@ module DTK::Client
               sleep(1)
             end
 
-            raise DTK::Client::DtkError, "Error while logging there was no successful response after 3 tries." unless response.data(:is_complete)
+            if response.data(:is_complete)
+              # due to complicated response we change its formating
+              response = response.data(:results).first[1]
 
-            # due to complicated response we change its formating
-            response = response.data(:results).first[1]
+              unless response["error"].nil?
+                raise DTK::Client::DtkError, response["error"]
+              end
 
-            unless response["error"].nil?
-              raise DTK::Client::DtkError, response["error"]
-            end
+              # removing invalid chars from log
+              output = response["output"].gsub(/`/,'\'')
 
-            # removing invalid chars from log
-            output = response["output"].gsub(/`/,'\'')
+              unless output.empty?
+                file_ready = true
+                tail_temp_file << output 
+                tail_temp_file.flush
+              end
 
-            unless output.empty?
+              last_line = response["last_line"]
+              sleep(LOG_SLEEP_TIME_W)
+            else
               file_ready = true
-              tail_temp_file << output 
+              tail_temp_file << "\n\nError while logging there was no successful response after 3 tries, (^C, Q) to exit. \n\n"
               tail_temp_file.flush
+              tail_temp_file.close
+              Thread.current.exit
             end
-
-            last_line = response["last_line"]
-            sleep(LOG_SLEEP_TIME_W)
           end
         end
 

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

@@ -25,6 +25,7 @@ module DTK::Client
         begin 
           YAML.load(file_content)
         rescue Exception => e
+          e.to_s.gsub!(/\(<unknown>\)/,'')
           raise DTK::Client::DSLParsing::YAMLParsing.new("YAML parsing error #{e} in file",file)
         end
       end

data/lib/commands/thor/account.rb

@@ -33,7 +33,7 @@ module DTK::Client
 
     def self.add_key(path_to_key, name=nil)
       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
@@ -45,32 +45,21 @@ module DTK::Client
             
       post_body.merge!(:username => name.chomp) if name
       proper_response = nil
-      response, key_exists_already = Account.internal_add_user_access("service_module/add_user_direct_access", post_body, 'service module')
-      return response unless (response.ok? || key_exists_already)
-
 
-      if response.ok?
-        proper_response = response
-        match = response.data['match']
-        matched_username = response.data['matched_username']
-      end
+      response, key_exists_already = Account.internal_add_user_access("account/add_user_direct_access", post_body, 'service module')
 
-      response, key_exists_already = Account.internal_add_user_access("component_module/add_user_direct_access", post_body, 'component module')
       return response unless (response.ok? || key_exists_already)
-      proper_response = response if response.ok?
-      
-      # if either of request passed we will add to known hosts
-      if match
-        OsUtil.print("Provided RSA public key already exists, user creation aborted!", :yellow) 
-      elsif proper_response
-        repo_manager_fingerprint,repo_manager_dns = proper_response.data_ret_and_remove!(:repo_manager_fingerprint,:repo_manager_dns)
+
+      match = response.data['match']
+      matched_username = response.data['matched_username']
+
+      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)
-
-        return proper_response
-      else
-        nil
       end
+
+      return response, match, matched_username
     end
 
     desc "set-password", "Change password for your dtk user account"
@@ -123,9 +112,16 @@ module DTK::Client
     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()
-      access_granted = Account.add_key(path_to_key, name)
 
-      FileUtils.touch(DTK::Client::Configurator::DIRECT_ACCESS) if access_granted
+      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)
+      elsif matched_username
+        DTK::Client::OsUtil.print("User ('#{matched_username}') already exists.", :yellow)
+      else        
+        FileUtils.touch(DTK::Client::Configurator::DIRECT_ACCESS) if response.ok?
+      end
     end
 
     desc "remove-ssh-key NAME ","Removes user and direct access to modules."
@@ -139,7 +135,8 @@ module DTK::Client
       response = post rest_url("service_module/remove_user_direct_access"), post_body
       return response unless response.ok?
 
-      OsUtil.print("Ssh key removed successfully!", :yellow)
+      OsUtil.print("SSH key removed successfully!", :yellow)
+      response
     end
 
 

data/lib/commands/thor/assembly.rb

@@ -211,17 +211,26 @@ module DTK::Client
       :type => :string, 
       :banner => "TARGET-NAME/ID",
       :desc => "Target (id) to create assembly in" 
+    #hidden option
+    method_option "instance-bindings",
+      :type => :string 
+
     def stage(context_params)
       assembly_template_id, name = context_params.retrieve_arguments([:assembly_id!, :option_1],method_argument_names)
       post_body = {
         :assembly_id => assembly_template_id
       }
 
+      # using this to make sure cache will be invalidated after new assembly is created from other commands e.g.
+      # 'assembly-create', 'install' etc.
+      @@invalidate_map << :assembly
+      
       assembly_template_name = get_assembly_name(assembly_template_id)
       assembly_template_name.gsub!('::','-') if assembly_template_name
 
       # we check current options and forwarded options (from deploy method)
       in_target = options["in-target"] || context_params.get_forwarded_thor_option("in-target")
+      instance_bindings = options["instance-bindings"]
       assembly_list = Assembly.assembly_list()
 
       if name
@@ -232,6 +241,7 @@ module DTK::Client
       
       post_body.merge!(:target_id => in_target) if in_target
       post_body.merge!(:name => name) if name
+      post_body.merge!(:instance_bindings => instance_bindings) if instance_bindings
 
       response = post rest_url("assembly/stage"), post_body
       return response unless response.ok?
@@ -242,6 +252,7 @@ module DTK::Client
       return response
     end
 
+=begin
     # desc "ASSEMBLY-NAME/ID deploy [-v VERSION] [INSTANCE-NAME] [-t TARGET-NAME/ID] [-m COMMIT-MSG]", "Stage and deploy assembly in target."
     # version_method_option
     desc "ASSEMBLY-NAME/ID deploy [INSTANCE-NAME] [-t TARGET-NAME/ID] [-m COMMIT-MSG]", "Stage and deploy assembly in target."
@@ -300,7 +311,7 @@ module DTK::Client
 
       return ret
     end
-
+=end
 
     desc "delete ASSEMBLY-ID", "Delete assembly"
     method_option :force, :aliases => '-y', :type => :boolean, :default => false

data/lib/commands/thor/component_module.rb

@@ -296,10 +296,12 @@ TODO: might deprecate
 
       external_dependencies = response.data(:external_dependencies)
 
-      if error = response.data(:dsl_parsed_info)
-        dsl_parsed_message = ServiceImporter.error_message(module_name, error)
-        DTK::Client::OsUtil.print(dsl_parsed_message, :red) 
-      end
+      # commented out for now, since we have this same part of the code in push method
+      # which will always be called from this method
+      # if error = response.data(:dsl_parsed_info)
+      #   dsl_parsed_message = ServiceImporter.error_message(module_name, error)
+      #   DTK::Client::OsUtil.print(dsl_parsed_message, :red) 
+      # end
 
       dsl_created_info = response.data(:dsl_created_info)
       if dsl_created_info and !dsl_created_info.empty?
@@ -312,8 +314,11 @@ TODO: might deprecate
       # we push clone changes anyway, user can change and push again
       context_params.add_context_to_params(module_name, :"component-module", module_id)
       response = push(context_params, true)
-      response[:module_id] = module_id if git_import
-      response.add_data_value!(:external_dependencies,external_dependencies) if external_dependencies
+      
+      if git_import
+        response[:module_id] = module_id 
+        response.add_data_value!(:external_dependencies,external_dependencies) if external_dependencies
+      end
 
       return response
     end
@@ -709,7 +714,8 @@ TODO: might deprecate
     end
 
 #    desc "COMPONENT-MODULE-NAME/ID push [-v VERSION] [-m COMMIT-MSG]", "Push changes from local copy of component module to server"
-    desc "COMPONENT-MODULE-NAME/ID push [-m COMMIT-MSG]", "Push changes from local copy of component module to server"
+#    desc "COMPONENT-MODULE-NAME/ID push [-m COMMIT-MSG]", "Push changes from local copy of component module to server"
+    desc "COMPONENT-MODULE-NAME/ID push", "Push changes from local copy of component module to server"
      version_method_option
      method_option "message",:aliases => "-m" ,
        :type => :string, 
@@ -732,7 +738,8 @@ TODO: might deprecate
        push_clone_changes_aux(:component_module,component_module_id,version,options["message"]||DEFAULT_COMMIT_MSG,internal_trigger)
      end
 
-    desc "COMPONENT-MODULE-NAME/ID push-dtkn [-n NAMESPACE] [-m COMMIT-MSG]", "Push changes from local copy of component module to remote repository (dtkn)."
+#    desc "COMPONENT-MODULE-NAME/ID push-dtkn [-n NAMESPACE] [-m COMMIT-MSG]", "Push changes from local copy of component module to remote repository (dtkn)."
+    desc "COMPONENT-MODULE-NAME/ID push-dtkn [-n NAMESPACE]", "Push changes from local copy of component module to remote repository (dtkn)."
     method_option "message",:aliases => "-m" ,
       :type => :string, 
       :banner => "COMMIT-MSG",

data/lib/commands/thor/node.rb

@@ -163,9 +163,15 @@ module DTK::Client
       return response
     end
 
-    desc "NODE-NAME/ID delete-component COMPONENT-ID", "Delete component from node"
+    desc "NODE-NAME/ID delete-component COMPONENT-ID [-y]", "Delete component from node"
+    method_option :force, :aliases => '-y', :type => :boolean, :default => false
     def delete_component(context_params)
       node_id,component_id = context_params.retrieve_arguments([:node_id!, :option_1!],method_argument_names)
+
+      unless options.force?
+        return unless Console.confirmation_prompt("Are you sure you want to delete component '#{component_id}'"+'?')
+      end
+
       post_body = {
         :node_id => node_id,
         :component_id => component_id

data/lib/commands/thor/node_template.rb

@@ -35,7 +35,8 @@ module DTK::Client
       return response
     end
 =end
-    desc "list --all -t [TARGET-NAME]", "List all node templates."
+#    desc "list --all -t [TARGET-NAME]", "List all node templates."
+    desc "list", "List all node templates."
     method_option :all, :type => :boolean, :default => false
     method_option "target_identifier",:aliases => "-t" ,
       :type => :string, 
@@ -61,7 +62,7 @@ module DTK::Client
       }
       post rest_url("node/image_upgrade"), post_body
     end
-
+=begin
     #TODO: move to form desc "NODE-TEMPLATE-NAME/ID stage [INSTANCE-NAME]"
     #will then have to reverse arguments
     desc "stage NODE-TEMPLATE-NAME [INSTANCE-NAME]", "Stage node template in target."
@@ -81,8 +82,9 @@ module DTK::Client
       @@invalidate_map << :node_template
       @@invalidate_map << :node
 
-      return response
+      response
     end
+=end
   end
 end
 

data/lib/commands/thor/provider.rb

@@ -35,17 +35,26 @@ module DTK::Client
       return Provider.valid_children().include?(name_of_sub_context.to_sym)
     end
 
-    desc "create-provider PROVIDER-TYPE:PROVIDER-NAME --access-key ACCESS_KEY --secret-key SECRET_KEY --keypair KEYPAIR --security-group SECURITY-GROUP [--no-bootstrap]", "Create provider"
+    desc "create-provider PROVIDER-TYPE:PROVIDER-NAME --keypair KEYPAIR --security-group SECURITY-GROUP [--no-bootstrap]", "Create provider"
     method_option :keypair,    :type => :string
-    method_option :access_key, :type => :string
-    method_option :secret_key, :type => :string
     method_option :security_group, :type => :string
     method_option :no_bootstrap, :type => :boolean, :default => false
     def create_provider(context_params)
       composed_provider_name = context_params.retrieve_arguments([:option_1!],method_argument_names)
 
       provider_type, provider_name = decompose_provider_type_and_name(composed_provider_name)
-      access_key, secret_key, keypair, security_group = context_params.retrieve_thor_options([:access_key!, :secret_key!, :keypair!, :security_group!], options)
+      keypair, security_group = context_params.retrieve_thor_options([:keypair!, :security_group!], options)
+
+      result = DTK::Shell::InteractiveWizard::interactive_user_input(
+        {'IAAS Credentials' => { :type => :group, :options => [
+              {:key    => {}},
+              {:secret => {}}
+          ]}})
+      
+      access_key, secret_key = result['IAAS Credentials'].values_at(:key, :secret)
+
+      # Remove sensitive readline history
+      OsUtil.pop_readline_history(2)
 
       post_body = {
         :iaas_properties => {

data/lib/commands/thor/service.rb

@@ -173,6 +173,13 @@ TODO: overlaps with different meaning
       }, [:utils])
     end
 
+    desc "SERVICE-NAME/ID destroy-and-reset-nodes [-y]", "Terminates all nodes, but keeps config state so they can be spun up from scratch."
+    method_option :force, :aliases => '-y', :type => :boolean, :default => false
+    def destroy_and_reset_nodes(context_params)
+      destroy_and_reset_nodes_aux(context_params)
+    end
+
+
     desc "SERVICE-NAME/ID start [NODE-NAME]", "Starts all the service nodes. A single node can be selected."
     def start(context_params)
       start_aux(context_params)
@@ -188,7 +195,8 @@ TODO: overlaps with different meaning
     def cancel_task(context_params)
       cancel_task_aux(context_params)
     end
-
+=begin
+#TODO: until we investigate DTK-1349
     desc "rename SERVICE-NAME NEW-SERVICE-NAME","Change service name."
     def rename(context_params)
       assembly_name, new_assembly_name = context_params.retrieve_arguments([:option_1!,:option_2!],method_argument_names)
@@ -211,6 +219,7 @@ TODO: overlaps with different meaning
       @@invalidate_map << :service
       response      
     end
+=end
 
     #desc "ASSEMBLY-NAME/ID clear-tasks", "Clears the tasks that have been run already."
     #def clear_tasks(context_params)
@@ -218,13 +227,14 @@ TODO: overlaps with different meaning
     #end
 
     desc "SERVICE-NAME/ID create-assembly SERVICE-MODULE-NAME ASSEMBLY-NAME", "Create a new assembly from this service instance in the designated service module."
-    def create_service(context_params)
+    def create_assembly(context_params)
       assembly_id, service_module_name, assembly_template_name = context_params.retrieve_arguments([:service_id!,:option_1!,:option_2!],method_argument_names)
       response = promote_assembly_aux(:create,assembly_id,service_module_name,assembly_template_name)
       return response unless response.ok?
 
       @@invalidate_map << :assembly
-      @@invalidate_map << :service_module
+      @@invalidate_map << :service
+
       Response::Ok.new()
     end
     
@@ -237,8 +247,8 @@ TODO: overlaps with different meaning
       converge_aux(context_params)
     end
 
-    desc "SERVICE-NAME/ID push-assembly-updates [SERVICE-MODULE-NAME/ASSEMBLY-NAME]", "Push service instance to the designated assembly; default is parent assembly."
-    def push_service_updates(context_params)
+    desc "SERVICE-NAME/ID push-assembly-updates [SERVICE-MODULE-NAME/ASSEMBLY-NAME]", "Push changes made to this service instance to the designated assembly; default is parent assembly."
+    def push_assembly_updates(context_params)
       assembly_id, qualified_assembly_name = context_params.retrieve_arguments([:service_id!,:option_1],method_argument_names) 
       service_module_name, assembly_template_name =
         if qualified_assembly_name
@@ -562,7 +572,7 @@ TODO: will put in dot release and will rename to 'extend'
     # only supported at node-level
     # using HIDE_FROM_BASE to hide this command from base context (dtk:/assembly>)
     desc "HIDE_FROM_BASE add-component NODE-NAME COMPONENT", "Add a component to the service."
-    def addcomponent(context_params)
+    def add_component(context_params)
       response = create_component_aux(context_params)
 
       @@invalidate_map << :service
@@ -608,7 +618,6 @@ TODO: will put in dot release and will rename to 'extend'
     method_option :force, :aliases => '-y', :type => :boolean, :default => false
     def delete_component(context_params)
       response = delete_component_aux(context_params)
-      return response unless response.ok?
       
       @@invalidate_map << :service
       @@invalidate_map << :service_node

data/lib/commands/thor/service_module.rb

@@ -72,7 +72,7 @@ module DTK::Client
             ["info","info","# Info for given assembly in current service module."],
             ["stage", "stage [INSTANCE-NAME] [-t TARGET-NAME/ID]", "# Stage assembly in target."],
             # ["deploy","deploy [-v VERSION] [INSTANCE-NAME] [-t TARGET-NAME/ID] [-m COMMIT-MSG]", "# Stage and deploy assembly in target."],
-            ["deploy","deploy [INSTANCE-NAME] [-t TARGET-NAME/ID] [-m COMMIT-MSG]", "# Stage and deploy assembly in target."],
+            # ["deploy","deploy [INSTANCE-NAME] [-t TARGET-NAME/ID] [-m COMMIT-MSG]", "# Stage and deploy assembly in target."],
             ["list-nodes","list-nodes", "# List all nodes for given assembly."],
             ["list-components","list-components", "# List all components for given assembly."]
           ]
@@ -586,7 +586,8 @@ module DTK::Client
     PushCatalogs = ["origin", "dtkn"]
 =end
 
-    desc "SERVICE-MODULE-NAME/ID push [-m COMMIT-MSG]", "Push changes from local copy to server (origin)."
+#    desc "SERVICE-MODULE-NAME/ID push [-m COMMIT-MSG]", "Push changes from local copy to server (origin)."
+    desc "SERVICE-MODULE-NAME/ID push", "Push changes from local copy to server."
     method_option "message",:aliases => "-m" ,
       :type => :string, 
       :banner => "COMMIT-MSG",
@@ -608,7 +609,8 @@ module DTK::Client
       push_clone_changes_aux(:service_module,service_module_id,version,nil,internal_trigger)
     end
 
-    desc "SERVICE-MODULE-NAME/ID push-dtkn [-n NAMESPACE] [-m COMMIT-MSG]", "Push changes from local copy of service module to remote repository (dtkn)."
+#    desc "SERVICE-MODULE-NAME/ID push-dtkn [-n NAMESPACE] [-m COMMIT-MSG]", "Push changes from local copy of service module to remote repository (dtkn)."
+    desc "SERVICE-MODULE-NAME/ID push-dtkn [-n NAMESPACE]", "Push changes from local copy of service module to remote repository (dtkn)."
     method_option "message",:aliases => "-m" ,
       :type => :string, 
       :banner => "COMMIT-MSG",

data/lib/commands/thor/workspace.rb

@@ -175,8 +175,8 @@ module DTK::Client
       push_module_updates_aux(context_params)
     end
 
-    desc "WORKSPACE-NAME/ID push-assembly-updates SERVICE-MODULE-NAME/ASSEMBLY-NAME", "Push workspace instance to the designated assembly."
-    def push_service_updates(context_params)
+    desc "WORKSPACE-NAME/ID push-assembly-updates SERVICE-MODULE-NAME/ASSEMBLY-NAME", "Push changes made to this workspace to the designated assembly."
+    def push_assembly_updates(context_params)
       workspace_id, qualified_assembly_name = context_params.retrieve_arguments([:workspace_id!,:option_1!],method_argument_names) 
       if qualified_assembly_name =~ /(^[^\/]*)\/([^\/]*$)/
         service_module_name, assembly_template_name = [$1,$2]
@@ -192,7 +192,7 @@ module DTK::Client
     desc "WORKSPACE-NAME/ID create-assembly SERVICE-MODULE-NAME ASSEMBLY-NAME [-p]", "Create a new assembly from the workspace instance in the designated service module."
    # The option -p will purge the workspace after assembly creation." 
     method_option :purge, :aliases => '-p', :type => :boolean, :default => false
-    def create_service(context_params)
+    def create_assembly(context_params)
       workspace_id, service_module_name, assembly_template_name = context_params.retrieve_arguments([:workspace_id!,:option_1!,:option_2!],method_argument_names)
       response = promote_assembly_aux(:create,workspace_id,service_module_name,assembly_template_name)
       return response unless response.ok?
@@ -202,7 +202,8 @@ module DTK::Client
       end
 
       @@invalidate_map << :assembly
-      @@invalidate_map << :service_module
+      @@invalidate_map << :service
+
       Response::Ok.new()
     end
 
@@ -266,7 +267,6 @@ module DTK::Client
     method_option :force, :aliases => '-y', :type => :boolean, :default => false
     def delete_component(context_params)
       response = delete_component_aux(context_params)
-      return response unless response.ok?
       
       @@invalidate_map << :service
       @@invalidate_map << :service_node
@@ -396,6 +396,12 @@ module DTK::Client
       purge_aux(context_params)
     end
 
+    desc "WORKSPACE-NAME/ID destroy-and-reset-nodes [-y]", "Terminates all nodes, but keeps config state so they can be spun up from scratch."
+    method_option :force, :aliases => '-y', :type => :boolean, :default => false
+    def destroy_and_reset_nodes(context_params)
+      destroy_and_reset_nodes_aux(context_params)
+    end
+
     desc "WORKSPACE-NAME/ID set-target TARGET-NAME/ID", "Set target associated with workspace."
     def set_target(context_params)
       set_target_aux(context_params)

data/lib/core.rb

@@ -82,6 +82,7 @@ def top_level_execute_core(entity_name, method_name, context_params=nil, options
       validation_message += ", usage: #{usage_info}"
 
       validation_message.gsub!("^^", '') if validation_message.include?("^^")
+      validation_message.gsub!("HIDE_FROM_BASE ", '') if validation_message.include?("HIDE_FROM_BASE")
     end
 
     DTK::Client::OsUtil.print(validation_message, :yellow)
@@ -115,14 +116,23 @@ def check_direct_access(params)
 
   puts "Adding direct access for current user..."
   # response = DTK::Client::Account.add_access(params[:ssh_key_path])
-  response = DTK::Client::Account.add_key(params[:ssh_key_path])
+  response, matched_pub_key, matched_username = DTK::Client::Account.add_key(params[:ssh_key_path])
   
-  if response.nil? || !response.ok?
-    DTK::Client::OsUtil.print("We were not able to add direct access for current user. In order to properly use dtk-shell you will have to add access manually ('dtk account add-ssh-key').\n", :yellow) 
-    return
+  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) 
+  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])
+  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])
   end
+  
 
-  FileUtils.touch(params[:file_path])
+  response
 end
 
 module DTK

data/lib/dtk-client/version.rb

@@ -1,3 +1,3 @@
 module DtkClient
-  VERSION="0.5.6.1"
+  VERSION="0.5.8"
 end

data/lib/shell/interactive_wizard.rb

@@ -24,9 +24,12 @@ module DTK
       end
 
       # Generic wizard which will return hash map based on metadata input
+      #
+      # Example provided bellow
+      #
       def self.interactive_user_input(wizard_dsl, recursion_call = false)
         results = {}
-        
+        wizard_dsl = [wizard_dsl].flatten
         begin
           wizard_dsl.each do |meta_input|
             input_name = meta_input.keys.first
@@ -56,7 +59,7 @@ module DTK
                 validation = (validation_range_start..metadata[:options].size).to_a
               when :group
                 # recursion call to populate second level of hash params
-                puts " Enter '#{display_name}' details: "
+                puts " Enter '#{display_name}': "
                 results[input_name] = self.interactive_user_input(metadata[:options], true)
                 next
             end

data/lib/util/os_util.rb

@@ -1,6 +1,7 @@
 dtk_require_from_base('domain/response')
 dtk_require_from_base('auxiliary')
 require 'highline'
+require 'readline'
 
 module DTK
   module Client
@@ -25,6 +26,14 @@ module DTK
           is_windows? ? genv(:temp) : '/tmp'
         end
 
+
+        def pop_readline_history(number_of_last_commands)
+          number_of_last_commands.downto(1) do
+            Readline::HISTORY.pop
+          end
+          nil
+        end
+
         def get_log_location
           return "#{dtk_local_folder}"
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.5.6.1
+  version: 0.5.8
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler