dtk-client 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90044fb0aeac2ab716a8bbad16eab81ba09b177f
-  data.tar.gz: af29727daadaa126bc8b3ea39e8515b49e8ace37
+  metadata.gz: c80ce06a9a9d822a933c7613d0d2e608e68bf8ea
+  data.tar.gz: 516e42bae79455ea32c275236df7720ef683a4a2
 SHA512:
-  metadata.gz: 4d40f5739a3921835fb2c38cad3428134f807091327c50eb40c7066cc1fa8168dc1e8c60da2e26fd9c7ceb6c6940f6d81e74001717a6bd0c0f5335bb3abbf7ae
-  data.tar.gz: e2ab0c0121f8034da2262595f5f7caabe81d6cd85a37a72b7fe6983d480ea89503779e8bb2aef0e5efc4d8d512d8088929db0ec4f634a33a920444e0f2c77326
+  metadata.gz: 4d4df462ad21ae5516dfcb89de0949d7c6537814365d93b44a666a099853f17521b5f20c31aa1b286293dff22bffcaabff76bdd8aba9f655fbd879b53a546bd7
+  data.tar.gz: 28cd24c15adab48e77f888ff9205954b479866d9a532d69785218c638e51d57ccc69d62517d16109e7c8eac8f8a25f090e10c2625c0c1405bd4ec26df76661e0

data/bin/dtk

@@ -5,7 +5,7 @@ $shell_mode = false
 
 require File.expand_path('../lib/client', File.dirname(__FILE__))
 require File.expand_path('../lib/configurator', File.dirname(__FILE__))
-require File.expand_path('../lib/parser/adapters/thor',    File.dirname(__FILE__))
+require File.expand_path('../lib/parser/adapters/thor', File.dirname(__FILE__))
 require File.expand_path('../lib/shell/context', File.dirname(__FILE__))
 require File.expand_path('../lib/shell/domain/context_entity', File.dirname(__FILE__))
 require File.expand_path('../lib/shell/domain/active_context', File.dirname(__FILE__))
