pi 0.1.30 → 0.1.31

Sign up to get free protection for your applications and to get access to all the features.
@@ -13,6 +13,34 @@ module PI::Cli
13
13
  "isDebug" => false,
14
14
  "needMonitor" => false
15
15
  }
16
+
17
+ def total_opts
18
+ all_opts = Hash.new
19
+ all_opts = {
20
+ :user => @options[:user],
21
+ :password => @options[:password],
22
+ :name => @options[:name],
23
+ :email => @options[:email],
24
+ :path => @options[:path],
25
+ :ver => @options[:ver],
26
+ :desc => @options[:desc],
27
+ :projectid => @options[:projectid],
28
+ :target => @options[:target],
29
+ :instance => @options[:instance],
30
+ :type => @options[:type],
31
+ :value => @options[:value],
32
+ :service => @options[:service],
33
+ :dns => @options[:dns],
34
+ :zoneid => @options[:zoneid],
35
+ :instanceid => @options[:instanceid],
36
+ :file => @options[:file],
37
+ :continent => @options[:continent],
38
+ :country => @options[:country],
39
+ :recordid => @options[:recordid],
40
+ :graceful => @options[:graceful]
41
+ }
42
+ end
43
+
16
44
  def choose_project
17
45
  projects = client.projects
18
46
  err "No Projects" if projects.nil? || projects.empty?
@@ -15,6 +15,11 @@ module PI::Cli::Command
15
15
  }
16
16
 
17
17
  def apps
18
+ all_opts = total_opts
19
+ all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(projectid|target)/i}
20
+ all_opts_except_valid_opts.each_value do |value|
21
+ err "Invalid options" if value != nil
22
+ end
18
23
  client.check_login_status
19
24
  projectid = @options[:projectid]
20
25
  target = @options[:target]
@@ -66,6 +71,10 @@ module PI::Cli::Command
66
71
  end
67
72
 
68
73
  def create_app(appname=nil)
74
+ all_opts = total_opts
75
+ all_opts.each_value do |value|
76
+ err "Invalid options" if value != nil
77
+ end
69
78
  client.check_login_status
70
79
  binarylist, deployType, instances = nil, nil, nil
71
80
 
@@ -201,6 +210,11 @@ module PI::Cli::Command
201
210
  end
202
211
 
203
212
  def delete_app(appid_or_appname=nil)
213
+ all_opts = total_opts
214
+ all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target)/i}
215
+ all_opts_except_valid_opts.each_value do |value|
216
+ err "Invalid options" if value != nil
217
+ end
204
218
  client.check_login_status
205
219
  app, appid = choose_app_help_target_not_all(appid_or_appname)
206
220
  appid = (appid == nil ? app[:id] : appid)
@@ -221,6 +235,11 @@ module PI::Cli::Command
221
235
  end
222
236
 
223
237
  def start_app(appid_or_appname=nil)
238
+ all_opts = total_opts
239
+ all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target)/i}
240
+ all_opts_except_valid_opts.each_value do |value|
241
+ err "Invalid options" if value != nil
242
+ end
224
243
  client.check_login_status
225
244
  target_not_all, app, appid = choose_app_help(appid_or_appname)
226
245
  if target_not_all
@@ -236,6 +255,11 @@ module PI::Cli::Command
236
255
  end
237
256
 
238
257
  def stop_app(appid_or_appname=nil)
258
+ all_opts = total_opts
259
+ all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target|graceful)/i}
260
+ all_opts_except_valid_opts.each_value do |value|
261
+ err "Invalid options" if value != nil
262
+ end
239
263
  client.check_login_status
240
264
  target_not_all, app, appid = choose_app_help(appid_or_appname)
241
265
  if target_not_all
@@ -251,6 +275,11 @@ module PI::Cli::Command
251
275
  end
252
276
 
253
277
  def restart_app(appid_or_appname=nil)
278
+ all_opts = total_opts
279
+ all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target|graceful)/i}
280
+ all_opts_except_valid_opts.each_value do |value|
281
+ err "Invalid options" if value != nil
282
+ end
254
283
  client.check_login_status
