dtk-client 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9540610a410ba802ef78157c6781d4271ccfe04
-  data.tar.gz: 7a38732fc16295a3cad0f088483198746d776b21
+  metadata.gz: 7d12c019fd00d94a4be0b393fc9ee0f9f3355095
+  data.tar.gz: ab0b919677570741e387a4ed4ca0e01479c2607d
 SHA512:
-  metadata.gz: 7a1ed74ece609638c98e20ba20e2d3cb12364ecc1bc7cadf94fc5341837fda53c51226bc0529c63464c80cdf5ea3b96c3769fc070fc60233e950e0d208bda23f
-  data.tar.gz: 300e8bec9f03786c3867a0e473c8eff0d93b7c056148fc9bf70752220d1103c3e7d29eb37305890ad653fa7d16b5d4ca0bc5b8f14aa9f9c59a0329180ac7186c
+  metadata.gz: 08c9897c885fc0af755288124c43746e0edaa6477856ae649c7b576faf282772d2a04231327d96190ca479885447c1df96dbeb6da6a8709dbe6e69c23cacd708
+  data.tar.gz: e9c8de28290402661d9db61cbbef3574abeb02f32f5a64a6b50a2e1cdd4453ff1ac1dc80e313ee730851867803ee6c9bf5198ff47828547a5c70986e356dc188

data/dtk-client.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
 
-  spec.add_dependency 'dtk-common-core','0.10.0'
+  spec.add_dependency 'dtk-common-core','0.10.1'
   spec.add_dependency 'gli', '2.13.4'
   spec.add_dependency 'highline', '1.7.8'
   spec.add_dependency 'colorize', '0.7.7'

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

@@ -0,0 +1,59 @@
+#
+# 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 Module
+      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_in_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::Module.stage(args)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cli/command/module.rb

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

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

@@ -21,12 +21,14 @@ module DTK::Client; module CLI
       subcommand_def 'converge' do |c|
         command_body c, :converge, "Converge service instance" do |sc|
           sc.flag Token.directory_path, :desc => 'Absolute or relative path to service instance directory; not needed if executed in the service instance directory'
-
+          sc.switch Token.force
           sc.action do |_global_options, options, _args|
             service_instance = service_instance_in_options_or_context(options)
-
+            force            = options[:f]
             args = {
-              :service_instance => service_instance
+              :service_instance => service_instance,
+              :force            => force,
+              :directory_path   => options[:directory_path]
             }
             Operation::Service.converge(args)
           end

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

@@ -22,22 +22,22 @@ module DTK::Client; module CLI
         command_body c, :delete, 'Destroys the running infrastructure associated with the service instance' do |sc|
         sc.flag Token.directory_path, :desc => 'Absolute or relative path to service instance directory associated; not needed if executed in service instance directory'
           sc.switch Token.skip_prompt, :desc => 'Skip prompt that checks if user wants to delete the service instance'
-          sc.switch Token.recursive
+          sc.switch Token.recursive, :desc => 'Delete all service instances staged into specified target'
+          sc.switch Token.force, :desc => 'Ignore changes and destroy the running service instance'
           # sc.switch Token.purge, :desc => 'Delete the service instance directory on the client'
           sc.action do |_global_options, options, args|
-            directory_path = options[:directory_path]
-            purge          = options[:purge]
-            recursive      = options[:recursive]
-            # if purge && (!directory_path || (directory_path == @base_dsl_file_obj.parent_dir?))
-            #   raise Error::Usage, "If use option '#{option_ref(:purge)}' then need to call from outside directory and use option '#{option_ref(:directory_path)}'"
-            # end
+            directory_path   = options[:directory_path]
+            purge            = options[:purge]
+            recursive        = options[:recursive]
+            force            = options[:force]
             service_instance = service_instance_in_options_or_context(options)
 
             args = {
               :service_instance => service_instance,
               :skip_prompt      => options[:skip_prompt],
               :directory_path   => directory_path,
-              :recursive        => recursive
+              :recursive        => recursive,
+              :force            => force
             }
             Operation::Service.delete(args)
           end

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

@@ -24,16 +24,18 @@ module DTK::Client
           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_in_options_or_context(options)