@@ -17,6 +17,17 @@ require File.expand_path('../lib/shell/parse_monkey_patch', File.dirname(__FILE_
 require File.expand_path('../lib/shell/help_monkey_patch', File.dirname(__FILE__))
 require File.expand_path('../lib/execute/cli_pure/cli_rerouter', File.dirname(__FILE__))
 
+paths = []
+paths << File.expand_path('../lib/commands/thor/*.rb', File.dirname(__FILE__))
+paths << File.expand_path('../lib/commands/common/thor/*.rb', File.dirname(__FILE__))
+
+paths.each do |path|
+  Dir[path].each do |thor_class_file|
+    require thor_class_file
+  end
+end
+
+
 
 require 'shellwords'
 require 'json'

data/dtk-client.gemspec

@@ -29,7 +29,7 @@ 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.2'
+  gem.add_dependency 'dtk-common-core','0.7.3'
   gem.add_dependency 'git','1.2.8'
   gem.add_dependency 'colorize','~> 0.5.8'
   gem.add_dependency 'highline', '1.6.16'

data/lib/command_helpers/git_repo/merge.rb

@@ -0,0 +1,139 @@
+module DTK; module Client; class CommandHelper
+  class GitRepo
+    class Merge
+      def initialize(repo, remote_branch_ref, opts = {})
+        @repo = repo
+        @remote_branch_ref = remote_branch_ref
+        @local_branch = repo.local_branch_name
+        # options
+        @opts_commit_sha = opts[:commit_sha]
+        @opts_force = opts[:force]
+        @opts_merge_if_no_conflict = opts[:merge_if_no_conflict]
+        @opts_ignore_dependency_merge_conflict = opts[:ignore_dependency_merge_conflict]
+        @opts_full_module_name = opts[:full_module_name]
+      end
+      
+      def self.merge(repo, remote_branch_ref, opts = {})
+        new(repo, remote_branch_ref, opts).merge
+      end
+      
+      def merge
+        if @opts_force
+          merge_force()
+        else
+          # check if merge needed
+          merge_rel = merge_relationship()
+          case merge_rel
+            when :equal 
+              response__no_diffs()
+            when :local_ahead, :branchpoint
+              merge_not_fast_forward(merge_rel)
+            when :local_behind
+              merge_simple()
+            else
+              raise Error.new("Unexpected merge_rel (#{merge_rel})")
+          end
+        end
+      end
+      
+      private
+      
+      def merge_force
+        diffs = compute_diffs()
+        # TODO: should put in a commit message that merged from remote repo
+        @repo.merge_theirs(@remote_branch_ref)
+        response(diffs)
+      end
+      
+      def merge_not_fast_forward(merge_rel)
+        if @opts_merge_if_no_conflict
+          if any_conflicts?
+            msg = 'Unable to do pull-dtkn merge without conflicts. Options are:'
+            msg << " a) command 'pull-dtkn --force', but all local changes will be lost or" 
+            msg << " b) use command 'edit' to get in linux shell and directly use git commands."
+            raise ErrorUsage.new(msg)
+          else
+            if merge_rel == :local_ahead
+              response__no_diffs(:custom_message => 'No op because local module is ahead')
+            else
+              merge_simple()
+            end
+          end
+        elsif @opts_force
+          merge_force()
+        elsif @opts_ignore_dependency_merge_conflict
+          custom_message = "Unable to do fast-forward merge. You can go to '#{@opts_full_module_name}' and pull with --force option but all changes will be lost." 
+          # TODO: should this instead by ErrorUsage.new like below
+          response(:custom_message => :custom_message)
+        else
+          # this will only be reached if opts_merge_if_no_conflict is false 
+          raise ErrorUsage.new('Unable to do fast-forward merge. You can use --force on pull-dtkn, but all local changes will be lost.')
+        end
+      end
+      
+      def merge_simple
+        # see if any diffs between fetched remote and local branch
+        # this has be done after commit
+        diffs = compute_diffs()
+        return diffs unless diffs.any_diffs?()
+        
+        safe_execute do
+          # TODO: should put in a commit message that merged from remote repo
+          @repo.merge(@remote_branch_ref)
+        end
+        
+        if commit_sha = @opts_commit_sha
+          if commit_sha != @repo.head_commit_sha()
+            raise Error.new("Git synchronization problem: expected local head to have sha (#{commit_sha})")
+          end
+        end
+        
+        response(diffs)
+      end
+      
+      def merge_relationship
+        @repo.merge_relationship(:remote_branch, @remote_branch_ref)    
+      end
+      
+      def any_conflicts?
+        # TODO: optimization is to combine this with mereg to have merge_if_no_conflics? 
+        #       and if no conflicts just commit and merge --no-commit
+        ret = nil
+        begin
+          @repo.command('merge',['--no-commit', @remote_branch_ref])
+         rescue ::Git::GitExecuteError
+          ret = true
+        ensure
+          safe_execute do
+            @repo.command('merge',['--abort'])
+          end
+        end
+        ret
+      end
+
+      def response__no_diffs(opts_response = {})
+        response(diffs__no_diffs(), opts_response)
+      end
+
+      def response(diffs, opts_response = {})
+        { :diffs => diffs, :commit_sha => @repo.head_commit_sha() }.merge(opts_response)
+      end
+      
+      def diffs__no_diffs
+        GitRepo.diffs__no_diffs
+      end
+      
+      def compute_diffs
+        GitRepo.compute_diffs(@repo,  @remote_branch_ref)
+      end
+      
+      def safe_execute(&block)
+        begin
+          yield
+         rescue Exception
+          nil
+        end
+      end
+    end
+  end
+end; end; end

data/lib/command_helpers/git_repo.rb

@@ -7,7 +7,8 @@ dtk_require("../domain/git_error_handler")
 
 module DTK; module Client; class CommandHelper
   class GitRepo < self; class << self
-
+    dtk_require('git_repo/merge')
+                          
     def create(repo_dir,branch=nil,opts={})
       GitAdapter.new(repo_dir, branch)
     end
@@ -357,8 +358,15 @@ module DTK; module Client; class CommandHelper
           end
           commit_sha = repo.find_remote_sha(remote_branch_ref)
         else
-          where = opts[:where]||'server'
-          raise ErrorUsage.new("Merge needed before module (#{pp_module(repo)}) can be pushed to #{where}. If you want to force push use '--force' option.")
+          where = opts[:where] || 'server'
+          msg = "Merge needed before module (#{pp_module(repo)}) can be pushed to #{where}. "
+          if where.to_sym == :catalog
+            msg <<  " Either a merge into the local module can be done with pull-dtkn command, followed by push-dtkn or force"
+          else
+            msg << "Force"
+          end
+          msg << " push can be used with the '--force' option, but this will overwrite remote contents"
+          raise ErrorUsage.new(msg)
         end
       elsif merge_rel == :no_remote_ref
         repo.push(remote_branch_ref)
@@ -447,16 +455,27 @@ module DTK; module Client; class CommandHelper
       { "diffs" => (diffs[:diffs]||"").to_s, "status" => repo.local_summary() }
     end
 
+    
+    def diffs__no_diffs
+      DiffSummary.new
+    end
+    def compute_diffs(repo, remote_branch_ref)
+      DiffSummary.diff(repo, repo.local_branch_name, remote_branch_ref)
+    end
+    public :diffs__no_diffs, :compute_diffs
+
     def pull_repo_changes_aux(repo, opts = {})
-      diffs = DiffSummary.new()
-      hard_reset = opts[:hard_reset] || opts[:force]
+      # TODO: cleanup use of hard_reset and force
+      force = 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 repo.changed?
+        repo.stage_and_commit('Commit prior to pull from remote')
+      end
 
       if commit_sha = opts[:commit_sha]
         # no op if at commit_sha
-        return diffs if (commit_sha == repo.head_commit_sha()) && !hard_reset
+        return diffs__no_diffs if (commit_sha == repo.head_commit_sha()) && !force
       end
 
       if opts[:remote_repo] && opts[:remote_repo_url]
@@ -464,50 +483,9 @@ 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 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
-
-      # 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)
-        if 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)
-          { :diffs => diffs, :commit_sha => repo.head_commit_sha() }
-        elsif opts[:ignore_dependency_merge_conflict]
-          { :diffs => diffs, :commit_sha => repo.head_commit_sha(), :custom_message => "Unable to do fast-forward merge. You can go to '#{opts[:full_module_name]}' and pull with --force option but all changes will be lost." }
-        else
-          raise Error.new('Unable to do fast-forward merge. You can use --force but all changes will be lost.')
-        end
-      elsif merge_rel == :local_behind
-        # see if any diffs between fetched remote and local branch
-        # this has be done after commit
-        diffs = DiffSummary.diff(repo, local_branch, remote_branch_ref)
-        return diffs unless diffs.any_diffs?()
-
-        begin
-          repo.merge(remote_branch_ref)
-        rescue Exception => e
-          puts e
-        end
-
-        if commit_sha && commit_sha != repo.head_commit_sha()
-          raise Error.new("Git synchronization problem: expected local head to have sha (#{commit_sha})")
-        end
-
-        { :diffs => diffs, :commit_sha => repo.head_commit_sha() }
-      else
-        raise Error.new("Unexpected merge_rel (#{merge_rel})")
-      end
+      remote_branch_ref = remote_branch_ref(repo.local_branch_name, opts)
+      # TODO: cleanup use of hard_reset and force; Merge.merge just uses :force
+      Merge.merge(repo, remote_branch_ref, opts.merge(:force => force))
     end
 
     def remote(remote_repo=nil)

data/lib/command_helpers/service_importer.rb

@@ -32,7 +32,7 @@ module DTK::Client
           new_context_params.add_context_to_params(module_type, module_type)
           new_context_params.add_context_name_to_params(module_type, module_type, module_name)
 
-          forwarded_opts = { skip_recursive_pull: true, ignore_dependency_merge_conflict: true }
+          forwarded_opts = { :skip_recursive_pull => true, :ignore_dependency_merge_conflict => true }
           forwarded_opts.merge!(:do_not_raise => true) if opts[:do_not_raise]
           new_context_params.forward_options(forwarded_opts)
 

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

@@ -1,10 +1,10 @@
 require 'rest_client'
 require 'json'
 require 'colorize'
-dtk_require_from_base("dtk_logger")
-dtk_require_from_base("util/os_util")
-dtk_require_from_base("command_helper")
-dtk_require_common_commands('thor/task_status')
+dtk_require_from_base('dtk_logger')
+dtk_require_from_base('util/os_util')
+dtk_require_from_base('command_helper')
+dtk_require_from_base('task_status')
 dtk_require_common_commands('thor/set_required_attributes')
 dtk_require_common_commands('thor/edit')
 dtk_require_common_commands('thor/purge_clone')
@@ -89,6 +89,7 @@ module DTK::Client
       # synchronize_clone will load new assembly template into service clone on workspace (if it exists)
       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)