255
284
  target_not_all, app, appid = choose_app_help(appid_or_appname)
256
285
  if target_not_all
@@ -264,6 +293,11 @@ module PI::Cli::Command
264
293
  end
265
294
 
266
295
  def scale_app(appid_or_appname=nil)
296
+ all_opts = total_opts
297
+ all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target|instance)/i}
298
+ all_opts_except_valid_opts.each_value do |value|
299
+ err "Invalid options" if value != nil
300
+ end
267
301
  client.check_login_status
268
302
  instance = @options[:instance]
269
303
  app, appid = choose_app_help_target_not_all(appid_or_appname)
@@ -306,6 +340,11 @@ module PI::Cli::Command
306
340
  end
307
341
 
308
342
  def update_app(appid_or_appname=nil)
343
+ all_opts = total_opts
344
+ all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target|ver|graceful)/i}
345
+ all_opts_except_valid_opts.each_value do |value|
346
+ err "Invalid options" if value != nil
347
+ end
309
348
  client.check_login_status
310
349
  tag = @options[:ver]
311
350
  app, appid = choose_app_help_target_not_all(appid_or_appname)
@@ -349,6 +388,11 @@ module PI::Cli::Command
349
388
  end
350
389
 
351
390
  def status(appid_or_appname=nil)
391
+ all_opts = total_opts
392
+ all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target)/i}
393
+ all_opts_except_valid_opts.each_value do |value|
394
+ err "Invalid options" if value != nil
395
+ end
352
396
  client.check_login_status
353
397
  app, appid = choose_app_help_target_not_all(appid_or_appname)
354
398
  appid = (appid == nil ? app[:id] : appid)
@@ -365,6 +409,11 @@ module PI::Cli::Command
365
409
  end
366
410
 
367
411
  def app_env(appid_or_appname=nil)
412
+ all_opts = total_opts
413
+ all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target)/i}
414
+ all_opts_except_valid_opts.each_value do |value|
415
+ err "Invalid options" if value != nil
416
+ end
368
417
  client.check_login_status
369
418
  app, appid = choose_app_help_target_not_all(appid_or_appname)
370
419
  appid = (appid == nil ? app[:id] : appid)
@@ -382,6 +431,11 @@ module PI::Cli::Command
382
431
  end
383
432
 
384
433
  def create_env(appid_or_appname=nil)
434
+ all_opts = total_opts
435
+ all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target|name|value)/i}
436
+ all_opts_except_valid_opts.each_value do |value|
437
+ err "Invalid options" if value != nil
438
+ end
385
439
  client.check_login_status
386
440
  name = @options[:name]
387
441
  value = @options[:value]
@@ -421,6 +475,11 @@ module PI::Cli::Command
421
475
  end
422
476
 
423
477
  def delete_env(appid_or_appname=nil)
478
+ all_opts = total_opts
479
+ all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target|name)/i}
480
+ all_opts_except_valid_opts.each_value do |value|
481
+ err "Invalid options" if value != nil
482
+ end
424
483
  client.check_login_status
425
484
  name = @options[:name]
426
485
  app, appid = choose_app_help_target_not_all(appid_or_appname)
@@ -454,6 +513,11 @@ module PI::Cli::Command
454
513
  end
455
514
 
456
515
  def app_log(appid_or_appname=nil)
516
+ all_opts = total_opts
517
+ all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target|instanceid|file)/i}
518
+ all_opts_except_valid_opts.each_value do |value|
519
+ err "Invalid options" if value != nil
520
+ end
457
521
  client.check_login_status
458
522
  instanceindex = @options[:instanceid]
459
523
  file = @options[:file]
@@ -478,6 +542,11 @@ module PI::Cli::Command
478
542
  end
479
543
 
480
544
  def app_debug(appid_or_appname=nil)
545
+ all_opts = total_opts
546
+ all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target)/i}
547
+ all_opts_except_valid_opts.each_value do |value|
548
+ err "Invalid options" if value != nil
549
+ end
481
550
  client.check_login_status
