dtk-client 0.7.7 → 0.7.8

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

@@ -18,19 +18,21 @@ module DTK::Client
       response = post(rest_url("#{module_type}/get_remote_module_info"),post_body)
       return response unless response.ok?
 
-      module_name,full_module_name = response.data(:module_name,:full_module_name)
+      module_name,full_module_name, frozen = response.data(:module_name, :full_module_name, :frozen)
+      raise DtkError, "You are not allowed to update frozen #{module_type} versions!" if frozen
+
       remote_params = response.data_hash_form(:remote_repo_url,:remote_repo,:remote_branch)
       remote_params.merge!(:version => version) if version
 
       # check and import component module dependencies before importing service itself
       unless opts[:skip_recursive_pull]
-        import_module_component_dependencies(module_type, module_id,remote_namespace)
+        import_module_component_dependencies(module_type, module_id, remote_namespace)
       end
 
       # check whether a local module exists to determine whether pull from local clone or try to pull from server
       # TODO: probably remove OsUtil.print("Pulling changes from remote: #{remote_params[:remote_repo]} @ #{remote_params[:remote_repo_url]}")
 
-      if Helper(:git_repo).local_clone_dir_exists?(module_type,module_name,:full_module_name=>full_module_name,:version=>version)
+      if Helper(:git_repo).local_clone_dir_exists?(module_type, module_name, :full_module_name => full_module_name, :version => version)
         unless rsa_pub_key
           raise DtkError,"No File found at (#{path_to_key}). Path is wrong or it is necessary to generate the public rsa key (e.g., run ssh-keygen -t rsa)"
         end

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

@@ -41,6 +41,7 @@ module DTK::Client
       post_body.merge!(:force => opts[:force]) if opts[:force]
       post_body.merge!(:task_action => opts[:task_action]) if opts[:task_action]
       post_body.merge!(:generate_docs => true) if opts[:generate_docs]
+      post_body.merge!(:use_impl_id => opts[:use_impl_id]) if opts[:use_impl_id]
 
       if opts[:set_parsed_false]
         post_body.merge!(:set_parsed_false => true)

data/lib/commands/thor/component_module.rb

@@ -60,9 +60,10 @@ module DTK::Client
       return :component_module, "component_module/list", nil
     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."
+    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."
     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)
       @@invalidate_map << :component_module if response && response.ok?
@@ -75,13 +76,14 @@ module DTK::Client
       set_attribute_module_aux(context_params)
     end
 
-    desc "list [--remote] [--diff] [-n NAMESPACE]", "List loaded or remote component modules. Use --diff to compare loaded and remote component modules."
+    desc "list [--remote] [--diffs] [-n NAMESPACE]", "List loaded or remote component modules. Use --diff to compare loaded and remote component modules."
     method_option :remote, :type => :boolean, :default => false
-    method_option :diff, :type => :boolean, :default => false
+    method_option :diffs, :type => :boolean, :default => false, :aliases => "--diff"
     method_option :namespace, :aliases => "-n" ,
       :type => :string,
       :banner => "NAMESPACE",
       :desc => "List modules only in specific namespace."
+    # method_option :with_versions, :type => :boolean, :default => false, :aliases => "with-versions"
     def list(context_params)
       return module_info_about(context_params, :components, :component) if context_params.is_there_command?(:"component")
 
@@ -90,13 +92,25 @@ module DTK::Client
       action           = (remote ? "list_remote" : "list")
 
       post_body        = (remote ? { :rsa_pub_key => SSHUtil.rsa_pub_key_content() } : {:detail_to_include => ["remotes"]})
-      post_body[:diff] = options.diff? ? options.diff : {}
+      post_body[:diff] = options.diffs? ? options.diffs : {}
+
+      if post_body[:detail_to_include]
+        post_body[:detail_to_include] << 'versions' # if options.with_versions?
+      else
+        post_body[:detail_to_include]
+      end
+
       post_body.merge!(:module_namespace => options.namespace) if options.namespace
 
       response = post rest_url("component_module/#{action}"), post_body
 
       return response unless response.ok?
-      response.render_table()
+
+      if options.with_versions?
+        response.render_table(:module_with_versions, true)
+      else
+        response.render_table()
+      end
     end
 
     desc "COMPONENT-MODULE-NAME/ID list-components", "List all components for given component module."
@@ -114,6 +128,20 @@ module DTK::Client
       module_info_about(context_params, :instances, :component_instances)
     end
 
