dtk-client 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 255d3202f2e1ed5a8549778e48dbb1e98d83e287
-  data.tar.gz: c7c2879f1783ea5dfae4bba570e0587e7853c469
+  metadata.gz: 6ae387fa3ef1b1ab77afa462b3de70d85dc091d9
+  data.tar.gz: 28a1fbd9f0f73e2e4d8b3a4071f50610957e5f35
 SHA512:
-  metadata.gz: edc060619dbdfee5195dd346a87a0c81edbe18c69a67704b0510c048560d60e125270f7dc27b40877f718453d2a288c992a8e56b0f11f308d46901a2cd8fb1d9
-  data.tar.gz: 436463ab2e98c92e9e5677ef12e54453eb9c2825249e2d1dd2b50592c65f87185d127b0c4a011dd113fb72f1e8bb44b0c8b7e8f98094e728db25b44778d90a5b
+  metadata.gz: d4c9d5be56fcdacca8fe807b471217ad2ea5a8a85ffa20b875d73b21b1adfcdb7ddf7225a1c08297210eb51efbc1d4c744ce465757a4b75fd7a9970ecad6fe61
+  data.tar.gz: ba9ea50cf712535d0aa4b95cddf9ad11b1f5c451ee7a57e82b8cff7185645abd98043eba12a8e8235cd6f7e47ce5944583b0389515b5ff52218043d97b5ab868

data/lib/command_helpers/git_repo.rb

@@ -28,7 +28,7 @@ module DTK; module Client; class CommandHelper
 
         target_repo_dir = local_repo_dir(type,full_name,version,opts)
         if File.exists?(target_repo_dir)
-          raise ErrorUsage.new("Directory '#{target_repo_dir}' is not empty; it must be deleted or removed before retrying the command")          
+          raise ErrorUsage.new("Directory '#{target_repo_dir}' is not empty; it must be deleted or removed before retrying the command")
         end
 
         begin
@@ -60,13 +60,13 @@ module DTK; module Client; class CommandHelper
       end
     end
 
-    #opts can have the following keys
+    # opts can have the following keys
     #
-    #:remote_repo
-    #:remote_branch
-    #:remote_repo_url
-    #:local_branch
-    #:no_fetch
+    # :remote_repo
+    # :remote_branch
+    # :remote_repo_url
+    # :local_branch
+    # :no_fetch
     #
     def push_changes(type,full_module_name,version,opts={})
       Response.wrap_helper_actions() do
@@ -152,7 +152,7 @@ module DTK; module Client; class CommandHelper
         local_repo_dir = local_repo_dir(type,full_module_name,version)
 
         unless File.directory?(local_repo_dir)
-          raise ErrorUsage.new("The content for module (#{full_module_name}) should be put in directory (#{local_repo_dir})")
+          raise ErrorUsage.new("The content for module (#{full_module_name}) should be put in directory (#{local_repo_dir})",:log_error=>false)
         end
 
         # transfered this part to initialize_client_clone_and_push because if we remove .git folder and
@@ -175,7 +175,6 @@ module DTK; module Client; class CommandHelper
     end
 
     def rename_and_initialize_clone_and_push(type, module_name, new_module_name, branch, repo_url, local_repo_dir, version = nil)
-
       # check to see if the new dir has proper naming e.g. (~/dtk/component_modules/dtk::java)
       unless local_repo_dir.match(/\/#{new_module_name.gsub(ModuleUtil::NAMESPACE_SEPERATOR,'/')}$/)
         old_dir = local_repo_dir
@@ -185,13 +184,23 @@ module DTK; module Client; class CommandHelper
         parent_path = new_dir.gsub(/(\/\w+)$/,'')
         FileUtils::mkdir_p(parent_path) unless File.directory?(parent_path)
         # raise ErrorUsage.new("Destination folder already exists '#{new_dir}', aborting initialization.") if File.directory?(new_dir)
-        FileUtils.mv(old_dir, new_dir)
+        if File.directory?(new_dir)
+          # return empty response if user does not want to overwrite current directory
+          return unless Console.confirmation_prompt("Destination directory #{new_dir} exists already. Do you want to overwrite it with content from #{old_dir}"+'?')
+          FileUtils.rm_rf(new_dir)
+        end
+        # FileUtils.mv(old_dir, new_dir)
+        FileUtils.cp_r(old_dir, new_dir)
       else
         new_dir = local_repo_dir
       end
 
       # Continue push
-      initialize_client_clone_and_push(type, new_module_name, branch, repo_url, new_dir, version)
+      response = initialize_client_clone_and_push(type, new_module_name, branch, repo_url, new_dir, version)
+      return response unless response.ok?
+
+      response.data.merge!(:old_dir => old_dir)
+      response
     end
 
     # makes repo_dir (determined from type and module_name) into a git dir, pulls, adds, content and then pushes

data/lib/command_helpers/service_importer.rb

@@ -40,7 +40,7 @@ module DTK::Client
         print "Importing component module '#{module_name}' ... "
         new_context_params = ::DTK::Shell::ContextParams.new([module_name])
         new_context_params.override_method_argument!('option_2', m_module['version'])
-        new_context_params.forward_options( { "skip_cloning" => true}).merge!(opts)
+        new_context_params.forward_options( { "skip_cloning" => false}).merge!(opts)
 
         response = ContextRouter.routeTask("component_module", "install", new_context_params, @conn)
         puts(response.data(:does_not_exist) ? response.data(:does_not_exist) : "Done.")

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

@@ -67,9 +67,12 @@ module DTK::Client
       end
 
       namespace ||= opts[:default_namespace]
+      local_clone_dir_exists = Helper(:git_repo).local_clone_dir_exists?(:service_module, service_module_name, :namespace => namespace)
+
       if namespace
         post_body.merge!(:namespace => namespace)
-        post_body.merge!(:local_clone_dir_exists => true) if Helper(:git_repo).local_clone_dir_exists?(:service_module, service_module_name, :namespace => namespace)
+        post_body.merge!(:local_clone_dir_exists => true) if local_clone_dir_exists
+        # post_body.merge!(:local_clone_dir_exists => true) if Helper(:git_repo).local_clone_dir_exists?(:service_module, service_module_name, :namespace => namespace)
       end
 
       post_body.merge!(:assembly_template_name => assembly_template_name) if assembly_template_name
@@ -78,10 +81,15 @@ module DTK::Client
       return response unless response.ok?()
 
       #synchronize_clone will load new assembly template into service clone on workspace (if it exists)
-      commit_sha,workspace_branch,namespace,full_module_name = response.data(:commit_sha,:workspace_branch,:module_namespace,:full_module_name)
+      commit_sha,workspace_branch,namespace,full_module_name,repo_url,version = response.data(:commit_sha,:workspace_branch,:module_namespace,:full_module_name,:repo_url,:version)
       service_module_name ||= response.data(:module_name)
       opts = {:local_branch=>workspace_branch, :namespace => namespace}
-      response = Helper(:git_repo).synchronize_clone(:service_module,service_module_name,commit_sha,opts)
+
+      if local_clone_dir_exists
+        response = Helper(:git_repo).synchronize_clone(:service_module,service_module_name,commit_sha,opts)
+      else
+        response = Helper(:git_repo).create_clone_with_branch(:service_module, service_module_name, repo_url, workspace_branch, version, namespace)
+      end
       return response unless response.ok?
 
       DTK::Client::OsUtil.print("New assembly template '#{assembly_template_name}' created in service module '#{full_module_name}'.", :yellow) if mode == :create

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

@@ -38,7 +38,7 @@ module DTK::Client
       post_body
     end
 
-    def get_remote_module_info_aux(module_type, module_id, remote_namespace, version=nil, module_refs_content=nil)
+    def get_remote_module_info_aux(module_type, module_id, remote_namespace, version=nil, module_refs_content=nil, local_namespace=nil)
       id_field      = "#{module_type}_id"
       rsa_pub_value = SSHUtil.rsa_pub_key_content()
 
@@ -50,6 +50,7 @@ module DTK::Client
       }
       post_body.merge!(:version => version) if version
       post_body.merge!(:remote_namespace => remote_namespace) if remote_namespace