-            assembly_name = args[0]
-            version       = options[:version] || module_ref.version
-            service_name  = options[:service_name]
+            module_ref     = module_ref_in_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
 
@@ -44,7 +46,9 @@ module DTK::Client
               :version         => version,
               :target_service  => options[:parent_service_instance],
               :remove_existing => options[:purge],
-              :is_target       => options[:target]
+              :is_target       => options[:target],
+              :force           => force,
+              :directory_path  => directory_path
             }
             Operation::Service.stage(args)
           end

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

@@ -23,8 +23,8 @@ module DTK::Client; module CLI
         sc.flag Token.directory_path, :desc => 'Absolute or relative path to service instance directory associated; not needed if executed in service instance directory'
           sc.switch Token.skip_prompt, :desc => 'Skip prompt that checks if user wants to delete the service instance'
           sc.switch Token.purge, :desc => 'Delete the service instance directory on the client'
-          sc.switch Token.force
-          sc.switch Token.recursive
+          sc.switch Token.force, :desc => 'Removes service instance with all nodes and modules'
+          sc.switch Token.recursive, :desc => 'Delete dependent service instances'
           sc.action do |_global_options, options, args|
             directory_path = options[:directory_path]
             purge          = options[:purge]

data/lib/cli/command/service.rb

@@ -22,7 +22,6 @@ module DTK::Client
         include Command::Mixin
         ALL_SUBCOMMANDS = [
           'clone',
-          'stage',
           'delete',
           'uninstall',
           'edit',

data/lib/cli/context/type/module.rb

@@ -22,10 +22,18 @@ module DTK::Client; module CLI
         include Command::Module
         include Command::Service        
 
+        COMMAND_DEFS = [:service, :module]
+
         def add_command_defs!
-          add_command :module
-          # add_command :service needed for stage and deploy commands
-          add_command :service
+         COMMAND_DEFS.each {|cmd| add_command(cmd)}
+        end
+
+        def context_type
+          'module'
+        end
+
+        def allowed_commands_defs
+          COMMAND_DEFS.map { |cmd| cmd.to_s }
         end
 
       end

data/lib/cli/context/type/service.rb

@@ -20,9 +20,20 @@ module DTK::Client::CLI
     module Type
       class Service < Context
         include Command::Service
+        include Command::Module
+
+        COMMAND_DEFS = [:service, :module]
 
         def add_command_defs!
-          add_command :service
+         COMMAND_DEFS.each {|cmd| add_command(cmd)}
+        end
+
+        def context_type
+          'service'
+        end
+
+        def allowed_commands_defs
+          COMMAND_DEFS.map { |cmd| cmd.to_s }
         end
       end
     end

data/lib/cli/context/type/top.rb

@@ -20,7 +20,10 @@ module DTK::Client::CLI
     module Type
       class Top < Context
         include Command::All
-
+        
+        def context_type
+          nil
+        end
         private
 
         def add_command_defs!

data/lib/cli/runner.rb

@@ -35,6 +35,7 @@ module DTK::Client
           DTKNAccess.resolve_direct_access(config_existed)
 
           context =  Context.determine_context
+          add_missing_context(argv, context)
           if response_obj = context.run_and_return_response_object(argv)
             # render_response will raise Error in case of error response
             render_response(response_obj)
@@ -53,6 +54,16 @@ module DTK::Client
         Response::ErrorHandler.raise_if_error(response_obj)
         response_obj.render_data
       end
+
+      def self.add_missing_context(argv, context)
+        add_context = true
+
+        if context_type = context.context_type
+          allowed_commands = context.allowed_commands_defs
+          allowed_commands.each {|cmd| add_context = false if argv.include?(cmd)}
+          argv.unshift(context_type) if add_context
+        end
+      end
     end
   end
 end

data/lib/cli/version.rb

@@ -1,7 +1,7 @@
 module DTK
   module Client
     module CLI
-      VERSION="0.10.1"
+      VERSION="0.10.2"
     end
   end
 end

data/lib/client/git_repo/adapter/git_gem.rb

@@ -172,7 +172,7 @@ module DTK::Client
         changes[1].each { |item| puts "\t#{item}" }
         puts "\nDeleted files:\n".colorize(:red) unless changes[2].empty?
         changes[2].each { |item| puts "\t#{item}" }
-        puts ""
+        puts "" 
       end
     end
   end

data/lib/client/git_repo.rb

@@ -46,7 +46,17 @@ module DTK::Client
       end
     end
 
-    
+    def self.modified?(dir)
+      repo_dir = {
+        :path    => dir,
+        :branch  => Git.open(dir).branches.local
+      }
+      message = DTK::Client::Operation::ClientModuleDir::GitRepo.modified(repo_dir)
+      if message.data(:modified)
+        raise Error::Usage, "Please push or revert changes."
+      end
+    end
+
     def add_remote(name, url)
       @git_adapter.add_remote(name, url)
     end

data/lib/client/operation/client_module_dir/git_repo.rb

@@ -68,6 +68,12 @@ module DTK::Client
         end
       end
 
+      def self.modified(args)
+        wrap_operation(args) do |args|
+          response_data_hash(:modified => Internal.modified(args))
+        end
+      end
+
       def self.init_and_push_from_existing_repo(args)
         wrap_operation(args) do |args|
           repo_dir      = args.required(:repo_dir)
@@ -194,6 +200,16 @@ module DTK::Client
           head_sha 
         end
         
+        def self.modified(args)
+          repo_url = args.required(:path)
+          branch   = args.required(:branch)
+          repo     = git_repo.new(repo_url, :branch => branch)
+
+          changed = repo.changed?
+          repo.print_status if changed
+          changed
+        end
+
         def self.create_add_remote_and_push(repo_dir, repo_url, remote_branch)
           repo = git_repo.new(repo_dir)
           add_remote_and_push(repo, repo_url, remote_branch)

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

@@ -23,8 +23,14 @@ module DTK::Client
           module_ref       = args.required(:module_ref)
           module_name      = args.required(:module_name)
           target_directory = args[:target_directory]
+          
+          opts = {
+            :namespace => module_ref.namespace, 
+            :version => module_ref.version
+          }
+
           unless module_info = module_exists?(module_ref, :type => :common_module)
-            raise Error::Usage, "DTK module '#{module_ref.print_form}' does not exist on server."
+            raise Error::Usage, "DTK module '#{DTK::Common::PrettyPrintForm.module_ref(module_ref.module_name, opts)}' does not exist on server."
           end
 
           branch    = module_info.required(:branch, :name)
@@ -41,7 +47,7 @@ module DTK::Client
           }
 
           ret = ClientModuleDir::GitRepo.clone_module_repo(clone_args)
