dtk-client 0.7.8 → 0.7.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2NjNGJhMTdjNzA2ZTI2ZGIzNGU5NGQwOTE2NzY4YTgzNmJlY2Y3MA==
+    NjVkYjRmNjg4ZWIwNGZkNWQ1YzM1MjU0MTRmMmFjMDdiMjczNTQ4Ng==
   data.tar.gz: !binary |-
-    Y2JiNzVhYWE5YzFlY2RjNzVkOWE3ZmI0MjM3YWFhZGU3OTgxOGY1OQ==
+    ZWE0NjRlNmNlZDNlMjMyZTU3YjUxMzkzNTM4NTVhYjUzYWNhMTQwNg==
 SHA512:
   metadata.gz: !binary |-
-    YmQxMGI5OWEzNDAyY2U3ZGY2MDBkODFmODZiZTAzNDljZmIwN2VjMGQ5MWMw
-    OTBjZGJmZThhMWMxZjI5MzNlZWM1MDMwNjQzNzNmMzI2YjY3NWZjNzNjMmEx
-    OGI1MWY0NDI5NWNhZjY4MTZjMWQzODY0NmVkNDE5ZjQ2NDM3ZWQ=
+    YjBmOGZiNzVhZGVhM2I2YTVhMjcxNGRjNmI0ZGJkNWU2ZDNlMGRmOTljZTBi
+    NmUyMDM0OTVlMzc3NTJjYzQ2ODI0YmI0ZWVjNzg0ZGRjN2Y0OGY4YmRlNDIw
+    MTFlZDVmODk4YTk1YWUwNWZmMmQzNDNlMmJkYjQ3MDVmNWIwYjM=
   data.tar.gz: !binary |-
-    MGIxMTA5YWRmZGY2YjVmNmVmOTRmNWNjODc0NjAzZmNlMGQwOTQ2ZDZiMDQ1
-    ZjRmZjY2NWMwOWYyODZlYWZlZmFlZTBhNzFmMGEwNWEzZmJkNWFjY2NlZTRl
-    MDlkYzk1ZjhjMDg5NThlOWIyNDhiMDVlMDZhZGJmODVkMDE1YTI=
+    NGI3Yzk1OTQwOTBhYzc1ZDU4NTQ2NzIzNDRiOTlmNzY2NzkxOTFmMzY4Y2Q3
+    NWRhNDM2NDA4ZjViYzVkMzhmZTAwZjg0ODJkNjAyMzY2NzNlN2NiMDgzY2Nj
+    NzQzNmEzODUwMDJhOTk1NDA4NGNmNjAwNmEzNTc2ZDM2NmVhMjY=

data/lib/command_helpers/service_importer.rb

@@ -38,7 +38,7 @@ module DTK::Client
       end
 
       if opts[:force] || Console.confirmation_prompt("Do you want to update in addition to this module its dependent modules from the catalog?")
-        required_modules.each do |r_module|
+        required_modules.uniq.each do |r_module|
           module_name = full_module_name(r_module)
           module_type = r_module['type']
           version     = r_module['version']
@@ -86,7 +86,7 @@ module DTK::Client
       update_none = RemoteDependencyUtil.check_for_frozen_modules(required_modules)
 
       # Print out or update installed modules from catalog
-      required_modules.each do |r_module|
+      required_modules.uniq.each do |r_module|
         module_name         = full_module_name(r_module)
         module_type         = r_module['type']
         version             = r_module['version']

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

@@ -128,6 +128,16 @@ module DTK::Client
       response.render_table()
     end
 
+    def list_actions_aux(context_params)
+      assembly_or_workspace_id = context_params.retrieve_arguments([REQ_ASSEMBLY_OR_WS_ID],method_argument_names)
+
+      post_body = { :assembly_id  => assembly_or_workspace_id }
+      post_body.merge!(:type => options.type) if options.type?
+
+      response = post rest_url("assembly/list_actions"), post_body
+      response.render_table('service_actions')
+    end
+
    # desc "SERVICE-NAME/ID execute-action COMPONENT-INSTANCE [ACTION-NAME [ACTION-PARAMS]]"
     def execute_ad_hoc_action_aux(context_params)
       assembly_or_workspace_id,component_id,method_name,action_params_string = context_params.retrieve_arguments([REQ_ASSEMBLY_OR_WS_ID,:option_1!,:option_2,:option_3],method_argument_names)
@@ -148,6 +158,68 @@ module DTK::Client
       nil
     end
 
+    def exec_aux(context_params, opts = {})
+      assembly_or_workspace_id, task_action, task_params_string = context_params.retrieve_arguments([REQ_ASSEMBLY_OR_WS_ID, :option_1!, :option_2], method_argument_names)
+
+      # support 'converge' task action as synonym for 'create'
+      task_action = 'create' if task_action && task_action.eql?('converge')
+
+      # parse params and return format { 'p_name1' => 'p_value1' , 'p_name2' => 'p_value2' }
+      task_params = parse_params?(task_params_string)||{}
+
+      # match if sent node/component
+      if task_action_match = task_action.match(/(^[\w\-\:]*)\/(.*)/)
+        node, task_action = $1, $2
+        task_params.merge!("node" => node)
+      end
+
+      post_body = PostBody.new(
+        :assembly_id  => assembly_or_workspace_id,
+        :commit_msg?  => options.commit_msg,
+        :task_action? => task_action,
+        :task_params? => task_params
+      )
+      response = post rest_url("assembly/exec"), post_body
+      return response unless response.ok?
+
+      response_data = response.data
+
+      if violations = response_data['violations']
+        OsUtil.print("The following violations were found; they must be corrected before workspace can be converged", :red)
+        resp = DTK::Client::Response.new(:assembly, { "status" => 'ok', "data" => violations })
+        return opts[:internal_trigger] ? { :violations => resp } : resp.render_table(:violation)
+      end
+
+      if confirmation_message = response_data["confirmation_message"]
+        return unless Console.confirmation_prompt("Workspace service is stopped, do you want to start it"+'?')
+
+        response = post rest_url("assembly/exec"), post_body.merge!(:start_assembly => true, :skip_violations => true)
+        return response unless response.ok?
+
+        response_data = response.data
+      end
+
+      if message = response_data["message"]
+        OsUtil.print(message, :yellow)
+        return
+      end
+
+      return Response::Ok.new()
+    end
+
+    def exec_sync_aux(context_params)
+      assembly_or_workspace_id = context_params.retrieve_arguments([REQ_ASSEMBLY_OR_WS_ID], method_argument_names)
+
+      response = exec_aux(context_params, {:internal_trigger => true})
+      return response if (response.is_a?(Response) && !response.ok?) || response.nil?
+
+      if violations_response = response[:violations]
+        return violations_response.render_table(:violation)
+      end
+
+      task_status_stream(assembly_or_workspace_id)
+    end
+
     def converge_aux(context_params,opts={})
       assembly_or_workspace_id,task_action,task_params_string = context_params.retrieve_arguments([REQ_ASSEMBLY_OR_WS_ID,:option_1,:option_2],method_argument_names)
 
