dtk-client 0.11.4 → 0.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4fe37c7f760ab997a0789958481c16a3924f8fc
-  data.tar.gz: 4329e1f91b5b7542cccbe0d27105e831d7b7f498
+  metadata.gz: 5de7ced1e236b8558747c61de9dbb0bd99bdec16
+  data.tar.gz: 00233bc8aaaa577b2edfdbf494ba39e332004ada
 SHA512:
-  metadata.gz: e7ee7ed59d2b153fa7e4815f006f6a7fc42a1ffcf67b67818a9278a4a44c44c9d08a65f9859f0d56f14e7066285f0a49f96677ea916d2f9c12907faae5208372
-  data.tar.gz: e09ab967d418e7445f6d584682f2059d8a07f06b5e1fde7a09a4541d4bb353c5e5b7b2410cb4efc9066238695b0c81c6528aedb5709673b526f08d5c553084bc
+  metadata.gz: 4fb0de210ec0f760c6c36fdea20b740ad197d4d546b36ce66b8d740e523d9b144b22d27fc242805fb11bb8f873fdd323d97e1472d3c69fd9e009db9c25a4ceee
+  data.tar.gz: f710986718de80dba1c001cb7e7429dc84ee3c7634e45c9ab57424088ff25cee77e4194c6717651285771d6855b831a7bbab570c13490a524ca925bd541d7f2c

data/lib/cli/command/module/delete_from_remote.rb

@@ -23,13 +23,14 @@ module DTK::Client
         command_body c, 'delete-from-dtkn', 'Delete module from the DTK remote catalog (DTKN)' do |sc|
           sc.flag Token.version
           sc.switch Token.skip_prompt
+          sc.switch Token.force, :desc => 'Force delete'
           
           sc.action do |_global_options, options, args|
             module_ref = module_ref_object_from_options_or_context?(:module_ref => args[0], :version => options[:version])
             operation_args = {
               :module_ref  => module_ref,
-              :skip_prompt => options[:skip_prompt]
-              # :force     => options[:f]
+              :skip_prompt => options[:skip_prompt],
+              :force     => options[:f]
             }
             Operation::Module.delete_from_remote(operation_args)
           end

data/lib/cli/command/module/stage.rb

@@ -23,33 +23,30 @@ module DTK::Client
         command_body c, :stage, 'Create a new service instance to refer to staged infrastructure that then can be deployed' do |sc|
           sc.flag Token.directory_path, :desc => 'Path to module directory where assembly is being staged from; not needed if in the module directory'
           sc.flag Token.service_name, :desc => 'If specified, name to use for new service instance; otherwise service instance name is auto-generated' 
-          sc.flag Token.context_service_instance
+          sc.flag Token.comma_seperated_contexts
           sc.switch Token.force
           sc.switch Token.base
-          #sc.switch Token.target
-          # on useful for testing in dev mode
-          # sc.switch Token.purge, :desc => 'Overwrite any content that presently exists in the service instance directory to be created'
-          #  sc.flag Token.version
           sc.action do |_global_options, options, args|
-            module_ref     = module_ref_object_from_options_or_context(options)
-            assembly_name  = args[0]
-            version        = options[:version] || module_ref.version
-            service_name   = options[:service_name]
-            force          = options[:f]
-            directory_path = options[:directory_path] || @base_dsl_file_obj.parent_dir
+            module_ref               = module_ref_object_from_options_or_context(options)
+            assembly_name            = args[0]
+            service_name             = options[:service_name]
+            version                  = options[:version] || module_ref.version
+            directory_path           = options[:directory_path] || @base_dsl_file_obj.parent_dir
+            comma_seperated_contexts = options[:context]
 