+    desc "COMPONENT-MODULE-NAME/ID list-versions","List all versions associated with this component module."
+    def list_versions(context_params)
+      response = list_versions_aux(context_params)
+      return response unless response.ok?
+      response.render_table(:list_versions, true)
+    end
+
+    desc "COMPONENT-MODULE-NAME/ID list-remote-versions","List all remote versions associated with this component module."
+    def list_remote_versions(context_params)
+      response = list_remote_versions_aux(context_params)
+      return response unless response.ok?
+      response.render_table(:list_versions, true)
+    end
+
     desc "import [NAMESPACE:]COMPONENT-MODULE-NAME", "Create new component module from local clone"
     def import(context_params)
       response = import_module_aux(context_params)
@@ -171,11 +199,12 @@ module DTK::Client
     # TODO: put in doc REMOTE-MODULE havs namespace and optionally version information; e.g. r8/hdp or r8/hdp/v1.1
     # if multiple items and failire; stops on first failure
 #    desc "install [NAMESPACE/]REMOTE-COMPONENT-MODULE-NAME [-r DTK-REPO-MANAGER]","Install remote component module into local environment"
-    desc "install NAMESPACE/REMOTE-COMPONENT-MODULE-NAME","Install remote component module into local environment"
+    desc "install NAMESPACE/REMOTE-COMPONENT-MODULE-NAME [-v VERSION]","Install remote component module into local environment"
     method_option "repo-manager",:aliases => "-r" ,
       :type => :string,
       :banner => "REPO-MANAGER",
       :desc => "DTK Repo Manager from which to resolve requested module."
+      version_method_option
     def install(context_params)
       response = install_module_aux(context_params)
       if response && response.ok?
@@ -236,9 +265,10 @@ module DTK::Client
     end
 =end
 
-    desc "delete-from-catalog NAMESPACE/REMOTE-COMPONENT-MODULE-NAME [-y] [--force]", "Delete the component module from the DTK Network catalog"
+    desc "delete-from-catalog NAMESPACE/REMOTE-COMPONENT-MODULE-NAME [-y] [--force] [-v VERSION]", "Delete the component module from the DTK Network catalog"
     method_option :confirmed, :aliases => '-y', :type => :boolean, :default => false
     method_option :force, :type => :boolean, :default => false
+    version_method_option
     def delete_from_catalog(context_params)
       delete_from_catalog_aux(context_params)
     end
@@ -259,7 +289,9 @@ module DTK::Client
     #   return response
     # end
 
-    desc "COMPONENT-MODULE-NAME/ID publish [[NAMESPACE/]REMOTE-COMPONENT-MODULE-NAME]", "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)
       publish_module_aux(context_params)
     end
@@ -332,10 +364,9 @@ module DTK::Client
     #                   This will change behaviour of method in such way that edit will not be
     #                   triggered after it.
     #
-    #desc "COMPONENT-MODULE-NAME/ID clone [-v VERSION] [-n]", "Locally clone component module and component files. Use -n to skip edit prompt"
-    # version_method_option
-    desc "COMPONENT-MODULE-NAME/ID clone [-n]", "Locally clone component module and component files. Use -n to skip edit prompt"
+    desc "COMPONENT-MODULE-NAME/ID clone [-n] [-v VERSION]", "Locally clone component module and component files. Use -n to skip edit prompt"
     method_option :skip_edit, :aliases => '-n', :type => :boolean, :default => false
+    version_method_option
     def clone(context_params, internal_trigger=true)
       clone_module_aux(context_params, internal_trigger)
     end
@@ -348,7 +379,6 @@ module DTK::Client
     end
 
     desc "COMPONENT-MODULE-NAME/ID push [--force] [--docs]", "Push changes from local copy of component module to server"
-    version_method_option
     method_option "message",:aliases => "-m" ,
       :type => :string,
       :banner => "COMMIT-MSG",
@@ -360,7 +390,7 @@ module DTK::Client
       push_module_aux(context_params, 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] [--force]", "Push changes from local copy of component module to remote repository (dtkn)."
     method_option "message",:aliases => "-m" ,
       :type => :string,
@@ -416,6 +446,11 @@ module DTK::Client
       fork_aux(context_params)
     end
 
+    desc "COMPONENT-MODULE-NAME/ID create-new-version VERSION", "Create new component module version"
+    def create_new_version(context_params)
+      create_new_version_aux(context_params)
+    end
+
     #
     # DEVELOPMENT MODE METHODS
     #

data/lib/commands/thor/developer.rb

