dtk-client 0.10.5 → 0.10.6

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 770b6fa7ab8687c5275c4acce3eaa5cae52a330c
-  data.tar.gz: 745309e408b3d4fa06175f4cdb82d665afd22c7b
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OGU5NTUzYWM4NzlhOTJiNWFmN2NhNjQwNjE1N2FkN2YwMzc4ZThkYQ==
+  data.tar.gz: !binary |-
+    YjZkZDk4ODA4ZTliNDkyZjdiYjMwMWFiMGRmOWFlYzFjYzJhNzVjNA==
 SHA512:
-  metadata.gz: 5d614db5a69af9d464e21ec16f4c78209e2061c3dbd97c2b4890928c87b457aa5d2822860c3ae3c27c97b29889b729ea96199ac34b2390878989450f121f4881
-  data.tar.gz: 8be6f20053599b04e50d144b7de3b8a58a6f5cb9e5c0cd6de8fcdea60d39c86cf5045d8da5e6c529e0024ce177edbd34ab686472d55b719c35ff7b1d2da9c7a3
+  metadata.gz: !binary |-
+    OTRhOWY0NTkwZTFlNTRlZWVhNDRmNGRjZTc3NmVlMzIzNjU5N2UzZDI1M2I1
+    ZGRjZTQ4MDMxOGFkOGNkNGUyYzBlZDdhOWQzOWJiNmYzNDEzNmE0YjZkNDNk
+    ZTVkYTZkMjdlZTVkMmI3YTk4MGY5YmU0Y2EzY2IxY2QyZDVjN2Q=
+  data.tar.gz: !binary |-
+    ZDVlYTQxM2Y0M2YwOGE1NjgwMWYzZTY4ZTBjOGEzNGMyYTA1OTE4NTlhZmVj
+    ZmVhMmE0M2I4NjA3ZGVlNWUzN2NiZjVhNzk0ZTY5ODVmOGVhZWRhZTgwMjgy
+    N2VlOWNhY2IyNWJjNjE0OGVlMTlmYjk0YWQ0NzY2MDc3MTdmMWE=

data/.gitignore

@@ -5,3 +5,4 @@ sftp-config*.json
 .tags
 .tags1
 Gemfile.lock
+.vscode

data/bin/dtk-puppet

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+#
+# 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
+  require_relative '../lib/dtk_client'
+  module GlobalForDSL
+    Error  = ::DTK::Client::Error
+    ErrorUsage  = ::DTK::Client::Error::Usage
+  end
+  #dtk_dsl must be loaded after GlobalForDSL set
+  require 'dtk_dsl'
+
+  Client::Error.top_level_trap_error do
+    begin
+      require 'puppet'
+    rescue LoadError => e
+      fail DTK::Client::Error::Usage.new("Puppet gem is not installed on your system. Please install it and try again.")
+    end
+    # lib/dtk_cli must be loaded after lib/client and lib/dsl
+    require_relative '../lib/dtk_puppet'
+    Puppet::Parser.parse(ARGV)
+  end
+end

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

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

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

@@ -22,6 +22,7 @@ module DTK::Client
         command_body c, 'pull-dtkn', 'Pull content from repo manager to client module directory and push to server' do |sc|
           sc.flag Token.directory_path, :desc => 'Absolute or relative path to module directory containing content to update; not need if in the module directory'
           sc.switch Token.skip_prompt
+          sc.switch Token.force
           sc.action do |_global_options, options, _args|
             module_ref = module_ref_object_from_options_or_context(options)
             operation_args = {
@@ -29,7 +30,8 @@ module DTK::Client
               :base_dsl_file_obj   => @base_dsl_file_obj,
               :has_directory_param => !options["d"].nil?,
               :directory_path      => options[:directory_path],
-              :skip_prompt         => options[:skip_prompt]
+              :skip_prompt         => options[:skip_prompt],
+              :force               => options[:f]
             }
             Operation::Module.pull_dtkn(operation_args)
             Operation::Module.push(operation_args.merge(:method => "pulled"))

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

@@ -32,7 +32,7 @@ module DTK::Client
             if options[:uninstall_name].nil?
               module_ref =
                 if module_name = args[0]
-                  module_ref_object_from_options_or_context?({:module_ref => module_name, :version => (version || 'master')}, module_refs_opts)
+                  module_ref_object_from_options_or_context?({:module_ref => module_name, :version => (version)}, module_refs_opts)
                 else
                   module_ref_object_from_options_or_context(options, module_refs_opts)
                 end
