dtk-client 0.7.2.1 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36866fedf15d78bce59f29a9b8b14bb3521ad724
-  data.tar.gz: 5b6279a70d1e584ffadce4bf6cf966af16b88240
+  metadata.gz: 0f5b684856babcaa9d925ad089f311461b8ea4c6
+  data.tar.gz: 952f5d25a660b8c17936cdc20ef80d1cd1c13ec7
 SHA512:
-  metadata.gz: 80cd07ca2c793d1f6e5203c4d53d19dc41459e6cff72db3a1a46e654ba2c45063f05a20117cab3ff8545d45bb46f2b20eb1b09e2a02973cb35fd0553419055f3
-  data.tar.gz: 6b458944a0025ed1873464a2e2c517296c0409aa8a8db864ca60fbb32f3598bc79aedbd3bccac40704734bb248f714abb76791bde50c2f21a6ff662334f73aca
+  metadata.gz: 12d06bf9def6875592c3bbf2daf4c31c175d426875672854d4c1c4d8ad25bb14b2f0db998e45cd4c906ef24ad96352b76d1daeb769bde35bcb637bd0acdf1840
+  data.tar.gz: 6dfd454ecc21eeba533d4ccb1ac130dfa9d7235055f133551bd320ff5d24366ad3f197da1b3a3eab572745bf11ba4352a36c63ae6f9e3653b5f645a4cea14467

data/Gemfile

@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 # dependcies are defined in gemspec file since to avoid duplication
 # gemspec :name => 'dtk-client'

data/dtk-client.gemspec

@@ -29,8 +29,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'hirb','~> 0.7.0'
   gem.add_dependency 'thor','~> 0.15.4'
   gem.add_dependency 'erubis','~> 2.7.0'
-  gem.add_dependency 'dtk-common-core','0.7.1'
-  gem.add_dependency 'git','~> 1.2.6'
+  gem.add_dependency 'dtk-common-core','0.7.2'
+  gem.add_dependency 'git','1.2.8'
   gem.add_dependency 'colorize','~> 0.5.8'
   gem.add_dependency 'highline', '1.6.16'
   gem.add_dependency 'awesome_print', '1.1.0'

data/lib/command_helpers/git_repo.rb

@@ -9,7 +9,7 @@ module DTK; module Client; class CommandHelper
   class GitRepo < self; class << self
 
     def create(repo_dir,branch=nil,opts={})
-      GitAdapter.new(repo_dir,branch)
+      GitAdapter.new(repo_dir, branch)
     end
 
     def create_clone_from_optional_branch(type, module_name, repo_url, opts={})
@@ -18,6 +18,7 @@ module DTK; module Client; class CommandHelper
       namespace =  opts[:namespace]
       create_clone_with_branch(type,module_name,repo_url,branch,version,namespace,{:track_remote_branch => true}.merge(opts))
     end
+
     # TODO: should we deprecate below for above, subsituting the body of below for above ?
     def create_clone_with_branch(type, module_name, repo_url, branch=nil, version=nil, module_namespace=nil, opts={})
       Response.wrap_helper_actions do
@@ -40,7 +41,7 @@ module DTK; module Client; class CommandHelper
 
         begin
           opts_clone = (opts[:track_remote_branch] ? {:track_remote_branch => true} : {})
-          GitAdapter.clone(repo_url, target_repo_dir, branch,opts_clone)
+          GitAdapter.clone(repo_url, target_repo_dir, branch, opts_clone)
         rescue => e
           # Handling Git error messages with more user friendly messages
           e = GitErrorHandler.handle(e)
@@ -73,12 +74,13 @@ module DTK; module Client; class CommandHelper
     # :remote_branch
     # :remote_repo_url
     # :local_branch
+    # :override_repo_dir_location
     # :no_fetch
     #
     def push_changes(type, full_module_name, version, opts={})
       Response.wrap_helper_actions() do
-        repo_dir = local_repo_dir(type, full_module_name, version, opts)
-        repo = create(repo_dir,opts[:local_branch])
+        repo_dir = opts[:override_repo_dir_location] ? opts[:override_repo_dir_location] : local_repo_dir(type, full_module_name, version, opts)
+        repo = create(repo_dir, opts[:local_branch])
         push_repo_changes_aux(repo, opts)
       end
     end
@@ -128,6 +130,16 @@ module DTK; module Client; class CommandHelper
       end
     end
 