-          OsUtil.print_info("DTK module '#{module_ref.print_form}' has been successfully cloned into '#{ret.required(:target_repo_dir)}'")
+          OsUtil.print_info("DTK module '#{DTK::Common::PrettyPrintForm.module_ref(module_ref.module_name, opts)}' has been successfully cloned into '#{ret.required(:target_repo_dir)}'")
         end
       end
     end

data/lib/client/operation/module/install/external_module.rb

@@ -18,12 +18,12 @@
 module DTK::Client
   class Operation::Module::Install
     class ExternalModule < self
-      BaseRoute = "modules"
+      BaseRoute    = "modules"
+      @update_all  = false
+      @update_none = false
 
       def self.install_dependent_modules(module_refs, opts = {})
-        # if skip_prompt option is sent it means user wants to update_all
-        @update_all  = opts[:skip_prompt]
-        @update_none = false
+        @update_all = opts[:skip_prompt] if opts[:skip_prompt]
         @print_dependency_newline = false
 
         module_refs.each do |module_ref|
@@ -93,9 +93,13 @@ module DTK::Client
         module_name = component_module.module_name
         version     = component_module.version
 
-        import_msg = "#{opts[:indent]}Importing module '#{namespace}:#{module_name}"
-        import_msg += "(#{version})" if version && !version.eql?('master')
-        import_msg += "' ... "
+        print_opts = {
+          :module_name => module_name,
+          :namespace   => namespace,
+          :version     => version
+        }
+
+        import_msg = "#{opts[:indent]}Importing module '#{DTK::Common::PrettyPrintForm.module_ref(module_name, print_opts)}' ..."
 
         # Using print to avoid adding cr at the end.
         print "\n" if opts[:add_newline]
