dtk-client 0.6.0 → 0.6.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +13 -5
- data/lib/commands/thor/assembly.rb +3 -1
- data/lib/commands/thor/node_template.rb +16 -11
- data/lib/dtk-client/version.rb +1 -1
- data/lib/parser/adapters/thor/common_option_defs.rb +17 -6
- data/lib/parser/adapters/thor.rb +3 -1
- metadata +21 -21
checksums.yaml
CHANGED
@@ -1,7 +1,15 @@
|
|
1
1
|
---
|
2
|
-
|
3
|
-
metadata.gz:
|
4
|
-
|
2
|
+
!binary "U0hBMQ==":
|
3
|
+
metadata.gz: !binary |-
|
4
|
+
MDc3MDgwYjMwMzU0MTM5Y2UzZGY5YTk4MGM3NDIxMTNkMjBlZjI0Ng==
|
5
|
+
data.tar.gz: !binary |-
|
6
|
+
N2QyN2FhN2JiMTNlZGU0YTM1YzAzYTE2ZGZiNTdlYjEyZGNmN2ZjMQ==
|
5
7
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
|
8
|
+
metadata.gz: !binary |-
|
9
|
+
NDVmZGE3ODE2NjFhZWNmMGUxNDQ0YWI3ODM0NGU2NjRlZGFkNzlhZGQ0YzA5
|
10
|
+
NGNhOTUwYzgxMmUxZDgwODU1ZDhiZDljYWNjNWEwM2I3MWM3OTQ5MjFkOTIz
|
11
|
+
MmYxNjBjZTQwZjI5ZWRlMTA0NDkxYmE0MTc5YzM3MTY1NzllNzg=
|
12
|
+
data.tar.gz: !binary |-
|
13
|
+
MGU0MjZmMDViY2FiNGY3ZGMyMzVjMWJmNGE0NjFhZTljNjA1ZTExZjVlNjY5
|
14
|
+
MjEzN2JjOWE3MTEzMmI4NmUyOGM1ZWZjNzE4OTI4YzgxZDQyOGU0YmU5ZDEw
|
15
|
+
NGU4MGRhMGUwZmYzYzE0NjkzZDZmYmY5ZTU4ZGVkYjQ0NGVkZTM=
|
@@ -204,7 +204,9 @@ module DTK::Client
|
|
204
204
|
@@invalidate_map << :assembly
|
205
205
|
|
206
206
|
assembly_template_name = get_assembly_name(assembly_template_id)
|
207
|
-
|
207
|
+
if assembly_template_name
|
208
|
+
assembly_template_name.gsub!(/(::)|(\/)/,'-')
|
209
|
+
end
|
208
210
|
|
209
211
|
in_target = options["in-target"]
|
210
212
|
instance_bindings = options["instance-bindings"]
|
@@ -45,29 +45,34 @@ module DTK::Client
|
|
45
45
|
post rest_url("node/image_upgrade"), post_body
|
46
46
|
end
|
47
47
|
|
48
|
-
desc "add-node-template NODE-TEMPLATE-NAME TARGET-NAME/ID --os OS --image-id IMAGE-ID --size SIZE[,SIZE2,..]", "Add new node template"
|
48
|
+
desc "add-node-template NODE-TEMPLATE-NAME [-t TARGET-NAME/ID] --os OS --image-id IMAGE-ID --size SIZE[,SIZE2,..]", "Add new node template"
|
49
|
+
method_option "target",:aliases => "-t"
|
49
50
|
method_option "os"
|
50
51
|
method_option "image-id",:aliases => "-i"
|
51
52
|
method_option "size",:aliases => "-s"
|
52
53
|
def add_node_template(context_params)
|
53
|
-
node_template_name
|
54
|
-
missing_opts = ['os','image-id'].reject{|k|options.has_key?(k)}
|
55
|
-
unless missing_opts.empty?
|
56
|
-
pl = (missing_opts.size > 1)
|
57
|
-
missing = missing_opts.map{|o|"--#{o}"}.join(',')
|
58
|
-
raise DtkError, "[ERROR] The mandatory #{plural?(pl,'option')} (#{missing}) #{plural?(pl,'is/are')} missing"
|
59
|
-
end
|
54
|
+
node_template_name = context_params.retrieve_arguments([:option_1!],method_argument_names)
|
60
55
|
size_array = options[:size] && options[:size].split(',')
|
56
|
+
|
61
57
|
post_body = post_body(
|
62
58
|
:node_template_name => node_template_name,
|
63
|
-
:target_id =>
|
64
|
-
:operating_system =>
|
65
|
-
:image_id =>
|
59
|
+
:target_id => options['target'],
|
60
|
+
:operating_system => required_option('os'),
|
61
|
+
:image_id => required_option('image-id'),
|
66
62
|
:size_array => size_array
|
67
63
|
)
|
68
64
|
post rest_url("node/add_node_template"), post_body
|
69
65
|
end
|
70
66
|
|
67
|
+
desc "delete-node-template NODE-TEMPLATE-NAME", "Delete node template"
|
68
|
+
def delete_node_template(context_params)
|
69
|
+
node_template_name = context_params.retrieve_arguments([:option_1!],method_argument_names)
|
70
|
+
post_body = post_body(
|
71
|
+
:node_template_name => node_template_name
|
72
|
+
)
|
73
|
+
post rest_url("node/delete_node_template"), post_body
|
74
|
+
end
|
75
|
+
|
71
76
|
=begin
|
72
77
|
#Not implemented yet
|
73
78
|
desc "NODE-TEMPLATE-NAME/ID info", "Get information about given node template."
|
data/lib/dtk-client/version.rb
CHANGED
@@ -1,11 +1,22 @@
|
|
1
1
|
module DTK; module Client
|
2
2
|
class CommandBaseThor
|
3
|
-
module
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
3
|
+
module CommonOptionDefs
|
4
|
+
module Mixin
|
5
|
+
def required_option(key)
|
6
|
+
key = key.to_s
|
7
|
+
unless options.has_key?(key)
|
8
|
+
raise DtkError, "[ERROR] The mandatory option --#{key} is missing"
|
9
|
+
end
|
10
|
+
options[key]
|
11
|
+
end
|
12
|
+
end
|
13
|
+
module ClassMixin
|
14
|
+
def version_method_option()
|
15
|
+
method_option "version",:aliases => "-v",
|
16
|
+
:type => :string,
|
17
|
+
:banner => "VERSION",
|
18
|
+
:desc => "Version"
|
19
|
+
end
|
9
20
|
end
|
10
21
|
end
|
11
22
|
end
|
data/lib/parser/adapters/thor.rb
CHANGED
@@ -21,7 +21,7 @@ module DTK
|
|
21
21
|
extend TaskStatusMixin
|
22
22
|
extend Console
|
23
23
|
include CommandHelperMixin
|
24
|
-
extend
|
24
|
+
extend CommonOptionDefs::ClassMixin
|
25
25
|
|
26
26
|
@@cached_response = {}
|
27
27
|
@@invalidate_map = []
|
@@ -343,6 +343,8 @@ module DTK
|
|
343
343
|
|
344
344
|
no_tasks do
|
345
345
|
|
346
|
+
include CommonOptionDefs::Mixin
|
347
|
+
|
346
348
|
#
|
347
349
|
# Run shell command directly from main, use with CAUTION
|
348
350
|
#
|
metadata
CHANGED
@@ -1,27 +1,27 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: dtk-client
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.6.
|
4
|
+
version: 0.6.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Rich PELAVIN
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-10-
|
11
|
+
date: 2014-10-08 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
16
16
|
requirements:
|
17
|
-
- -
|
17
|
+
- - ! '>='
|
18
18
|
- !ruby/object:Gem::Version
|
19
19
|
version: 1.2.4
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
|
-
- -
|
24
|
+
- - ! '>='
|
25
25
|
- !ruby/object:Gem::Version
|
26
26
|
version: 1.2.4
|
27
27
|
- !ruby/object:Gem::Dependency
|
@@ -56,98 +56,98 @@ dependencies:
|
|
56
56
|
name: mime-types
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
58
58
|
requirements:
|
59
|
-
- -
|
59
|
+
- - ~>
|
60
60
|
- !ruby/object:Gem::Version
|
61
61
|
version: '1.25'
|
62
62
|
type: :runtime
|
63
63
|
prerelease: false
|
64
64
|
version_requirements: !ruby/object:Gem::Requirement
|
65
65
|
requirements:
|
66
|
-
- -
|
66
|
+
- - ~>
|
67
67
|
- !ruby/object:Gem::Version
|
68
68
|
version: '1.25'
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: hirb
|
71
71
|
requirement: !ruby/object:Gem::Requirement
|
72
72
|
requirements:
|
73
|
-
- -
|
73
|
+
- - ~>
|
74
74
|
- !ruby/object:Gem::Version
|
75
75
|
version: 0.7.0
|
76
76
|
type: :runtime
|
77
77
|
prerelease: false
|
78
78
|
version_requirements: !ruby/object:Gem::Requirement
|
79
79
|
requirements:
|
80
|
-
- -
|
80
|
+
- - ~>
|
81
81
|
- !ruby/object:Gem::Version
|
82
82
|
version: 0.7.0
|
83
83
|
- !ruby/object:Gem::Dependency
|
84
84
|
name: thor
|
85
85
|
requirement: !ruby/object:Gem::Requirement
|
86
86
|
requirements:
|
87
|
-
- -
|
87
|
+
- - ~>
|
88
88
|
- !ruby/object:Gem::Version
|
89
89
|
version: 0.15.4
|
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
96
|
version: 0.15.4
|
97
97
|
- !ruby/object:Gem::Dependency
|
98
98
|
name: erubis
|
99
99
|
requirement: !ruby/object:Gem::Requirement
|
100
100
|
requirements:
|
101
|
-
- -
|
101
|
+
- - ~>
|
102
102
|
- !ruby/object:Gem::Version
|
103
103
|
version: 2.7.0
|
104
104
|
type: :runtime
|
105
105
|
prerelease: false
|
106
106
|
version_requirements: !ruby/object:Gem::Requirement
|
107
107
|
requirements:
|
108
|
-
- -
|
108
|
+
- - ~>
|
109
109
|
- !ruby/object:Gem::Version
|
110
110
|
version: 2.7.0
|
111
111
|
- !ruby/object:Gem::Dependency
|
112
112
|
name: dtk-common-core
|
113
113
|
requirement: !ruby/object:Gem::Requirement
|
114
114
|
requirements:
|
115
|
-
- -
|
115
|
+
- - ~>
|
116
116
|
- !ruby/object:Gem::Version
|
117
117
|
version: 0.5.10
|
118
118
|
type: :runtime
|
119
119
|
prerelease: false
|
120
120
|
version_requirements: !ruby/object:Gem::Requirement
|
121
121
|
requirements:
|
122
|
-
- -
|
122
|
+
- - ~>
|
123
123
|
- !ruby/object:Gem::Version
|
124
124
|
version: 0.5.10
|
125
125
|
- !ruby/object:Gem::Dependency
|
126
126
|
name: git
|
127
127
|
requirement: !ruby/object:Gem::Requirement
|
128
128
|
requirements:
|
129
|
-
- -
|
129
|
+
- - ~>
|
130
130
|
- !ruby/object:Gem::Version
|
131
131
|
version: 1.2.6
|
132
132
|
type: :runtime
|
133
133
|
prerelease: false
|
134
134
|
version_requirements: !ruby/object:Gem::Requirement
|
135
135
|
requirements:
|
136
|
-
- -
|
136
|
+
- - ~>
|
137
137
|
- !ruby/object:Gem::Version
|
138
138
|
version: 1.2.6
|
139
139
|
- !ruby/object:Gem::Dependency
|
140
140
|
name: colorize
|
141
141
|
requirement: !ruby/object:Gem::Requirement
|
142
142
|
requirements:
|
143
|
-
- -
|
143
|
+
- - ~>
|
144
144
|
- !ruby/object:Gem::Version
|
145
145
|
version: 0.5.8
|
146
146
|
type: :runtime
|
147
147
|
prerelease: false
|
148
148
|
version_requirements: !ruby/object:Gem::Requirement
|
149
149
|
requirements:
|
150
|
-
- -
|
150
|
+
- - ~>
|
151
151
|
- !ruby/object:Gem::Version
|
152
152
|
version: 0.5.8
|
153
153
|
- !ruby/object:Gem::Dependency
|
@@ -328,17 +328,17 @@ require_paths:
|
|
328
328
|
- lib
|
329
329
|
required_ruby_version: !ruby/object:Gem::Requirement
|
330
330
|
requirements:
|
331
|
-
- -
|
331
|
+
- - ! '>='
|
332
332
|
- !ruby/object:Gem::Version
|
333
333
|
version: '0'
|
334
334
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
335
335
|
requirements:
|
336
|
-
- -
|
336
|
+
- - ! '>='
|
337
337
|
- !ruby/object:Gem::Version
|
338
338
|
version: '0'
|
339
339
|
requirements: []
|
340
340
|
rubyforge_project:
|
341
|
-
rubygems_version: 2.
|
341
|
+
rubygems_version: 2.2.2
|
342
342
|
signing_key:
|
343
343
|
specification_version: 4
|
344
344
|
summary: DTK CLI client for DTK server interaction.
|