@@ -44,15 +44,16 @@ module DTK::Client
     # run-agent haris1 dev_manager inject_agent "{ 'action_agent_branch': 'master', 'action_agent_url': 'git@github.com:rich-reactor8/dtk-action-agent.git' }"
     desc "run-agent SERVICE-NAME AGENT-NAME AGENT-METHOD PARAMS", "Updates DTK Action Agent to provided branch, example: dev_manager inject_agent \"{ 'action_agent_branch': 'master', 'action_agent_url': 'url' }\""
     def run_agent(context_params)
-      service_name, agent_name, agent_method, action_params = context_params.retrieve_arguments([:option_1!, :option_2!, :option_3!, :option_4], method_argument_names)
+      service_name, agent_name, agent_method, action_params = context_params.retrieve_arguments([:option_1!, :option_2!, :option_3!, :option_4!], method_argument_names)
 
       action_params ||= "{}"
       action_params.gsub!("'",'"')
 
       response = post_file rest_url("developer/run_agent"), { :service_name => service_name, :agent_name => agent_name, :agent_method => agent_method, :agent_params => action_params }
+      return response unless response.ok?
 
       action_results_id = response.data(:action_results_id)
-      print_action_results(action_results_id)
+      print_simple_results(action_results_id)
 
       nil
     end

data/lib/commands/thor/service.rb