@@ -399,7 +471,7 @@ module DTK::Client
       Response::Ok.new()
     end
 
-    def workflow_info_aux(context_params)
+    def action_info_aux(context_params)
       assembly_or_workspace_id,workflow_name = context_params.retrieve_arguments([REQ_ASSEMBLY_OR_WS_ID,:option_1],method_argument_names)
       post_body = {
         :assembly_id => assembly_or_workspace_id,
@@ -900,7 +972,8 @@ module DTK::Client
 
       if node_id.nil? && !(component_id.to_s =~ /^[0-9]+$/)
         if component_id.to_s.include?('/')
-          node_id, component_id = component_id.split('/')
+          cmp_match = component_id.match(/([\w-]*)\/(.*)/)
+          node_id, component_id = cmp_match[1], cmp_match[2]
           node_name = node_id
         else
           # TODO: update server so dont have to pass in 'assembly_wide'
@@ -1346,6 +1419,10 @@ module DTK::Client
               detail_to_include = [:component_dependencies]
             end
           when "attributes"
+            node_id      = options.node unless node_id
+            component_id = options.component unless component_id
+            attribute_id = options.attribute unless attribute_id
+
             data_type = (options.links? ? :workspace_attribute_w_link : :workspace_attribute)
             edit_attr_format = context_params.get_forwarded_options()[:format] if context_params.get_forwarded_options()
             if tags = options.tags
@@ -1371,10 +1448,11 @@ module DTK::Client
       end
 
       post_body = {
-        :assembly_id => assembly_or_workspace_id,
-        :node_id => node_id,
+        :assembly_id  => assembly_or_workspace_id,
+        :node_id      => node_id,
         :component_id => component_id,
-        :subtype     => 'instance',
+        :attribute_id => attribute_id,
+        :subtype      => 'instance',
       }.merge(post_options)
 
       post_body.merge!(:detail_to_include => detail_to_include) if detail_to_include
@@ -1441,5 +1519,38 @@ module DTK::Client
         raise DtkError, 'Please use -c option only with service instance component attributes (cmp_name/attribute_name)'
       end
     end
+
+    def stage_aux(context_params)
+      assembly_template_name, instance_name = context_params.retrieve_arguments([:option_1!, :option_2], method_argument_names)
+
+      service_module_name, assembly, assembly_name = assembly_template_name.split('/')
+      raise DtkValidationError, "Service module name is ill-formed! Should contain <namespace>:<name>" unless service_module_name =~ /(^[^:]+):([^:]+$)/
+
+      unless assembly_name
+        assembly_name = assembly
+        assembly = nil
+      end
+      raise DtkValidationError, "ASSEMBLY-NAME parameter is ill-formed! Should contain <namespace>:<service_name>/assembly/<assembly_name> or <namespace>:<service_name>/<assembly_name>" if assembly && !assembly.eql?('assembly')
+
+      new_context_params = DTK::Shell::ContextParams.new
+      new_context_params.add_context_to_params(:service_module, :service_module)
+      new_context_params.add_context_name_to_params(:service_module, :service_module, service_module_name)
+      new_context_params.method_arguments = [assembly_name]
+      new_context_params.method_arguments << instance_name if instance_name
+
+      fwd_opts  = {}
+      in_target = options["in-target"]
+      node_size = options.node_size
+      os_type   = options.os_type
+      version   = options.version
+
+      fwd_opts.merge!(:in_target => in_target) if in_target
+      fwd_opts.merge!(:node_size => node_size) if node_size
+      fwd_opts.merge!(:os_type => os_type) if os_type
+      fwd_opts.merge!(:version => version) if version
+      new_context_params.forward_options(fwd_opts)
+
+      response = ContextRouter.routeTask(:service_module, "stage", new_context_params, @conn)
+    end
   end
 end

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

@@ -22,8 +22,9 @@ module DTK::Client
       # clone base version first if not cloned already
       clone_base_aux(module_type, module_id, "#{module_namespace}:#{module_name}") if opts[:use_latest] && version
 
-      module_location = OsUtil.module_location(module_type, "#{module_namespace}:#{module_name}", version)
-      raise DTK::Client::DtkValidationError, "#{module_type.to_s.gsub('_',' ').capitalize} '#{module_name}#{version && "-#{version}"}' already cloned!" if File.directory?(module_location) && !opts[:skip_if_exist_check]
+     # TODO: DTK-2358: comenyed out because causing error in this jira; see if need to put in in revisedform to avoid this error; below is checking wromg thing ( module_location is set to wromg thing to check)
+      # module_location = OsUtil.module_location(module_type, "#{module_namespace}:#{module_name}", version)
+      # raise DTK::Client::DtkValidationError, "#{module_type.to_s.gsub('_',' ').capitalize} '#{module_name}#{version && "-#{version}"}' already cloned!" if File.directory?(module_location) && !opts[:skip_if_exist_check]
 
       full_module_name = ModuleUtil.resolve_name(module_name, module_namespace)
 

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

@@ -87,19 +87,21 @@ module DTK::Client
       end
     end
 
-    def delete_module_aux(context_params, method_opts={})
+    def delete_module_aux(context_params, method_opts = {})
       module_location, modules_path = nil, nil
       module_id = context_params.retrieve_arguments([:option_1!], method_argument_names)
 
       delete_module_sub_aux(context_params, module_id, method_opts)
     end
 
-    def delete_module_sub_aux(context_params, module_id, method_opts={})
-      # ModuleUtil.check_format!(module_id)
-      version = options.version
+    def delete_module_sub_aux(context_params, module_id, method_opts = {})
+      version     = options.version
       module_name = get_name_from_id_helper(module_id)
       module_type = get_module_type(context_params)
 
+      # delete all versions
+      version = 'delete_all' if method_opts[:delete_all]
+
       unless (options.force? || method_opts[:force_delete])
         msg = "Are you sure you want to delete module '#{module_name}'"
         msg += " version '#{version}'" if version
@@ -111,26 +113,34 @@ module DTK::Client
       opts = { :module_name => module_name }
 
       unless version
-        post_body.merge!(:include_base => true)
+        # post_body.merge!(:include_base => true)
 
         versions_response = post rest_url("#{module_type}/list_versions"), post_body
         return versions_response unless versions_response.ok?
 
         versions = versions_response.data.first['versions']
-        if versions.size > 2
-          versions << "all"
+        if versions.size > 0
+          versions << "all" unless versions.size == 1
           ret_version = Console.confirmation_prompt_multiple_choice("\nSelect version to delete:", versions)
           return unless ret_version
           raise DtkError, "You are not allowed to delete 'base' version while other versions exist!" if ret_version.eql?('base')
           version = ret_version
+        else
+          raise DtkError, "There are no versions created for #{module_type} '#{module_name}'!"
         end
       end
 
       if version
         if version.eql?('all')
+          # delete only versions (not base)
+          post_body.merge!(:all_except_base => true)
+          opts.merge!(:all_except_base => true)
+        elsif version.eql?('delete_all')
+          # this means delete entire module (including all versions + base)
           post_body.merge!(:delete_all_versions => true)
           opts.merge!(:delete_all_versions => true)
         else
+          # delete specific version only
           post_body.merge!(:version => version)
           opts.merge!(:version => version)
         end
@@ -156,6 +166,8 @@ module DTK::Client
 
       unless method_opts[:no_error_msg]
         if version && version.eql?('all')
+          OsUtil.print("All versions (except base) of '#{module_name}' module have been deleted.", :yellow)
+        elsif version && version.eql?('delete_all')
           OsUtil.print("All versions of '#{module_name}' module have been deleted.", :yellow)
         else
           msg = "Module '#{module_name}' "
@@ -242,6 +254,7 @@ module DTK::Client
       remote_module_name, version = context_params.retrieve_arguments([:option_1!, :option_2], method_argument_names)
       forwarded_version           = context_params.get_forwarded_options()['version']
       add_version                 = false
+      master_only                 = (options.version? && options.version.eql?('master'))
 
       version ||= forwarded_version || options.version
       version = nil if version.eql?('master')
@@ -276,7 +289,8 @@ module DTK::Client
       # we need to install base module version if not installed
       unless skip_base
         master_response = install_base_version_aux?(context_params, post_body, module_type, version)
-        return master_response unless master_response.ok?
+        # return master_response unless master_response.ok?
+        return master_response if !master_response.ok? || master_only
 
         latest_version = master_response.data(:latest_version)
 
@@ -317,7 +331,7 @@ module DTK::Client
         opts = { :do_not_raise => true }
         module_opts = ignore_component_error ? opts.merge(:ignore_component_error => true) : opts.merge(:additional_message => true)
         module_opts.merge!(:update_none => true) if options.update_none?
-        module_opts.merge!(:hide_output => true) if skip_base
+        module_opts.merge!(:hide_output => true) if skip_base && !master_only
 
         continue = trigger_module_auto_import(missing_components, required_components, module_opts)
         return unless continue
@@ -362,14 +376,16 @@ module DTK::Client
         raise DtkError, "Module '#{remote_module_name}' version '#{version}' does not exist on repo manager!" unless versions.include?(version)
       end
 
+      base_response = nil
       if !head_installed && !latest_version.eql?('master')
         new_context_params = DTK::Shell::ContextParams.new
         new_context_params.add_context_to_params(module_type, module_type)
         new_context_params.method_arguments = [remote_module_name]
         new_context_params.forward_options('skip_base' => true, 'version' => 'master')
-        install_module_aux(new_context_params)
+        base_response = install_module_aux(new_context_params)
       end
 
+      return base_response if base_response && (options.version? && options.version.eql?('master'))
       master_response
     end
 
@@ -436,10 +452,15 @@ module DTK::Client
 
     def publish_module_aux(context_params)
       module_type = get_module_type(context_params)
-      module_id, module_name, input_remote_name = context_params.retrieve_arguments([REQ_MODULE_ID, REQ_MODULE_NAME, :option_1!], method_argument_names)
+      module_id, module_name, input_remote_name = context_params.retrieve_arguments([REQ_MODULE_ID, REQ_MODULE_NAME, :option_1], method_argument_names)
 
       raise DtkValidationError, "You have to provide version you want to publish!" unless options.version
 
+      unless input_remote_name
+        input_remote_name = module_name.gsub(":","/")
+        context_params.method_arguments << input_remote_name
+      end
+
       skip_base         = context_params.get_forwarded_options()['skip_base']
       forwarded_version = context_params.get_forwarded_options()['version']
 

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

@@ -37,9 +37,9 @@ module DTK::Client
           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
         opts_perform_locally = remote_params.merge(
-          :full_module_name => full_module_name, 
-          :force => opts[:force], 
-          :do_not_raise => opts[:do_not_raise], 
+          :full_module_name => full_module_name,
+          :force => opts[:force],
+          :do_not_raise => opts[:do_not_raise],
           :ignore_dependency_merge_conflict => opts[:ignore_dependency_merge_conflict]
         )
         PullFromRemote.perform_locally(self,module_type,module_id,module_name,opts_perform_locally)
@@ -102,9 +102,9 @@ module DTK::Client
         if custom_message = response.data[:custom_message]
           puts custom_message
         elsif (response.data[:diffs].nil? || response.data[:diffs].empty?)
-          puts "No changes to pull from remote." unless response['errors']
+          puts "No changes to pull from remote.".colorize(:yellow) unless response['errors']
         else
-          puts "Changes pulled from remote"
+          puts "Changes pulled from remote".colorize(:green)
         end
 
         response

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

@@ -4,10 +4,12 @@ module DTK::Client
       module_name = opts[:module_name]
       version = opts[:version]
       opts_module_loc = (opts[:assembly_module] ? {:assembly_module => opts[:assembly_module]} : Hash.new)
-      module_location = OsUtil.module_location(module_type,module_name,version,opts_module_loc)
+      module_location = OsUtil.module_location(module_type, module_name, version, opts_module_loc)
       dirs_to_delete = [module_location]
       if opts[:delete_all_versions]
-        dirs_to_delete += OsUtil.module_version_locations(module_type,module_name,version,opts)
+        dirs_to_delete += OsUtil.module_version_locations(module_type, module_name, version, opts)
+      elsif opts[:all_except_base]
+        dirs_to_delete = OsUtil.module_version_locations(module_type, module_name, version, opts)
       end
       response = Response::Ok.new()
       pwd = Dir.getwd()

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

@@ -5,14 +5,16 @@ dtk_require("../../../domain/git_adapter")
 module DTK::Client
   module PushToRemoteMixin
 
+    NO_PUSH_CHANGES_MSG = "There are no changes to push"
+
     def push_to_git_remote_aux(full_module_name, module_type, version, opts, force = false)
       opts.merge!(:force => force)
 
       response = Helper(:git_repo).push_changes(module_type, full_module_name, version, opts)
 
       return response unless response.ok?
-      if response.data(:diffs).empty?
-        raise DtkError, "No changes to push"
+      if response.data(:diffs) && !response.data(:diffs)[:are_there_changes]
+        raise DtkError, NO_PUSH_CHANGES_MSG
       end
 
       Response::Ok.new()
@@ -40,8 +42,8 @@ module DTK::Client
         response = Helper(:git_repo).push_changes(module_type, full_module_name, version, opts)
         return response unless response.ok?
 
-        if response.data(:diffs).empty?
-          raise DtkError, "No changes to push"
+        if response.data(:diffs) && !response.data(:diffs)[:are_there_changes]
+          raise DtkError, NO_PUSH_CHANGES_MSG
         end
 
         Response::Ok.new()
@@ -64,8 +66,8 @@ module DTK::Client
       }
       response = Helper(:git_repo).push_changes(module_type, full_module_name, version, opts)
       return response unless response.ok?