+      merge_warning_message = response.data(:merge_warning_message)
       opts = { :local_branch => workspace_branch, :namespace => namespace }
 
       if (mode == :update) || local_clone_dir_exists
@@ -98,7 +99,9 @@ module DTK::Client
       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
+      OsUtil.print("New assembly template '#{assembly_template_name}' created in service module '#{full_module_name}'.", :yellow) if mode == :create
+      OsUtil.print(merge_warning_message, :yellow) if merge_warning_message
+
       response
     end
 
@@ -141,8 +144,8 @@ module DTK::Client
       response = post rest_url("assembly/ad_hoc_action_execute"), post_body
       return response unless response.ok?
 
-      task_status_stream(assembly_or_workspace_id)
-      Response::Ok.new()
+      task_status_stream(assembly_or_workspace_id, :ignore_stage_level_info => true)
+      nil
     end
 
     def converge_aux(context_params,opts={})
@@ -155,7 +158,7 @@ module DTK::Client
       return response unless response.ok?
       if response.data and response.data.size > 0
         error_message = "The following violations were found; they must be corrected before workspace can be converged"
-        DTK::Client::OsUtil.print(error_message, :red)
+        OsUtil.print(error_message, :red)
         return response.render_table(:violation)
       end
 
@@ -176,9 +179,14 @@ module DTK::Client
           return response unless response.ok?
         end
       end