482
551
  app, appid = choose_app_help_target_not_all(appid_or_appname)
483
552
  appid = (appid == nil ? app[:id] : appid)
@@ -4,6 +4,11 @@ module PI::Cli::Command
4
4
  include PI::Cli::InteractHelper
5
5
 
6
6
  def app_dns(appid_or_appname=nil)
7
+ all_opts = total_opts
8
+ all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target)/i}
9
+ all_opts_except_valid_opts.each_value do |value|
10
+ err "Invalid options" if value != nil
11
+ end
7
12
  client.check_login_status
8
13
  app, appid = choose_app_help_target_not_all(appid_or_appname)
9
14
  appid = (appid == nil ? app[:id] : appid)
@@ -15,16 +20,14 @@ module PI::Cli::Command
15
20
  dns.each do |s|
16
21
  display "#{s}"
17
22
  end
18
- # dns_table = table do |t|
19
- # t.headings = 'Mapped DNS Name'
20
- # dns.each do |s|
21
- # t << s
22
- # end
23
- # end
24
- # display dns_table
25
23
  end
26
24
 
27
25
  def map_dns(appid_or_appname=nil)
26
+ all_opts = total_opts
27
+ all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target|dns)/i}
28
+ all_opts_except_valid_opts.each_value do |value|
29
+ err "Invalid options" if value != nil
30
+ end
28
31
  client.check_login_status
29
32
  dnsname = @options[:dns]
30
33
  if dnsname
@@ -46,11 +49,6 @@ module PI::Cli::Command
46
49
  end
47
50
  else
48
51
  manifest = asks "Select dns, indexed list?", :choices => dns.collect { |d| d[:name] }, :indexed => true
49
- #display "Selected dns: ",false
50
- #manifest.each do |m|
51
- #display "#{m} ",false
52
- #end
53
- #display "\n"
54
52
  end
55
53
  display "Mapping dns: ",false
56
54
 
@@ -68,6 +66,11 @@ module PI::Cli::Command
68
66
  end
69
67
 
70
68
  def unmap_dns(appid_or_appname=nil)
69
+ all_opts = total_opts
70
+ all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target|dns)/i}
71
+ all_opts_except_valid_opts.each_value do |value|
72
+ err "Invalid options" if value != nil
73
+ end
71
74
  client.check_login_status
72
75
  dnsname = @options[:dns]
73
76
  app, appid = choose_app_help_target_not_all(appid_or_appname)
@@ -86,6 +89,10 @@ module PI::Cli::Command
86
89
  end
87
90
 
88
91
  def dns
92
+ all_opts = total_opts
93
+ all_opts.each_value do |value|
94
+ err "Invalid options" if value != nil
95
+ end
89
96
  client.check_login_status
90
97
  dns = client.dns
91
98
  return display "No Services" if dns.nil? || dns.empty?
@@ -101,6 +108,10 @@ module PI::Cli::Command
101
108
  end
102
109
 
103
110
  def zones
111
+ all_opts = total_opts
112
+ all_opts.each_value do |value|
113
+ err "Invalid options" if value != nil
114
+ end
104
115
  client.check_login_status
105
116
  zones = client.dns_zone_list
106
117
  return display JSON.pretty_generate(zones) if @options[:json]
@@ -115,6 +126,11 @@ module PI::Cli::Command
115
126
  end
116
127
 
117
128
  def create_dns(dnsname=nil)
129
+ all_opts = total_opts
130
+ all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(projectid|desc|zoneid)/i}
131
+ all_opts_except_valid_opts.each_value do |value|
132
+ err "Invalid options" if value != nil
133
+ end
118
134
  client.check_login_status
119
135
  projectid = @options[:projectid]
120
136
  description = @options[:desc]
@@ -185,6 +201,10 @@ module PI::Cli::Command
185
201
  end
186
202
 
187
203
  def delete_dns(dnsid=nil)
