dtk-client 0.10.0.2 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f28cd5b72fe1b22b5ed1c1acf5d7994c70e147d5
-  data.tar.gz: 3ed5a5af32baa1a5d22e5a493bd4907b7636eef2
+  metadata.gz: e9540610a410ba802ef78157c6781d4271ccfe04
+  data.tar.gz: 7a38732fc16295a3cad0f088483198746d776b21
 SHA512:
-  metadata.gz: 609335a109d58bfc74ffa0b0b5580b6474fdadea1d2691d7270420de7f60bb1bd26363c7e55cd77e0f2dbd854bc4c9939d0587360f314b77b45814809f9fae1a
-  data.tar.gz: 3f3446bd3d10709e48c19c12886fde17da89e16bf0dcaa866a582a525fe81bb411352da2475100ca54abe75705b02f886805f03546b6a3a6ec846bdad6d7e8ec
+  metadata.gz: 7a1ed74ece609638c98e20ba20e2d3cb12364ecc1bc7cadf94fc5341837fda53c51226bc0529c63464c80cdf5ea3b96c3769fc070fc60233e950e0d208bda23f
+  data.tar.gz: 300e8bec9f03786c3867a0e473c8eff0d93b7c056148fc9bf70752220d1103c3e7d29eb37305890ad653fa7d16b5d4ca0bc5b8f14aa9f9c59a0329180ac7186c

data/.gitignore

@@ -2,4 +2,5 @@
 sftp-config*.json
 .remote-sync.json
 .tags
+.tags1
 Gemfile.lock

data/dtk-client.gemspec

@@ -24,6 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'git', '1.2.9'
   spec.add_dependency 'hirb', '0.7.3'
   spec.add_dependency 'mime-types', '~> 2.99.3'
-  spec.add_dependency 'dtk-dsl', '1.0.0'
+  spec.add_dependency 'dtk-dsl', '~> 1.0.0'
   
 end

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

@@ -23,9 +23,12 @@ module DTK::Client
         command_body c, :install, 'Install a module on the server from a client directory or from the DTK remote catalog (DTKN)' do |sc|
           sc.flag Token.version
           sc.flag Token.directory_path, :desc => 'Absolute or relative path to directory containing content to install'
+          sc.switch Token.skip_prompt
+
           sc.action do |_global_options, options, args|
             directory_path = options[:directory_path]
-            version = options[:version]
+            version        = options[:version]
+            skip_prompt    = options[:skip_prompt]
 
             # install from dtkn (later probably from other remote catalogs)
             if module_name = args[0]
@@ -40,9 +43,10 @@ module DTK::Client
             end
 
             install_opts = directory_path ? { :directory_path => directory_path, :version => (version || 'master') } : options
-            module_ref = module_ref_in_options_or_context?(install_opts)
-            flag = true unless options["d"].nil?
-            Operation::Module.install(:module_ref => module_ref, :base_dsl_file_obj => @base_dsl_file_obj, :flag => flag)
+            module_ref   = module_ref_in_options_or_context?(install_opts)
+            flag         = true unless options["d"].nil?
+
+            Operation::Module.install(:module_ref => module_ref, :base_dsl_file_obj => @base_dsl_file_obj, :flag => flag, :skip_prompt => skip_prompt)
           end
         end
       end

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

@@ -0,0 +1,39 @@
+#
+# 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 'list-remotes' do |c|
+        command_body c, 'list-remotes', 'List remote modules' do |sc|
+          sc.flag Token.namespace
+          sc.action do |_global_options, options, args|
+            arg = {}
+            unless options[:n].nil?
+              arg = {
+                :module_namespace => options[:n]
+              }
+            end
+            
+            Operation::Module.list_remotes(arg)
+          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']
+        ALL_SUBCOMMANDS = ['install', 'list', 'list-assemblies', 'push', 'uninstall', 'clone', 'list-remotes']
         command_def :desc => 'Subcommands for interacting with DTK modules'
         ALL_SUBCOMMANDS.each { |subcommand| require_relative("module/#{subcommand.gsub(/-/,'_')}") } 
       end

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