+      unless task_id = response.data(:task_id)
+        if message = response.data(:message)
+          OsUtil.print(message, :yellow)
+        end
+        return Response::Ok.new()
+      end
 
       # execute task
-      task_id = response.data(:task_id)
       response = post rest_url("task/execute"), "task_id" => task_id
       return response unless response.ok?
 
@@ -319,7 +327,7 @@ module DTK::Client
       return response unless response.ok?
       return Response::Ok.new() unless response.data(:any_updates)
       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"
+        error_message = "Module '#{component_module_name}' parsing errors found:\n#{dsl_parsing_errors}\nYou can fix errors using 'edit' command from referenced service modules and then invoke 'push-component-module-updates' again from this context.\n"
         OsUtil.print(error_message, :red)
         return Response::NoOp.new()
       end
@@ -341,10 +349,11 @@ module DTK::Client
         :module_type => 'component_module'
       }
       post_body.merge!(:force => true) if options.force?
-      response = post(rest_url("assembly/get_component_module_info"),post_body)
+      response = post(rest_url("assembly/prepare_for_pull_from_base"),post_body)
       return response unless response.ok?
 
       if dsl_parsing_errors = response.data(:dsl_parsing_errors)
+        # TODO: DTK-2206; think error message below is incorrect
         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()
@@ -420,8 +429,13 @@ module DTK::Client
         end
       response = task_status_aux(mode,assembly_or_workspace_id,:assembly,:summarize => options.summarize?)
 
