dtk-client 0.11.5 → 0.11.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.license_header +1 -1
- data/lib/cli/context.rb +1 -1
- data/lib/cli/version.rb +1 -1
- data/lib/client/load_source.rb +15 -4
- data/lib/client/render/view/table/processor.rb +7 -1
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: '09840901f95d94e261d6eb27edb5ca81fa652426'
|
4
|
+
data.tar.gz: a45f1a592a98e7eda1c43394d87f5b150b3c660e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: bfdaf7faafa9ea7bf10f58c82234387b2dcf941f1a0da8595cae33b533914b8d35f1064ef1fe3706bce7c45c9466444ff528cae7cbf552f630826cae837a5c0e
|
7
|
+
data.tar.gz: a1ecb45fe85ae011ffa98c7fd4b3450503a02a4845bb6a1690ebf78d1af4d6e85c2f244efbd2b68c59b49bf896cba31e9e766b48e63d67ed78ed9568bf4612f7
|
data/.license_header
CHANGED
data/lib/cli/context.rb
CHANGED
data/lib/cli/version.rb
CHANGED
data/lib/client/load_source.rb
CHANGED
@@ -53,7 +53,7 @@ module DTK::Client
|
|
53
53
|
|
54
54
|
if parent.is_a?(Operation::Module::PullDtkn) && updated
|
55
55
|
stage_and_commit(target_repo_dir, commit_msg([ComponentInfo.info_type]))
|
56
|
-
delete_diffs(target_repo_dir)
|
56
|
+
delete_diffs(target_repo_dir, remote_module_info.data(:version))
|
57
57
|
end
|
58
58
|
rescue Error::MissingDslFile => e
|
59
59
|
# 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
|
|
71
71
|
end
|
72
72
|
end
|
73
73
|
|
74
|
-
def self.delete_diffs(target_repo_dir)
|
74
|
+
def self.delete_diffs(target_repo_dir, version = nil)
|
75
75
|
current_branch = git_repo_operation.current_branch(:path => target_repo_dir).data(:branch)
|
76
|
-
repo
|
77
|
-
|
76
|
+
repo = git_repo_operation.create_empty_git_repo?(:repo_dir => target_repo_dir, :branch => current_branch).data(:repo)
|
77
|
+
|
78
|
+
if delete_files = repo.diff_name_status(current_branch, "remotes/dtkn-component-info/#{dtkn_version_ref(version)}", { :diff_filter => 'D' })
|
78
79
|
unless delete_files.empty?
|
79
80
|
to_delete = delete_files.keys.select { |key| !key.include?('dtk.model.yaml') && !key.include?('module_refs.yaml') }
|
80
81
|
to_delete.each { |file| Operation::ClientModuleDir.rm_f("#{target_repo_dir}/#{file}") }
|
@@ -114,6 +115,16 @@ module DTK::Client
|
|
114
115
|
|
115
116
|
attr_reader :info_processor, :target_repo_dir
|
116
117
|
|
118
|
+
def self.dtkn_version_ref(version = nil)
|
119
|
+
if version.nil?
|
120
|
+
'master'
|
121
|
+
elsif version == 'master'
|
122
|
+
'master'
|
123
|
+
else
|
124
|
+
"v#{version}"
|
125
|
+
end
|
126
|
+
end
|
127
|
+
|
117
128
|
def self.write_output_path_text_pairs(transform_helper, target_repo_dir, info_types_processed)
|
118
129
|
end
|
119
130
|
|
@@ -77,11 +77,17 @@ module DTK::Client
|
|
77
77
|
# based on mapping we set key = eval(value)
|
78
78
|
@table_mapping.each do |k, v|
|
79
79
|
begin
|
80
|
-
if print_error_table && k.include?('error')
|
80
|
+
if print_error_table && k.include?('error')
|
81
81
|
error_message = value_of(structured_element, v)
|
82
|
+
# Escaping error when doing dtk-cancel on debugger state service instance
|
83
|
+
error_message = "" if error_message.include?("EOF")
|
82
84
|
if failed_component = value_of(structured_element, 'failed_component')
|
83
85
|
@failed_components << "- #{failed_component.gsub('__','::')}"
|
84
86
|
end
|
87
|
+
|
88
|
+
if error_message.include?("Deadline Exceeded")
|
89
|
+
error_message = "Byebug session timeout, please run 'dtk service converge' again."
|
90
|
+
end
|
85
91
|
|
86
92
|
# due to problems with space we have special way of handling error columns
|
87
93
|
# in such a way that those error will be specially printed later on
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: dtk-client
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.11.
|
4
|
+
version: 0.11.6
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Reactor8
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-
|
11
|
+
date: 2017-12-05 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: dtk-common-core
|
@@ -390,7 +390,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
390
390
|
version: '0'
|
391
391
|
requirements: []
|
392
392
|
rubyforge_project:
|
393
|
-
rubygems_version: 2.
|
393
|
+
rubygems_version: 2.6.11
|
394
394
|
signing_key:
|
395
395
|
specification_version: 4
|
396
396
|
summary: DTK CLI client for DTK server interaction.
|