@@ -68,12 +68,16 @@ module DTK::Client
     def self.extended_context()
       {
         :context => {
-          :add_component => "component_template",
           :create_node => "node_template",
           :create_node_group => "node_template",
           :add_component_dependency => "component_template"
         },
         :command => {
+          :add_component => {
+            :endpoint => "component_template",
+            :url => "component/list",
+            :opts => {:subtype=>"template", :ignore => "test_module", :hide_assembly_cmps => "true"}
+          },
           :edit_component_module => {
             :endpoint => "assembly",
             :url => "assembly/info_about",

data/lib/commands/thor/service_module.rb

@@ -8,6 +8,7 @@ dtk_require_from_base('command_helpers/service_importer')
 dtk_require_common_commands('thor/common')
 dtk_require_common_commands('thor/module')
 dtk_require_common_commands('thor/poller')
+dtk_require_common_commands('thor/assembly_template')
 
 module DTK::Client
   class ServiceModule < CommandBaseThor
@@ -19,6 +20,7 @@ module DTK::Client
       include ServiceImporter
       include ModuleMixin
       include Poller
+      include AssemblyTemplateMixin
 
       def get_service_module_name(service_module_id)
         get_name_from_id_helper(service_module_id)
@@ -76,7 +78,7 @@ module DTK::Client
           ],
           :assembly => [
             ["info","info","# Info for given assembly in current service module."],
-            ["stage", "stage [INSTANCE-NAME] [-t TARGET-NAME/ID] [--node-size NODE-SIZE-SPEC] [--os-type OS-TYPE]", "# Stage assembly in target."],
+            # ["stage", "stage [INSTANCE-NAME] [-t TARGET-NAME/ID] [--node-size NODE-SIZE-SPEC] [--os-type OS-TYPE] [-v VERSION]", "# 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] [-m COMMIT-MSG]", "# Stage and deploy assembly in target."],
@@ -95,7 +97,8 @@ module DTK::Client
       module_info_aux(context_params)
     end
 
-    desc "SERVICE-MODULE-NAME/ID list-assemblies","List assemblies associated with service module."
+    desc "SERVICE-MODULE-NAME/ID list-assemblies [-v VERSION]","List assemblies associated with service module."
+    version_method_option
     method_option :remote, :type => :boolean, :default => false
     def list_assemblies(context_params)
       context_params.method_arguments = ["assembly"]
@@ -109,13 +112,14 @@ module DTK::Client
       list(context_params)
     end
 
-    desc "list [--remote] [--diff] [-n NAMESPACE]","List service modules (local/remote). Use --diff to compare loaded and remote modules."
+    desc "list [--remote] [--diffs] [-n NAMESPACE]","List service modules (local/remote). Use --diff to compare loaded and remote modules."
     method_option :remote, :type => :boolean, :default => false
-    method_option :diff, :type => :boolean, :default => false
+    method_option :diffs, :type => :boolean, :default => false, :aliases => "--diff"
     method_option :namespace, :aliases => "-n" ,
       :type => :string,
       :banner => "NAMESPACE",
       :desc => "List modules only in specific namespace."
+    # method_option :with_versions, :type => :boolean, :default => false, :aliases => "with-versions"
     def list(context_params)
       service_module_id, about, service_module_name = context_params.retrieve_arguments([:service_module_id, :option_1, :option_2],method_argument_names)
       datatype = nil
@@ -132,21 +136,29 @@ module DTK::Client
       if (context_params.last_entity_name == :"service-module") and about.nil?
         action    = options.remote? ? "list_remote" : "list"
         post_body = (options.remote? ? { :rsa_pub_key => SSHUtil.rsa_pub_key_content() } : {:detail_to_include => ["remotes"]})
-        post_body[:diff] = options.diff? ? options.diff : {}
+        post_body[:diff] = options.diffs? ? options.diffs : {}
         post_body.merge!(:module_namespace => options.namespace) if options.namespace
 
+        if post_body[:detail_to_include]
+          post_body[:detail_to_include] << 'versions' # if options.with_versions?
+        else
+          post_body[:detail_to_include]
+        end
+
         response = post rest_url("service_module/#{action}"), post_body
       # If user is on service identifier level, list task can't have '--remote' option.
       else
         # TODO: this is temp; will shortly support this
         raise DTK::Client::DtkValidationError.new("Not supported '--remote' option when listing service module assemblies, component templates or modules", true) if options.remote?
         raise DTK::Client::DtkValidationError.new("Not supported type '#{about}' for list for current context level. Possible type options: 'assembly'", true) unless(about == "assembly" || about == "modules")
-
+        post_body = { :service_module_id => service_module_id }
         if about
           case about
           when "assembly"
-            data_type        = :assembly_template_description
-            action           = "list_assemblies"
+            version   = options.version
+            data_type = :assembly_template_description
+            action    = "list_assemblies"
+            post_body.merge!(:version => version) if version
           when "modules"
             data_type        = options.remote? ? :component_remote : :component_module
             action           = "list_component_modules"
@@ -154,10 +166,16 @@ module DTK::Client
             raise_validation_error_method_usage('list')
           end
         end
-        response = post rest_url("service_module/#{action}"), { :service_module_id => service_module_id }
+        response = post rest_url("service_module/#{action}"), post_body
       end
 
-      response.render_table(data_type) unless response.nil?
+      unless response.nil?
+        if options.with_versions?
+          response.render_table(:module_with_versions, true)
+        else
+          response.render_table(data_type)
+        end
+      end
 
       response
     end
@@ -167,24 +185,26 @@ module DTK::Client
       list_instances_aux(context_params)
     end
 
-    # desc "SERVICE-MODULE-NAME/ID list-versions","List all versions associated with this service module."
-    # def list_versions(context_params)
-    #   service_module_id = context_params.retrieve_arguments([:service_module_id!],method_argument_names)
-    #   post_body = {
-    #     :service_module_id => service_module_id,
-    #     :detail_to_include => ["remotes"],
-    #     :rsa_pub_key => SSHUtil.rsa_pub_key_content()
-    #   }
-    #   response = post rest_url("service_module/versions"), post_body
+    desc "SERVICE-MODULE-NAME/ID list-versions","List all versions associated with this service module."
+    def list_versions(context_params)
+      response = list_versions_aux(context_params)
+      return response unless response.ok?
+      response.render_table(:list_versions, true)
+    end
 
-    #   response.render_table(:module_version)
-    # end
+    desc "SERVICE-MODULE-NAME/ID list-remote-versions","List all remote versions associated with this service module."
+    def list_remote_versions(context_params)
+      response = list_remote_versions_aux(context_params)
+      return response unless response.ok?
+      response.render_table(:list_versions, true)
+    end
 
     # version_method_option
-    desc "install NAMESPACE/REMOTE-SERVICE-MODULE-NAME [-y]", "Install remote service module into local environment. -y will automatically clone component modules."
+    desc "install NAMESPACE/REMOTE-SERVICE-MODULE-NAME [-y] [-v VERSION]", "Install remote service module into local environment. -y will automatically clone component modules."
     method_option :force, :aliases => '-y', :type => :boolean, :default => false
     # method_option :ignore, :aliases => '-i', :type => :boolean, :default => false
     method_option :update_none, :type => :boolean, :default => false
+    version_method_option
     def install(context_params)
       response = install_module_aux(context_params)
       @@invalidate_map << :service_module if response && response.ok?
@@ -249,7 +269,9 @@ module DTK::Client
     #   post rest_url("service_module/export"), post_body
     # end
 
-    desc "SERVICE-MODULE-NAME/ID publish [[NAMESPACE/]REMOTE-SERVICE-MODULE-NAME]","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)
       publish_module_aux(context_params)
     end
@@ -293,7 +315,6 @@ module DTK::Client
     #   push_to_remote_aux(:service_module, service_module_id, service_module_name, options["namespace"], options["version"])
     # end
 
-    # desc "SERVICE-MODULE-NAME/ID pull-from-dtkn [-n NAMESPACE] [-v VERSION]", "Update local service module from remote repository."
     desc "SERVICE-MODULE-NAME/ID pull-dtkn [-n NAMESPACE] [--force]", "Update local service module from remote repository."
     method_option :namespace,:aliases => '-n',
       :type   => :string,
@@ -354,8 +375,9 @@ module DTK::Client
     #
     # desc "SERVICE-MODULE-NAME/ID clone [-v VERSION] [-n]", "Locally clone the service module files. Use -n to skip edit prompt"
     # version_method_option
-    desc "SERVICE-MODULE-NAME/ID clone [-n]", "Locally clone the service module files. Use -n to skip edit prompt"
+    desc "SERVICE-MODULE-NAME/ID clone [-n] [-v VERSION]", "Locally clone the service module files. Use -n to skip edit prompt"
     method_option :skip_edit, :aliases => '-n', :type => :boolean, :default => false
+    version_method_option
     def clone(context_params, internal_trigger=false)
       clone_module_aux(context_params, internal_trigger)
     end
@@ -420,6 +442,68 @@ module DTK::Client
       response
     end
 
+    desc "SERVICE-MODULE-NAME/ID stage ASSEMBLY-NAME [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 :settings, :type => :string, :aliases => '-s'
+    method_option :node_size, :type => :string, :aliases => "--node-size"
+    method_option :os_type, :type => :string, :aliases => "--os-type"
+    version_method_option
+    #hidden option
+    method_option "instance-bindings", :type => :string
+    def stage(context_params)
+      service_module_id, service_module_name, assembly_template_name, name = context_params.retrieve_arguments([:service_module_id!, :service_module_name!, :option_1!, :option_2], method_argument_names)
+      post_body = {
+        :assembly_id => assembly_template_name
+      }
+
+      # special case when we need service module id
+      context_params.pure_cli_mode = true
+      post_body[:service_module_id] = service_module_id if context_params.pure_cli_mode
+
+      # 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
+
+      if assembly_template_name.to_s =~ /^[0-9]+$/
+        assembly_template_name = get_assembly_name(assembly_template_id)
+      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
+        name = get_assembly_stage_name(assembly_list, assembly_template_name)
+      end
+
+      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
+      post_body.merge!(:settings_json_form => JSON.generate(settings)) if settings
+      post_body.merge!(:node_size => node_size) if node_size
+      post_body.merge!(:os_type => os_type) if os_type
+      post_body.merge!(:version => version) if version
+      post_body.merge!(:service_module_name => service_module_name) if service_module_name
+
+      response = post rest_url("assembly/stage"), post_body
+      return response unless response.ok?
+      # when changing context send request for getting latest assemblies instead of getting from cache
+      @@invalidate_map << :service
+      @@invalidate_map << :assembly
+
+      return response
+    end
+
 
     # desc "SERVICE-MODULE-NAME/ID push [-v VERSION] [-m COMMIT-MSG]", "Push changes from local copy of service module to server"
     # version_method_option
@@ -513,9 +597,10 @@ module DTK::Client
 
     # 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]", "Delete service module and all items contained in it. Optional parameter [-p] is to delete local directory."
+    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."
     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)
       response = delete_module_aux(context_params)
       @@invalidate_map << :service_module if response && response.ok?
@@ -523,9 +608,10 @@ module DTK::Client
       response
     end
 
-    desc "delete-from-catalog NAMESPACE/REMOTE-SERVICE-MODULE-NAME [-y] [--force]", "Delete the service module from the DTK Network catalog"
+    desc "delete-from-catalog NAMESPACE/REMOTE-SERVICE-MODULE-NAME [-y] [--force] [-v VERSION]", "Delete the service module from the DTK Network catalog"
     method_option :confirmed, :aliases => '-y', :type => :boolean, :default => false
     method_option :force, :type => :boolean, :default => false
+    version_method_option
     def delete_from_catalog(context_params)
       delete_from_catalog_aux(context_params)
     end
@@ -569,6 +655,11 @@ module DTK::Client
       fork_aux(context_params)
     end
 
+    desc "SERVICE-MODULE-NAME/ID create-new-version VERSION", "Create new service module version"
+    def create_new_version(context_params)
+      create_new_version_aux(context_params)
+    end
+
     #
     # DEVELOPMENT MODE METHODS
     #