+            context_service_names = comma_seperated_contexts && Validation.process_comma_seperated_contexts(comma_seperated_contexts) 
             Validation.validate_name(service_name) if service_name
 
             args = {
-              :module_ref      => module_ref,
-              :assembly_name   => assembly_name,
-              :service_name    => service_name,
-              :version         => version,
-              :context_service  => options[:context_service_instance],
-              :remove_existing => options[:purge],
-              :is_target       => options[:base],
-              :force           => force,
-              :directory_path  => directory_path
+              :module_ref            => module_ref,
+              :assembly_name         => assembly_name,
+              :service_name          => service_name,
+              :version               => version,
+              :context_service_names => context_service_names, 
+              :remove_existing       => options[:purge],
+              :is_base               => options[:base],
+              :force                 => options[:f],
+              :directory_path        => directory_path
             }
             Operation::Module.stage(args)
           end
@@ -57,4 +54,4 @@ module DTK::Client
       end
     end
   end
-end
+end

data/lib/cli/command/module/uninstall.rb

@@ -25,8 +25,10 @@ module DTK::Client
           sc.flag Token.directory_path
           sc.flag Token.version
           sc.flag Token.uninstall_name
+          sc.switch Token.force
           sc.action do |_global_options, options, args|
             version = options[:version]
+            force   = options["force"]
 
             module_refs_opts = {:ignore_parsing_errors => true}
             if options[:uninstall_name].nil?
@@ -42,7 +44,7 @@ module DTK::Client
 
             raise Error::Usage, "You can use version only with 'namespace/name' provided" if version && module_name.nil?
 
-            Operation::Module.uninstall(:module_ref => module_ref, :skip_prompt => options[:skip_prompt], :name => options[:uninstall_name] || module_name, :version => version)
+            Operation::Module.uninstall(:module_ref => module_ref, :force => force, :skip_prompt => options[:skip_prompt], :name => options[:uninstall_name] || module_name, :version => version)
           end
         end
       end

data/lib/cli/command/module.rb

@@ -22,19 +22,19 @@ module DTK::Client
         include Command::Mixin
 
         ALL_SUBCOMMANDS = [
+          'delete-from-remote',
           'install',
           'list',
           'list-assemblies',
-          'push',
-          'uninstall',
-          # 'clone',
           'list-remotes',
+          'publish',
+          'pull-dtkn',
+          'push',
           'push-dtkn',
           'stage',
-          'pull-dtkn',
-          'publish',
-          'delete-from-remote'
+          'uninstall'
         ]
+
         command_def :desc => 'Subcommands for interacting with DTK modules'
         ALL_SUBCOMMANDS.each { |subcommand| require_relative("module/#{subcommand.gsub(/-/,'_')}") } 
       end

data/lib/cli/command/service.rb

@@ -23,34 +23,37 @@ module DTK::Client
 
         include Command::Mixin
         ALL_SUBCOMMANDS = [
+          'cancel-task',
           'clone',
+          'converge',
           'delete',
-          'uninstall',
           'edit',
-          'push',
-          'pull',
-          'converge',
-          'task-status',
+          'eject',
+          'exec',
+          'exec-sync',
+          'link',
           'list',
           'list-actions',
           'list-attributes',
           'list-component-links',
-          'list-dependencies',
           'list-components',
+          'list-dependencies',
           'list-nodes',
           'list-violations',
-          'link',
-#          'start',
-#          'stop',
-          'cancel-task',
-          'ssh',
-          'set-required-attributes',
+          'pull',
+          'push',
           'set-attribute',
-          'exec',
-          'exec-sync',
           'set-default-target',
-          'eject'
-         ]
+          'set-required-attributes',
+          'ssh',
+          # TODO: put back in
+          #  'start',
+          #  'stop',
+
+          'task-status',
+          'uninstall'
+        ]
+
         command_def :desc => 'Subcommands for creating and interacting with DTK service instances'
         ALL_SUBCOMMANDS.each { |subcommand| require_relative("service/#{subcommand.gsub(/-/,'_')}") } 
       end

data/lib/cli/command/token.rb