@@ -0,0 +1,43 @@
+#
+# 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 'clone' do |c|
+        c.arg Token::Arg.service_instance
+        c.arg Token::Arg.target_directory, :optional => true
+        command_body c, :clone, 'Clone content of service module from server to client' do |sc|
+          sc.action do |_global_options, options, args|
+            service_name = args[0]
+            service_ref  = service_instance_in_options_or_context(:service_instance => service_name, :version => options[:version])
+
+            arg = {
+              :service_ref       => service_ref,
+              :service_name      => service_name,
+              :target_directory  => args[1]
+            }
+
+            Operation::Service.clone_service(arg)
+          end
+        end
+      end
+
+    end
+  end
+end
+

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

@@ -0,0 +1,48 @@
+#
+# 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
+  module Command
+    module Service
+      subcommand_def 'delete' do |c|
+        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.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
+            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
+            }
+            Operation::Service.delete(args)
+          end
+        end
+      end
+    end
+  end
+end; end

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

@@ -22,7 +22,9 @@ module DTK::Client
         c.arg Token::Arg.action
         c.arg Token::Arg.action_params, :optional => true
         command_body c, :exec, 'Execute action asynchronously' do |sc|
+          sc.flag Token.directory_path, :desc => 'Absolute or relative path to service instance directory containing updates to pull; not need if in the service instance directory'
           sc.action do |_global_options, options, args|
+          
             service_instance = service_instance_in_options_or_context(options)
             
             action        = args[0]
@@ -33,7 +35,14 @@ module DTK::Client
               :action           => action,
               :action_params    => action_params
             }
-            Operation::Service.exec(args)
+            
+            response = Operation::Service.exec(args)
+
+            if violations = response.data(:violations)
+              response.set_data(violations)
+              response.data.flatten!
+              response.set_render_as_table!
+            end
           end
         end
       end

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

@@ -22,6 +22,7 @@ module DTK::Client
         c.arg Token::Arg.action
         c.arg Token::Arg.action_params, :optional => true
         command_body c, 'exec-sync', 'Execute action synchronously' do |sc|
+         sc.flag Token.directory_path, :desc => 'Absolute or relative path to service instance directory containing updates to pull; not need if in the service instance directory'
           sc.action do |_global_options, options, args|
             service_instance = service_instance_in_options_or_context(options)
             
@@ -34,13 +35,18 @@ module DTK::Client
               :action_params    => action_params
             }
             response = Operation::Service.exec(args)
+
             unless response.ok?
               response
             else
               # TODO: break if any exceptions
+
               if response.data(:empty_workflow)
-                Response::Ok.new 
-              #eslsif TODO: break if any violations
+                Response::Ok.new
+              elsif violations = response.data(:violations)
+                response.set_data(violations)
+                response.data.flatten!
+                response.set_render_as_table!
               else
                 Operation::Service.task_status(args.merge(:mode => 'stream'))
               end

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

@@ -0,0 +1,46 @@
+#
+# 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
+  module Command
+    module Service
+      subcommand_def 'set-attribute' do |c|
+        c.arg Token::Arg.attribute_name
+        c.arg Token::Arg.attribute_value, :optional => true
+        command_body c, 'set-attribute',  'Edit specific attribute.' do |sc|
+          sc.switch Token.u
+          sc.flag Token.directory_path
+          sc.action do |_global_options, options, _args|
+
+            service_instance = service_instance_in_options_or_context(options)
+
+            attribute_name = _args[0]
+            options[:u] ? attribute_value = nil : attribute_value = _args[1]
+    
+            args = {
+              :attribute_name   => attribute_name,
+              :service_instance => service_instance,
+              :attribute_value  => attribute_value
+            }
+
+            Operation::Service.set_attribute(args)
+          end
+        end
+      end
+    end
+  end
+end; end

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

@@ -20,7 +20,7 @@ module DTK::Client
     module Service
       subcommand_def 'ssh' do |c|
         c.arg Token::Arg.node_name
-        command_body c, :ssh, 'Ssh into service instance node.' do |sc|
+        command_body c, :ssh, 'SSH into service instance node.' do |sc|
           sc.flag Token.remote_user
           sc.flag Token.identity_file, :desc => 'Identity file used for connection, if not provided default is used'
 

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