-      # TODO: Hack which is necessery for the specific problem (DTK-725), we don't get proper error message when there is a timeout doing converge
-      unless mode == :stream
+      if mode == :stream
+        #no response if ok
+        response unless response.ok?
+      else
+        # TODO: Hack which is necessery for the specific problem (DTK-725), 
+        #       we don't get proper error message when there is a timeout doing converge
+        
         unless response == true
           return response.merge("data" => [{ "errors" => {"message" => "Task does not exist for workspace."}}]) unless response["data"]
           response["data"].each do |data|
@@ -430,9 +444,8 @@ module DTK::Client
             end
           end
         end
+        response
       end
-
-      response
     end
 
     def task_action_detail_aw_aux(context_params)
@@ -534,7 +547,6 @@ module DTK::Client
         assembly_or_workspace_id, dep_cmp, antec_cmp, dependency_name = context_params.retrieve_arguments([REQ_ASSEMBLY_OR_WS_ID, :option_1!, :option_2!, :option_3], method_argument_names)
       end
 
-      antec_cmp = "assembly_wide/#{antec_cmp}" unless antec_cmp.include?('/')
       post_body = {
         :assembly_id => assembly_or_workspace_id,
         :input_component_id => dep_cmp,
@@ -706,10 +718,10 @@ module DTK::Client
         :pattern => pattern
       }
 
-      raise DTK::Client::DtkValidationError, 'Please use only component-attribute (-c) or node-attribute (-n) option' if options.component_attribute? && options.node_attribute?
+      raise DtkValidationError, 'Please use only component-attribute (-c) or node-attribute (-n) option' if options.component_attribute? && options.node_attribute?
 
       # if try to set service instance attribute but using -n option to sepicify it is node attribute, say that node attribute does not exist
-      raise DTK::Client::DtkError, "[ERROR] Node attribute '#{pattern}' does not exist" if options.node_attribute? && !pattern.include?('/')
+      raise DtkError, "[ERROR] Node attribute '#{pattern}' does not exist" if options.node_attribute? && !pattern.include?('/')
 
       # make sure -c and -n are used only with node or cmp attributes directly on service instance
       validate_service_instance_node_or_cmp_attrs(pattern, options) if options.component_attribute? || options.node_attribute?
@@ -725,7 +737,7 @@ module DTK::Client
         if r_data.is_a?(Hash) && (ambiguous = r_data['ambiguous'])
           unless ambiguous.empty?
             msg = "It is ambiguous whether '#{ambiguous.join(', ')}' #{ambiguous.size == 1 ? 'is' : 'are'} node or component attribute(s). Run set-attribute again with one of options -c [--component-attribute] or -n [--node-attribute]."
-            raise DTK::Client::DtkError, msg
+            raise DtkError, msg
           end
         end
       end
@@ -888,6 +900,7 @@ module DTK::Client
           node_id, component_id = component_id.split('/')
           node_name = node_id
         else
+          # TODO: update server so dont have to pass in 'assembly_wide'
           node_id = node_name = 'assembly_wide'
         end
       end
@@ -916,7 +929,7 @@ module DTK::Client
       }
 
       response = post(rest_url("assembly/initiate_get_netstats"),post_body)
-      raise DTK::Client::DtkValidationError, response.data(:errors) if response.data(:errors)
+      raise DtkValidationError, response.data(:errors) if response.data(:errors)
       return response unless response.ok?
 
       action_results_id = response.data(:action_results_id)
@@ -957,7 +970,7 @@ module DTK::Client
         begin
           execute_test_tries = Integer(options['timeout'])
         rescue
-          raise DTK::Client::DtkValidationError, "Timeout value is not valid"
+          raise DtkValidationError, "Timeout value is not valid"
         end
       end
 
@@ -969,7 +982,7 @@ module DTK::Client
 
       response = post(rest_url("assembly/initiate_execute_tests"),post_body)
 
-      raise DTK::Client::DtkValidationError, response.data(:errors) if response.data(:errors)
+      raise DtkValidationError, response.data(:errors) if response.data(:errors)
       return response unless response.ok?
 
       action_results_id = response.data(:action_results_id)
