dtk-network-client 1.0.1 → 1.0.1.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/dtk-network-client.gemspec +2 -3
- data/lib/client/command/install.rb +20 -1
- data/lib/client/conn.rb +21 -12
- data/lib/client/dependency_tree.rb +20 -1
- data/lib/client/git_repo.rb +7 -7
- data/lib/client/version.rb +1 -1
- metadata +9 -9
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 074e87ffd8e8637cc10edf504211b68e7e964f7d
|
4
|
+
data.tar.gz: eace69876b3ed30670c6d12c13a3f0e1503320b5
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 35e47a6974977ddd171956234df8280893d353e0acd3b19c9fe0a7308c416bfb5be834fc8eb86d4c07463d077e90a1abd4e585735ac6a6e6456c196534478cad
|
7
|
+
data.tar.gz: a46749ebbea8af42cfe81673b1a4633e5a09f16facbb26a45c040eb5aa5c6cbd2de622760f5d07fa2c3cff9c708d81b6b65cf54003e0b6abce5136af8093df8e
|
data/dtk-network-client.gemspec
CHANGED
@@ -15,11 +15,10 @@ Gem::Specification.new do |spec|
|
|
15
15
|
spec.files = `git ls-files`.split("\n")
|
16
16
|
|
17
17
|
spec.add_dependency 'git', '1.2.9'
|
18
|
-
# spec.add_dependency 'dtk-common-core', '0.11.0'
|
19
18
|
spec.add_dependency 'semverly', '~> 1.0'
|
20
|
-
spec.add_dependency 'rest-client', '1.
|
19
|
+
spec.add_dependency 'rest-client', '~> 1.7.3'
|
21
20
|
# spec.add_dependency 'aws-sdk', '~> 3'
|
22
21
|
spec.add_dependency 'aws-sdk-s3', '~> 1.8'
|
23
22
|
spec.add_dependency 'dtk-dsl', '~> 1.1.0'
|
24
|
-
spec.add_dependency 'dtk-common-core', '0.11.1'
|
23
|
+
spec.add_dependency 'dtk-common-core', '0.11.1.1'
|
25
24
|
end
|
@@ -183,7 +183,26 @@ module DTK::Network::Client
|
|
183
183
|
end
|
184
184
|
|
185
185
|
def convert_to_module_ref_lock_format(dep_tree)
|
186
|
-
|
186
|
+
lock_format = {}
|
187
|
+
|
188
|
+
dep_tree.each do |dep|
|
189
|
+
dep_name = "#{dep[:namespace]}/#{dep[:name]}"
|
190
|
+
|
191
|
+
full_dep = { dep_name => {} }
|
192
|
+
|
193
|
+
if version = (dep[:version] || dep['version'])
|
194
|
+
full_dep[dep_name].merge!({ 'version' => version })
|
195
|
+
end
|
196
|
+
|
197
|
+
if modules = (dep[:modules] || dep['modules'])
|
198
|
+
full_dep[dep_name].merge!({ 'modules' => modules })
|
199
|
+
end
|
200
|
+
|
201
|
+
lock_format.merge!(full_dep)
|
202
|
+
end
|
203
|
+
|
204
|
+
lock_format
|
205
|
+
# dep_tree.inject({}) { |h, dep| h.merge!({ "#{dep[:namespace]}/#{dep[:name]}" => { 'version' => (dep[:version] || dep['version']), 'modules' => (dep[:modules] || dep['modules']) }})}
|
187
206
|
end
|
188
207
|
end
|
189
208
|
end
|
data/lib/client/conn.rb
CHANGED
@@ -54,21 +54,30 @@ module DTK::Network
|
|
54
54
|
|
55
55
|
response = rest_method_func.call
|
56
56
|
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
57
|
+
if check_for_session_expiried(response)
|
58
|
+
3.times do
|
59
|
+
sleep 2
|
60
|
+
print "Session expired: re-establishing session & re-trying request ..."
|
61
|
+
@cookies = Session.re_initialize
|
62
|
+
response = rest_method_func.call
|
63
|
+
return response unless check_for_session_expiried(response)
|
64
|
+
end
|
65
|
+
end
|
65
66
|
|
67
|
+
response
|
68
|
+
end
|
66
69
|
|
67
|
-
|
70
|
+
def check_for_session_expiried(response)
|
71
|
+
if response && response.is_a?(Hash)
|
72
|
+
if errors = response['errors']
|
73
|
+
if errors.is_a?(Array)
|
74
|
+
error = errors.first
|
75
|
+
return true if error.eql?('You need to sign in or sign up before continuing.')
|
76
|
+
end
|
77
|
+
end
|
78
|
+
end
|
68
79
|
|
69
|
-
|
70
|
-
#TODO: DTK-2554: put in processing of messages Shell::MessageQueue.process_response(response_obj)
|
71
|
-
# response_obj
|
80
|
+
false
|
72
81
|
end
|
73
82
|
|
74
83
|
def login
|
@@ -58,6 +58,8 @@ module DTK::Network
|
|
58
58
|
|
59
59
|
activate_dependencies(dependencies)
|
60
60
|
@activated
|
61
|
+
|
62
|
+
sort_activated_dependencies(@activated)
|
61
63
|
end
|
62
64
|
|
63
65
|
private
|
@@ -144,6 +146,19 @@ module DTK::Network
|
|
144
146
|
end
|
145
147
|
end
|
146
148
|
|
149
|
+
def sort_activated_dependencies(activated_deps)
|
150
|
+
ret_hash = {}
|
151
|
+
|
152
|
+
activated_deps.each do |k, activated_dep|
|
153
|
+
ret_hash.merge!({ k => activated_dep })
|
154
|
+
if modules = (activated_dep[:modules] || activated_dep['modules'])
|
155
|
+
modules.each { |name, _content| ret_hash = {name => activated_deps[name]}.merge(ret_hash) }
|
156
|
+
end
|
157
|
+
end
|
158
|
+
|
159
|
+
ret_hash
|
160
|
+
end
|
161
|
+
|
147
162
|
def self.ret_as_module_refs(dep_modules)
|
148
163
|
dep_modules.map { |k,v| create_module_ref(k, v) }
|
149
164
|
end
|
@@ -167,6 +182,10 @@ module DTK::Network
|
|
167
182
|
ret.merge!(source: source)
|
168
183
|
end
|
169
184
|
|
185
|
+
if modules = version_hash[:modules] || version_hash['modules']
|
186
|
+
ret.merge!(modules: modules)
|
187
|
+
end
|
188
|
+
|
170
189
|
ret
|
171
190
|
end
|
172
191
|
|
@@ -257,7 +276,7 @@ module DTK::Network
|
|
257
276
|
if yaml_dep = module_yaml_dependencies[nd_name]
|
258
277
|
matches_version_new = module_ref_version.satisfied_by?(yaml_dep['version'])
|
259
278
|
matches_source_new = (source == yaml_dep['source'])
|
260
|
-
next
|
279
|
+
next if (matches_version_new && matches_source_new)
|
261
280
|
end
|
262
281
|
|
263
282
|
top_level_dependencies.delete(nd_name) if (matches_version && matches_source)
|
data/lib/client/git_repo.rb
CHANGED
@@ -151,14 +151,14 @@ module DTK::Network::Client
|
|
151
151
|
# repo.head_commit_sha
|
152
152
|
# end
|
153
153
|
|
154
|
-
def self.pull_from_remote(args)
|
155
|
-
|
156
|
-
|
157
|
-
|
154
|
+
# def self.pull_from_remote(args)
|
155
|
+
# repo_url = args.required(:repo_url)
|
156
|
+
# remote_branch = args.required(:branch)
|
157
|
+
# repo_dir = args.required(:repo_dir)
|
158
158
|
|
159
|
-
|
160
|
-
|
161
|
-
end
|
159
|
+
# repo = git_repo.new(repo_dir, :branch => remote_branch)
|
160
|
+
# repo.pull(repo.remotes.first, remote_branch)
|
161
|
+
# end
|
162
162
|
|
163
163
|
# def self.push_when_there_is_dtk_remote(repo, repo_dir, repo_url, remote_branch)
|
164
164
|
# # if there is only one remote and it is dtk-server; remove .git and initialize and push as new repo to dtk-server remote
|
data/lib/client/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: dtk-network-client
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0.1
|
4
|
+
version: 1.0.1.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Reactor8
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-
|
11
|
+
date: 2018-05-23 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: git
|
@@ -42,16 +42,16 @@ dependencies:
|
|
42
42
|
name: rest-client
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
44
44
|
requirements:
|
45
|
-
- -
|
45
|
+
- - "~>"
|
46
46
|
- !ruby/object:Gem::Version
|
47
|
-
version: 1.
|
47
|
+
version: 1.7.3
|
48
48
|
type: :runtime
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
|
-
- -
|
52
|
+
- - "~>"
|
53
53
|
- !ruby/object:Gem::Version
|
54
|
-
version: 1.
|
54
|
+
version: 1.7.3
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
56
|
name: aws-sdk-s3
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
@@ -86,14 +86,14 @@ dependencies:
|
|
86
86
|
requirements:
|
87
87
|
- - '='
|
88
88
|
- !ruby/object:Gem::Version
|
89
|
-
version: 0.11.1
|
89
|
+
version: 0.11.1.1
|
90
90
|
type: :runtime
|
91
91
|
prerelease: false
|
92
92
|
version_requirements: !ruby/object:Gem::Requirement
|
93
93
|
requirements:
|
94
94
|
- - '='
|
95
95
|
- !ruby/object:Gem::Version
|
96
|
-
version: 0.11.1
|
96
|
+
version: 0.11.1.1
|
97
97
|
description: Library for interaction with dtk network.
|
98
98
|
email: support@reactor8.com
|
99
99
|
executables: []
|
@@ -176,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
176
176
|
version: '0'
|
177
177
|
requirements: []
|
178
178
|
rubyforge_project:
|
179
|
-
rubygems_version: 2.
|
179
|
+
rubygems_version: 2.6.11
|
180
180
|
signing_key:
|
181
181
|
specification_version: 4
|
182
182
|
summary: Library for interaction with dtk network.
|