@@ -0,0 +1,53 @@
+#
+# 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
+  module Command
+    module Service
+      subcommand_def 'uninstall' do |c|
+        command_body c, :uninstall, 'Uninstalls the service instance from the server' 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.purge, :desc => 'Delete the service instance directory on the client'
+          sc.switch Token.force
+          sc.switch Token.recursive
+          sc.action do |_global_options, options, args|
+            directory_path = options[:directory_path]
+            purge          = options[:purge]
+            force          = options[:force]
+            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
+            service_instance = service_instance_in_options_or_context(options)
+
+            args = {
+              :service_instance => service_instance,
+              :skip_prompt      => options[:skip_prompt],
+              :directory_path   => directory_path,
+              :purge            => purge,
+              :force            => force,
+              :recursive        => recursive
+            }
+            Operation::Service.uninstall(args)
+          end
+        end
+      end
+    end
+  end
+end; end

data/lib/cli/command/service.rb

@@ -21,8 +21,10 @@ module DTK::Client
       module Service
         include Command::Mixin
         ALL_SUBCOMMANDS = [
+          'clone',
           'stage',
-          'destroy',
+          'delete',
+          'uninstall',
           'edit',
           'push',
           'pull',
@@ -41,6 +43,7 @@ module DTK::Client
           'cancel-task',
           'ssh',
           'set-required-attributes',
+          'set-attribute',
           'exec',
           'exec-sync',
           'set-default-target'

data/lib/cli/command/token.rb

@@ -46,6 +46,8 @@ module DTK::Client
         :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'),
+        
 
         # switches
         # Switch constructor args order: key, desc, opts={}
@@ -57,6 +59,8 @@ module DTK::Client
         :target       => Switch.new(:target, 'Create target service instance'),
         :links        => Switch.new(:links, 'Links'),
         :dependencies => Switch.new(:deps, 'Dependencies'),
+        :u            => Switch.new([:u, :unset], 'Unset attribute'),
+        :recursive    => Switch.new(:r, 'Recursive')
       }
 
       ARG_TOKENS = {
@@ -68,7 +72,9 @@ module DTK::Client
         :workspace_name   => 'WORKSPACE-NAME',
         :target_instance  => 'TARGET-SERVICE-INSTANCE',
         :module_name      => 'NAMESPACE/MODULE-NAME',
-        :target_directory => 'TARGET-DIRECTORY'
+        :target_directory => 'TARGET-DIRECTORY',
+        :attribute_name   => 'ATTRIBUTE-NAME',
+        :attribute_value  => 'VALUE'
       }
       
     end

data/lib/cli/context/type.rb

@@ -25,13 +25,14 @@ module DTK::Client
       # This function can have the side of updating base_dsl_file_obj
       def self.create_context!(base_dsl_file_obj)
         if path = base_dsl_file_obj.path?
-          case base_dsl_file_obj.file_type.type
+          top_level_type = base_dsl_file_obj.file_type.top_level_type
+          case top_level_type
           when :common_module 
             Module.new(base_dsl_file_obj)
           when :service_instance  
             Service.new(base_dsl_file_obj)
           else 
-            raise Error, "Unexpected file_type '#{file_type.type}'"
+            raise Error, "Unexpected top_level_type '#{top_level_type}'"
           end
         else
           Top.new(base_dsl_file_obj)

data/lib/cli/context.rb

@@ -23,9 +23,6 @@ module DTK::Client
       require_relative('context/attributes')
 
       def self.determine_context
-#testing stub
-#dir_path = File.expand_path('../../examples/spark', File.dirname(__FILE__))
-#base_dsl_file_obj = base_dsl_file_obj(:dir_path => dir_path)
         base_dsl_file_obj = base_dsl_file_obj()
         Type.create_context!(base_dsl_file_obj)
       end
@@ -76,8 +73,8 @@ module DTK::Client
       end
 
       def service_instance_from_base_dsl_file?
-        #raise_error_when_missing_context(:service_instance) unless base_dsl_file_obj.file_type == DTK::DSL::FileType::ServiceInstance
-        base_dsl_file_obj.file_type == DTK::DSL::FileType::ServiceInstance
+        #raise_error_when_missing_context(:service_instance) unless base_dsl_file_obj.file_type == DTK::DSL::FileType::ServiceInstance::DSLFile::Top
+        base_dsl_file_obj.file_type == DTK::DSL::FileType::ServiceInstance::DSLFile::Top
         base_dsl_file_obj.parse_content(:service_module_summary).val(:Name)
       end
 