@@ -1004,9 +1017,9 @@ module DTK::Client
       end
 
       if (response.data(:results).empty? && options['timeout'].nil?)
-        raise DTK::Client::DtkValidationError, "Could not finish execution of tests in default timeframe (#{execute_test_tries} seconds). Try again with passing --timeout TIMEOUT parameter"
+        raise DtkValidationError, "Could not finish execution of tests in default timeframe (#{execute_test_tries} seconds). Try again with passing --timeout TIMEOUT parameter"
       elsif (response.data(:results).empty? && !options['timeout'].nil?)
-        raise DTK::Client::DtkValidationError, "Could not finish execution of tests in set timeframe (#{execute_test_tries} seconds). Try again with increasing --timeout TIMEOUT parameter"
+        raise DtkValidationError, "Could not finish execution of tests in set timeframe (#{execute_test_tries} seconds). Try again with increasing --timeout TIMEOUT parameter"
       else
         response.print_error_table = true
         response.set_data(*response.data(:results))
@@ -1026,7 +1039,7 @@ module DTK::Client
       }
 
       response = post(rest_url("assembly/initiate_get_ps"),post_body)
-      raise DTK::Client::DtkValidationError, response.data(:errors) if response.data(:errors)
+      raise DtkValidationError, response.data(:errors) if response.data(:errors)
       return response unless response.ok?
 
       action_results_id = response.data(:action_results_id)
@@ -1114,10 +1127,10 @@ module DTK::Client
             }
 
             response = post rest_url("assembly/initiate_get_log"), post_body
-            raise DTK::Client::DtkValidationError, response.data(:errors) if response.data(:errors)
+            raise DtkValidationError, response.data(:errors) if response.data(:errors)
 
             unless response.ok?
-              raise DTK::Client::DtkError, "Error while getting log from server, there was no successful response."
+              raise DtkError, "Error while getting log from server, there was no successful response."
             end
 
             action_results_id = response.data(:action_results_id)
@@ -1134,7 +1147,7 @@ module DTK::Client
               # server has found an error
               unless response.data(:results).nil?
                 if response.data(:results)['error']
-                  raise DTK::Client::DtkError, response.data(:results)['error']
+                  raise DtkError, response.data(:results)['error']
                 end
               end
 
@@ -1148,7 +1161,7 @@ module DTK::Client
               response = response.data(:results).first[1]
 
               unless response["error"].nil?
-                raise DTK::Client::DtkError, response["error"]
+                raise DtkError, response["error"]
               end
 
               # removing invalid chars from log
@@ -1195,7 +1208,7 @@ module DTK::Client
         t2.join()
       rescue Interrupt
         t2.exit()
-      rescue DTK::Client::DtkError => e
+      rescue DtkError => e
         t2.exit()
         raise e
       end
@@ -1222,10 +1235,10 @@ module DTK::Client
         }
 
         response = post rest_url("assembly/initiate_grep"), post_body
-        raise DTK::Client::DtkValidationError, response.data(:errors) if response.data(:errors)
+        raise DtkValidationError, response.data(:errors) if response.data(:errors)
 
         unless response.ok?
-          raise DTK::Client::DtkError, "Error while getting log from server. Message: #{response['errors'][0]['message'].nil? ? 'There was no successful response.' : response['errors'].first['message']}"
+          raise DtkError, "Error while getting log from server. Message: #{response['errors'][0]['message'].nil? ? 'There was no successful response.' : response['errors'].first['message']}"
         end
 
         action_results_id = response.data(:action_results_id)
@@ -1242,7 +1255,7 @@ module DTK::Client
           # server has found an error
           unless response.data(:results).nil?
             if response.data(:results)['error']
-              raise DTK::Client::DtkError, response.data(:results)['error']
+              raise DtkError, response.data(:results)['error']
             end
           end
 
@@ -1251,14 +1264,14 @@ module DTK::Client
           sleep(1)
         end
 
-        raise DTK::Client::DtkError, "Error while logging there was no successful response after 3 tries." unless response.data(:is_complete)
+        raise DtkError, "Error while logging there was no successful response after 3 tries." unless response.data(:is_complete)
 
         console_width = ENV["COLUMNS"].to_i
 
         response.data(:results).each do |r|