204
+ all_opts = total_opts
205
+ all_opts.each_value do |value|
206
+ err "Invalid options" if value != nil
207
+ end
188
208
  client.check_login_status
189
209
  unless dnsid
190
210
  dnsid = choose_dnsid
@@ -194,6 +214,11 @@ module PI::Cli::Command
194
214
  end
195
215
 
196
216
  def register_dns(dnsid=nil)
217
+ all_opts = total_opts
218
+ all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target|continent|country)/i}
219
+ all_opts_except_valid_opts.each_value do |value|
220
+ err "Invalid options" if value != nil
221
+ end
197
222
  client.check_login_status
198
223
  target = @options[:target]
199
224
  continent = @options[:continent]
@@ -224,7 +249,6 @@ module PI::Cli::Command
224
249
  end
225
250
  if continent.to_s == "DEFAULT"
226
251
  manifest = {
227
- # :continentName => continent,
228
252
  :continentCode => continent,
229
253
  :countryCode => "DEFAULT"
230
254
  }
@@ -239,7 +263,6 @@ module PI::Cli::Command
239
263
  country = countries.invert["#{country}"]
240
264
  end
241
265
  manifest = {
242
- # :continentName => continent,
243
266
  :continentCode => continent,
244
267
  :countryCode => country
245
268
  }
@@ -249,6 +272,11 @@ module PI::Cli::Command
249
272
  end
250
273
 
251
274
  def deregister_dns(dnsid=nil)
275
+ all_opts = total_opts
276
+ all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(recordid)/i}
277
+ all_opts_except_valid_opts.each_value do |value|
278
+ err "Invalid options" if value != nil
279
+ end
252
280
  client.check_login_status
253
281
  recordid = @options[:recordid]
254
282
  unless dnsid
@@ -273,6 +301,10 @@ module PI::Cli::Command
273
301
  end
274
302
 
275
303
  def dns_records(dnsid=nil)
304
+ all_opts = total_opts
305
+ all_opts.each_value do |value|
306
+ err "Invalid options" if value != nil
307
+ end
276
308
  client.check_login_status
277
309
  unless dnsid
278
310
  dnsid = choose_dnsid
@@ -10,6 +10,10 @@ module PI::Cli::Command
10
10
  include PI::Cli::InteractHelper
11
11
 
12
12
  def projects
13
+ all_opts = total_opts
14
+ all_opts.each_value do |value|
15
+ err "Invalid options" if value != nil
16
+ end
13
17
  client.check_login_status
14
18
  user = client.user_info
15
19
  proj_sum = client.project_sum
@@ -59,6 +63,10 @@ module PI::Cli::Command
59
63
  end
60
64
 
61
65
  def create_project(project=nil)
66
+ all_opts = total_opts
67
+ all_opts.each_value do |value|
68
+ err "Invalid options" if value != nil
69
+ end
62
70
  client.check_login_status
63
71
  loop{
64
72
  unless project
@@ -142,6 +150,10 @@ module PI::Cli::Command
142
150
  end
143
151
 
144
152
  def delete_project(projectid=nil)
153
+ all_opts = total_opts
154
+ all_opts.each_value do |value|
155
+ err "Invalid options" if value != nil
156
+ end
145
157
  client.check_login_status
146
158
  unless projectid
147
159
  useproject = choose_project
@@ -163,6 +175,11 @@ module PI::Cli::Command
163
175
  end
164
176
 
165
177
  def upload(projectid=nil)
178
+ all_opts = total_opts
179
+ all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(path|ver|desc)/i}
180
+ all_opts_except_valid_opts.each_value do |value|
181
+ err "Invalid options" if value != nil
182
+ end
166
183
  client.check_login_status
167
184
  path = @options[:path]
168
185
  if path
@@ -246,6 +263,10 @@ module PI::Cli::Command
246
263
  end
247
264
 
248
265
  def delete_binary(projectid=nil)
266
+ all_opts = total_opts
267
+ all_opts.each_value do |value|
268
+ err "Invalid options" if value != nil
269
+ end
249
270
  client.check_login_status