@@ -42,7 +42,7 @@ module DTK::Client
 
             raise Error::Usage, "You can use version only with 'namespace/name' provided" if version && module_name.nil?
 
-            Operation::Module.uninstall(:module_ref => module_ref, :skip_prompt => options[:skip_prompt], :name => options[:uninstall_name], :version => version)
+            Operation::Module.uninstall(:module_ref => module_ref, :skip_prompt => options[:skip_prompt], :name => options[:uninstall_name] || module_name, :version => version)
           end
         end
       end

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

@@ -36,14 +36,14 @@ module DTK::Client; module CLI
             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
-            
+
             if name.nil? 
               service_instance = service_instance_in_options_or_context(options, :ignore_parsing_errors => true) 
-            else 
+            else  
               service_instance = name
             end
 
-            args = {
+            args = {  
               :service_instance => service_instance,
               :skip_prompt      => options[:skip_prompt],
               :directory_path   => directory_path,

data/lib/cli/command/token.rb

@@ -54,7 +54,7 @@ module DTK::Client
         # Switch constructor args order: key, desc, opts={}
         :all          => Switch.new(:all, 'All'),
         :delete       => Switch.new(:delete, 'Delete'),
-        :force        => Switch.new(:f, 'Force'),
+        :force        => Switch.new([:f, :force], 'Force'),
         :purge        => Switch.new(:purge, 'Purge'),
         :push         => Switch.new(:push, 'Push changes'),
         :skip_prompt  => Switch.new(:y, 'Skip prompt'),

data/lib/cli/version.rb

@@ -18,7 +18,7 @@
 module DTK
   module Client
     module CLI
-      VERSION="0.10.5"
+      VERSION="0.10.6"
     end
   end
 end

data/lib/client/error/subclasses.rb

@@ -101,5 +101,12 @@ module DTK::Client
         super("No method#{method_ref} for concrete class #{klass}")
       end
     end
+
+    class MissingDslFile < self
+      def initialize(error_msg, _opts = {})
+        msg_to_pass_to_super = "[ERROR] #{error_msg}"
+        super(msg_to_pass_to_super, :backtrace => NO_BACKTRACE)
+      end
+    end
   end
 end

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

@@ -38,12 +38,17 @@ module DTK::Client
         def rev_list(sha)
           self.lib.rev_list(sha)
         end
+
+        def name_status(branch1 = nil, branch2 = nil, opts = {})
+          self.lib.name_status(branch1, branch2, opts)
+        end
       end
 
       class ::Git::Lib
         def merge(branch, message = nil, opts = {})
           arr_opts = []
           arr_opts << '--allow-unrelated-histories' if opts[:allow_unrelated_histories]
+          arr_opts << '-Xtheirs' if opts[:use_theirs]
           arr_opts << '-m' << message if message
           arr_opts += [branch]
           command('merge', arr_opts)
@@ -53,6 +58,29 @@ module DTK::Client
           arr_opts = [sha]
           command('rev-list', arr_opts)
         end
+
+        def name_status(branch1 = nil, branch2 = nil, opts = {})
+          arr_opts = []
+          arr_opts << '--name-status'
+          arr_opts << "--diff-filter=#{opts[:diff_filter]}" if opts[:diff_filter]
+          arr_opts << branch1 if branch1
+          arr_opts << branch2 if branch2
+
+          command_lines('diff', arr_opts).inject({}) do |memo, line|
+            status, path = line.split("\t")
+            memo[path] = status
+            memo
+          end
+        end
+
+        def command_lines(cmd, opts = [], chdir = true, redirect = '')
+          cmd_op = command(cmd, opts, chdir)
+          op = cmd_op.encode("UTF-8", "binary", {
+                :invalid => :replace,
+                :undef => :replace
+              })
+          op.split("\n")
+        end
       end
       
       # opts can have keys
@@ -108,8 +136,8 @@ module DTK::Client
         @git_repo.push(remote, branch_for_push, opts)
       end
 
-      def merge(branch_to_merge_from)
-        @git_repo.merge(branch_to_merge_from, 'merge', :allow_unrelated_histories => allow_unrelated_histories?)
+      def merge(branch_to_merge_from, opts = {})
+        @git_repo.merge(branch_to_merge_from, 'merge', :allow_unrelated_histories => allow_unrelated_histories?, :use_theirs => opts[:use_theirs])
       end
 
       def status
@@ -225,6 +253,10 @@ module DTK::Client
         @git_repo.diff
       end
 
+      def diff_name_status(branch_or_sha_1, branch_or_sha_2, opts = {})
+        @git_repo.name_status(branch_or_sha_1, branch_or_sha_2, opts)
+      end
+
       def changed?
         (!(changed().empty? && untracked().empty? && deleted().empty?))
       end
@@ -233,7 +265,7 @@ module DTK::Client
         #   :with_diffs (Boolean)
       def print_status(opts = {})
         if opts[:with_diffs]
-          print_status_with_diffs
+          print_status_with_diffs(opts)
         else
           print_status_simple
         end
@@ -256,9 +288,10 @@ module DTK::Client
         puts "" 
       end
 
-      def print_status_with_diffs
+      def print_status_with_diffs(opts)
+        command = opts[:command]
         changes = [changed(), untracked(), deleted()]
-        puts "\nThere are changes that are not pushed to the server that will not be staged:\n".colorize(:green) unless changes[0].empty?
+        puts "\nThe command '#{command}' will not be triggered, there are changes not pushed to the server:\n".colorize(:green) unless changes[0].empty?
         diff = @git_repo.diff.stats[:files]
         file_changed = changes[0].size
         deletions = 0

data/lib/client/git_repo.rb

@@ -63,7 +63,8 @@ module DTK::Client
     def self.modified_with_diff?(dir, opts = {})
       repo_dir = {
         :path    => dir,
-        :branch  => Git.open(dir).branches.local
+        :branch  => Git.open(dir).branches.local,
+        :command => opts[:command]
       }
 
       message = DTK::Client::Operation::ClientModuleDir::GitRepo.modified_with_diff(repo_dir)
@@ -95,6 +96,10 @@ module DTK::Client
       @git_adapter.diff
     end
 
+    def diff_name_status(branch_or_sha_1 = nil, branch_or_sha_2 = nil, opts = {})
+      @git_adapter.diff_name_status(branch_or_sha_1, branch_or_sha_2, opts)
+    end
+
     def fetch(remote = 'origin')
       @git_adapter.fetch(remote)
     end
@@ -107,8 +112,8 @@ module DTK::Client
       @git_adapter.is_there_remote?(remote_name)
     end
 
-    def merge(branch_to_merge_from)
-      @git_adapter.merge(branch_to_merge_from)
+    def merge(branch_to_merge_from, opts = {})
+      @git_adapter.merge(branch_to_merge_from, opts)
     end
 
     # opts can have keys:

data/lib/client/load_source/component_info.rb

@@ -20,10 +20,7 @@ module DTK::Client
     class ComponentInfo < self
       def fetch_and_cache_info
         fetch_remote
-        unless local_ahead?.data('local_ahead')
-          merge_from_remote
-          transform_from_component_info
-        end
+        transform_from_component_info if merge_from_remote
       end
 
       def fetch_info

data/lib/client/load_source/service_info.rb

@@ -20,10 +20,7 @@ module DTK::Client
     class ServiceInfo < self
       def fetch_and_cache_info
         fetch_remote
-        unless local_ahead?.data('local_ahead')
-          merge_from_remote
-          transform_from_service_info
-        end
+        transform_from_service_info if merge_from_remote
       end
 
       def fetch_info
@@ -39,9 +36,10 @@ module DTK::Client
       def transform_from_service_info
         info_processor.read_inputs_and_compute_outputs!
         
-        # delete old files
-        # Assumed that this is done before ComponentInfo.transform_from_service_info
-        Operation::ClientModuleDir.delete_directory_content(target_repo_dir)
+        # delete only service instance files, since we need component module files for merge
+        info_processor.input_file_paths.map { |path| Operation::ClientModuleDir.rm_f(path) }
+        Operation::ClientModuleDir.rm_f("#{target_repo_dir}/assemblies")
+        # Operation::ClientModuleDir.delete_directory_content(target_repo_dir)
       end
       
     end

data/lib/client/load_source.rb

@@ -20,12 +20,14 @@ module DTK::Client
     require_relative('load_source/service_info')
     require_relative('load_source/component_info')
 
-    def initialize(transform_helper, info_type, remote_repo_url, parent)
+    def initialize(transform_helper, info_type, remote_repo_url, parent, force, use_theirs = nil)
       @info_processor   = transform_helper.info_processor(info_type)
       @info_type        = info_type
       @remote_repo_url  = remote_repo_url
       @target_repo_dir  = parent.target_repo_dir
       @version          = parent.version
+      @force            = force
+      @use_theirs       = use_theirs
     end
     private :initialize
 
@@ -35,16 +37,30 @@ module DTK::Client
       target_repo_dir      = parent.target_repo_dir
       transform_helper     = ServiceAndComponentInfo::TransformFrom.new(target_repo_dir, parent.module_ref, parent.version)
       info_types_processed = []
+      force                = opts[:force]
+      use_theirs           = opts[:use_theirs]
 
       if service_info = remote_module_info.data(:service_info)
-        ServiceInfo.fetch_and_cache_info(transform_helper, service_info['remote_repo_url'], parent)
+        ServiceInfo.fetch_and_cache_info(transform_helper, service_info['remote_repo_url'], parent, force, use_theirs)
         info_types_processed << ServiceInfo.info_type
         stage_and_commit(target_repo_dir, commit_msg(info_types_processed)) if opts[:stage_and_commit_steps]
       end
 
       if component_info = remote_module_info.data(:component_info)
-        ComponentInfo.fetch_and_cache_info(transform_helper, component_info['remote_repo_url'], parent)
-        info_types_processed << ComponentInfo.info_type
+        begin
+          ComponentInfo.fetch_and_cache_info(transform_helper, component_info['remote_repo_url'], parent, force, use_theirs)
+          info_types_processed << ComponentInfo.info_type
+
+          if parent.is_a?(Operation::Module::PullDtkn)
+            stage_and_commit(target_repo_dir, commit_msg([ComponentInfo.info_type]))
+            delete_diffs(target_repo_dir)
+          end
+        rescue Error::MissingDslFile => e
+          # this is special case where in some stage git can recognize that dtk.model.yaml is renamed to dtk.module.yaml
+          # which then will not be introduced on merge and we get error described in the ticket https://reactor8.atlassian.net/browse/DTK-2925
+          raise e unless use_theirs
+          stage_and_commit(target_repo_dir, commit_msg(info_types_processed))
+        end
       end
 
       unless info_types_processed.empty?
@@ -55,8 +71,19 @@ module DTK::Client
       end
     end
 
-    def self.fetch_and_cache_info(transform_helper, remote_repo_url, parent)
-      new(transform_helper, info_type, remote_repo_url, parent).fetch_and_cache_info
+    def self.delete_diffs(target_repo_dir)
+      current_branch = git_repo_operation.current_branch(:path => target_repo_dir).data(:branch)
+      repo = git_repo_operation.create_empty_git_repo?(:repo_dir => target_repo_dir, :branch => current_branch).data(:repo)
+      if delete_files = repo.diff_name_status(current_branch, "remotes/dtkn-component-info/master", { :diff_filter => 'D' })
+        unless delete_files.empty?
+          to_delete = delete_files.keys.select { |key| !key.include?('dtk.model.yaml') && !key.include?('module_refs.yaml') }
+          to_delete.each { |file| Operation::ClientModuleDir.rm_f("#{target_repo_dir}/#{file}") }
+        end
+      end
+    end
+
+    def self.fetch_and_cache_info(transform_helper, remote_repo_url, parent, force, use_theirs = false)
+      new(transform_helper, info_type, remote_repo_url, parent, force, use_theirs).fetch_and_cache_info
     end
 
     def self.fetch_from_remote(remote_module_info, parent, opts = {})
@@ -71,12 +98,12 @@ module DTK::Client
       transform_helper = ServiceAndComponentInfo::TransformFrom.new(target_repo_dir, parent.module_ref, parent.version)
 
       if service_info = remote_module_info.data(:service_info)
-        srv_info = ServiceInfo.new(transform_helper, ServiceInfo.info_type, service_info['remote_repo_url'], parent)
+        srv_info = ServiceInfo.new(transform_helper, ServiceInfo.info_type, service_info['remote_repo_url'], parent, opts[:force])
         srv_info.fetch_info
       end
 
       if component_info = remote_module_info.data(:component_info)
-        cmp_info = ComponentInfo.new(transform_helper, ComponentInfo.info_type, component_info['remote_repo_url'], parent)
+        cmp_info = ComponentInfo.new(transform_helper, ComponentInfo.info_type, component_info['remote_repo_url'], parent, opts[:force])
         cmp_info.fetch_info
       end
 
@@ -107,8 +134,33 @@ module DTK::Client
     end
 
     def merge_from_remote
-      git_repo_args = common_git_repo_args.merge(:remote_branch => git_repo_remote_branch, :no_commit => true)
-      git_repo_operation.merge_from_dtkn_remote(git_repo_args)
+      merged = true
+      git_repo_args = common_git_repo_args.merge(:remote_branch => git_repo_remote_branch, :no_commit => true, :use_theirs => @use_theirs)
+
+      if local_ahead?.data('local_ahead')
+        if @force
+          git_repo_operation.reset_hard(git_repo_args)
+        else
+          merged = false
+        end
+      else
+        reset_if_merge_conflict(git_repo_operation, git_repo_args)
+      end
+
+      merged
+    end
+
+    def reset_if_merge_conflict(git_repo_operation, git_repo_args)
+      begin
+        git_repo_operation.merge_from_dtkn_remote(git_repo_args)
+      rescue => e
+        unless @force
+          current_branch = Operation::ClientModuleDir::GitRepo.current_branch(:path => @target_repo_dir).data(:branch)
+          git_repo_operation.reset_hard(git_repo_args.merge(:branch => current_branch))
+          raise Error::Usage, "Unable to do fast-forward merge! You can use '--force' option but all local changes will be lost!"
+        end
+        git_repo_operation.reset_hard(git_repo_args)
+      end
     end
 
     def local_ahead?

data/lib/client/module_ref.rb

@@ -44,6 +44,8 @@ module DTK::Client
 
     def self.pretty_print(module_name, namespace, version = nil)
       # TODO: update ::DTK::Common::PrettyPrintForm to insert 'master' when version is nil 
+      version = version.join(', ')  if version.is_a?(Array)
+
       ::DTK::Common::PrettyPrintForm.module_ref(module_name, :namespace => namespace, :version => version || 'master')
     end
     def pretty_print

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

@@ -48,7 +48,7 @@ module DTK::Client
         #   :no_commit
         def merge_from_remote(remote_branch, opts = {})
           merge_from_ref = "#{remote_name}/#{remote_branch}"
-          Internal.merge(@repo, merge_from_ref, :no_commit => opts[:no_commit])
+          Internal.merge(@repo, merge_from_ref, :no_commit => opts[:no_commit], :use_theirs => opts[:use_theirs])
         end
 
         def local_ahead?(remote_branch, opts = {})
@@ -56,6 +56,11 @@ module DTK::Client
           Internal.local_ahead?(@repo, merge_from_ref, :no_commit => opts[:no_commit])
         end
 
+        def reset_hard(remote_branch, opts = {})
+          merge_from_ref = opts[:branch] || "#{remote_name}/#{remote_branch}"
+          Internal.reset_hard(@repo, merge_from_ref)
+        end
+
         private
 
         # TODO: These constants used in Internal; Deprecate GIT_REMOTE amd LOCAL_BRANCH for remote_name and local_branch

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

@@ -55,7 +55,7 @@ module DTK::Client
         #   :no_commit
         def self.merge(repo, merge_from_ref, opts = {})
           base_sha = repo.head_commit_sha
-          repo.merge(merge_from_ref)
+          repo.merge(merge_from_ref, :use_theirs => opts[:use_theirs])
           # the git gem does not take no_commit as merge argument; so doing it with soft reset
           repo.reset_soft(base_sha) if opts[:no_commit]
           repo.head_commit_sha
@@ -144,11 +144,12 @@ module DTK::Client
           repo_url = args.required(:path)
           branch   = args.required(:branch)
           repo     = git_repo.new(repo_url, :branch => branch)
+          command  = args.required(:command)
 
           original_path = Dir.pwd
           Dir.chdir(args[:path])
           changed = repo.changed?
-          repo.print_status(:with_diffs => opts[:with_diffs]) if changed
+          repo.print_status(:with_diffs => opts[:with_diffs], :command => command) if changed
           Dir.chdir(original_path)
           changed
         end
@@ -286,6 +287,11 @@ module DTK::Client
           ::DTK::Client::GitRepo
         end
 
+        def self.reset_hard(repo, merge_from_ref)
+          repo.reset_hard(merge_from_ref)
+          repo.head_commit_sha
+        end
+
         private
 
         def self.branch_from_local_branch_type(local_branch_type)

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

@@ -106,11 +106,12 @@ module DTK::Client
 
       def self.merge_from_dtkn_remote(args)
         wrap_operation(args) do |args|
-          remote_branch = args.required(:remote_branch)
-          no_commit     = args[:no_commit]
-          repo_with_remote  = repo_with_dtkn_remote(args)
+          remote_branch    = args.required(:remote_branch)
+          no_commit        = args[:no_commit]
+          repo_with_remote = repo_with_dtkn_remote(args)
+          use_theirs       = args[:use_theirs]
 
-          response_data_hash(:head_sha => repo_with_remote.merge_from_remote(remote_branch, :no_commit => no_commit))
+          response_data_hash(:head_sha => repo_with_remote.merge_from_remote(remote_branch, :no_commit => no_commit, :use_theirs => use_theirs))
         end
       end
 
@@ -217,6 +218,14 @@ module DTK::Client
         end
       end
 
+      def self.reset_hard(args)
+        wrap_operation(args) do |args|
+          remote_branch    = args.required(:remote_branch)
+          repo_with_remote = repo_with_dtkn_remote(args)
+          branch           = args[:branch]
+          response_data_hash(:head_sha => repo_with_remote.reset_hard(remote_branch, :branch => branch))
+        end
+      end
 
       private
 

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

@@ -37,8 +37,8 @@ module DTK::Client
         query_string_hash = QueryStringHash.new(
           :module_name => module_ref.module_name,
           :namespace   => module_ref.namespace,
-          :rsa_pub_key => SSHUtil.rsa_pub_key_content,
-          :force?      => opts[:force]
+          :rsa_pub_key => SSHUtil.rsa_pub_key_content
+          # :force?    => opts[:force]
         )
 
         unless version = module_ref.version

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

@@ -38,7 +38,7 @@ module DTK::Client
         repo_dir = file_obj.parent_dir # repo dir is directory that directly holds the base file object file_obj
         git_response = ClientModuleDir::GitRepo.fetch_merge_and_push(:repo_dir => repo_dir, :repo_url => repo_url, :branch => branch)
         commit_sha     = git_response.data(:head_sha)
-        rest_post("#{BaseRoute}/update_from_repo", common_post_body.merge(:commit_sha => commit_sha))
+        rest_post("#{BaseRoute}/update_from_repo", common_post_body.merge(:commit_sha => commit_sha, :initial_update => true))
       end
     end
   end

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

@@ -28,7 +28,7 @@ module DTK::Client
             ]
           )
           rest_get("#{BaseRoute}/list", query_string_hash)