-      if response.data(:diffs).empty?
-        raise DtkError, "No changes to push"
+      if response.data(:diffs) && !response.data(:diffs)[:are_there_changes]
+        raise DtkError, NO_PUSH_CHANGES_MSG
       end
 
       Response::Ok.new()

data/lib/commands/thor/account.rb

@@ -26,6 +26,20 @@ module DTK::Client
       end
     end
 
+    def self.extended_context()
+      {
+        :context => {
+          :delete_ssh_key => {
+            :field => "username",
+            :url => "account/list_ssh_keys",
+            :opts => { :username => "#{::DTK::Client::Configurator.client_username}" }
+          }
+        },
+        :command => {
+        }
+      }
+    end
+
     def self.internal_add_user_access(url, post_body, component_name)
       response = post(rest_url(url),post_body)
       key_exists_already = (response.error_message||'').include?(KEY_EXISTS_ALREADY_CONTENT)
@@ -107,9 +121,7 @@ module DTK::Client
 
     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}
-
+      post_body = {:username => ::DTK::Client::Configurator.client_username }
       response = post rest_url("account/list_ssh_keys"), post_body
       response.render_table(:account_ssh_keys)
     end

data/lib/commands/thor/assembly.rb

@@ -51,7 +51,7 @@ module DTK::Client
         end
       end
 