250
271
  unless projectid
251
272
  useproject = choose_project
@@ -265,6 +286,10 @@ module PI::Cli::Command
265
286
  end
266
287
 
267
288
  def project_events(projectid=nil)
289
+ all_opts = total_opts
290
+ all_opts.each_value do |value|
291
+ err "Invalid options" if value != nil
292
+ end
268
293
  client.check_login_status
269
294
  unless projectid
270
295
  useproject = choose_project
@@ -283,6 +308,10 @@ module PI::Cli::Command
283
308
  end
284
309
 
285
310
  def project_tags(projectid=nil)
311
+ all_opts = total_opts
312
+ all_opts.each_value do |value|
313
+ err "Invalid options" if value != nil
314
+ end
286
315
  client.check_login_status
287
316
  unless projectid
288
317
  useproject = choose_project
@@ -300,6 +329,10 @@ module PI::Cli::Command
300
329
  end
301
330
 
302
331
  def project_commits(projectid=nil)
332
+ all_opts = total_opts
333
+ all_opts.each_value do |value|
334
+ err "Invalid options" if value != nil
335
+ end
303
336
  client.check_login_status
304
337
  unless projectid
305
338
  useproject = choose_project
@@ -4,6 +4,11 @@ module PI::Cli::Command
4
4
  include PI::Cli::InteractHelper
5
5
 
6
6
  def app_service(appid_or_appname=nil)
7
+ all_opts = total_opts
8
+ all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target)/i}
9
+ all_opts_except_valid_opts.each_value do |value|
10
+ err "Invalid options" if value != nil
11
+ end
7
12
  client.check_login_status
8
13
  app, appid = choose_app_help_target_not_all(appid_or_appname)
9
14
  appid = (appid == nil ? app[:id] : appid)
@@ -21,6 +26,11 @@ module PI::Cli::Command
21
26
  end
22
27
 
23
28
  def bind_service(appid_or_appname=nil)
29
+ all_opts = total_opts
30
+ all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target|service)/i}
31
+ all_opts_except_valid_opts.each_value do |value|
32
+ err "Invalid options" if value != nil
33
+ end
24
34
  client.check_login_status
25
35
  service = @options[:service]
26
36
  app, appid = choose_app_help_target_not_all(appid_or_appname)
@@ -58,6 +68,11 @@ module PI::Cli::Command
58
68
  end
59
69
 
60
70
  def unbind_service(appid_or_appname=nil)
71
+ all_opts = total_opts
72
+ all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target|service)/i}
73
+ all_opts_except_valid_opts.each_value do |value|
74
+ err "Invalid options" if value != nil
75
+ end
61
76
  client.check_login_status
62
77
  service = @options[:service]
63
78
  app, appid = choose_app_help_target_not_all(appid_or_appname)
@@ -77,6 +92,10 @@ module PI::Cli::Command
77
92
  end
78
93
 
79
94
  def services
95
+ all_opts = total_opts
96
+ all_opts.each_value do |value|
97
+ err "Invalid options" if value != nil
98
+ end
80
99
  client.check_login_status
81
100
  services = client.services
82
101
  return display "No Services" if services.nil? || services.empty?
@@ -91,7 +110,11 @@ module PI::Cli::Command
91
110
  display services_table
92
111
  end
93
112
 
94
- def service(serviceid=nil)
113
+ def service(serviceid=nil)
114
+ all_opts = total_opts
115
+ all_opts.each_value do |value|
116
+ err "Invalid options" if value != nil
117
+ end
95
118
  client.check_login_status
96
119
  if serviceid
97
120
  services = client.services
@@ -111,6 +134,10 @@ module PI::Cli::Command
111
134
  end
112
135
 
113
136
  def import_service(importurl=nil)
137
+ all_opts = total_opts
138
+ all_opts.each_value do |value|
139
+ err "Invalid options" if value != nil
140
+ end
114
141
  client.check_login_status
115
142
  importurl = ask"Input the url to import" unless importurl
116
143
  client.import_service(importurl)