+    def hard_reset_branch_to_sha(type, module_name, opts={})
+      Response.wrap_helper_actions() do
+        full_module_name   = full_module_name(module_name,opts)
+        repo_dir           = local_repo_dir(type, full_module_name, opts[:version], opts)
+        repo               = create(repo_dir, opts[:local_branch])
+        current_branch_sha = opts[:current_branch_sha]
+        repo.reset_hard(current_branch_sha)
+      end
+    end
+
     # opts can have the following keys
     #
     # :version
@@ -135,7 +147,7 @@ module DTK; module Client; class CommandHelper
     # :namespace
     def local_clone_dir_exists?(type,module_name,opts={})
       full_module_name = full_module_name(module_name,opts)
-      ret = local_repo_dir(type,full_module_name,opts[:version])
+      ret = local_repo_dir(type, full_module_name, opts[:version], opts)
       File.directory?(ret) && ret
     end
 
@@ -436,10 +448,14 @@ module DTK; module Client; class CommandHelper
 
     def pull_repo_changes_aux(repo,opts={})
       diffs = DiffSummary.new()
+      hard_reset = opts[:hard_reset] || opts[:force]
+
+      # default commit in case it is needed
+      repo.stage_and_commit("Commit prior to pull from remote") if repo.changed?
 
       if commit_sha = opts[:commit_sha]
         #no op if at commit_sha
-        return diffs if commit_sha == repo.head_commit_sha()
+        return diffs if (commit_sha == repo.head_commit_sha()) && !hard_reset
       end
 
       if opts[:remote_repo] and opts[:remote_repo_url]
@@ -447,24 +463,21 @@ module DTK; module Client; class CommandHelper
       end
 
       repo.fetch(remote(opts[:remote_repo]))
-
       local_branch = repo.local_branch_name
       remote_branch_ref = remote_branch_ref(local_branch,opts)
 
-      if opts[:hard_reset]
+      if hard_reset
         diffs = DiffSummary.diff(repo,local_branch, remote_branch_ref)
         repo.merge_theirs(remote_branch_ref)
         return({:diffs => diffs, :commit_sha => repo.head_commit_sha()})
       end
 
-      # default commit in case it is needed
-      repo.stage_and_commit("Commit prior to pull from remote") if repo.changed?
-
       #check if merge needed
       merge_rel = repo.merge_relationship(:remote_branch,remote_branch_ref)
       if merge_rel == :equal
         { :diffs => diffs, :commit_sha => repo.head_commit_sha() }
       elsif [:branchpoint,:local_ahead].include?(merge_rel)
+        raise ErrorUsage.new("Unable to do fast-forward merge. You can use --force but all changes in the service instance will be lost") unless opts[:force]
         # TODO: right now just wiping out what is in repo
         diffs = DiffSummary.diff(repo,local_branch, remote_branch_ref)
         repo.merge_theirs(remote_branch_ref)
@@ -494,6 +507,7 @@ module DTK; module Client; class CommandHelper
     def remote(remote_repo=nil)
       remote_repo||"origin"
     end
+
     def remote_branch_ref(local_branch,opts={})
       "#{remote(opts[:remote_repo])}/#{opts[:remote_branch]||opts[:local_branch]||local_branch}"
     end
@@ -514,7 +528,7 @@ module DTK; module Client; class CommandHelper
     end
 
     def local_repo_dir(type,full_module_name,version=nil,opts={})
-      OsUtil.module_location(type,full_module_name,version,opts)
+      OsUtil.module_location(type, full_module_name, version, opts)
     end
 
     def backup_dir(type, full_module_name, opts={})

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