-      raise DTK::Client::DtkError, "Illegal name (#{assembly_template_name}) for assembly." if assembly_template_name.nil?
+      raise DTK::Client::DtkError, "Illegal name or id (#{assembly_template_id}) for assembly." if assembly_template_name.nil?
       return assembly_template_name
     end
 

data/lib/commands/thor/component_module.rb

@@ -60,17 +60,28 @@ module DTK::Client
       return :component_module, "component_module/list", nil
     end
 
-    desc "delete COMPONENT-MODULE-NAME [-y] [-p] [-v VERSION]", "Delete component module and all items contained in it. Optional parameter [-p] is to delete local directory."
+    desc "delete-version COMPONENT-MODULE-NAME [-y] [-p] [-v VERSION]", "Delete component module version and all items contained in it. Optional parameter [-p] is to delete local directory."
     method_option :force, :aliases => '-y', :type => :boolean, :default => false
     method_option :purge, :aliases => '-p', :type => :boolean, :default => false
     version_method_option
-    def delete(context_params,method_opts={})
+    def delete_version(context_params, method_opts = {})
       response = delete_module_aux(context_params, method_opts)
       @@invalidate_map << :component_module if response && response.ok?
 
       response
     end
 
+    desc "delete COMPONENT-MODULE-NAME [-y] [-p]", "Delete component module and all items contained in it. Optional parameter [-p] is to delete local directory."
+    method_option :force, :aliases => '-y', :type => :boolean, :default => false
+    method_option :purge, :aliases => '-p', :type => :boolean, :default => false
+    # version_method_option
+    def delete(context_params, method_opts = {})
+      response = delete_module_aux(context_params, method_opts.merge!(:delete_all => true))
+      @@invalidate_map << :component_module if response && response.ok?
+
+      response
+    end
+
     desc "COMPONENT-MODULE-NAME/ID set-attribute ATTRIBUTE-ID VALUE", "Set value of component module attributes"
     def set_attribute(context_params)
       set_attribute_module_aux(context_params)
@@ -289,7 +300,7 @@ module DTK::Client
     #   return response
     # end
 
-    desc "COMPONENT-MODULE-NAME/ID publish [[NAMESPACE/]REMOTE-COMPONENT-MODULE-NAME] [-v VERSION] [--force]", "Publish component module to remote repository."
+    desc "COMPONENT-MODULE-NAME/ID publish [[NAMESPACE/]REMOTE-COMPONENT-MODULE-NAME] -v VERSION [--force]", "Publish component module to remote repository."
     version_method_option
     method_option :force, :type => :boolean, :default => false, :aliases => '-f'
     def publish(context_params)

data/lib/commands/thor/node.rb