@@ -118,6 +145,10 @@ module PI::Cli::Command
118
145
  end
119
146
 
120
147
  def export_service(serviceid=nil)
148
+ all_opts = total_opts
149
+ all_opts.each_value do |value|
150
+ err "Invalid options" if value != nil
151
+ end
121
152
  client.check_login_status
122
153
  unless serviceid
123
154
  serviceid = choose_serviceid
@@ -128,6 +159,10 @@ module PI::Cli::Command
128
159
  end
129
160
 
130
161
  def check_service(serviceid=nil)
162
+ all_opts = total_opts
163
+ all_opts.each_value do |value|
164
+ err "Invalid options" if value != nil
165
+ end
131
166
  client.check_login_status
132
167
  unless serviceid
133
168
  serviceid = choose_serviceid
@@ -141,6 +176,10 @@ module PI::Cli::Command
141
176
  end
142
177
 
143
178
  def delete_service(serviceid=nil)
179
+ all_opts = total_opts
180
+ all_opts.each_value do |value|
181
+ err "Invalid options" if value != nil
182
+ end
144
183
  client.check_login_status
145
184
  unless serviceid
146
185
  serviceid = choose_serviceid
@@ -150,6 +189,11 @@ module PI::Cli::Command
150
189
  end
151
190
 
152
191
  def register_service(serviceid=nil)
192
+ all_opts = total_opts
193
+ all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target|type)/i}
194
+ all_opts_except_valid_opts.each_value do |value|
195
+ err "Invalid options" if value != nil
196
+ end
153
197
  client.check_login_status
154
198
  target = @options[:target]
155
199
  servicetype = @options[:type]
@@ -192,6 +236,11 @@ module PI::Cli::Command
192
236
  end
193
237
 
194
238
  def deregister_service(serviceid=nil)
239
+ all_opts = total_opts
240
+ all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target)/i}
241
+ all_opts_except_valid_opts.each_value do |value|
242
+ err "Invalid options" if value != nil
243
+ end
195
244
  client.check_login_status
196
245
  servicetargetname = @options[:target]
197
246
  unless serviceid
@@ -3,12 +3,18 @@ require 'set'
3
3
  module PI::Cli::Command
4
4
 
5
5
  class User < Base
6
+ include PI::Cli::ChooseHelper
6
7
  YES_SET = Set.new(["y", "Y", "yes", "YES"])
7
8
  NO_SET = Set.new(["n", "N", "no", "NO"])
8
9
 
9
10
  def login(url=nil)
10
11
  user = @options[:user]
11
12
  password = @options[:password]
13
+ all_opts = total_opts
14
+ all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(user|password)/i}
15
+ all_opts_except_valid_opts.each_value do |value|
16
+ err "Invalid options" if value != nil
17
+ end
12
18
  unless url
13
19
  url = ask "Attempting login to '#{target_url}'?", :default => true
14
20
  if url == true
@@ -40,11 +46,19 @@ module PI::Cli::Command
40
46
  end
41
47
 
42
48
  def logout
49
+ all_opts = total_opts
50
+ all_opts.each_value do |value|
51
+ err "Invalid options" if value != nil
52
+ end
43
53
  PI::Cli::Config.remove_token_file
44
54
  say "Successfully logged out of [#{target_url}]".green
45
55
  end
46
56
 
47
57
  def info
58
+ all_opts = total_opts
59
+ all_opts.each_value do |value|
60
+ err "Invalid options" if value != nil
61
+ end
48
62
  info = client.info
49
63
  return display JSON.pretty_generate(info) if @options[:json]
50
64
  display "\nName: #{info[:name]}"
@@ -54,6 +68,10 @@ module PI::Cli::Command
54
68
  end
55
69
 
56
70
  def user
71
+ all_opts = total_opts
72
+ all_opts.each_value do |value|
73
+ err "Invalid options" if value != nil
74
+ end
57
75
  client.check_login_status
58
76
  user = client.user_info
59
77
  github_info = client.github_info
