dtk-client 0.11.5 → 0.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5de7ced1e236b8558747c61de9dbb0bd99bdec16
-  data.tar.gz: 00233bc8aaaa577b2edfdbf494ba39e332004ada
+  metadata.gz: '09840901f95d94e261d6eb27edb5ca81fa652426'
+  data.tar.gz: a45f1a592a98e7eda1c43394d87f5b150b3c660e
 SHA512:
-  metadata.gz: 4fb0de210ec0f760c6c36fdea20b740ad197d4d546b36ce66b8d740e523d9b144b22d27fc242805fb11bb8f873fdd323d97e1472d3c69fd9e009db9c25a4ceee
-  data.tar.gz: f710986718de80dba1c001cb7e7429dc84ee3c7634e45c9ab57424088ff25cee77e4194c6717651285771d6855b831a7bbab570c13490a524ca925bd541d7f2c
+  metadata.gz: bfdaf7faafa9ea7bf10f58c82234387b2dcf941f1a0da8595cae33b533914b8d35f1064ef1fe3706bce7c45c9466444ff528cae7cbf552f630826cae837a5c0e
+  data.tar.gz: a1ecb45fe85ae011ffa98c7fd4b3450503a02a4845bb6a1690ebf78d1af4d6e85c2f244efbd2b68c59b49bf896cba31e9e766b48e63d67ed78ed9568bf4612f7

data/.license_header

@@ -1,4 +1,4 @@
-Copyright (C) 2010-2016 dtk contributors
+Copyright (C) 2010-2017 dtk contributors
 
 This file is part of the dtk project.
 

data/lib/cli/context.rb

@@ -202,7 +202,7 @@ module DTK::Client
 
       ERROR_MSG_MAPPING = {
         :service_instance => 'service instance',
-        :module_ref       => 'mdoule'
+        :module_ref       => 'module'
       }
       def raise_error_when_missing_context(type, options = {})
         if options["d"].nil?

data/lib/cli/version.rb

@@ -18,7 +18,7 @@
 module DTK
   module Client
     module CLI
-      VERSION="0.11.5"
+      VERSION="0.11.6"
     end
   end
 end

data/lib/client/load_source.rb

@@ -53,7 +53,7 @@ module DTK::Client
 
           if parent.is_a?(Operation::Module::PullDtkn) && updated
             stage_and_commit(target_repo_dir, commit_msg([ComponentInfo.info_type]))
-            delete_diffs(target_repo_dir)
+            delete_diffs(target_repo_dir, remote_module_info.data(:version))
           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
@@ -71,10 +71,11 @@ module DTK::Client
       end
     end
 
-    def self.delete_diffs(target_repo_dir)
+    def self.delete_diffs(target_repo_dir, version = nil)
       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' })
+      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/#{dtkn_version_ref(version)}", { :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}") }
@@ -114,6 +115,16 @@ module DTK::Client
 
     attr_reader :info_processor, :target_repo_dir
 
+    def self.dtkn_version_ref(version = nil)
+      if version.nil?
+        'master'
+      elsif version == 'master'
+        'master'
+      else
+        "v#{version}"
+      end
+    end
+
     def self.write_output_path_text_pairs(transform_helper, target_repo_dir, info_types_processed)
     end
 

data/lib/client/render/view/table/processor.rb

@@ -77,11 +77,17 @@ module DTK::Client
           # based on mapping we set key = eval(value)
           @table_mapping.each do |k, v|
             begin
-              if print_error_table && k.include?('error')
+              if print_error_table && k.include?('error') 
                 error_message = value_of(structured_element, v)
+                # Escaping error when doing dtk-cancel on debugger state service instance
+                error_message = "" if error_message.include?("EOF")
                 if failed_component = value_of(structured_element, 'failed_component')
                   @failed_components << "- #{failed_component.gsub('__','::')}"
                 end
+                
+                if  error_message.include?("Deadline Exceeded")
+                  error_message = "Byebug session timeout, please run 'dtk service converge' again."
+                end
 
                 # due to problems with space we have special way of handling error columns
                 # in such a way that those error will be specially printed later on

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.11.5
+  version: 0.11.6
 platform: ruby
 authors:
 - Reactor8
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-06 00:00:00.000000000 Z
+date: 2017-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dtk-common-core
@@ -390,7 +390,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: DTK CLI client for DTK server interaction.