@@ -173,6 +173,7 @@ module DTK::Client
       edit_opts = {
         :automatically_clone => true,
         :pull_if_needed => false,
+        :service_instance_module => true,
         :assembly_module => {
           :assembly_name => assembly_name,
           :version => version
@@ -280,6 +281,60 @@ module DTK::Client
       Response::Ok.new()
     end
 
+    def pull_base_component_module_aux(context_params)
+      assembly_or_workspace_id, component_module_name = context_params.retrieve_arguments([REQ_ASSEMBLY_OR_WS_ID,:option_1!],method_argument_names)
+      post_body = {
+        :assembly_id => assembly_or_workspace_id,
+        :module_name => component_module_name,
+        :module_type => 'component_module'
+      }
+      post_body.merge!(:force => true) if options.force?
+      response = post(rest_url("assembly/get_component_module_info"),post_body)
+      return response unless response.ok?
+
+      if dsl_parsing_errors = response.data(:dsl_parsing_errors)
+        error_message = "Module '#{component_module_name}' parsing errors found:\n#{dsl_parsing_errors}\nYou can fix errors using 'edit' command from module context and invoke promote-module-updates again.\n"
+        OsUtil.print(error_message, :red)
+        return Response::Error.new()
+      end
+
+      assembly_name, module_id, module_name, version, base_module_branch, branch_head_sha, local_branch, namespace, repo_url, current_branch_sha = response.data(:assembly_name, :module_id, :full_module_name, :version, :workspace_branch, :branch_head_sha, :local_branch, :module_namespace, :repo_url, :current_branch_sha)
+      edit_opts = {
+        :assembly_module => {
+          :assembly_name => assembly_name,
+          :version => version
+        },
+        :workspace_branch_info => {
+          :repo_url => repo_url,
+          :branch => local_branch,
+          :module_name => module_name,
+          :commit_sha  => branch_head_sha
+        },
+        :remote_branch => base_module_branch,
+        :commit_sha    => branch_head_sha,
+        :current_branch_sha => current_branch_sha,
+        :full_module_name => module_name
+      }
+      opts = {:local_branch => local_branch, :namespace => namespace}
+
+      opts.merge!(:hard_reset => true) if options.revert?
+      opts.merge!(:force => true) if options.force?
+
+      response = Helper(:git_repo).pull_changes?(:component_module, module_name, edit_opts.merge!(opts))
+      return response unless response.ok?()
+
+      edit_opts.merge!(:force_parse => true, :update_from_includes => true, :print_dependencies => true)
+      response = push_clone_changes_aux(:component_module, module_id, nil, "Pull base module updates", true, edit_opts)
+      
+      unless response.ok?()
+        # if parsing error on assembly module (components/attributes/link_defs integrity violations) do git reset --hard
+        Helper(:git_repo).hard_reset_branch_to_sha(:component_module, module_name, edit_opts)
+        return response
+      end
+
+      Response::Ok.new()
+    end
+
     def workflow_info_aux(context_params)
       assembly_or_workspace_id = context_params.retrieve_arguments([REQ_ASSEMBLY_OR_WS_ID],method_argument_names)
       post_body = {

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

@@ -0,0 +1,32 @@
+module DTK::Client
+  module Commands
+    module Common
+      class Base
+        def initialize(command_base,context_params)
+          @command_base = command_base
+          @context_params = context_params
+        end
+       private
+        def retrieve_arguments(mapping)
+          @context_params.retrieve_arguments(mapping,@command_base.method_argument_names())
+        end
+
+        def retrieve_option_hash(option_list)
+          ret = Hash.new
+          option_values = @context_params.retrieve_thor_options(option_list,@command_base.options)
+          option_values.each_with_index do |val,i|
+            unless val.nil?
+              key = option_list[i].to_s.gsub(/\!$/,'').to_sym
+              ret.merge!(key => val)
+            end
+          end
+          ret
+        end
+
+        def post(url_path,body=nil)
+          @command_base.post(@command_base.rest_url(url_path),body)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,50 @@
+dtk_require('common_base')
+module DTK; module Client; module Commands::Common
+  class CreateTarget < Base
+    # option_list is of form [:provider!, :region, :keypair, :security_group!] indcating what is optional and what is required
+    def execute(type,option_list)
+      # we use :target_id but that will return provider_id (another name for target template ID)
+      target_name = retrieve_arguments([:option_1])
+      iaas_properties = iaas_properties(type,option_list)
+      provider = iaas_properties.delete(:provider)
+      post_body = {
+        :type             => type.to_s,
+        :provider_id      => provider,
+        :iaas_properties  => iaas_properties
+      }
+      post_body.merge!(:target_name => target_name) if target_name
+      post 'target/create', post_body
+    end
+
+   private
+    def iaas_properties(type,option_list)
+      iaas_properties = retrieve_option_hash(option_list)
+      special_processing_security_groups!(iaas_properties)
+      special_processing_region!(iaas_properties)
+      iaas_properties
+    end
+
+    def special_processing_region!(iaas_properties)
+      if region = iaas_properties[:region]
+        Shell::InteractiveWizard.validate_region(region)
+      end
+      iaas_properties
+    end
+
+    def special_processing_security_groups!(iaas_properties)
+      if security_group = iaas_properties[:security_group] 
+        if security_group.end_with?(',')
+          raise DtkValidationError.new("Multiple security groups should be separated with ',' and without spaces between them (e.g. --security_groups gr1,gr2,gr3,...) ")
+        end
+        security_groups = security_group.split(',')
+        
+        unless security_groups.empty? || security_groups.size==1
+          iaas_properties.delete(:security_group)
+          iaas_properties.merge!(:security_group_set => security_groups)
+        end
+      end
+      iaas_properties
+    end
+
+  end
+end; end; end

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

@@ -82,7 +82,7 @@ module DTK::Client
           else
             "Would you like to commit ALL the changes?"
           end
-        confirmed_ok = Console.confirmation_prompt(confirm_msg)
+        confirmed_ok = Console.confirmation_prompt_simple(confirm_msg)
       end
       if (auto_commit || confirmed_ok)
         if auto_commit

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

@@ -59,7 +59,7 @@ module DTK::Client
           print_external_dependencies(external_dependencies, 'in the git repo')
         end
 
-        Response::Ok.new()
+        OsUtil.print("Successfully installed #{ModuleUtil.module_name(module_type)} '#{ModuleUtil.join_name(@module_name, @module_namespace)}' from git.", :green)
       end
 
       def from_file()

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

@@ -36,9 +36,9 @@ module DTK::Client
       inconsistent     = external_dependencies["inconsistent"]||[]
       possibly_missing = external_dependencies["possibly_missing"]||[]
 
-      OsUtil.print("There are inconsistent module dependencies mentioned in #{location}: #{inconsistent.join(', ')}", :red) unless inconsistent.empty?
-      OsUtil.print("There are missing module dependencies mentioned in #{location}: #{possibly_missing.join(', ')}", :yellow) unless possibly_missing.empty?
-      OsUtil.print("There are ambiguous module dependencies mentioned in #{location}: '#{amb_sorted.join(', ')}'. One of the namespaces should be selected by editing the module_refs file", :yellow) if ambiguous && !ambiguous.empty?
+      OsUtil.print("There are inconsistent module dependencies mentioned #{location}: #{inconsistent.join(', ')}", :red) unless inconsistent.empty?
+      OsUtil.print("There are missing module dependencies mentioned #{location}: #{possibly_missing.join(', ')}", :yellow) unless possibly_missing.empty?
+      OsUtil.print("There are ambiguous module dependencies mentioned #{location}: '#{amb_sorted.join(', ')}'. One of the namespaces should be selected by editing the module_refs file", :yellow) if ambiguous && !ambiguous.empty?
     end
 
    private
@@ -222,6 +222,7 @@ module DTK::Client
     end
 
     def import_git_module_aux(context_params)
+      OsUtil.print('Retrieving git module data, please wait ...')
       CommonModule::Import.new(self, context_params).from_git()
     end
 
@@ -348,7 +349,7 @@ module DTK::Client
       module_id, module_name = context_params.retrieve_arguments([REQ_MODULE_ID,REQ_MODULE_NAME,:option_1],method_argument_names)
 
       catalog      = 'dtkn'
-      version      = options["version"]
+      version      = options.version
       module_type  = get_module_type(context_params)
       skip_recursive_pull = context_params.get_forwarded_options()[:skip_recursive_pull]
 
@@ -358,7 +359,12 @@ module DTK::Client
 
       if catalog.to_s.eql?("dtkn")
         clone_aux(module_type.to_sym, module_id, version, true, true) unless File.directory?(module_location)
-        opts = {:version => version, :remote_namespace => options.namespace, :skip_recursive_pull => skip_recursive_pull}
+        opts = {
+          :force               => options.force?,
+          :version             => version,
+          :remote_namespace    => options.namespace,
+          :skip_recursive_pull => skip_recursive_pull
+        }
 
         response = pull_from_remote_aux(module_type.to_sym, module_id, opts)
         return response unless response.ok?
@@ -469,13 +475,22 @@ module DTK::Client
         return response unless response.ok?
       end
 
-
-      OsUtil.print("Pushing local content to remote #{target_remote['repo_url']} ... ", :yellow)
-      push_to_git_remote_aux(module_name, module_type.to_sym, version, {
-          :remote_repo_url => target_remote['repo_url'],
-          :remote_branch   => 'master',
-          :remote_repo     =>  "#{target_remote['display_name']}--remote"
-        },  options.force?)
+      if target_remote['base_git_location']
+        OsUtil.print("Pushing local content to remote #{target_remote['base_git_url']} in folder #{target_remote['base_git_location']} ...")
+        return push_to_git_remote_location_aux(module_name, module_type.to_sym, version, {
+                  :remote_repo_url      => target_remote['base_git_url'],
+                  :remote_repo_location => target_remote['base_git_location'],
+                  :remote_branch        => 'master',
+                  :remote_repo          => "#{target_remote['display_name']}--remote"
+               }, options.force?)
+      else
+        OsUtil.print("Pushing local content to remote #{target_remote['repo_url']} ... ", :yellow)
+        return push_to_git_remote_aux(module_name, module_type.to_sym, version, {
+                  :remote_repo_url => target_remote['repo_url'],
+                  :remote_branch   => 'master',
+                  :remote_repo     =>  "#{target_remote['display_name']}--remote"
+                },  options.force?)
+      end
     end
 
     def push_dtkn_module_aux(context_params, internal_trigger=false)
@@ -616,6 +631,15 @@ module DTK::Client
 
       module_name = context_params.retrieve_arguments(["#{module_type}_name".to_sym],method_argument_names)
       namespace, name = get_namespace_and_name(module_name,':')
+
+      module_location = OsUtil.module_location(module_type, module_name, nil)
+      unless File.directory?(module_location)
+        if Console.confirmation_prompt("Module '#{module_name}' has not been cloned. Would you like to clone module now"+'?')
+          response = clone_aux(module_type.to_sym, module_id, nil, true)
+          return response unless response.ok?
+        end
+      end
+
       response = Helper(:git_repo).cp_r_to_new_namespace(module_type, name, namespace, fork_namespace)
       return response unless response.ok?
 
@@ -623,7 +647,7 @@ module DTK::Client
       new_context_params.add_context_to_params(module_type, module_type)
       new_context_params.method_arguments = ["#{fork_namespace}:#{name}"]
 
-      create_response = CommonModule::Import.new(self, new_context_params).from_file()
+      create_response = DTK::Client::ContextRouter.routeTask(module_type, "import", new_context_params, @conn)
       unless create_response.ok?
         FileUtils.rm_rf("#{response['data']['module_directory']}")
         return create_response

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

@@ -28,13 +28,13 @@ module DTK::Client
       end
 
       # check whether a local module exists to determine whether pull from local clone or try to pull from server
-      OsUtil.print("Pulling changes to remote: #{remote_params[:remote_repo]} @ #{remote_params[:remote_repo_url]}")
+      OsUtil.print("Pulling changes from remote: #{remote_params[:remote_repo]} @ #{remote_params[:remote_repo_url]}")
 
       if Helper(:git_repo).local_clone_dir_exists?(module_type,module_name,:full_module_name=>full_module_name,:version=>version)
         unless rsa_pub_key
           raise DtkError,"No File found at (#{path_to_key}). Path is wrong or it is necessary to generate the public rsa key (e.g., run ssh-keygen -t rsa)"
         end
-        opts_perform_locally = remote_params.merge(:full_module_name => full_module_name)
+        opts_perform_locally = remote_params.merge(:full_module_name => full_module_name, :force => opts[:force])
         PullFromRemote.perform_locally(self,module_type,module_id,module_name,opts_perform_locally)
       else
         # TODO: see if this works correctly

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

@@ -14,7 +14,7 @@ module DTK::Client
       raise DtkError, "Puppet forge module name should be in format USERNAME-NAME" unless pf_module_name.match(NAME_REGEX)
 
       response = poller_response do
-        post rest_url("component_module/install_puppet_forge_modules"),PostBody.new(post_body_hash)
+        post rest_url("component_module/install_puppet_forge_modules"), PostBody.new(post_body_hash)
       end
 
       return response unless response.ok?

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

@@ -35,6 +35,8 @@ module DTK::Client
       post_body.merge!(:modification_type => opts[:modification_type]) if opts[:modification_type]
       post_body.merge!(:force_parse => true) if options['force-parse'] || opts[:force_parse]
       post_body.merge!(:update_from_includes => true) if opts[:update_from_includes]
+      post_body.merge!(:service_instance_module => true) if opts[:service_instance_module]
+      post_body.merge!(:current_branch_sha => opts[:current_branch_sha]) if opts[:current_branch_sha]
 
       if opts[:set_parsed_false]
         post_body.merge!(:set_parsed_false => true)

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

@@ -1,4 +1,7 @@
 dtk_require_common_commands('thor/common')
+dtk_require("../../../domain/git_adapter")
+
+
 module DTK::Client
   module PushToRemoteMixin
 
@@ -15,6 +18,38 @@ module DTK::Client
       Response::Ok.new()
     end
 
+    def push_to_git_remote_location_aux(full_module_name, module_type, version, opts, force = false)
+      opts.merge!(:force => force)
+
+      # staging dir which will be removed
+      temp_stage_dir = OsUtil.temp_git_remote_location()
+      content_dir    = File::join(temp_stage_dir, opts[:remote_repo_location])
+
+      begin
+        # clone desired repo
+        ::DTK::Client::GitAdapter.clone(opts[:remote_repo_url], temp_stage_dir, opts[:remote_branch])
+        # make sure that content dir exist
+        FileUtils.mkdir_p(content_dir)
+        # copy content of module to new dir (overriding everything in process)
+        module_location = OsUtil.module_location(module_type, full_module_name, version)
+        FileUtils.cp_r(File.join(module_location, '/.'), content_dir)
+        # remove git folder
+        FileUtils.rm_rf(File.join(content_dir, '.git'))
+        # now we push it
+        opts.merge!(:override_repo_dir_location => temp_stage_dir)
+        response = Helper(:git_repo).push_changes(module_type, full_module_name, version, opts)
+        return response unless response.ok?
+
+        if response.data(:diffs).empty?
+          raise DtkError, "No changes to push"
+        end
+
+        Response::Ok.new()
+      ensure
+        FileUtils.rm_rf(temp_stage_dir)
+      end
+    end
+
     def push_to_remote_aux(remote_module_info, module_type, force = false)
       full_module_name     = remote_module_info.data(:full_module_name)
       version = remote_module_info.data(:version)

data/lib/commands/thor/account.rb

@@ -33,7 +33,7 @@ module DTK::Client
       [response, key_exists_already]
     end
 
-    def self.add_key(path_to_key, name=nil)
+    def self.add_key(path_to_key, name='dtk-client')
       match, matched_username = nil, nil
 
       unless File.file?(path_to_key)
@@ -120,7 +120,7 @@ module DTK::Client
       response, matched, matched_username = Account.add_key(path_to_key, name)
 
       if matched
-        DTK::Client::OsUtil.print("Provided ssh pub key has already been added.", :yellow)
+        DTK::Client::OsUtil.print("Provided SSH pub key has already been added.", :yellow)
       elsif matched_username
         DTK::Client::OsUtil.print("User ('#{matched_username}') already exists.", :yellow)
       else
@@ -128,7 +128,7 @@ module DTK::Client
       end
 
       if response.ok? && !response.data(:registered_with_repoman)
-        OsUtil.print("Warning: We were not able to register your key with remote catalog!", :yellow)
+        OsUtil.print("Warning: We were not able to register your key with remote catalog! Contact DTK team for more infromation.", :yellow)
       end
 
       response.ok? ? nil : response

data/lib/commands/thor/component_module.rb

@@ -127,6 +127,7 @@ module DTK::Client
       namespace, module_name = get_namespace_and_name(full_module_name, ModuleUtil::NAMESPACE_SEPERATOR)
       module_type            = get_module_type(context_params)
 
+      OsUtil.print('Retrieving puppet module metadata, please wait ...')
       response = puppet_forge_install_aux(context_params, pf_module_name, module_name, namespace, nil, module_type)
 
       @@invalidate_map << :component_module
@@ -262,16 +263,19 @@ module DTK::Client
       publish_module_aux(context_params)
     end
 
-    desc "COMPONENT-MODULE-NAME/ID pull-dtkn [-n NAMESPACE]", "Update local component module from remote repository."
-    method_option "namespace",:aliases => "-n",
-      :type => :string,
+    desc "COMPONENT-MODULE-NAME/ID pull-dtkn [-n NAMESPACE] [--force]", "Update local component module from remote repository."
+    method_option :namespace,:aliases => '-n',
+      :type   => :string,
       :banner => "NAMESPACE",
-      :desc => "Remote namespace"
+      :desc   => "Remote namespace"
+    method_option :force,:aliases => '-f',
+      :type    => :boolean,
+      :desc   => "Force pull",
+      :default => false
     def pull_dtkn(context_params)
       pull_dtkn_aux(context_params)
     end
 
-
 =begin
     desc "COMPONENT-MODULE-NAME/ID chown REMOTE-USER", "Set remote module owner"
     method_option "namespace", :aliases => "-n", :type => :string, :banner => "NAMESPACE", :desc => "Remote namespace"