@@ -186,7 +190,12 @@ module DTK::Client
           print "\n"
           @print_dependency_newline = false
         end
-        OsUtil.print("#{opts[:indent]}Using module '#{module_ref.namespace}:#{module_ref.module_name}'" + (module_ref.version.nil? ? "" : " version: #{module_ref.version} "))
+
+        opts = {
+          :namespace => module_ref.namespace,
+          :version   => module_ref.version
+        }
+        OsUtil.print("#{opts[:indent]}Using module '#{DTK::Common::PrettyPrintForm.module_ref(module_ref.module_name, opts)}'")
       end
 
     end

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

@@ -45,10 +45,14 @@ module DTK::Client
         unless dependent_modules.empty?
           OsUtil.print_info('Auto-importing dependencies')
           ExternalModule.install_dependent_modules(dependent_modules, opts)
-          OsUtil.print_info("Successfully imported '#{@base_module_ref.namespace}:#{@base_module_ref.module_name}' version #{@base_module_ref.version}")
         end
 
+        opts = {
+          :namespace   => @base_module_ref.namespace,
+          :version     => @base_module_ref.version
+        }
         CommonModule.install(@base_module_ref, @file_obj)
+        OsUtil.print_info("Successfully imported '#{DTK::Common::PrettyPrintForm.module_ref(@base_module_ref.module_name, opts)}'")
         nil
       end
       

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

@@ -24,7 +24,7 @@ module DTK::Client
           version        = args[:version]
           directory_path = args[:directory_path]
 
-          # will create different classes for different catalog taypes when we add support for them
+          # will create different classes for different catalog types when we add support for them
           new('dtkn', module_ref, directory_path, version).install
         end
       end

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

@@ -0,0 +1,64 @@
+#
+# 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::Module
+    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]
+          )
+
+          DTK::Client::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 removed before retrying the command" if ClientModuleDir.local_dir_exists?(:service, service_name) 
+
+          post_body.merge!(:service_name => service_name)
+          response = rest_post("#{BaseRoute}/stage", 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

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

@@ -21,9 +21,14 @@ module DTK::Client
       def self.execute(args = Args.new)
         wrap_operation(args) do |args|
           module_ref  = args.required(:module_ref)
+          
+          opts = {
+            :namespace => module_ref.namespace,
+            :version   => module_ref.version
+          }
 
           unless args[:skip_prompt]
-            return false unless Console.prompt_yes_no("Are you sure you want to uninstall module '#{module_ref.print_form}' from the server?", :add_options => true)
+            return false unless Console.prompt_yes_no("Are you sure you want to uninstall module '#{DTK::Common::PrettyPrintForm.module_ref(module_ref.module_name, opts)}' from the server?", :add_options => true)
           end
 
           post_body = PostBody.new(
@@ -32,7 +37,7 @@ module DTK::Client
             :version?    => module_ref.version
           )
           rest_post("#{BaseRoute}/delete", post_body)
-          OsUtil.print_info("DTK module '#{module_ref.print_form}' has been deleted successfully.")
+          OsUtil.print_info("DTK module '#{DTK::Common::PrettyPrintForm.module_ref(module_ref.module_name, opts)}' has been deleted successfully.")
           nil
         end
       end

data/lib/client/operation/module.rb

@@ -18,7 +18,7 @@
 module DTK::Client
   class Operation
     class Module < self
-      OPERATIONS = [:install, :list, :list_assemblies, :list_remotes, :push, :uninstall, :clone_module, :install_from_catalog]
+      OPERATIONS = [:install, :list, :list_assemblies, :list_remotes, :push, :uninstall, :clone_module, :install_from_catalog, :stage]
       OPERATIONS.each { |operation| require_relative("module/#{operation}") }
 
       BaseRoute = 'modules'

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

@@ -21,11 +21,14 @@ module DTK::Client
       def self.execute(args = Args.new)
         wrap_operation(args) do |args|
           service_instance = args.required(:service_instance)
+          force            = args[:force]
+          directory_path   = args[:directory_path]
 
           post_body = PostBody.new(
             :service_instance => service_instance
           )
 
+          DTK::Client::GitRepo.modified?(directory_path || OsUtil.current_dir) unless force
           violations = find_violations(service_instance)
           return violations if violations
 

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

@@ -22,18 +22,21 @@ module DTK::Client
         wrap_operation(args) do |args|
           service_instance = args.required(:service_instance)
           recursive        = args.required(:recursive)
+          force            = args[:force]
+          directory_path   = args[:directory_path]
 
           unless args[:skip_prompt]
             return false unless Console.prompt_yes_no("Are you sure you want to delete the content of service instance '#{service_instance}' ?", :add_options => true)
           end
 
+          DTK::Client::GitRepo.modified?(directory_path || OsUtil.current_dir) unless force
           post_body = PostBody.new(
             :service_instance => service_instance,
             :recursive? => recursive
           )
           rest_post("#{BaseRoute}/delete", post_body)
 
-          OsUtil.print_info("DTK module '#{service_instance}' has been deleted successfully.")
+          OsUtil.print_info("Delete procedure started. For more information use 'dtk task-status'.")
         end
       end
 

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

@@ -30,7 +30,7 @@ module DTK::Client
           }
           ClientModuleDir::GitRepo.pull_from_service_repo(pull_args)
         end