@@ -96,8 +93,8 @@ module DTK::Client
       end
       FILE_TYPES = 
         [
-         ::DTK::DSL::FileType::CommonModule,
-         ::DTK::DSL::FileType::ServiceInstance
+         ::DTK::DSL::FileType::CommonModule::DSLFile::Top,
+         ::DTK::DSL::FileType::ServiceInstance::DSLFile::Top
         ]
 
       def module_ref_in_options_or_context(options)

data/lib/cli/directory_parser/file_system.rb

@@ -60,8 +60,7 @@ module DTK::Client; module CLI
           end
         else
           file_types.each do | file_type |
-            path_info = file_type.create_path_info
-            if path = most_nested_matching_file_path?(path_info, flag, :current_dir => opts[:dir_path])
+            if path = most_nested_matching_file_path?(file_type, flag, :current_dir => opts[:dir_path])
               return [file_type, path]
             end
           end
@@ -69,22 +68,22 @@ module DTK::Client; module CLI
         ret
       end
 
-      # return either a string file path or of match to path_info working from current directory and 'otwards'
-      # until base_path in path_info (if it exists)
+      # return either a string file path or of match to file_type working from current directory and 'outwards'
+      # until base_path in file_type (if it exists)
       # opts can have keys
       #  :current_dir if set means start from this dir; otherwise start from computed current dir
-      def most_nested_matching_file_path?(path_info, flag, opts = {})
-        base_dir = path_info.base_dir || OsUtil.home_dir
+      def most_nested_matching_file_path?(file_type, flag, opts = {})
+        base_dir = file_type.base_dir || OsUtil.home_dir
         current_dir = opts[:current_dir] || OsUtil.current_dir
-        check_match_recurse_on_failure?(path_info, current_dir, base_dir, flag)
+        check_match_recurse_on_failure?(file_type, current_dir, base_dir, flag)
       end
 
-      def check_match_recurse_on_failure?(path_info, current_dir, base_dir, flag)
-        match = matching_file_paths(current_dir, path_info)
+      def check_match_recurse_on_failure?(file_type, current_dir, base_dir, flag)
+        match = matching_file_paths(current_dir, file_type)
         if match.empty?
           unless current_dir == base_dir
             if parent_path = OsUtil.parent_dir?(current_dir)
-              check_match_recurse_on_failure?(path_info, parent_path, base_dir, flag) unless flag
+              check_match_recurse_on_failure?(file_type, parent_path, base_dir, flag) unless flag
             end
           end
         elsif match.size == 1
@@ -94,9 +93,14 @@ module DTK::Client; module CLI
         end
       end
 
-      # returns an array of strings that are file paths
+      # returns an array of strings that are file paths; except bakup files (e.g. bak.dtk.service.yaml)
       def matching_file_paths(dir_path, path_info)
-        Dir.glob("#{dir_path}/*").select { |file_path| File.file?(file_path) and path_info.matches?(file_path) }
+        Dir.glob("#{dir_path}/*").select { |file_path| File.file?(file_path) and !is_backup_file?(file_path) and path_info.matches?(file_path) }
+      end
+
+      def is_backup_file?(file_path)
+        regex = Regexp.new("\.bak\.dtk\.(service|module)\.(yml|yaml)$")
+        file_path =~ regex
       end
     end
   end

data/lib/cli/version.rb

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

data/lib/client/content_generator.rb

@@ -91,9 +91,14 @@ module DTK::Client
         content_hash     = convert_file_content_to_hash(assembly)
         name             = content_hash['name']
         assembly_content = content_hash['assembly']
-        workflows        = ret_workflows_hash(content_hash)
 
+        workflows = ret_workflows_hash(content_hash)
         assembly_content.merge!('workflows' => workflows) if workflows
+
+        # convert node_bindings to node attributes
+        node_bindings = content_hash['node_bindings']
+        create_node_properties_from_node_bindings?(node_bindings, assembly_content)
+
         assemblies.merge!(name => assembly_content)
       end
 