-          raise DTK::Client::DtkError, r[1]["error"] if r[1]["error"]
+          raise DtkError, r[1]["error"] if r[1]["error"]
 
-          message_colorized = DTK::Client::OsUtil.colorize(r[0].inspect, :green)
+          message_colorized = OsUtil.colorize(r[0].inspect, :green)
 
           if r[1]["output"].empty?
             puts "NODE-ID #{message_colorized} - Log does not contain data that matches you pattern #{grep_pattern}!"
@@ -1272,7 +1285,7 @@ module DTK::Client
             puts r[1]["output"].gsub(/`/,'\'')
           end
         end
-      rescue DTK::Client::DtkError => e
+      rescue DtkError => e
         raise e
       end
     end
@@ -1286,7 +1299,7 @@ module DTK::Client
       # we expect action result ID
       response = post rest_url("assembly/start"), post_body
       return response unless response.ok?()
-      raise DTK::Client::DtkValidationError, response.data(:errors).first if response.data(:errors)
+      raise DtkValidationError, response.data(:errors).first if response.data(:errors)
 
       task_id = response.data(:task_id)
       post rest_url("task/execute"), "task_id" => task_id
@@ -1300,7 +1313,7 @@ module DTK::Client
 
       response = post rest_url("assembly/stop"), post_body
       return response unless response.ok?()
-      raise DTK::Client::DtkValidationError, response.data(:errors).first if response.data(:errors)
+      raise DtkValidationError, response.data(:errors).first if response.data(:errors)
 
       response
     end
@@ -1365,7 +1378,7 @@ module DTK::Client
       rest_endpoint = "assembly/info_about"
 
       if context_params.is_last_command_eql_to?(:attribute)
-        raise DTK::Client::DtkError, "Not supported command for current context level." if attribute_id
+        raise DtkError, "Not supported command for current context level." if attribute_id
         about, data_type = get_type_and_raise_error_if_invalid(about, "attributes", ["attributes"])
       elsif context_params.is_last_command_eql_to?(:component)
         if component_id
@@ -1420,9 +1433,9 @@ module DTK::Client
       split_pattern = pattern.split('/')
       return if split_pattern.size == 2
       if options.node_attribute?
-        raise DTK::Client::DtkError, 'Please use -n option only with service instance node attributes (node_name/attribute_name)'
+        raise DtkError, 'Please use -n option only with service instance node attributes (node_name/attribute_name)'
       elsif options.component_attribute?
-        raise DTK::Client::DtkError, 'Please use -c option only with service instance component attributes (cmp_name/attribute_name)'
+        raise DtkError, 'Please use -c option only with service instance component attributes (cmp_name/attribute_name)'
       end
     end
   end

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

@@ -28,13 +28,21 @@ 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 from remote: #{remote_params[:remote_repo]} @ #{remote_params[:remote_repo_url]}")
+      # TODO: probably remove 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, :force => opts[:force], :do_not_raise => opts[:do_not_raise], :ignore_dependency_merge_conflict => opts[:ignore_dependency_merge_conflict])
+        # making :merge_if_no_conflict the default (when force not set)
+        merge_if_no_conflict = (opts[:force] ? nil : true)
+        opts_perform_locally = remote_params.merge(
+          :full_module_name => full_module_name, 
+          :force => opts[:force], 
+          :merge_if_no_conflict => merge_if_no_conflict,
+          :do_not_raise => opts[:do_not_raise], 
+          :ignore_dependency_merge_conflict => opts[:ignore_dependency_merge_conflict]
+        )
         PullFromRemote.perform_locally(self,module_type,module_id,module_name,opts_perform_locally)
       else
         # TODO: see if this works correctly
@@ -100,7 +108,7 @@ module DTK::Client
           puts "Changes pulled from remote"
         end
 
-        return response
+        response
       end
 
       def self.perform_on_server(cmd_obj,module_type,module_id,module_name,remote_params)