-        end.set_render_as_table!
+        end.set_render_as_table!(nil, '* denotes that dsl has not been parsed and validated')
       end
     end
   end

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

@@ -69,6 +69,7 @@ module DTK::Client
         # this part will fetch remote branches from repo manager after publish from server is finished
         LoadSource.fetch_from_remote(remote_module_info, self)
 
+        OsUtil.print_info("'#{module_ref.pretty_print}' has been published successfully.")
         nil
       end
     end

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

@@ -39,6 +39,7 @@ module DTK::Client
           directory_path      = args[:directory_path]
           has_directory_param = args[:has_directory_param]
           skip_prompt         = args[:skip_prompt]
+          force               = args[:force]
 
           if has_directory_param
             file_obj = base_dsl_file_obj.raise_error_if_no_content_flag(:module_ref)
@@ -46,7 +47,7 @@ module DTK::Client
             file_obj = base_dsl_file_obj.raise_error_if_no_content
           end
 
-          new('dtkn', module_ref, directory_path, version, file_obj).pull_dtkn(:skip_prompt => skip_prompt)
+          new('dtkn', module_ref, directory_path, version, file_obj).pull_dtkn(:skip_prompt => skip_prompt, :force => force)
         end
       end
       
@@ -61,7 +62,7 @@ module DTK::Client
         end
 
         error_msg = "To allow pull-dtkn to go through, invoke 'dtk push' to push the changes to server before invoking pull-dtkn again"
-        GitRepo.modified_with_diff?(@target_repo_dir, { :error_msg => error_msg })
+        GitRepo.modified_with_diff?(@target_repo_dir, { :error_msg => error_msg, :command => 'pull-dtkn' })
 
         query_string_hash = QueryStringHash.new(
           :module_name => @module_ref.module_name,
@@ -87,7 +88,7 @@ module DTK::Client
         end
 
         @print_helper.print_continuation_pulling_base_module
-        LoadSource.fetch_transform_and_merge(remote_module_info, self, :stage_and_commit_steps => true)
+        LoadSource.fetch_transform_and_merge(remote_module_info, self, :stage_and_commit_steps => true, :force => opts[:force], :use_theirs => true)
 
         nil
       end