@@ -38,9 +38,13 @@ module DTK::Client
     def self.extended_context()
       {
         :context => {
-          :add_component => "component_template"
         },
         :command => {
+          :add_component => {
+            :endpoint => "component_template",
+            :url => "component/list",
+            :opts => {:subtype=>"template", :ignore => "test_module", :hide_assembly_cmps => "true"}
+          },
           :delete_component => {
             :endpoint => "assembly",
             :url => "assembly/info_about",

data/lib/commands/thor/service.rb

@@ -101,19 +101,23 @@ module DTK::Client
             :url => "assembly/info_about",
             :opts => {:subtype=>"instance", :about=>"modules"}
           },
-          :workflow_info => {
+          :action_info => {
             :endpoint => "assembly",
             :url => "assembly/task_action_list"
           },
           :exec => {
             :endpoint => "assembly",
-            :url => "assembly/task_action_list"
+            :url => "assembly/list_actions"
           },
-          # TODO: DEPRECATE execute_workflow 
-          :execute_workflow => {
+          :exec_sync => {
             :endpoint => "assembly",
-            :url => "assembly/task_action_list"
+            :url => "assembly/list_actions"
           }
+          # TODO: DEPRECATE execute_workflow
+          # :execute_workflow => {
+          #   :endpoint => "assembly",
+          #   :url => "assembly/task_action_list"
+          # }
         }
       }
     end
@@ -264,24 +268,35 @@ module DTK::Client
       Response::Ok.new()
     end
 
-    desc "SERVICE-NAME/ID exec SERVICE-LEVEL-ACTION [PARAMS] [--stream-results]", "Execute a service level action"
-    method_option 'stream-results', :aliases => '-s', :type => :boolean, :default => false, :desc => "Stream results"
+    desc "SERVICE-NAME/ID exec [NODE/NODE-GROUP/]ACTION [ACTION-PARAMS]", "Execute action asynchronously"
     def exec(context_params)
-      opts = {}
-      opts.merge!(:mode => :stream) if context_params.pure_cli_mode or options['stream-results']
-      converge_aux(context_params, opts)
+      exec_aux(context_params)
     end
-    # TODO: DEPRECATE: keeping around for backward compatibiity but will be deprecating execute-workflow
-    desc "SERVICE-NAME/ID execute-workflow WORKFLOW-ACTION [WORKFLOW-PARAMS] [-m COMMIT-MSG]", "Execute workflow.", :hide => true
-    method_option "commit_msg",:aliases => "-m" ,
-      :type => :string,
-      :banner => "COMMIT-MSG",
-      :desc => "Commit message"
-    def execute_workflow(context_params)
-      OsUtil.print_deprecate_message("Command 'execute-workflow' will be deprecated; use 'exec' instead")
-      converge(context_params)
+
+    desc "SERVICE-NAME/ID exec-sync [NODE/NODE-GROUP/]ACTION [ACTION-PARAMS]", "Execute action synchronously"
+    def exec_sync(context_params)
+      exec_sync_aux(context_params)
     end
 
+    # desc "SERVICE-NAME/ID exec SERVICE-LEVEL-ACTION [PARAMS] [--stream-results]", "Execute a service level action", :hide => true
+    # method_option 'stream-results', :aliases => '-s', :type => :boolean, :default => false, :desc => "Stream results"
+    # def exec(context_params)
+    #   opts = {}
+    #   opts.merge!(:mode => :stream) if context_params.pure_cli_mode or options['stream-results']
+    #   converge_aux(context_params, opts)
+    # end
+
+    # TODO: DEPRECATE: keeping around for backward compatibiity but will be deprecating execute-workflow
+    # desc "SERVICE-NAME/ID execute-workflow WORKFLOW-ACTION [WORKFLOW-PARAMS] [-m COMMIT-MSG]", "Execute workflow.", :hide => true
+    # method_option "commit_msg",:aliases => "-m" ,
+    #   :type => :string,
+    #   :banner => "COMMIT-MSG",
+    #   :desc => "Commit message"
+    # def execute_workflow(context_params)
+    #   OsUtil.print_deprecate_message("Command 'execute-workflow' will be deprecated; use 'exec' instead")
+    #   converge(context_params)
+    # end
+
     desc "SERVICE-NAME/ID converge [-m COMMIT-MSG] [--stream-results]", "Converge service instance."
     method_option "commit_msg",:aliases => "-m" ,
       :type => :string,
@@ -294,15 +309,15 @@ module DTK::Client
       converge_aux(context_params, opts)
     end
 
-    desc "SERVICE-NAME/ID execute-action COMPONENT-INSTANCE [ACTION-NAME [ACTION-PARAMS]]", "Converge the component or execute tha action on the component."
-    def execute_action(context_params)
-      execute_ad_hoc_action_aux(context_params)
-    end
+    # desc "SERVICE-NAME/ID execute-action COMPONENT-INSTANCE [ACTION-NAME [ACTION-PARAMS]]", "Converge the component or execute tha action on the component.", :hide => true
+    # def execute_action(context_params)
+    #   execute_ad_hoc_action_aux(context_params)
+    # end
 
-    desc "SERVICE-NAME/ID list-actions [--summary]", "List the actions defined on components in the service instance."
-    method_option :summary, :aliases => '-s', :type => :boolean, :default => false
+    desc "SERVICE-NAME/ID list-actions [--type TYPE]", "List the actions defined on components in the service instance."
+    method_option :type, :aliases => '-t'
     def list_actions(context_params)
-      list_ad_hoc_actions_aux(context_params)
+      list_actions_aux(context_params)
     end
 
     desc "SERVICE-NAME/ID push-assembly-updates [NAMESPACE:SERVICE-MODULE-NAME/ASSEMBLY-NAME]", "Push changes made to this service instance to the designated assembly; default is parent assembly."
@@ -343,18 +358,21 @@ module DTK::Client
       edit_module_aux(context_params)
     end
 
-    desc "SERVICE-NAME/ID create-workflow WORKFLOW-NAME [--from BASE-WORKFLOW-NAME]", "Create a new workflow in the service instance."
-    method_option :from, :type => :string
-    def create_workflow(context_params)
-      edit_or_create_workflow_aux(context_params,:create => true,:create_from => options.from)
-    end
+    # desc "SERVICE-NAME/ID create-workflow WORKFLOW-NAME [--from BASE-WORKFLOW-NAME]", "Create a new workflow in the service instance."
+    # method_option :from, :type => :string
+    # def create_workflow(context_params)
+    #   edit_or_create_workflow_aux(context_params,:create => true,:create_from => options.from)
+    # end
 
-    desc "SERVICE-NAME/ID edit-workflow [WORKFLOW-NAME]", "Edit a workflow in the service instance."
-    def edit_workflow(context_params)
+    desc "SERVICE-NAME/ID edit-action [SERVICE-LEVEL-ACTION]", "Edit action in the service instance."
+    def edit_action(context_params)
       edit_or_create_workflow_aux(context_params)
     end
 
-    desc "SERVICE-NAME/ID edit-attributes", "Edit service's attributes."
+    desc "SERVICE-NAME/ID edit-attributes [-n NODE] [-c COMPONENT] [-a ATTRIBUTE]", "Edit service's attributes."
+    method_option :node, :aliases => '-n'
+    method_option :component, :aliases => '-c'
+    method_option :attribute, :aliases => '-a'
     def edit_attributes(context_params)
       edit_attributes_aux(context_params)
     end
@@ -421,10 +439,13 @@ TODO: will put in dot release and will rename to 'extend'
       list_components_aux(context_params)
     end
 
-    desc "SERVICE-NAME/ID list-attributes [-f FORMAT] [-t TAG,..] [--links]","List attributes associated with service."
+    desc "SERVICE-NAME/ID list-attributes [-f FORMAT] [-t TAG,..] [--links] [-n NODE] [-c COMPONENT] [-a ATTRIBUTE]","List attributes associated with service."
     method_option :format, :aliases => '-f'
     method_option :tags, :aliases => '-t'
     method_option :links, :type => :boolean, :default => false, :aliases => '-l'
+    method_option :node, :aliases => '-n'
+    method_option :component, :aliases => '-c'
+    method_option :attribute, :aliases => '-a'
     def list_attributes(context_params)
       list_attributes_aux(context_params)
     end
@@ -449,15 +470,15 @@ TODO: will put in dot release and will rename to 'extend'
       print_includes_aux(context_params)
     end
 
-    desc "SERVICE-NAME/ID workflow-info [WORKFLOW-NAME]", "Get the contents of a workflow associated with the service."
-    def workflow_info(context_params)
-      workflow_info_aux(context_params)
+    desc "SERVICE-NAME/ID action-info [SERVICE-LEVEL-ACTION]", "Get the contents of action associated with the service."
+    def action_info(context_params)
+      action_info_aux(context_params)
     end
 
-    desc "SERVICE-NAME/ID list-workflows", "List the workflows associated with the service."
-    def list_workflows(context_params)
-      workflow_list_aux(context_params)
-    end
+    # desc "SERVICE-NAME/ID list-workflows", "List the workflows associated with the service.", :hide => true
+    # def list_workflows(context_params)
+    #   workflow_list_aux(context_params)
+    # end
 
     desc "list","List services."
     def list(context_params)
@@ -777,6 +798,17 @@ TODO: will put in dot release and will rename to 'extend'
       grep_aux(context_params)
     end
 
+    desc "stage ASSEMBLY-TEMPLATE [INSTANCE-NAME] [-t TARGET-NAME/ID] [--node-size NODE-SIZE-SPEC] [--os-type OS-TYPE] [-v VERSION]", "Stage assembly in target."
+    method_option "in-target", :aliases => "-t", :type => :string, :banner => "TARGET-NAME/ID", :desc => "Target (id) to create assembly in"
+    method_option :node_size, :type => :string, :aliases => "--node-size"
+    method_option :os_type, :type => :string, :aliases => "--os-type"
+    version_method_option
+    #hidden options
+    method_option "instance-bindings", :type => :string
+    method_option :settings, :type => :string, :aliases => '-s'
+    def stage(context_params)
+      stage_aux(context_params)
+    end
 
   end
 end

data/lib/commands/thor/service_module.rb

@@ -25,6 +25,35 @@ module DTK::Client
       def get_service_module_name(service_module_id)
         get_name_from_id_helper(service_module_id)
       end
+
+      def get_name_and_version_from_assembly_template(assembly_template_name)
+        name    = assembly_template_name
+        version = nil
+
+        if assembly_template_name.match(/(.*)(\-v\d{1,2}\.\d{1,2}\.\d{1,2}\Z)/)
+          name, version = [$1,$2]
+        end
+
+        if version
+          version.gsub!('-v','')
+        else
+          version = 'base'
+        end
+
+        return name, version
+      end
+    end
+
+    def self.extended_context()
+      {
+        :command => {
+          :stage => {
+            :endpoint => "service_module",
+            :url => "service_module/list_assemblies",
+            :opts => {}
+          }
+        }
+      }
     end
 
     def self.valid_children()
@@ -269,7 +298,7 @@ module DTK::Client
     #   post rest_url("service_module/export"), post_body
     # end
 
-    desc "SERVICE-MODULE-NAME/ID publish [[NAMESPACE/]REMOTE-SERVICE-MODULE-NAME]  [-v VERSION] [--force]","Publish service module to remote repository"
+    desc "SERVICE-MODULE-NAME/ID publish [[NAMESPACE/]REMOTE-SERVICE-MODULE-NAME]  -v VERSION [--force]","Publish service module to remote repository"
     version_method_option
     method_option :force, :type => :boolean, :default => false, :aliases => '-f'
     def publish(context_params)
@@ -464,22 +493,24 @@ module DTK::Client
       # 'assembly-create', 'install' etc.
       @@invalidate_map << :assembly
 
+      fwd_options       = context_params.get_forwarded_options()
+      in_target         = fwd_options[:in_target]||options["in-target"]
+      instance_bindings = options["instance-bindings"]
+      settings          = parse_service_settings(options["settings"])
+      node_size         = fwd_options[:node_size]||options.node_size
+      os_type           = fwd_options[:os_type]||options.os_type
+      version           = fwd_options[:version]||options.version
+      assembly_list     = Assembly.assembly_list()
+
       if assembly_template_name.to_s =~ /^[0-9]+$/
-        assembly_template_name = get_assembly_name(assembly_template_id)
+        assembly_template_name = DTK::Client::Assembly.get_assembly_template_name_for_service(assembly_template_name, service_module_name)
+        assembly_template_name, version = get_name_and_version_from_assembly_template(assembly_template_name)
       else
         namespace, module_name = get_namespace_and_name(service_module_name, ':')
         assembly_template_name = "#{module_name}/#{assembly_template_name}"
       end
       assembly_template_name.gsub!(/(::)|(\/)/,'-') if assembly_template_name
 
-      in_target         = options["in-target"]
-      instance_bindings = options["instance-bindings"]
-      settings          = parse_service_settings(options["settings"])
-      node_size         = options.node_size
-      os_type           = options.os_type
-      version           = options.version
-      assembly_list     = Assembly.assembly_list()
-
       if name
         raise DTK::Client::DtkValidationError, "Unable to stage service with name '#{name}'. Service with specified name exists already!" if assembly_list.include?(name)
       else
@@ -595,14 +626,22 @@ module DTK::Client
       # list_diffs_module_aux(context_params)
     end
 
-    # desc "delete SERVICE-MODULE-NAME [-v VERSION] [-y] [-p]", "Delete service module or service module version and all items contained in it. Optional parameter [-p] is to delete local directory."
-    # version_method_option
-    desc "delete SERVICE-MODULE-NAME [-y] [-p] [-v VERSION]", "Delete service module and all items contained in it. Optional parameter [-p] is to delete local directory."
+    desc "delete-version SERVICE-MODULE-NAME [-y] [-p] [-v VERSION]", "Delete service module version and all items contained in it. Optional parameter [-p] is to delete local directory."
     method_option :force, :aliases => '-y', :type => :boolean, :default => false
     method_option :purge, :aliases => '-p', :type => :boolean, :default => false
     version_method_option
+    def delete_version(context_params, method_opts = {})
+      response = delete_module_aux(context_params, method_opts)
+      @@invalidate_map << :service_module if response && response.ok?
+
+      response
+    end
+
+    desc "delete SERVICE-MODULE-NAME [-y] [-p]", "Delete service module and all items contained in it. Optional parameter [-p] is to delete local directory."
+    method_option :force, :aliases => '-y', :type => :boolean, :default => false
+    method_option :purge, :aliases => '-p', :type => :boolean, :default => false
     def delete(context_params)
-      response = delete_module_aux(context_params)
+      response = delete_module_aux(context_params, :delete_all => true)
       @@invalidate_map << :service_module if response && response.ok?
 
       response

data/lib/commands/thor/workspace.rb

@@ -78,19 +78,23 @@ module DTK::Client
             :url => "assembly/info_about",
             :opts => {:subtype=>"instance", :about=>"modules"}
           },
-          :workflow_info => {
+          :action_info => {
             :endpoint => "assembly",
             :url => "assembly/task_action_list"
           },
           :exec => {
             :endpoint => "assembly",
-            :url => "assembly/task_action_list"
+            :url => "assembly/list_actions"
           },
-          # TODO: DEPRECATE execute_workflow
-          :execute_workflow => {
+          :exec_sync => {
             :endpoint => "assembly",
-            :url => "assembly/task_action_list"
+            :url => "assembly/list_actions"
           }
+          # TODO: DEPRECATE execute_workflow
+          # :execute_workflow => {
+          #   :endpoint => "assembly",
+          #   :url => "assembly/task_action_list"
+          # }
         }
       }
     end
@@ -194,25 +198,35 @@ module DTK::Client
     #  clear_tasks_aux(context_params)
     #end
 
-    desc "WORKSPACE-NAME/ID exec SERVICE-LEVEL-ACTION [PARAMS] [--stream-results]", "Execute a service level action"
-    method_option 'stream-results', :aliases => '-s', :type => :boolean, :default => false, :desc => "Stream results"
+    desc "WORKSPACE-NAME/ID exec [NODE/NODE-GROUP/]ACTION [ACTION-PARAMS]", "Execute action asynchronously"
     def exec(context_params)
-      opts = {}
-      opts.merge!(:mode => :stream) if context_params.pure_cli_mode or options['stream-results']
-      converge_aux(context_params, opts)
+      exec_aux(context_params)
     end
 
-    # TODO: DEPRECATE: keeping around for backward compatibiity but will be deprecating execute-workflow
-    desc "WORKSPACE-NAME/ID execute-workflow WORKFLOW-ACTION [WORKFLOW-PARAMS] [-m COMMIT-MSG]", "Execute workflow.", :hide => true
-    method_option "commit_msg",:aliases => "-m",
-      :type => :string,
-      :banner => "COMMIT-MSG",
-      :desc => "Commit message"
-    def execute_workflow(context_params)
-      OsUtil.print_deprecate_message("Command 'execute-workflow' will be deprecated; use 'exec' instead")
-      converge_aux(context_params)
+    desc "WORKSPACE-NAME/ID exec-sync [NODE/NODE-GROUP/]ACTION [ACTION-PARAMS]", "Execute action synchronously"
+    def exec_sync(context_params)
+      exec_sync_aux(context_params)
     end
 
+    # desc "WORKSPACE-NAME/ID exec SERVICE-LEVEL-ACTION [PARAMS] [--stream-results]", "Execute a service level action"
+    # method_option 'stream-results', :aliases => '-s', :type => :boolean, :default => false, :desc => "Stream results"
+    # def exec(context_params)
+    #   opts = {}
+    #   opts.merge!(:mode => :stream) if context_params.pure_cli_mode or options['stream-results']
+    #   converge_aux(context_params, opts)
+    # end
+
+    # TODO: DEPRECATE: keeping around for backward compatibiity but will be deprecating execute-workflow
+    # desc "WORKSPACE-NAME/ID execute-workflow WORKFLOW-ACTION [WORKFLOW-PARAMS] [-m COMMIT-MSG]", "Execute workflow.", :hide => true
+    # method_option "commit_msg",:aliases => "-m",
+    #   :type => :string,
+    #   :banner => "COMMIT-MSG",
+    #   :desc => "Commit message"
+    # def execute_workflow(context_params)
+    #   OsUtil.print_deprecate_message("Command 'execute-workflow' will be deprecated; use 'exec' instead")
+    #   converge_aux(context_params)
+    # end
+
 
     desc "WORKSPACE-NAME/ID converge [-m COMMIT-MSG] [--stream-results]", "Converge workspace instance."
     method_option "commit_msg",:aliases => "-m" ,
@@ -415,18 +429,21 @@ module DTK::Client
       edit_module_aux(context_params)
     end
 
-    desc "WORKSPACE-NAME/ID create-workflow WORKFLOW-NAME [--from BASE-WORKFLOW-NAME]", "Create a new workflow in the workspace."
-    method_option :from, :type => :string
-    def create_workflow(context_params)
-      edit_or_create_workflow_aux(context_params,:create => true,:create_from => options.from)
-    end
+    # desc "WORKSPACE-NAME/ID create-workflow WORKFLOW-NAME [--from BASE-WORKFLOW-NAME]", "Create a new workflow in the workspace."
+    # method_option :from, :type => :string
+    # def create_workflow(context_params)
+    #   edit_or_create_workflow_aux(context_params,:create => true,:create_from => options.from)
+    # end
 
-    desc "WORKSPACE-NAME/ID edit-workflow [WORKFLOW-NAME]", "Edit a workflow in the workspace."
-    def edit_workflow(context_params)
+    desc "WORKSPACE-NAME/ID edit-action [WORKSPACE-LEVEL-ACTION]", "Edit a workflow in the workspace."
+    def edit_action(context_params)
       edit_or_create_workflow_aux(context_params)
     end
 
-    desc "WORKSPACE-NAME/ID edit-attributes", "Edit workspace's attributes."
+    desc "WORKSPACE-NAME/ID edit-attributes [-n NODE] [-c COMPONENT] [-a ATTRIBUTE]", "Edit workspace's attributes."
+    method_option :node, :aliases => '-n'
+    method_option :component, :aliases => '-c'
+    method_option :attribute, :aliases => '-a'
     def edit_attributes(context_params)
       edit_attributes_aux(context_params)
     end
@@ -496,10 +513,13 @@ module DTK::Client
       end
     end
 
-    desc "WORKSPACE-NAME/ID list-attributes [-f FORMAT] [-t TAG,..] [--links]","List attributes associated with workspace."
+    desc "WORKSPACE-NAME/ID list-attributes [-f FORMAT] [-t TAG,..] [--links] [-n NODE] [-c COMPONENT] [-a ATTRIBUTE]","List attributes associated with workspace."
     method_option :format, :aliases => '-f'
     method_option :tags, :aliases => '-t'
     method_option :links, :type => :boolean, :default => false, :aliases => '-l'
+    method_option :node, :aliases => '-n'
+    method_option :component, :aliases => '-c'
+    method_option :attribute, :aliases => '-a'
     def list_attributes(context_params)
       list_attributes_aux(context_params)
     end
@@ -530,16 +550,22 @@ module DTK::Client
       list_tasks_aux(context_params)
     end
 
-    desc "WORKSPACE-NAME/ID workflow-info [WORKFLOW-NAME]", "Get the contents of a workflow associated with the workspace."
-    def workflow_info(context_params)
-      workflow_info_aux(context_params)
+    desc "WORKSPACE-NAME/ID action-info [WORKSPACE-LEVEL-ACTION]", "Get the contents of action associated with the workspace."
+    def action_info(context_params)
+      action_info_aux(context_params)
     end
 
-    desc "WORKSPACE-NAME/ID list-workflows", "List the workflows associated with the workspace."
-    def list_workflows(context_params)
-      workflow_list_aux(context_params)
+    desc "WORKSPACE-NAME/ID list-actions [--type TYPE]", "List the actions defined on components in the workspace."
+    method_option :type, :aliases => '-t'
+    def list_actions(context_params)
+      list_actions_aux(context_params)
     end
 
+    # desc "WORKSPACE-NAME/ID list-workflows", "List the workflows associated with the workspace.", :hide => true
+    # def list_workflows(context_params)
+    #   workflow_list_aux(context_params)
+    # end
+
     desc "WORKSPACE-NAME/ID list-violations", "Finds violations in the workspace that will prevent a converge operation."
     def list_violations(context_params)
       list_violations_aux(context_params)
@@ -614,13 +640,23 @@ module DTK::Client
       task_status_aw_aux(context_params)
     end
 
-
-
-
     desc "WORKSPACE-NAME/ID task-action-detail", "Get the task info of the running or last running workspace task."
     def task_action_detail(context_params)
       task_action_detail_aw_aux(context_params)
     end
+
+    desc "stage INSTANCE-NAME ASSEMBLY-TEMPLATE [-t TARGET-NAME/ID] [--node-size NODE-SIZE-SPEC] [--os-type OS-TYPE] [-v VERSION]", "Stage assembly in target."
+    method_option "in-target", :aliases => "-t", :type => :string, :banner => "TARGET-NAME/ID", :desc => "Target (id) to create assembly in"
+    method_option :node_size, :type => :string, :aliases => "--node-size"
+    method_option :os_type, :type => :string, :aliases => "--os-type"
+    version_method_option
+    #hidden options
+    method_option "instance-bindings", :type => :string
+    method_option :settings, :type => :string, :aliases => '-s'
+    def stage(context_params)
+      stage_aux(context_params)
+    end
+
   end
 end
 

data/lib/domain/git_adapter.rb

@@ -69,7 +69,8 @@ module DTK
 
           files_modified = difference.stats[:files] ? difference.stats[:files].keys.collect { |file| { :path => file }} : []
           {
-            :files_modified => files_modified
+            :files_modified => files_modified,
+            :are_there_changes => !files_modified.empty?
           }
         else
           raise Error.new("Error finding branches: local branch '#{local_branch}' (found: #{!branch_local_obj.nil?}), remote branch '#{remote_reference}' (found: #{!branch_remote_obj.nil?})")
@@ -92,10 +93,12 @@ module DTK
       end
 
       def local_summary()
+
         {
           :files_added => (untracked() + added()).collect { |file| { :path => file }},
           :files_modified => changed().collect { |file| { :path => file }},
-          :files_deleted => deleted().collect { |file| { :path => file }}
+          :files_deleted => deleted().collect { |file| { :path => file }},
+          :are_there_changes => something_changed?
         }
       end
 
@@ -355,6 +358,10 @@ module DTK
         status.is_a?(Hash) ? status.added().keys : status.added().collect { |file| file.first }
       end
 
+      def something_changed?
+        ![changed, untracked, deleted, added].flatten.empty?
+      end
+
       def status
         @git_repo.status
       end

data/lib/dtk-client/version.rb

@@ -1,3 +1,3 @@
 module DtkClient
-  VERSION="0.7.8"
+  VERSION="0.7.9"
 end

data/lib/shell/context.rb

@@ -184,9 +184,7 @@ module DTK
           extended_context = command_clazz.respond_to?(:extended_context) ? command_clazz.extended_context() : {}
 
           unless extended_context.empty?
-            extended_context = extended_context[:context]
-            # extended_context.reject!{|k,v| k.to_s!=line_buffer}
-            # extended_context.select!{|k,v| k.to_s.eql?(line_buffer_first) || k.to_s.eql?(line_buffer_last)}
+            extended_context = extended_context[:context] || {}
             extended_context.select!{|k,v| line_buffer.include?(k.to_s)} if extended_context.respond_to?(:select!)
 
             if (extended_context[line_buffer_last] && !line_buffer_first.eql?(line_buffer_last))
@@ -196,7 +194,18 @@ module DTK
             else
               new_context = extended_context[line_buffer_first.to_sym] unless line_buffer_first.nil? || line_buffer_first.empty?
             end
-            active_context_copy.push_new_context(new_context, new_context) unless new_context.nil?
+
+            unless new_context.nil?
+              if new_context.is_a?(String)
+                active_context_copy.push_new_context(new_context, new_context)
+              elsif new_context.is_a?(Hash)
+                context_candidates = load_extended_context_commands(new_context, active_context_copy)
+                results_filter = (readline_input.match(/\/$/) && invalid_context.empty?) ? "" : readline_input.split("/").last
+                results_filter ||= ""
+                context_candidates = context_candidates.grep( /^#{Regexp.escape(results_filter)}/ )
+                return context_candidates
+              end
+            end
           end
         end
 
@@ -673,7 +682,7 @@ module DTK
         end
 
         if extended_context_commands
-            context_candidates = load_extended_context_commands(extended_context_commands, active_context_copy)
+          context_candidates = load_extended_context_commands(extended_context_commands, active_context_copy)
         else
           # If command does not end with '/' check if there are more than one result candidate for current context
           if !readline_input.empty? && !readline_input.match(/\/$/) && invalid_context.empty? && !active_context_copy.empty?
@@ -794,15 +803,17 @@ module DTK
       end
 
       def load_extended_context_commands(extended_context_commands, active_context_copy)
-        candidates = []
-        entity_name = active_context_copy.last_context
-        parent_entity = active_context_copy.context_list[1]
+        candidates        = []
+        entity_name       = active_context_copy.last_context
+        parent_entity     = active_context_copy.context_list[1]
+        response_ruby_obj = nil
 
-        if entity_name.is_identifier?
-          endpoint = extended_context_commands[:endpoint]
-          url = extended_context_commands[:url]
-          opts = extended_context_commands[:opts]||{}
+        field    = extended_context_commands[:field]||'display_name'
+        endpoint = extended_context_commands[:endpoint]
+        url      = extended_context_commands[:url]
+        opts     = extended_context_commands[:opts]||{}
 
+        if entity_name.is_identifier?
           if (parent_entity && parent_entity.is_identifier? && (parent_entity != entity_name))
             parent_id_label = "#{endpoint}_id".to_sym
             parent_id = parent_entity.identifier
@@ -814,13 +825,16 @@ module DTK
           id = entity_name.identifier
           opts[id_label] = id
 
-          # response_ruby_obj = DTK::Client::CommandBaseThor.get_cached_response(endpoint.to_sym, url, opts)
-          # when extended context autocomplete always send new request
-          response_ruby_obj = post rest_url(url), opts
-          return [] if(response_ruby_obj.nil? || !response_ruby_obj.ok?)
+          response_ruby_obj = DTK::Client::CommandBaseThor.get_cached_response(endpoint, url, opts)
+          # response_ruby_obj = post rest_url(url), opts
+        else
+          response_ruby_obj = DTK::Client::CommandBaseThor.get_cached_response(endpoint, url, opts)
+          # response_ruby_obj = post rest_url(url), opts
+        end
 
+        if response_ruby_obj && response_ruby_obj.ok?
           response_ruby_obj.data.each do |d|
-            candidates << d["display_name"]
+            candidates << d[field]
           end
         end
 

data/lib/util/console.rb

@@ -39,13 +39,13 @@ module DTK::Client
       def confirmation_prompt_simple(message, add_options=true)
         # used to disable skip with ctrl+c
         trap("INT", "SIG_IGN")
-        message += " (y/n)" if add_options
+        message += " (Y/n)" if add_options
 
         while line = Readline.readline("#{message}: ", true)
-          if (line.eql?("yes") || line.eql?("y") || line.empty?)
+          if (line.downcase.eql?("yes") || line.downcase.eql?("y") || line.empty?)
             trap("INT",false)
             return true
-          elsif (line.eql?("no") || line.eql?("n"))
+          elsif (line.downcase.eql?("no") || line.downcase.eql?("n"))
             trap("INT",false)
             return false
           end

data/lib/util/os_util.rb

@@ -126,11 +126,11 @@ module DTK
           end
         end
 
-        def module_version_locations(module_type,module_name,version=nil,opts={})
-          base_path, namespace, name = module_location_parts(module_type,module_name,version,opts) #.first
+        def module_version_locations(module_type, module_name, version = nil, opts={})
+          base_path, namespace, name = module_location_parts(module_type, module_name, version, opts) #.first
           namespace_path = "#{base_path}/#{namespace}"
           module_versions = Dir.entries(namespace_path).select{|a| a.match(/^#{name}-\d{1,2}.\d{1,2}.\d{1,2}$/)}
-          module_versions.map{ |version|"#{namespace_path}/#{version}" }
+          module_versions.map{ |version| "#{namespace_path}/#{version}" }
         end
 
         def module_clone_location(module_type)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.7.9
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types