@@ -32,25 +32,24 @@ module DTK::Client
       TOKENS = {
         # flags
         # Flag constructor args order: key, arg_name, desc, opts={}
-        :commit_message          => Flag.new(:m, 'COMMIT-MSG', 'Commit message'),
-        :directory_path          => Flag.new(:d, 'DIRECTORY-PATH', 'Directory path'),
-        :parent_service_instance => Flag.new(:parent, 'PARENT', 'Parent service instance; if not specified, the default context service instance serves as parent'),
-        :context_service_instance => Flag.new(:context, 'CONTEXT' ,'Context service instance; if not specified, the default service instance serves as context'),
-        :module_ref              => Flag.new(:m, ModuleRef::NamespaceModuleName.legal_form, 'Module name with namespace; not needed if command is executed from within the module directory'),
-        :relative_path           => Flag.new(:f, 'RELATIVE-FILE-PATH', 'Relative file path'),
-        :service_instance        => Flag.new(:s, 'SERVICE-INSTANCE', 'Service instance name'),
-        :service_name            => Flag.new(:n, 'SERVICE-NAME', 'Service name'),
-        :version                 => Flag.new(:v, 'VERSION', 'Version'),
-        :type                    => Flag.new(:type, 'TYPE', 'Type'),
-        :node                    => Flag.new(:n, 'NODE', 'Node'),
-        :component               => Flag.new(:c, 'COMPONENT', 'Component'),
-        :remote_user             => Flag.new(:u, 'REMOTE-USER', 'Remote user'),
-        :identity_file           => Flag.new(:i, 'PATH-TO-PEM', 'Path to pem file'),
-        :mode                    => Flag.new(:mode, 'MODE', 'Mode'),
-        :namespace               => Flag.new(:n, 'NAMESPACE', 'Namespace'),
-        :uninstall_name          => Flag.new(:name, 'NAME', 'Module name to uninstall'),
-        :link_name               => Flag.new([:l, :link_name], 'link-name', 'Specify link name'),
-        :format                  => Flag.new(:format, 'FORMAT', 'Choose in which format to display data (ex. TABLE, YAML)'),
+        :commit_message            => Flag.new(:m, 'COMMIT-MSG', 'Commit message'),
+        :directory_path            => Flag.new(:d, 'DIRECTORY-PATH', 'Directory path'),
+        :comma_seperated_contexts  => Flag.new(:context, 'CONTEXT1,CONTEXT2,...' ,'Comma-seperated context service instance(s); if not specified, the default service instance serves as the context'),
+        :module_ref                => Flag.new(:m, ModuleRef::NamespaceModuleName.legal_form, 'Module name with namespace; not needed if command is executed from within the module directory'),
+        :relative_path             => Flag.new(:f, 'RELATIVE-FILE-PATH', 'Relative file path'),
+        :service_instance          => Flag.new(:s, 'SERVICE-INSTANCE', 'Service instance name'),
+        :service_name              => Flag.new(:n, 'SERVICE-NAME', 'Service name'),
+        :version                   => Flag.new(:v, 'VERSION', 'Version'),
+        :type                      => Flag.new(:type, 'TYPE', 'Type'),
+        :node                      => Flag.new(:n, 'NODE', 'Node'),
+        :component                 => Flag.new(:c, 'COMPONENT', 'Component'),
+        :remote_user               => Flag.new(:u, 'REMOTE-USER', 'Remote user'),
+        :identity_file             => Flag.new(:i, 'PATH-TO-PEM', 'Path to pem file'),
+        :mode                      => Flag.new(:mode, 'MODE', 'Mode'),
+        :namespace                 => Flag.new(:n, 'NAMESPACE', 'Namespace'),
+        :uninstall_name            => Flag.new(:name, 'NAME', 'Module name to uninstall'),
+        :link_name                 => Flag.new([:l, :link_name], 'link-name', 'Specify link name'),
+        :format                    => Flag.new(:format, 'FORMAT', 'Choose in which format to display data (ex. TABLE, YAML)'),
 
         # switches
         # Switch constructor args order: key, desc, opts={}

data/lib/cli/version.rb

@@ -18,7 +18,7 @@
 module DTK
   module Client
     module CLI
-      VERSION="0.11.4"
+      VERSION="0.11.5"
     end
   end
 end

data/lib/client/operation/module/delete_from_remote.rb

@@ -37,8 +37,8 @@ module DTK::Client
         query_string_hash = QueryStringHash.new(
           :module_name => module_ref.module_name,
           :namespace   => module_ref.namespace,
-          :rsa_pub_key => SSHUtil.rsa_pub_key_content
-          # :force?    => opts[:force]
+          :rsa_pub_key => SSHUtil.rsa_pub_key_content,
+          :force?    => opts[:force]
         )
 
         unless version = module_ref.version
@@ -67,7 +67,6 @@ module DTK::Client
           module_ref_opts.merge!(:version => version) unless version.eql?('all')
           return unless Console.prompt_yes_no("Are you sure you want to delete module '#{DTK::Common::PrettyPrintForm.module_ref(module_ref.module_name, module_ref_opts)}' from repo manager?", :add_options => true)
         end
-
         rest_post "#{BaseRoute}/delete_from_remote", query_string_hash
 
         nil

data/lib/client/operation/module/stage.rb

@@ -27,12 +27,12 @@ module DTK::Client
           directory_path  = args[:directory_path]
 
           post_body = PostBody.new(
-            :namespace       => module_ref.namespace,
-            :module_name     => module_ref.module_name,
-            :assembly_name?  => args.required(:assembly_name),
-            :version?        => args[:version],
-            :target_service? => args[:context_service],
-            :is_target?      => args[:is_target]
+            :namespace              => module_ref.namespace,
+            :module_name            => module_ref.module_name,
+            :assembly_name?         => args.required(:assembly_name),
+            :version?               => args[:version],
+            :context_service_names? => args[:context_service_names],
+            :is_base?               => args[:is_base]
           )
           
           error_msg = "To allow stage to go through, invoke 'dtk push' to push the changes to server before invoking stage again"

data/lib/client/operation/module/uninstall.rb

@@ -23,6 +23,7 @@ module DTK::Client
           module_ref  = args.required(:module_ref)
           name        = args.required(:name)
           version     = args.required(:version)
+          force       = args.required(:force)
   
           unless name.nil?
             query_string_hash = QueryStringHash.new(
@@ -46,8 +47,8 @@ module DTK::Client
             end
             
           end
-
           post_body = module_ref_post_body(module_ref)
+          post_body.merge!(:force => force)
           rest_post("#{BaseRoute}/delete", post_body)
 
           error_msg =

data/lib/client/operation/module.rb

@@ -19,19 +19,19 @@ module DTK::Client
   class Operation
     class Module < self
       OPERATIONS = [
+        :clone_module,
+        :delete_from_remote,
         :install,
+        :install_from_catalog,
         :list,
         :list_assemblies,
         :list_remotes,
+        :publish,
+        :pull_dtkn,
         :push,
-        :uninstall,
-        :clone_module,
-        :install_from_catalog,
         :push_dtkn,
         :stage,
-        :pull_dtkn,
-        :publish,
-        :delete_from_remote
+        :uninstall
       ]
       OPERATIONS.each { |operation| require_relative("module/#{operation}") }
 

data/lib/client/operation/service/task_status/stream_mode/element/hierarchical_task/result/action.rb

@@ -31,6 +31,7 @@ module DTK::Client; class Operation::Service::TaskStatus::StreamMode::Element::H
           render_empty_line
           results_per_node.each { |result| result.render }
         else
+          render_info(results_per_node)
           render_errors(results_per_node)
         end
       end

data/lib/client/operation/service/task_status/stream_mode/element/hierarchical_task/result/components.rb

@@ -20,6 +20,7 @@ module DTK::Client; class Operation::Service::TaskStatus::StreamMode::Element::H
     class Components < self
       def render_results(results_per_node)
         render_errors(results_per_node)
+        render_info(results_per_node)
       end
     end
   end

data/lib/client/operation/service/task_status/stream_mode/element/hierarchical_task/result.rb

@@ -25,6 +25,7 @@ module DTK::Client; class Operation::Service::TaskStatus::StreamMode::Element
       def initialize(element, hash)
         super
         @errors = hash['errors'] || []
+        @info = hash['info'] || []
       end
 
       # This can be over-written
@@ -42,6 +43,7 @@ module DTK::Client; class Operation::Service::TaskStatus::StreamMode::Element
       protected 
 
       attr_reader :errors
+      attr_reader :info
 
       def render_errors(results_per_node)
         return unless results_per_node.find { |result| not result.errors.empty?}
@@ -55,12 +57,38 @@ module DTK::Client; class Operation::Service::TaskStatus::StreamMode::Element
         end
       end
 
+      def render_info(results_per_node)
+        return unless results_per_node.find do |result|
+          not result.info.empty? and result.errors.empty? 
+        end
+        # { |result| not result.errors.empty?}
+        first_time = true
+        results_per_node.each do |result|
+          if first_time
+            render_line 'INFO:'
+            first_time = false
+          end
+          result.render_node_info
+        end
+      end
+
       def render_node_errors
         return if @errors.empty?
         render_node_term
         @errors.each do |error| 
           if err_msg = error['message']
-            render_error_line err_msg  
+            render_error_line err_msg
+            render_empty_line
+          end
+        end
+      end
+
+      def render_node_info
+        return if @info.empty? || !@errors.empty?
+        @info.each do |info| 
+          if err_msg = info[1]
+            #err_msg.colorize(:yellow)
+            render_info_line err_msg
             render_empty_line
           end
         end
@@ -69,6 +97,10 @@ module DTK::Client; class Operation::Service::TaskStatus::StreamMode::Element
       def render_error_line(line, opts = {})
         render_line(line, ErrorRenderOpts.merge(opts))
       end
+
+      def render_info_line(line, opts = {})
+        render_line(line)
+      end
       ErrorRenderOpts = { :tabs => 1}
       
     end

data/lib/client/operation/service/task_status/stream_mode/element/render.rb

@@ -32,6 +32,14 @@ class DTK::Client::Operation::Service::TaskStatus::StreamMode::Element
       @formatter.formatted_duration?(field?(:duration))
     end
 
+    def current_status
+      if @response_element["status"] == 'debugging' && @response_element["type"].include?("stage_end") 
+        return true
+      else
+        return false
+      end
+    end
+
     def render_duration_line
       render_line(@formatter.duration_msg?(field?(:duration)))
     end

data/lib/client/operation/service/task_status/stream_mode/element/stage.rb

@@ -31,8 +31,7 @@ module DTK::Client; class Operation::Service::TaskStatus::StreamMode
       def self.get_and_render_stages(task_status_handle, opts = {})
         unless wait = opts[:wait]
           raise Error, "opts[:wait] must be set"
-        end
-        
+        end        
         cursor = Cursor.new
         until cursor.task_end? do
           elements = get_single_stage(task_status_handle, cursor.stage, {:wait_for => cursor.wait_for}.merge(opts))
@@ -41,10 +40,15 @@ module DTK::Client; class Operation::Service::TaskStatus::StreamMode
             next
           end
           render_elements(elements)
-          cursor.advance!(task_end?(elements))
+          # Can there be more than 1 element in elements array? 
+          if elements.first.current_status
+            cursor.advance!(true)
+          else
+            cursor.advance!(task_end?(elements))
+          end
         end
       end
-    
+
       class Cursor
         def initialize
           @stage    = 1

data/lib/client/operation/service/task_status/stream_mode/element.rb

@@ -55,7 +55,7 @@ module DTK::Client; class Operation::Service::TaskStatus::StreamMode
     # opts can have
     #   :ignore_stage_level_info - Boolean
     def self.create_elements(response, opts = {})
-      response_elements = response.data
+      response_elements = response.data      
       unless response_elements.kind_of?(Array)
         raise Error.new("Unexpected that response.data no at array")
       end
@@ -82,8 +82,31 @@ module DTK::Client; class Operation::Service::TaskStatus::StreamMode
       elements.find{|el|el.kind_of?(NoResults)}
     end
 
+    def self.debug_mode?(response)
+      debug_mode_rows(response).size > 0
+    end
+
+    def self.debug_mode_rows(response)
+      response['data'].select do |data_row|
+        data_row['status'] == 'debugging'
+      end
+      #{ |data_row| data_row['status'] == 'debugging' }
+    end
+
+    def self.add_info_if_debug_mode!(response)
+      debug_info_rows = debug_mode_rows(response).select { |row| (row['info'] || {}) }
+      if debug_info_rows.size > 0
+        info_message = debug_info_rows.last['info']['message']
+        #response.set_render_as_table!(nil, info_message)
+      else
+        #response.set_render_as_table!
+      end
+    end
+
     def self.render_elements(elements)
-      elements.each{ |el| el.render }
+      elements.each do |el| #{ |el| el.render }
+        el.render
+      end
     end
 
     def render_stage_steps(subtasks)

data/lib/client/operation/service.rb

@@ -18,34 +18,35 @@
 module DTK::Client
   class Operation
     class Service < self
+      # TODO: remove deprecated operations 
       OPERATIONS = [
-        :commit_and_push,
+        :cancel_task,
         :clone_service,
+        :commit_and_push,
+        :converge,
+        # :create_workspace TODO: put this back in
         :delete,
-        :uninstall,
         :edit,
-        :pull,
-        :converge,
-        :task_status,
+        :eject,
+        :exec,
+        :link,
         :list,
         :list_actions,
         :list_attributes,
         :list_component_links,
-        :list_dependencies,
         :list_components,
+        :list_dependencies,
         :list_nodes,
         :list_violations,
-        :link,
-        :start,
-        :stop,
-        :cancel_task,
-        :ssh,
-        :set_required_attributes,
+        :pull,
         :set_attribute,
-        :exec,
         :set_default_target,
-        :eject
-        # :create_workspace
+        :set_required_attributes,
+        :ssh,
+        :start,
+        :stop,
+        :task_status,
+        :uninstall
       ]
       OPERATIONS.each { |operation| require_relative("service/#{operation}") }
 

data/lib/client/util/validation.rb

@@ -17,12 +17,31 @@
 #
 module DTK::Client
   module Validation
-    ValidNameCharacters = ['letters', 'numbers', '-', '_', '.']
-
     def self.validate_name(name)
-      unless name.to_s.match(/\A[\w\-\.]+\z/)
-        raise Error::Usage, "Name '#{name}' contains invalid characters! Valid characters are: '#{ValidNameCharacters.join("', '")}'."
+      raise Error::Usage, "Name '#{name}' contains invalid characters! Valid characters are: #{valid_characters}" unless valid_name?(name)
+      name
+    end
+
+    def self.process_comma_seperated_contexts(comma_seperated_contexts)
+      if comma_seperated_contexts
+        comma_seperated_contexts.split(',').map do |service_instance_name|
+          service_instance_name.gsub!(' ', '')
+          raise Error::Usage, "Name '#{name}' in context contains invalid characters! Valid characters are: #{valid_characters}" unless valid_name?(service_instance_name)
+          service_instance_name
+        end.reject(&:empty?)
       end
     end
+
+    private
+
+    def self.valid_name?(name)
+      name.to_s.match(/\A[\w\-\.]+\z/)
+    end
+
+    VALID_NAME_CHARACTERS = ['letters', 'numbers', '-', '_', '.']
+    def self.valid_characters
+      VALID_NAME_CHARACTERS.join("', '")
+    end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.11.5
 platform: ruby
 authors:
 - Reactor8
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-05 00:00:00.000000000 Z
+date: 2017-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dtk-common-core
@@ -197,7 +197,6 @@ files:
 - lib/cli/command/service/set_default_target.rb
 - lib/cli/command/service/set_required_attributes.rb
 - lib/cli/command/service/ssh.rb
-- lib/cli/command/service/stage.rb
 - lib/cli/command/service/start.rb
 - lib/cli/command/service/stop.rb
 - lib/cli/command/service/task_status.rb
@@ -307,7 +306,6 @@ files:
 - lib/client/operation/service/set_default_target.rb
 - lib/client/operation/service/set_required_attributes.rb
 - lib/client/operation/service/ssh.rb
-- lib/client/operation/service/stage.rb
 - lib/client/operation/service/start.rb
 - lib/client/operation/service/stop.rb
 - lib/client/operation/service/task_status.rb

data/lib/cli/command/service/stage.rb

@@ -1,59 +0,0 @@
-#
-# Copyright (C) 2010-2016 dtk contributors
-#
-# This file is part of the dtk project.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-module DTK::Client
-  module CLI::Command
-    module Service
-      subcommand_def 'stage' do |c|
-        c.arg Token::Arg.assembly_name, :optional => true
-        command_body c, :stage, 'Create a new service instance to refer to staged infrastructure that then can be deployed' do |sc|
-          sc.flag Token.directory_path, :desc => 'Path to module directory where assembly is being staged from; not needed if in the module directory'
-          sc.flag Token.service_name, :desc => 'If specified, name to use for new service instance; otherwise service instance name is auto-generated' 
-          sc.flag Token.parent_service_instance
-          sc.switch Token.force
-          sc.switch Token.target
-          # on useful for testing in dev mode
-          # sc.switch Token.purge, :desc => 'Overwrite any content that presently exists in the service instance directory to be created'
-          #  sc.flag Token.version
-          sc.action do |_global_options, options, args|
-            module_ref     = module_ref_object_from_options_or_context(options)
-            assembly_name  = args[0]
-            version        = options[:version] || module_ref.version
-            service_name   = options[:service_name]
-            force          = options[:f]
-            directory_path = options[:directory_path]
-
-            Validation.validate_name(service_name) if service_name
-
-            args = {
-              :module_ref      => module_ref,
-              :assembly_name   => assembly_name,
-              :service_name    => service_name,
-              :version         => version,
-              :target_service  => options[:parent_service_instance],
-              :remove_existing => options[:purge],
-              :is_target       => options[:target],
-              :force           => force,
-              :directory_path  => directory_path
-            }
-            Operation::Service.stage(args)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/client/operation/service/stage.rb

@@ -1,64 +0,0 @@
-#
-# Copyright (C) 2010-2016 dtk contributors
-#
-# This file is part of the dtk project.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-module DTK::Client
-  class Operation::Service
-    class Stage < self
-      def self.execute(args = Args.new)
-        wrap_operation(args) do |args|
-          module_ref      = args.required(:module_ref)
-          remove_existing = args[:remove_existing]
-          service_name    = args[:service_name] 
-          force           = args[:force]
-          directory_path  = args[:directory_path]
-
-          post_body = PostBody.new(
-            :namespace       => module_ref.namespace,
-            :module_name     => module_ref.module_name,
-            :assembly_name?  => args.required(:assembly_name),
-            :version?        => args[:version],
-            :target_service? => args[:target_service],
-            :is_target?      => args[:is_target]
-          )
-
-          GitRepo.modified?(directory_path || OsUtil.current_dir) unless force
-          service_name ||= rest_post("#{BaseRoute}/generate_service_name", post_body).data
-          base_path = ClientModuleDir.ret_base_path(:service, service_name)
-          
-          raise Error::Usage, "Directory '#{base_path}' is not empty; it must be deleted or moved before retrying the command" if ClientModuleDir.local_dir_exists?(:service, service_name) 
-
-          post_body.merge!(:service_name => service_name)
-          response = rest_post("#{BaseRoute}/create", post_body)
-
-          service_instance = response.required(:service, :name)
-
-          clone_args = {
-            :module_ref       => module_ref,
-            :repo_url         => response.required(:repo, :url),
-            :branch           => response.required(:branch, :name),
-            :service_instance => service_instance,
-            :remove_existing  => remove_existing
-          }
-          message = ClientModuleDir::GitRepo.clone_service_repo(clone_args)
-          target_dir = message.data(:target_repo_dir)
-
-          OsUtil.print_info("Service instance '#{service_instance}' has been created. In order to work with service instance, please navigate to: #{target_dir}") 
-        end
-      end
-    end
-  end
-end