+      post_body.merge!(:local_namespace => local_namespace) if local_namespace
       post_body.merge!(:module_ref_content => module_refs_content) if module_refs_content && !module_refs_content.empty?
 
       response = post(rest_url("#{module_type}/get_remote_module_info"),post_body)

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

@@ -241,9 +241,11 @@ module DTK::Client
 
       repo_url,repo_id,module_id,branch,new_module_name = response.data(:repo_url,:repo_id,:module_id,:workspace_branch,:full_module_name)
       response = Helper(:git_repo).rename_and_initialize_clone_and_push(module_type.to_sym, local_module_name, new_module_name, branch, repo_url, module_directory)
-      return response unless response.ok?
-      repo_obj,commit_sha =  response.data(:repo_obj, :commit_sha)
+      return response unless (response && response.ok?)
+
+      repo_obj,commit_sha = response.data(:repo_obj, :commit_sha)
       module_final_dir = repo_obj.repo_dir
+      old_dir = response.data[:old_dir]
 
       post_body = {
         :repo_id => repo_id,
@@ -255,6 +257,9 @@ module DTK::Client
 
       unless response.ok?
         response.set_data_hash({ :full_module_name => new_module_name })
+        # remove new directory if import failed
+        # DTK-1768: removed below; TODO: see if there is any case where applicable
+        # FileUtils.rm_rf(module_final_dir) unless (namespace && git_import)
         return response
       end
 
@@ -277,9 +282,31 @@ module DTK::Client
       context_params.add_context_to_params(local_module_name, module_type.to_s.gsub!(/\_/,'-').to_sym, module_id)
       response = push_module_aux(context_params, true)
 
+      unless response.ok?
+        # remove new directory if import failed
+        # DTK-1768: removed below; TODO: see if there is any case where applicable
+        # Also think what should be done is if failure then move the directory back to old dir position
+        # (if it has been moved)
+        # FileUtils.rm_rf(module_final_dir) unless (namespace && git_import)
+        return response
+      end
+
+      # remove the old one if no errors while importing
+      # DTK-1768: removed below; and replaced by removing old dir if unequal to final dir
+      # was not sure why clause namespace && git_import was in so kept this condition
+      # FileUtils.rm_rf(old_dir) unless (namespace && git_import)
+      # New:
+      if old_dir and (old_dir != module_final_dir)
+        FileUtils.rm_rf(old_dir) unless (namespace && git_import)
+      end
+
       if git_import
         response[:module_id] = module_id
         response.add_data_value!(:external_dependencies, external_dependencies) if external_dependencies
+      else
+        # if not git-import and user do import from default directory (e.g. import ntp - without namespace) print message
+        # module directory moved from (~/dtk/component_module/<module_name>) to (~/dtk/component_module/<default_namespace>/<module_name>)
+        DTK::Client::OsUtil.print("Module '#{new_module_name}' has been created and module directory moved to #{module_final_dir}",:yellow) unless namespace
       end
 
       response
@@ -298,7 +325,7 @@ module DTK::Client
       ignore_component_error = context_params.get_forwarded_options() ? context_params.get_forwarded_options()[:ignore_component_error] : options.ignore?
       additional_message     = context_params.get_forwarded_options()[:additional_message] if context_params.get_forwarded_options()
 
-      remote_namespace, local_module_name = get_namespace_and_name(remote_module_name,'/')
+      remote_namespace, local_module_name = get_namespace_and_name(remote_module_name,':')
 
       if clone_dir = Helper(:git_repo).local_clone_dir_exists?(module_type.to_sym, local_module_name, :namespace => remote_namespace, :version => version)
         message = "Module's directory (#{clone_dir}) exists on client. To install this needs to be renamed or removed"
@@ -308,7 +335,7 @@ module DTK::Client
       end
 
       post_body = {
-        :remote_module_name => remote_module_name,
+        :remote_module_name => remote_module_name.sub(':','/'),
         :local_module_name => local_module_name,
         :rsa_pub_key => SSHUtil.rsa_pub_key_content()
       }
@@ -386,7 +413,9 @@ module DTK::Client
       response = post rest_url("#{module_type}/export"), post_body
       return response unless response.ok?
 
-      DTK::Client::RemoteDependencyUtil.print_dependency_warnings(response, "Module has been successfully published!")
+      full_module_name = "#{response.data['remote_repo_namespace']}/#{response.data['remote_repo_name']}"
+
+      DTK::Client::RemoteDependencyUtil.print_dependency_warnings(response, "Module has been successfully published to '#{full_module_name}'!")
       Response::Ok.new()
     end
 
@@ -486,14 +515,14 @@ module DTK::Client
       raise DtkValidationError, "You have to provide valid catalog to push changes to! Valid catalogs: #{PushCatalogs}" unless catalog
 
       module_location = OsUtil.module_location(resolve_module_type(), module_name, version)
-
       reparse_aux(module_location) unless internal_trigger
+      local_namespace, local_module_name = get_namespace_and_name(module_name,':')
 
 #      if catalog.to_s.eql?("origin")
 #        push_clone_changes_aux(:component_module,component_module_id,version,options["message"]||DEFAULT_COMMIT_MSG,internal_trigger)
       if catalog.to_s.eql?("dtkn")
         module_refs_content = RemoteDependencyUtil.module_ref_content(module_location) if module_type == :service_module
-        remote_module_info  = get_remote_module_info_aux(module_type.to_sym, module_id, options["namespace"], version, module_refs_content)
+        remote_module_info  = get_remote_module_info_aux(module_type.to_sym, module_id, options["namespace"], version, module_refs_content, local_namespace)
         return remote_module_info unless remote_module_info.ok?
 
         unless File.directory?(module_location)
@@ -541,6 +570,7 @@ module DTK::Client
 
     def delete_assembly_aux(context_params)
       module_type = get_module_type(context_params)
+
       module_id, assembly_template_id = context_params.retrieve_arguments([REQ_MODULE_ID,:option_1!], method_argument_names)
       module_name = context_params.retrieve_arguments([:service_module_name],method_argument_names)
 
@@ -584,7 +614,7 @@ module DTK::Client
       version = nil
       commit_msg = "Deleting assembly template #{assembly_template_name.to_s}"
       internal_trigger = true
-      push_clone_changes_aux(module_type.to_sym, module_id, version, commit_msg, internal_trigger)
+      push_clone_changes_aux(module_type.to_sym, module_id, version, commit_msg, internal_trigger, :skip_cloning => true)
 
       Response::Ok.new()
     end

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

@@ -15,6 +15,7 @@ module DTK::Client
       module_location  = OsUtil.module_location(module_type,full_module_name,version,opts)
 
       unless File.directory?(module_location)
+        return if opts[:skip_cloning]
         if Console.confirmation_prompt("Push not possible, module '#{module_name}#{version && "-#{version}"}' has not been cloned. Would you like to clone module now"+'?')
           clone_aux(module_type,module_id, version, true, true, opts)
         else
@@ -46,11 +47,11 @@ module DTK::Client
           ret = Response::NoOp.new()
         end
       end
-      
+
       # check if server pushed anything that needs to be pulled
       dsl_updated_info = response.data(:dsl_updated_info)
       if dsl_updated_info and !dsl_updated_info.empty?
-        if msg = dsl_updated_info["msg"] 
+        if msg = dsl_updated_info["msg"]
           DTK::Client::OsUtil.print(msg,:yellow)
         end
         new_commit_sha = dsl_updated_info[:commit_sha]
@@ -67,7 +68,7 @@ module DTK::Client
         path = dsl_created_info["path"]
         content = dsl_created_info["content"]
         if path and content
-          msg = "A #{path} file has been created for you, located at #{repo_obj.repo_dir}" 
+          msg = "A #{path} file has been created for you, located at #{repo_obj.repo_dir}"
           response = Helper(:git_repo).add_file(repo_obj,path,content,msg)
           return response unless response.ok?
         end

data/lib/commands/thor/account.rb

@@ -154,6 +154,17 @@ module DTK::Client
       nil
     end
 
+    desc "set-catalog-credentials", "Sets catalog credentials"
+    def set_catalog_credentials(context_params)
+      creds = DTK::Client::Configurator.enter_catalog_credentials()
+
+      response = post rest_url("account/set_catalog_credentials"), { :username => creds[:username], :password => creds[:password] }
+      return response unless response.ok?
+
+      OsUtil.print("Your catalog credentials have been set!", :yellow)
+      nil
+    end
+
 
 
     # Will leave this commented for now until we check if above commands work as expected

data/lib/commands/thor/assembly.rb

@@ -22,7 +22,7 @@ module DTK::Client
       if response.ok?
         unless response['data'].nil?
           response['data'].each do |module_item|
-            if ("#{service_name.to_s}::#{assembly_template_name.to_s}" == (module_item['display_name']) && service_namespace == module_item['namespace'])
+            if ("#{service_name.to_s}/#{assembly_template_name.to_s}" == (module_item['display_name']) && service_namespace == module_item['namespace'])
               assembly_template_id = module_item['id']
               break
             end
@@ -31,7 +31,7 @@ module DTK::Client
       end
 
       raise DTK::Client::DtkError, "Illegal name (#{assembly_template_name}) for assembly." if assembly_template_id.nil?
-      
+
       return assembly_template_id
     end
 
@@ -74,13 +74,13 @@ module DTK::Client
       assembly_list = []
       response = get_cached_response(:service, "assembly/list", {})
       raise DTK::Client::DtkError, "Unable to retreive service list." unless (response.nil? || response.ok?)
-      
+
       if assemblies = response.data
         assemblies.each do |assembly|
           assembly_list << assembly["display_name"]
         end
       end
-      
+
       assembly_list
     end
 
@@ -89,19 +89,19 @@ module DTK::Client
     def info(context_params)
       assembly_template_id = context_params.retrieve_arguments([:assembly_id!],method_argument_names)
       data_type = :assembly_template
-      
+
       post_body = {
         :assembly_id => assembly_template_id,
         :subtype => 'template',
       }
-      
+
       post rest_url("assembly/info"), post_body
     end
 
     desc "ASSEMBLY-NAME/ID list-nodes [--service SERVICE-NAME]", "List all nodes for given assembly."
     method_option :list, :type => :boolean, :default => false
     method_option "service",:aliases => "-s" ,
-      :type => :string, 
+      :type => :string,
       :banner => "SERVICE-LIST-FILTER",
       :desc => "Service list filter"
     def list_nodes(context_params)
@@ -112,7 +112,7 @@ module DTK::Client
     desc "ASSEMBLY-NAME/ID list-components [--service SERVICE-NAME]", "List all components for given assembly."
     method_option :list, :type => :boolean, :default => false
     method_option "service",:aliases => "-s" ,
-      :type => :string, 
+      :type => :string,
       :banner => "SERVICE-LIST-FILTER",
       :desc => "Service list filter"
     def list_components(context_params)
@@ -133,7 +133,7 @@ module DTK::Client
           context_params_for_service = DTK::Shell::ContextParams.new
           context_params_for_service.add_context_to_params("service_module", "service_module", service_id)
           context_params_for_service.method_arguments = ['assembly',"#{service_id}"]
-          
+
           response = DTK::Client::ContextRouter.routeTask("service_module", "list", context_params_for_service, @conn)
         else
           response = post rest_url("assembly/list"), {:subtype => 'template', :detail_level => 'nodes'}
@@ -143,7 +143,7 @@ module DTK::Client
         end
 
       else
-        
+
         post_body = {
           :subtype => 'template',
           :assembly_id => assembly_template_id,
@@ -153,7 +153,7 @@ module DTK::Client
         case about
         when 'nodes'
           response = post rest_url("assembly/info_about"), post_body
-          data_type = :node_template
+          data_type = :assembly_node_template
         when 'components'
           response = post rest_url("assembly/info_about"), post_body
           data_type = :component
@@ -186,12 +186,12 @@ module DTK::Client
 
     desc "ASSEMBLY-NAME/ID stage [INSTANCE-NAME] [-t TARGET-NAME/ID] [--settings SETTINGS-NAME1[,..]]", "Stage assembly in target."
     method_option "in-target",:aliases => "-t" ,
-      :type => :string, 
+      :type => :string,
       :banner => "TARGET-NAME/ID",
-      :desc => "Target (id) to create assembly in" 
+      :desc => "Target (id) to create assembly in"
     #hidden option
     method_option "instance-bindings",
-      :type => :string 
+      :type => :string
     method_option :settings, :type => :string, :aliases => '-s'
     def stage(context_params)
       assembly_template_id, name = context_params.retrieve_arguments([:assembly_id!, :option_1],method_argument_names)
@@ -202,7 +202,7 @@ module DTK::Client
       # 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
-      
+
       assembly_template_name = get_assembly_name(assembly_template_id)
       if assembly_template_name
         assembly_template_name.gsub!(/(::)|(\/)/,'-')
@@ -218,7 +218,7 @@ module DTK::Client
       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
@@ -239,13 +239,13 @@ module DTK::Client
     desc "ASSEMBLY-NAME/ID deploy [INSTANCE-NAME] [--settings SETTINGS-NAME1[,..]] [-m COMMIT-MSG]", "Stage and deploy assembly in target."
     #hidden option
     method_option "instance-bindings",
-      :type => :string 
+      :type => :string
 #    method_option "in-target",:aliases => "-t" ,
 #      :type => :string,
 #      :banner => "TARGET-NAME/ID",
-#      :desc => "Target (id) to create assembly in" 
+#      :desc => "Target (id) to create assembly in"
     method_option "commit_msg",:aliases => "-m" ,
-      :type => :string, 
+      :type => :string,
       :banner => "COMMIT-MSG",
       :desc => "Commit message"
     method_option :settings, :type => :string, :aliases => '-s'
@@ -262,7 +262,7 @@ module DTK::Client
       # 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
-      
+
       assembly_template_name = get_assembly_name(assembly_template_id)
       if assembly_template_name
         assembly_template_name.gsub!(/(::)|(\/)/,'-')
@@ -279,7 +279,7 @@ module DTK::Client
       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
@@ -292,7 +292,7 @@ module DTK::Client
       @@invalidate_map << :assembly
       response
     end
- 
+
 
     desc "delete ASSEMBLY-ID", "Delete assembly"
     method_option :force, :aliases => '-y', :type => :boolean, :default => false
@@ -308,7 +308,7 @@ module DTK::Client
         :subtype => :template
       }
       response = post rest_url("assembly/delete"), post_body
-      
+
       # when changing context send request for getting latest assemblies instead of getting from cache
       @@invalidate_map << :assembly
       return response unless response.ok?

data/lib/commands/thor/component_module.rb

@@ -130,7 +130,7 @@ TODO: might deprecate
 
       post_body        = (remote ? { :rsa_pub_key => SSHUtil.rsa_pub_key_content() } : {:detail_to_include => ["remotes"]})
       post_body[:diff] = options.diff? ? options.diff : {}
-      post_body.merge!(:module_namespace => options.namespace)
+      post_body.merge!(:module_namespace => options.namespace) if options.namespace
 
       response = post rest_url("component_module/#{action}"),post_body
 
@@ -176,7 +176,7 @@ TODO: might deprecate
     desc "import [NAMESPACE:]COMPONENT-MODULE-NAME", "Create new component module from local clone"
     def import(context_params)
       response = import_module_aux(context_params)
-      @@invalidate_map << :component_module if (response && response.ok?)
+      @@invalidate_map << :component_module
 
       response
     end

data/lib/commands/thor/provider.rb

@@ -52,10 +52,10 @@ module DTK::Client
       raise ::DTK::Client::DtkValidationError.new("Multiple security groups should be separated with ',' and without spaces between them (e.g. --security_groups gr1,gr2,gr3,...) ") if security_group.end_with?(',')
 
       security_groups = security_group.split(',')
-      iaas_properties.merge!(:keypair_name => keypair)#,:security_group => security_group)
+      iaas_properties.merge!(:keypair_name => keypair)
 
       if (security_groups.empty? || security_groups.size==1)
-        iaas_properties.merge!(:security_group => security_group)#,:security_group => security_group)
+        iaas_properties.merge!(:security_group => security_group)
       else
         iaas_properties.merge!(:security_group_set => security_groups)
       end
@@ -108,18 +108,35 @@ module DTK::Client
     end
 
 
-    desc "PROVIDER-ID/NAME create-target [TARGET-NAME] --region REGION", "Create target based on given provider"
+    desc "PROVIDER-ID/NAME create-target [TARGET-NAME] --region REGION --keypair KEYPAIR --security-group SECURITY-GROUP(S)", "Create target based on given provider"
     method_option :region, :type => :string
+    method_option :keypair, :type => :string
+    method_option :security_group, :type => :string, :aliases => '--security-groups'
     def create_target(context_params)
       # we use :target_id but that will retunr provider_id (another name for target template ID)
-      provider_id, target_name = context_params.retrieve_arguments([:provider_id!,:option_1],method_argument_names)
-      region = context_params.retrieve_thor_options([:region!], options)
+      provider_id, target_name = context_params.retrieve_arguments([:provider_id!, :option_1],method_argument_names)
+      region, keypair, security_group = context_params.retrieve_thor_options([:region!, :keypair!, :security_group!], options)
 
+      #TODO: data-driven check if legal provider type and then what options needed depending on provider type
+      iaas_properties = Hash.new
       DTK::Shell::InteractiveWizard.validate_region(region)
 
+      security_groups = []
+      raise ::DTK::Client::DtkValidationError.new("Multiple security groups should be separated with ',' and without spaces between them (e.g. --security_groups gr1,gr2,gr3,...) ") if security_group.end_with?(',')
+
+      security_groups = security_group.split(',')
+      iaas_properties.merge!(:keypair => keypair)
+
+      if (security_groups.empty? || security_groups.size==1)
+        iaas_properties.merge!(:security_group => security_group)
+      else
+        iaas_properties.merge!(:security_group_set => security_groups)
+      end
+
       post_body = {
         :provider_id => provider_id,
-        :region => region
+        :region => region,
+        :iaas_properties => iaas_properties
       }
       post_body.merge!(:target_name => target_name) if target_name
       response = post rest_url("target/create"), post_body

data/lib/commands/thor/service_module.rb

@@ -121,7 +121,7 @@ module DTK::Client
         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.merge!(:module_namespace => options.namespace)
+        post_body.merge!(:module_namespace => options.namespace) if options.namespace
 
         response = post rest_url("service_module/#{action}"), post_body
       # If user is on service identifier level, list task can't have '--remote' option.
@@ -421,12 +421,33 @@ module DTK::Client
       repo_url,repo_id,module_id,branch,new_module_name = [:repo_url,:repo_id,:module_id,:workspace_branch,:full_module_name].map { |k| repo_info[k.to_s] }
 
       response = Helper(:git_repo).rename_and_initialize_clone_and_push(:service_module, local_module_name, new_module_name,branch,repo_url,service_directory)
-      return response unless response.ok?
+      return response unless (response && response.ok?)
 
-      repo_obj,commit_sha =  response.data(:repo_obj,:commit_sha)
+      repo_obj,commit_sha = response.data(:repo_obj,:commit_sha)
+      module_final_dir = repo_obj.repo_dir
+      old_dir = response.data[:old_dir]
 
       context_params.add_context_to_params(local_module_name, :"service-module", module_id)
-      push(context_params,true)
+      response = push(context_params,true)
+
+      unless response.ok?
+        # remove new directory if import failed
+        # DTK-1768: removed below; TODO: see if need to put a variant back in
+        # was not sure why clause namespace is there
+        # FileUtils.rm_rf(module_final_dir) unless namespace
+        return response
+      end
+
+      # remove the old one if no errors while importing
+      # DTK-1768: removed below; and replaced by removing old dir if unequal to final dir
+      # was not sure why clause namespace  was in so kept this condition
+      #FileUtils.rm_rf(old_dir) unless namespace
+      if old_dir and (old_dir != module_final_dir)
+        FileUtils.rm_rf(old_dir) unless namespace
+      end
+      DTK::Client::OsUtil.print("Module '#{new_module_name}' has been created and module directory moved to #{repo_obj.repo_dir}",:yellow) unless namespace
+
+      response
     end
 
 

data/lib/commands/thor/target.rb

@@ -84,19 +84,35 @@ module DTK::Client
       post rest_url("target/install_agents"), post_body
     end
 
-    desc "create-target [TARGET-NAME] --provider PROVIDER --region REGION", "Create target based on given provider"
+    desc "create-target [TARGET-NAME] --provider PROVIDER --region REGION --keypair KEYPAIR --security-group SECURITY-GROUP(S)", "Create target based on given provider"
     method_option :provider, :type => :string
     method_option :region, :type => :string
+    method_option :keypair, :type => :string
+    method_option :security_group, :type => :string, :aliases => '--security-groups'
     def create_target(context_params)
       # we use :target_id but that will retunr provider_id (another name for target template ID)
       target_name = context_params.retrieve_arguments([:option_1],method_argument_names)
-      provider    = context_params.retrieve_thor_options([:provider!], options)
-      region      = context_params.retrieve_thor_options([:region], options)
+      provider, region, keypair, security_group = context_params.retrieve_thor_options([:provider!, :region, :keypair!, :security_group!], options)
 
+      #TODO: data-driven check if legal provider type and then what options needed depending on provider type
+      iaas_properties = Hash.new
       DTK::Shell::InteractiveWizard.validate_region(region) if region
 
+      security_groups = []
+      raise ::DTK::Client::DtkValidationError.new("Multiple security groups should be separated with ',' and without spaces between them (e.g. --security_groups gr1,gr2,gr3,...) ") if security_group.end_with?(',')
+
+      security_groups = security_group.split(',')
+      iaas_properties.merge!(:keypair => keypair)
+
+      if (security_groups.empty? || security_groups.size==1)
+        iaas_properties.merge!(:security_group => security_group)
+      else
+        iaas_properties.merge!(:security_group_set => security_groups)
+      end
+
       post_body = {
-        :provider_id => provider
+        :provider_id => provider,
+        :iaas_properties => iaas_properties
       }
       post_body.merge!(:target_name => target_name) if target_name
       post_body.merge!(:region => region) if region

data/lib/commands/thor/test_module.rb

@@ -89,7 +89,7 @@ module DTK::Client
     desc "import [NAMESPACE:]TEST-MODULE-NAME", "Create new test module from local clone"
     def import(context_params)
       response = import_module_aux(context_params)
-      @@invalidate_map << :test_module if response && response.ok?
+      @@invalidate_map << :test_module
 
       response
     end

data/lib/configurator.rb

@@ -1,138 +1,156 @@
 require 'rubygems'
-
+require 'fileutils'
 dtk_require_from_base('util/os_util')
 
 module DTK
-	module Client
-		class Configurator
-
-			CONFIG_FILE   = File.join(OsUtil.dtk_local_folder, "client.conf")
-	  	CRED_FILE 	  = File.join(OsUtil.dtk_local_folder, ".connection")
-	  	DIRECT_ACCESS = File.join(OsUtil.dtk_local_folder, ".add_direct_access")
-	  	NODE_SSH_CREDENTIALS = File.join(OsUtil.dtk_local_folder, "ssh_credentials.yaml")
-
-			require 'fileutils'
-			FileUtils.mkdir(OsUtil.dtk_local_folder) unless File.directory?(OsUtil.dtk_local_folder)
-
-			def self.check_config_exists
-				exists = true
-				if !File.exists?(CONFIG_FILE)
-					puts "", "Please enter the DTK server address (example: instance.dtk.io)"
-					header = File.read(File.expand_path('../lib/config/client.conf.header', File.dirname(__FILE__)))
-					generate_conf_file(CONFIG_FILE, [['server_host', 'Server address']], header)
-					exists = false
-				end
-				if !File.exists?(CRED_FILE)
-					puts "", "Please enter your DTK login details"
-					generate_conf_file(CRED_FILE, [['username', 'Username'], ['password', 'Password']], '')
-					exists = false
-				end
-
-				exists
-			end
-
-			def self.check_git
-				if OsUtil.which('git') == nil
-					OsUtil.put_warning "[WARNING]", "Can't find the 'git' command in you path. Please make sure git is installed in order to use all features of DTK Client.", :yellow
-				else
-					OsUtil.put_warning "[WARNING]", 'Git username not set. This can cause issues while using DTK Client. To set it, run `git config --global user.name "User Name"`', :yellow if `git config --get user.name` == ""
-					OsUtil.put_warning "[WARNING]", 'Git email not set. This can cause issues while using DTK Client. To set it, run `git config --global user.email "me@here.com"`', :yellow if `git config --get user.email` == ""
-				end
-			end
-
-			# return true/false, .add_direct_access file location and ssk key file location
-			def self.check_direct_access
-				username_exists  = check_for_username_entry(client_username())
-				ssh_key_path = SSHUtil.default_rsa_pub_key_path()
-				
-				{:username_exists => username_exists, :file_path => DIRECT_ACCESS, :ssh_key_path => ssh_key_path}
-			end
-
-			def self.generate_conf_file(file_path, properties, header)
-				require 'highline/import'
-				property_template = []
-				
-					properties.each do |p,d|
-						begin
-							trap("INT") { 
-								puts "", "Exiting..."
-								abort 
-							}
-						end
-						value = ask("#{d}: ") { |q| q.echo = false if p == 'password'}
-						property_template << [p,value]
-					end
-
-				File.open(file_path, 'w') do |f|
-					f.puts(header)
-					property_template.each do |prop|
-						f.puts("#{prop[0]}=#{prop[1]}")
-					end
-				end
-			end
-
-			def self.regenerate_conf_file(file_path, properties, header)
-				File.open(file_path, 'w') do |f|
-					f.puts(header)
-					properties.each do |prop|
-						f.puts("#{prop[0]}=#{prop[1]}")
-					end
-				end
-			end
-
-			def self.create_missing_clone_dirs
-				FileUtils.mkdir(OsUtil.component_clone_location) unless File.directory?(OsUtil.component_clone_location)
-				FileUtils.mkdir(OsUtil.service_clone_location) unless File.directory?(OsUtil.service_clone_location)
-				FileUtils.mkdir(OsUtil.test_clone_location) unless File.directory?(OsUtil.test_clone_location)
-			end
-
-
-			def self.parse_key_value_file(file)
-				#adapted from mcollective config
-				ret = Hash.new
-				raise DTK::Client::DtkError,"Config file (#{file}) does not exists" unless File.exists?(file)
-				File.open(file).each do |line|
-				  # strip blank spaces, tabs etc off the end of all lines
-				  line.gsub!(/\s*$/, "")
-				  unless line =~ /^#|^$/
-				    if (line =~ /(.+?)\s*=\s*(.+)/)
-				      key = $1
-				      val = $2
-				      ret[key.to_sym] = val
-				    end
-				  end
-				end
-				ret
-			end
-			def self.add_current_user_to_direct_access()
-				username = client_username()
-
-				File.open(DIRECT_ACCESS, 'a') do |file|
-				  file.puts(username)
-				end
-
-				true
-			end
-
-			def self.client_username()
+  module Client
+    class Configurator
+
+      CONFIG_FILE   = File.join(OsUtil.dtk_local_folder, "client.conf")
+      CRED_FILE     = File.join(OsUtil.dtk_local_folder, ".connection")
+      DIRECT_ACCESS = File.join(OsUtil.dtk_local_folder, ".add_direct_access")
+      NODE_SSH_CREDENTIALS = File.join(OsUtil.dtk_local_folder, "ssh_credentials.yaml")
+
+      FileUtils.mkdir(OsUtil.dtk_local_folder) unless File.directory?(OsUtil.dtk_local_folder)
+
+      def self.check_config_exists
+        exists = true
+        if !File.exists?(CONFIG_FILE)
+          puts "", "Please enter the DTK server address (example: instance.dtk.io)"
+          header = File.read(File.expand_path('../lib/config/client.conf.header', File.dirname(__FILE__)))
+          generate_conf_file(CONFIG_FILE, [['server_host', 'Server address']], header)
+          exists = false
+        end
+        if !File.exists?(CRED_FILE)
+          puts "", "Please enter your DTK login details"
+          generate_conf_file(CRED_FILE, [['username', 'Username'], ['password', 'Password']], '')
+          exists = false
+        end
+
+        exists
+      end
+
+      def self.check_git
+        if OsUtil.which('git') == nil
+          OsUtil.put_warning "[WARNING]", "Can't find the 'git' command in you path. Please make sure git is installed in order to use all features of DTK Client.", :yellow
+        else
+          OsUtil.put_warning "[WARNING]", 'Git username not set. This can cause issues while using DTK Client. To set it, run `git config --global user.name "User Name"`', :yellow if `git config --get user.name` == ""
+          OsUtil.put_warning "[WARNING]", 'Git email not set. This can cause issues while using DTK Client. To set it, run `git config --global user.email "me@here.com"`', :yellow if `git config --get user.email` == ""
+        end
+      end
+
+      # return true/false, .add_direct_access file location and ssk key file location
+      def self.check_direct_access
+        username_exists  = check_for_username_entry(client_username())
+        ssh_key_path = SSHUtil.default_rsa_pub_key_path()
+
+        {:username_exists => username_exists, :file_path => DIRECT_ACCESS, :ssh_key_path => ssh_key_path}
+      end
+
+      def self.generate_conf_file(file_path, properties, header)
+        require 'highline/import'
+        property_template = []
+
+        properties.each do |p,d|
+          begin
+            trap("INT") {
+              puts "", "Exiting..."
+              abort
+            }
+          end
+          value = ask("#{d}: ") { |q| q.echo = false if p == 'password'}
+          property_template << [p,value]
+        end
+
+        File.open(file_path, 'w') do |f|
+          f.puts(header)
+          property_template.each do |prop|
+            f.puts("#{prop[0]}=#{prop[1]}")
+          end
+        end
+      end
+
+      def self.regenerate_conf_file(file_path, properties, header)
+        File.open(file_path, 'w') do |f|
+          f.puts(header)
+          properties.each do |prop|
+            f.puts("#{prop[0]}=#{prop[1]}")
+          end
+        end
+      end
+
+      def self.create_missing_clone_dirs
+        FileUtils.mkdir(OsUtil.component_clone_location) unless File.directory?(OsUtil.component_clone_location)
+        FileUtils.mkdir(OsUtil.service_clone_location) unless File.directory?(OsUtil.service_clone_location)
+        FileUtils.mkdir(OsUtil.test_clone_location) unless File.directory?(OsUtil.test_clone_location)
+      end
+
+
+      def self.parse_key_value_file(file)
+        # adapted from mcollective config
+        ret = Hash.new
+        raise DTK::Client::DtkError,"Config file (#{file}) does not exists" unless File.exists?(file)
+        File.open(file).each do |line|
+          # strip blank spaces, tabs etc off the end of all lines
+          line.gsub!(/\s*$/, "")
+          unless line =~ /^#|^$/
+            if (line =~ /(.+?)\s*=\s*(.+)/)
+              key = $1
+              val = $2
+              ret[key.to_sym] = val
+            end
+          end
+        end
+        ret
+      end
+      def self.add_current_user_to_direct_access()
+        username = client_username()
+
+        File.open(DIRECT_ACCESS, 'a') do |file|
+          file.puts(username)
+        end
+
+        true
+      end
+
+      def self.client_username()
         parse_key_value_file(CRED_FILE)[:username]
       end
 
-			#
-			# Method will check if there is username entry in DIRECT_ACCESS file
-			#
-			def self.check_for_username_entry(username)
-				if File.exists?(DIRECT_ACCESS)
-					File.open(DIRECT_ACCESS).each do |line|
-						if line.strip.eql?(username)
-							return true
-						end
-					end
-				end
-
-				return false
-			end
-		end
-	end
+      #
+      # Method will check if there is username entry in DIRECT_ACCESS file
+      #
+      def self.check_for_username_entry(username)
+        if File.exists?(DIRECT_ACCESS)
+          File.open(DIRECT_ACCESS).each do |line|
+            if line.strip.eql?(username)
+              return true
+            end
+          end
+        end
+
+        return false
+      end
+
+      def self.ask_catalog_credentials()
+        are_there_creds = Console.confirmation_prompt("Do you have DTK catalog credentials", true)
+        property_template = {}
+        if are_there_creds
+          property_template = self.enter_catalog_credentials()
+        end
+
+        property_template
+      end
+
+      def self.enter_catalog_credentials()
+        property_template = {}
+        { :username => 'Catalog Username', :password => 'Catalog Password' }.each do |p, v|
+          value = ask("#{v}: ") { |q| q.echo = false if p == :password }
+          property_template.store(p, value)
+        end
+        property_template
+      end
+    end
+  end
 end
 

data/lib/core.rb

@@ -121,6 +121,19 @@ def resolve_direct_access(params, config_exists=nil)
   return if params[:username_exists]
 
   puts "Processing..." if config_exists
+  # check to see if catalog credentials are set
+  conn = DTK::Client::Session.get_connection()
+  response = conn.post DTK::Client::CommandBase.class, conn.rest_url("account/check_catalog_credentials"), {}
+
+  # set catalog credentails
+  if response.ok? && !response.data['catalog_credentials_set']
+    # setting up catalog credentials
+    catalog_creds = DTK::Client::Configurator.ask_catalog_credentials()
+    unless catalog_creds.empty?
+      response = conn.post DTK::Client::CommandBase.class, conn.rest_url("account/set_catalog_credentials"), { :username => catalog_creds[:username], :password => catalog_creds[:password]}
+    end
+  end
+
   # response = DTK::Client::Account.add_access(params[:ssh_key_path])
   response, matched_pub_key, matched_username = DTK::Client::Account.add_key(params[:ssh_key_path])
 
@@ -138,7 +151,6 @@ def resolve_direct_access(params, config_exists=nil)
     DTK::Client::Configurator.add_current_user_to_direct_access()
   end
 
-
   response
 end
 
@@ -389,17 +401,19 @@ module DTK
       # to make sure that connection is properly set.
       #
       def print_warning
+        creds = get_credentials
         puts   "[WARNING] Unable to connect to server, please check you configuration."
         puts   "========================== Configuration =========================="
         printf "%15s %s\n", "REST endpoint:", rest_url
-        creds = get_credentials
         printf "%15s %s\n", "Username:", "#{creds[:username]}"
         printf "%15s %s\n", "Password:", "#{creds[:password] ? creds[:password].gsub(/./,'*') : 'No password set'}"
         puts   "==================================================================="
-        error_code = self.connection_error['errors'].first['errors'].first['code']
-        print " Error code: "
-        DTK::Client::OsUtil.print(error_code, :red)
 
+        if self.connection_error['errors'].first['errors']
+          error_code = self.connection_error['errors'].first['errors'].first['code']
+          print " Error code: "
+          DTK::Client::OsUtil.print(error_code, :red)
+        end
       end
 
       private

data/lib/domain/git_adapter.rb

@@ -15,9 +15,11 @@ module DTK
       end
 
       def stage_changes()
-        @git_repo.add(untracked())
-        @git_repo.add(added())
-        @git_repo.add(changed())
+        handle_git_error do
+          @git_repo.add(untracked())
+          @git_repo.add(added())
+          @git_repo.add(changed())
+        end
         deleted().each do |file|
           begin
             @git_repo.remove(file)
@@ -190,7 +192,8 @@ module DTK
       end
 
       def self.clone(repo_url, target_path, branch, opts={})
-        git_base = Git.clone(repo_url, target_path)
+        git_base = handle_git_error{Git.clone(repo_url, target_path)}
+
         unless branch.nil?
           if opts[:track_remote_branch]
             # This just tracks remote branch
@@ -256,6 +259,38 @@ module DTK
       end
 
     private
+      def handle_git_error(&block)
+        self.class.handle_git_error(&block)
+      end
+      def self.handle_git_error(&block)
+        ret = nil
+        begin
+          ret = yield
+         rescue => e
+          unless e.respond_to?(:message)
+            raise e 
+          else
+            err_msg = e.message
+            lines = err_msg.split("\n")
+            if lines.last =~ GitErrorPattern
+              err_msg = error_msg_when_git_error(lines)
+            end
+            raise DtkError.new(err_msg)
+          end 
+        end
+        ret
+      end
+      GitErrorPattern = /^fatal:/
+      def self.error_msg_when_git_error(lines)
+        ret = lines.last.gsub(GitErrorPattern,'').strip()
+        # TODO start putting in special cases here
+        if ret =~ /adding files failed/
+          if lines.first =~ /\.git/
+            ret = "Cannot add files that are in a .git directory; remove any nested .git directory"
+          end
+        end
+        ret
+      end
 
       # Method bellow show different behavior when working with 1.8.7
       # so based on Hash response we know it it is:

data/lib/domain/response.rb

@@ -36,9 +36,6 @@ module DTK
           Ok.new(results)
          rescue ErrorUsage => e
           Error::Usage.new("message"=> e.to_s)
-         #rescue ::Grit::Git::CommandFailed => e
-          # remove grit internal error handler
-         # Error::Usage.new("message"=> "Grit Error: #{e.err.gsub(/^.*:/,'').strip.capitalize}")
          rescue => e
           error_hash =  {
             "message"=> e.message,

data/lib/dtk-client/version.rb

@@ -1,3 +1,3 @@
 module DtkClient
-  VERSION="0.6.2"
+  VERSION="0.6.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2014-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -338,7 +338,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: DTK CLI client for DTK server interaction.