@@ -114,17 +119,71 @@ module DTK::Client
     def ret_dependencies_hash
       if file_path = get_module_refs_file
         module_refs_content = convert_file_content_to_hash(file_path)
-        dependencies = []
+        dependencies = {}
 
         if cmp_dependencies = module_refs_content['component_modules']
           cmp_dependencies.each_pair do |name, namespace_h|
-            dependencies << "#{namespace_h['namespace']}/#{name}"
+            dependencies.merge!({ "#{namespace_h['namespace']}/#{name}" => namespace_h['version']||'master' })
           end
         end
 
         dependencies
       end
     end
+
+    def create_node_properties_from_node_bindings?(node_bindings, assembly_content = {})
+      return unless node_bindings
+
+      nodes = assembly_content['nodes']
+      return if nodes.empty?
+
+      node_bindings.each do |node, node_binding|
+        image, size = get_ec2_properties_from_node_binding(node_binding)
+        new_attrs = { 'image' => image, 'size' => size }
+
+        if node_content = nodes[node]
+          components = node_content['components']
+          components = components.is_a?(Array) ? components : [components]
+
+          if index = include_node_property_component?(components)
+            ec2_properties = components[index]
+            if ec2_properties.is_a?(Hash)
+              if attributes = ec2_properties.values.first['attributes']
+                attributes['image'] = image unless attributes['image']
+                attributes['size'] = size unless attributes['size']
+              else
+                ec2_properties.merge!('attributes' => new_attrs)
+              end
+            else
+              components[index] = { ec2_properties => { 'attributes' => new_attrs } }
+            end
+          elsif node_attributes = node_content['attributes']
+            node_attributes['image'] = image unless node_attributes['image']
+            node_attributes['size'] = size unless node_attributes['size']
+          else
+            node_content['attributes'] = new_attrs
+          end
+        end
+      end
+    end
+
+    def get_ec2_properties_from_node_binding(node_binding)
+      image, size = node_binding.split('-')
+      [image, size]
+    end
+
+    def include_node_property_component?(components)
+      property_component = 'ec2::properties'
+      components.each do |component|
+        if component.is_a?(Hash)
+          return components.index(component) if component.keys.first.eql?(property_component)
+        else
+          return components.index(component) if component.eql?(property_component)
+        end
+      end
+
+      false
+    end
   end
 end
 

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

@@ -137,12 +137,12 @@ module DTK::Client
 
         def self.clone_service_repo(args)
           repo_url         = args.required(:repo_url)
-          module_ref       = args.required(:module_ref)
           branch           = args.required(:branch)
           service_instance = args.required(:service_instance)
           remove_existing  = args[:remove_existing]
+          repo_dir         = args[:repo_dir]
 
-          target_repo_dir = create_service_dir(service_instance, :remove_existing => remove_existing)
+          target_repo_dir = create_service_dir(service_instance, :remove_existing => remove_existing, :path => repo_dir)
           begin
             git_repo.clone(repo_url, target_repo_dir,  branch)
           rescue => e

data/lib/client/operation/client_module_dir.rb

@@ -28,7 +28,8 @@ module DTK::Client
       #   :backup_if_exist - Boolean (default: false)
       #   :remove_existing - Boolean (default: false)
       def self.create_service_dir(service_instance, opts = {})
-        path = "#{base_path(:service)}/#{service_instance}"
+        path = opts[:path]
+        path = "#{base_path(:service)}/#{service_instance}" if path.nil?
         if File.exists?(path)
           if opts[:remove_existing]
             FileUtils.rm_rf(path)
@@ -42,7 +43,8 @@ module DTK::Client
             # else
             # raise Error::Usage, "Directory '#{path}' is not empty; it must be deleted or removed before retrying the command"
             #end
-            raise Error::Usage, "Directory '#{path}' is not empty; it must be deleted or removed before retrying the command"
+            raise Error::Usage, "Directory '#{path}' is not empty; it must be deleted or removed before retrying the command" unless (Dir.entries(path) - %w{ . .. }).empty?
+            return path
           end
         end
         FileUtils.mkdir_p(path)