@@ -74,6 +92,10 @@ module PI::Cli::Command
74
92
  end
75
93
 
76
94
  def targets
95
+ all_opts = total_opts
96
+ all_opts.each_value do |value|
97
+ err "Invalid options" if value != nil
98
+ end
77
99
  client.check_login_status
78
100
  targets = client.targets
79
101
  return display JSON.pretty_generate(targets) if @options[:json]
@@ -88,7 +110,12 @@ module PI::Cli::Command
88
110
  display targets_table
89
111
  end
90
112
 
91
- def password(oldpassword=nil)
113
+ def password(oldpassword=nil)
114
+ all_opts = total_opts
115
+ all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(password)/i}
116
+ all_opts_except_valid_opts.each_value do |value|
117
+ err "Invalid options" if value != nil
118
+ end
92
119
  client.check_login_status
93
120
  newpassword = @options[:password]
94
121
  oldpassword = ask "Old Password", :echo => '*' unless oldpassword
@@ -115,9 +142,14 @@ module PI::Cli::Command
115
142
  end
116
143
 
117
144
  def github(name=nil)
145
+ all_opts = total_opts
146
+ all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(email|password)/i}
147
+ all_opts_except_valid_opts.each_value do |value|
148
+ err "Invalid options" if value != nil
149
+ end
118
150
  client.check_login_status
119
151
  email = @options[:email]
120
- password = @options[:password]
152
+ password = @options[:password]
121
153
  name = ask "Please input your name" unless name
122
154
  email = ask "Please input your email" unless email
123
155
  password = ask "Please input your password", :echo => '*' unless password
@@ -132,6 +164,10 @@ module PI::Cli::Command
132
164
  end
133
165
 
134
166
  def runtimes
167
+ all_opts = total_opts
168
+ all_opts.each_value do |value|
169
+ err "Invalid options" if value != nil
170
+ end
135
171
  client.check_login_status
136
172
  runtimes_info = client.runtimes
137
173
  return display JSON.pretty_generate(runtimes_info) if @options[:json]
@@ -145,6 +181,10 @@ module PI::Cli::Command
145
181
  end
146
182
 
147
183
  def frameworks
184
+ all_opts = total_opts
185
+ all_opts.each_value do |value|
186
+ err "Invalid options" if value != nil
187
+ end
148
188
  client.check_login_status
149
189
  runtimes = client.runtimes
150
190
  java_runtime = runtimes[0].downcase
data/lib/cli/runner.rb CHANGED
@@ -63,7 +63,7 @@ class PI::Cli::Runner
63
63
  @args.concat instances_delta_arg
64
64
  self
65
65
  end
66
-
66
+
67
67
  def check_instances_delta!
68
68
  return unless @args
69
69
  instance_args = @args.select { |arg| /^[-]\d+$/ =~ arg } || []
@@ -88,7 +88,8 @@ class PI::Cli::Runner
88
88
  else
89
89
  @exit_status = false
90
90
  if @args.size > args_range.last
91
- usage_error("Too many arguments for [#{action}]: %s" % [ @args[args_range.last..-1].map{|a| "'#{a}'"}.join(', ') ])
91
+ usage_error("Invalid arguments for [#{action}]")
92
+ # usage_error("Too many arguments for [#{action}]: %s" % [ @args[args_range.last..-1].map{|a| "'#{a}'"}.join(', ') ])
92
93
  else
93
94
  usage_error("Not enough arguments for [#{action}]")
94
95
  end
data/lib/cli/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module PI
2
2
  module Cli
3
- VERSION = '0.1.30'
3
+ VERSION = '0.1.31'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: pi
3
3
  version: !ruby/object:Gem::Version
4
- hash: 39
4
+ hash: 37
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 1
9
- - 30
10
- version: 0.1.30
9
+ - 31
10
+ version: 0.1.31
11
11
  platform: ruby
12
12
  authors:
13
13
  - Samsung
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2012-09-14 00:00:00 Z
18
+ date: 2012-09-28 00:00:00 Z
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency
21
21
  name: json_pure