-
+        nil
       end
     end
   end

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

@@ -23,6 +23,8 @@ module DTK::Client
           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,
@@ -33,11 +35,12 @@ module DTK::Client
             :is_target?      => args[:is_target]
           )
 
+          DTK::Client::GitRepo.modified?(directory_path || OsUtil.current_dir) unless force
           service_name ||= rest_post("#{BaseRoute}/generate_service_name", post_body).data
-          path = ClientModuleDir.ret_base_path(:service, service_name)
-          
-          raise Error::Usage, "Directory '#{path}' is not empty; it must be deleted or removed before retrying the command" if ClientModuleDir.local_dir_exists?(:service, service_name) 
+          base_path = ClientModuleDir.ret_base_path(:service, service_name)
           
+          raise Error::Usage, "Directory '#{base_path}' is not empty; it must be deleted or removed 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)
 

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

@@ -22,6 +22,7 @@ module DTK::Client
         wrap_operation(args) do |args|
           service_instance = args.required(:service_instance)
           recursive        = args.required(:recursive)
+          force            = args.required(:force)
 
           unless args[:skip_prompt]
             return false unless Console.prompt_yes_no("Are you sure you want to uninstall the infrastructure associated with '#{service_instance}' and delete this service instance from the server?", :add_options => true)
@@ -29,7 +30,8 @@ module DTK::Client
 
           post_body = PostBody.new(
             :service_instance => service_instance,
-            :recursive? => recursive
+            :recursive? => recursive,
+            :force      => force
           )
           rest_post("#{BaseRoute}/uninstall", post_body)
 

data/lib/client/operation/service.rb

@@ -25,7 +25,6 @@ module DTK::Client
         :uninstall,
         :edit,
         :pull,
-        :stage,
         :converge,
         :task_status,
         :list,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors:
 - Reactor8
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-18 00:00:00.000000000 Z
+date: 2016-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dtk-common-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.10.1
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -98,28 +98,28 @@ dependencies:
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.99.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.99.3
 - !ruby/object:Gem::Dependency
   name: dtk-dsl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
 description: Command line tool to interact with a DTK Server and DTK Service Catalog.
@@ -129,7 +129,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - README.md
 - Rakefile
@@ -153,6 +153,7 @@ files:
 - lib/cli/command/module/list_assemblies.rb
 - lib/cli/command/module/list_remotes.rb
 - lib/cli/command/module/push.rb
+- lib/cli/command/module/stage.rb
 - lib/cli/command/module/uninstall.rb
 - lib/cli/command/options.rb
 - lib/cli/command/service.rb
@@ -231,6 +232,7 @@ files:
 - lib/client/operation/module/list_assemblies.rb
 - lib/client/operation/module/list_remotes.rb
 - lib/client/operation/module/push.rb
+- lib/client/operation/module/stage.rb
 - lib/client/operation/module/uninstall.rb
 - lib/client/operation/module_service_common.rb
 - lib/client/operation/service.rb
@@ -320,17 +322,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: DTK CLI client for DTK server interaction.