Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Merged branch back, making the channel v-types official. |
|---|---|
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
c7a27f1422905e8bfe12111226977f9a |
| User & Date: | aku 2014-04-22 06:56:12 |
Context
|
2014-04-23
| ||
| 05:39 | Move the p-name helper command of validate::common into the parameter class, as a convenience method. check-in: 288c34780b user: aku tags: trunk | |
|
2014-04-22
| ||
| 06:56 | Merged branch back, making the channel v-types official. check-in: c7a27f1422 user: aku tags: trunk | |
| 06:55 | Merged trunk extensions. Closed-Leaf check-in: 6163942da7 user: aku tags: more-vtypes | |
|
2014-04-16
| ||
| 19:46 | cmdr::validate::common - Added commands to generate more specific error messages, while still general - From stackato client. Bumped version to 1.2. check-in: 8e18e110df user: andreask tags: trunk | |
Changes
Changes to validate.tcl.
7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 ... 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 ... 288 289 290 291 292 293 294 295 296 297 298 299 300 301 ... 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 ... 349 350 351 352 353 354 355 356 357 358 359 360 361 362 ... 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 |
# Meta author {Andreas Kupries}
# Meta location https://core.tcl.tk/akupries/cmdr
# Meta platform tcl
# Meta summary Standard validation types for parameters.
# Meta description Standard validation types for parameters.
# Meta subject {command line}
# Meta require {Tcl 8.5-}
# Meta require debug
# Meta require debug::caller
# @@ Meta End
# # ## ### ##### ######## ############# #####################
## Requisites
package require Tcl 8.5
package require cmdr::validate::common
package require debug
package require debug::caller
# # ## ### ##### ######## ############# #####################
## Definition
namespace eval ::cmdr {
namespace export validate
namespace ensemble create
}
namespace eval ::cmdr::validate {
namespace export boolean integer double percent identity \
pass str rfile rwfile rdirectory rwdirectory rpath rwpath
#namespace ensemble create
# For external v-types relying on them here.
namespace import ::cmdr::validate::common::fail
namespace import ::cmdr::validate::common::complete-enum
}
................................................................................
proc ::cmdr::validate::rfile::Ok {path} {
if {![file exists $path]} {return 0}
if {![file isfile $path]} {return 0}
if {![file readable $path]} {return 0}
return 1
}
# # ## ### ##### ######## ############# #####################
## File, existing and read/writable
namespace eval ::cmdr::validate::rwfile {
namespace export default validate complete release
namespace ensemble create
namespace import ::cmdr::validate::common::fail
namespace import ::cmdr::validate::common::complete-glob
}
proc ::cmdr::validate::rwfile::release {p x} { return }
proc ::cmdr::validate::rwfile::default {p} { return {} }
proc ::cmdr::validate::rwfile::complete {p x} {
debug.cmdr/validate {} 10
complete-glob ::cmdr::validate::rwfile::Ok $x
}
proc ::cmdr::validate::rwfile::validate {p x} {
debug.cmdr/validate {}
if {[Ok $x]} { return $x }
fail $p RWFILE "an existing read/writable file" $x
}
proc ::cmdr::validate::rwfile::Ok {path} {
if {![file exists $path]} {return 0}
if {![file isfile $path]} {return 0}
if {![file readable $path]} {return 0}
if {![file writable $path]} {return 0}
return 1
}
# # ## ### ##### ######## ############# #####################
................................................................................
## Directory, existing and read/writable.
namespace eval ::cmdr::validate::rwdirectory {
namespace export default validate complete release
namespace ensemble create
namespace import ::cmdr::validate::common::fail
namespace import ::cmdr::validate::common::complete-glob
}
proc ::cmdr::validate::rwdirectory::release {p x} { return }
proc ::cmdr::validate::rwdirectory::default {p} { return {} }
proc ::cmdr::validate::rwdirectory::complete {p x} {
debug.cmdr/validate {} 10
complete-glob ::cmdr::validate::rwdirectory::Ok $x
................................................................................
proc ::cmdr::validate::rwdirectory::validate {p x} {
debug.cmdr/validate {}
if {[Ok $x]} { return $x }
fail $p RWDIRECTORY "an existing read/writeable directory" $x
}
proc ::cmdr::validate::rwdirectory::Ok {path} {
if {![file exists $path]} {return 0}
if {![file isdirectory $path]} {return 0}
if {![file readable $path]} {return 0}
if {![file writable $path]} {return 0}
return 1
}
# # ## ### ##### ######## ############# #####################
................................................................................
## Any path, existing and read/writable.
namespace eval ::cmdr::validate::rwpath {
namespace export default validate complete release
namespace ensemble create
namespace import ::cmdr::validate::common::fail
namespace import ::cmdr::validate::common::complete-glob
}
proc ::cmdr::validate::rwpath::release {p x} { return }
proc ::cmdr::validate::rwpath::default {p} { return {} }
proc ::cmdr::validate::rwpath::complete {p x} {
debug.cmdr/validate {} 10
complete-glob ::cmdr::validate::rwpath::Ok $x
................................................................................
proc ::cmdr::validate::rwpath::validate {p x} {
debug.cmdr/validate {}
if {[Ok $x]} { return $x }
fail $p RWPATH "an existing read/writeable path" $x
}
proc ::cmdr::validate::rwpath::Ok {path} {
if {![file exists $path]} {return 0}
if {![file readable $path]} {return 0}
if {![file writable $path]} {return 0}
return 1
}
# # ## ### ##### ######## ############# #####################
## Ready
package provide cmdr::validate 1.2.1
return
|
> | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | > > > > > > | > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | |
7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 ... 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 ... 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 ... 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 ... 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 ... 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 |
# Meta author {Andreas Kupries}
# Meta location https://core.tcl.tk/akupries/cmdr
# Meta platform tcl
# Meta summary Standard validation types for parameters.
# Meta description Standard validation types for parameters.
# Meta subject {command line}
# Meta require {Tcl 8.5-}
# Meta require {cmdr::validate::common 1.2}
# Meta require debug
# Meta require debug::caller
# @@ Meta End
# # ## ### ##### ######## ############# #####################
## Requisites
package require Tcl 8.5
package require cmdr::validate::common 1.2
package require debug
package require debug::caller
# # ## ### ##### ######## ############# #####################
## Definition
namespace eval ::cmdr {
namespace export validate
namespace ensemble create
}
namespace eval ::cmdr::validate {
namespace export boolean integer double percent identity \
pass str rfile wfile rwfile rdirectory rwdirectory \
rpath rwpath rchan wchan rwchan
#namespace ensemble create
# For external v-types relying on them here.
namespace import ::cmdr::validate::common::fail
namespace import ::cmdr::validate::common::complete-enum
}
................................................................................
proc ::cmdr::validate::rfile::Ok {path} {
if {![file exists $path]} {return 0}
if {![file isfile $path]} {return 0}
if {![file readable $path]} {return 0}
return 1
}
# # ## ### ##### ######## ############# #####################
## File, existing and writable
namespace eval ::cmdr::validate::wfile {
namespace export default validate complete release
namespace ensemble create
namespace import ::cmdr::validate::common::fail
namespace import ::cmdr::validate::common::complete-glob
namespace import ::cmdr::validate::common::ok-directory
}
proc ::cmdr::validate::wfile::release {p x} { return }
proc ::cmdr::validate::wfile::default {p} { return {} }
proc ::cmdr::validate::wfile::complete {p x} {
debug.cmdr/validate {} 10
complete-glob ::cmdr::validate::wfile::Ok $x
}
proc ::cmdr::validate::wfile::validate {p x} {
debug.cmdr/validate {}
if {[Ok $x]} { return $x }
fail $p WFILE "a writable file" $x
}
proc ::cmdr::validate::wfile::Ok {path} {
if {![file exists $path]} {
# The file is allowed to not exist if its directory exists and
# is writable. This can apply recursively up the chain of
# directories.
return [ok-directory [file dirname $path]]
}
if {![file isfile $path]} {return 0}
if {![file writable $path]} {return 0}
return 1
}
# # ## ### ##### ######## ############# #####################
## File, existing and read/writable
namespace eval ::cmdr::validate::rwfile {
namespace export default validate complete release
namespace ensemble create
namespace import ::cmdr::validate::common::fail
namespace import ::cmdr::validate::common::complete-glob
namespace import ::cmdr::validate::common::ok-directory
}
proc ::cmdr::validate::rwfile::release {p x} { return }
proc ::cmdr::validate::rwfile::default {p} { return {} }
proc ::cmdr::validate::rwfile::complete {p x} {
debug.cmdr/validate {} 10
complete-glob ::cmdr::validate::rwfile::Ok $x
}
proc ::cmdr::validate::rwfile::validate {p x} {
debug.cmdr/validate {}
if {[Ok $x]} { return $x }
fail $p RWFILE "a read/writable file" $x
}
proc ::cmdr::validate::rwfile::Ok {path} {
if {![file exists $path]} {
# The file is allowed to not exist if its directory exists and
# is writable. This can apply recursively up the chain of
# directories.
return [ok-directory [file dirname $path]]
}
if {![file isfile $path]} {return 0}
if {![file readable $path]} {return 0}
if {![file writable $path]} {return 0}
return 1
}
# # ## ### ##### ######## ############# #####################
................................................................................
## Directory, existing and read/writable.
namespace eval ::cmdr::validate::rwdirectory {
namespace export default validate complete release
namespace ensemble create
namespace import ::cmdr::validate::common::fail
namespace import ::cmdr::validate::common::complete-glob
namespace import ::cmdr::validate::common::ok-directory
}
proc ::cmdr::validate::rwdirectory::release {p x} { return }
proc ::cmdr::validate::rwdirectory::default {p} { return {} }
proc ::cmdr::validate::rwdirectory::complete {p x} {
debug.cmdr/validate {} 10
complete-glob ::cmdr::validate::rwdirectory::Ok $x
................................................................................
proc ::cmdr::validate::rwdirectory::validate {p x} {
debug.cmdr/validate {}
if {[Ok $x]} { return $x }
fail $p RWDIRECTORY "an existing read/writeable directory" $x
}
proc ::cmdr::validate::rwdirectory::Ok {path} {
if {![file exists $path]} {
# The directory is allowed to not exist if its parent
# directory exists and is writable. This can apply recursively
# up the chain of directories.
return [ok-directory [file dirname $path]]
}
if {![file isdirectory $path]} {return 0}
if {![file readable $path]} {return 0}
if {![file writable $path]} {return 0}
return 1
}
# # ## ### ##### ######## ############# #####################
................................................................................
## Any path, existing and read/writable.
namespace eval ::cmdr::validate::rwpath {
namespace export default validate complete release
namespace ensemble create
namespace import ::cmdr::validate::common::fail
namespace import ::cmdr::validate::common::complete-glob
namespace import ::cmdr::validate::common::ok-directory
}
proc ::cmdr::validate::rwpath::release {p x} { return }
proc ::cmdr::validate::rwpath::default {p} { return {} }
proc ::cmdr::validate::rwpath::complete {p x} {
debug.cmdr/validate {} 10
complete-glob ::cmdr::validate::rwpath::Ok $x
................................................................................
proc ::cmdr::validate::rwpath::validate {p x} {
debug.cmdr/validate {}
if {[Ok $x]} { return $x }
fail $p RWPATH "an existing read/writeable path" $x
}
proc ::cmdr::validate::rwpath::Ok {path} {
if {![file exists $path]} {
# The path is allowed to not exist if its directory exists and
# is writable. This can apply recursively up the chain of
# directories.
return [ok-directory [file dirname $path]]
}
if {![file readable $path]} {return 0}
if {![file writable $path]} {return 0}
return 1
}
# # ## ### ##### ######## ############# #####################
## Channel, for existing and readable file. Defaults to stdin.
namespace eval ::cmdr::validate::rchan {
namespace export default validate complete release
namespace ensemble create
namespace import ::cmdr::validate::common::fail
namespace import ::cmdr::validate::common::complete-glob
}
proc ::cmdr::validate::rchan::release {p x} {
if {$x eq "stdin"} return
close $x
return
}
proc ::cmdr::validate::rchan::default {p} { return stdin }
proc ::cmdr::validate::rchan::complete {p x} {
debug.cmdr/validate {} 10
complete-glob ::cmdr::validate::rchan::Ok $x
}
proc ::cmdr::validate::rchan::validate {p x} {
debug.cmdr/validate {}
if {[Ok $x]} { return [open $x r] }
fail $p RCHAN "an existing readable file" $x
}
proc ::cmdr::validate::rchan::Ok {path} {
if {![file exists $path]} {return 0}
if {![file isfile $path]} {return 0}
if {![file readable $path]} {return 0}
return 1
}
# # ## ### ##### ######## ############# #####################
## Channel, for existing and writable file. Defaults to stdout.
namespace eval ::cmdr::validate::wchan {
namespace export default validate complete release
namespace ensemble create
namespace import ::cmdr::validate::common::fail
namespace import ::cmdr::validate::common::complete-glob
namespace import ::cmdr::validate::common::ok-directory
}
proc ::cmdr::validate::wchan::release {p x} {
if {$x eq "stdout"} return
close $x
return
}
proc ::cmdr::validate::wchan::default {p} { return stdout }
proc ::cmdr::validate::wchan::complete {p x} {
debug.cmdr/validate {} 10
complete-glob ::cmdr::validate::wchan::Ok $x
}
proc ::cmdr::validate::wchan::validate {p x} {
debug.cmdr/validate {}
if {[Ok $x]} { return [open $x w] }
fail $p WCHAN "a writable file" $x
}
proc ::cmdr::validate::wchan::Ok {path} {
if {![file exists $path]} {
# The file is allowed to not exist if its directory exists and
# is writable. This can apply recursively up the chain of
# directories.
return [ok-directory [file dirname $path]]
}
if {![file isfile $path]} {return 0}
if {![file writable $path]} {return 0}
return 1
}
# # ## ### ##### ######## ############# #####################
## Channel, for existing and read/writable file. No default.
namespace eval ::cmdr::validate::rwchan {
namespace export default validate complete release
namespace ensemble create
namespace import ::cmdr::validate::common::fail
namespace import ::cmdr::validate::common::complete-glob
namespace import ::cmdr::validate::common::ok-directory
}
proc ::cmdr::validate::rwchan::release {p x} { close $x }
proc ::cmdr::validate::rwchan::default {p} { return {} }
proc ::cmdr::validate::rwchan::complete {p x} {
debug.cmdr/validate {} 10
complete-glob ::cmdr::validate::rwchan::Ok $x
}
proc ::cmdr::validate::rwchan::validate {p x} {
debug.cmdr/validate {}
if {[Ok $x]} { return [open $x w+] }
fail $p RWCHAN "a read/writable file" $x
}
proc ::cmdr::validate::rwchan::Ok {path} {
if {![file exists $path]} {
# The file is allowed to not exist if its directory exists and
# is writable. This can apply recursively up the chain of
# directories.
return [ok-directory [file dirname $path]]
}
if {![file isfile $path]} {return 0}
if {![file readable $path]} {return 0}
if {![file writable $path]} {return 0}
return 1
}
# # ## ### ##### ######## ############# #####################
## Ready
package provide cmdr::validate 1.3
return
|
Changes to vcommon.tcl.
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
...
146
147
148
149
150
151
152
153
154
155
156
157
|
namespace eval ::cmdr::validate {
namespace export common
namespace ensemble create
}
namespace eval ::cmdr::validate::common {
namespace export \
complete-enum complete-glob \
fail fail-unknown-thing fail-known-thing \
p-name lead-in
namespace ensemble create
}
# # ## ### ##### ######## ############# #####################
................................................................................
if {![{*}$filter $path]} continue
lappend candidates $path
}
debug.cmdr/validate/common {= [join $candidates "\n= "]} 10
return $candidates
}
# # ## ### ##### ######## ############# #####################
## Ready
package provide cmdr::validate::common 1.2
return
|
|
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
|
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
...
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
|
namespace eval ::cmdr::validate {
namespace export common
namespace ensemble create
}
namespace eval ::cmdr::validate::common {
namespace export \
complete-enum complete-glob ok-directory \
fail fail-unknown-thing fail-known-thing \
p-name lead-in
namespace ensemble create
}
# # ## ### ##### ######## ############# #####################
................................................................................
if {![{*}$filter $path]} continue
lappend candidates $path
}
debug.cmdr/validate/common {= [join $candidates "\n= "]} 10
return $candidates
}
proc ::cmdr::validate::common::ok-directory {path} {
if {![file exists $path]} {
# The directory is allowed to not exist if its parent
# directory exists and is writable.
# Note: Prevent us from walking up the chain if the directory
# has no parent.
# Note 2: Switch to absolute notation if path is the relative
# name of the CWD (i.e. ".").
if {$path eq "."} {
set path [pwd]
}
set up [file dirname $path]
if {$up eq $path} {
# Reached root (/, x:, x:/), found it missing, stop & fail.
return 0
}
return [ok-directory $up]
}
if {![file isdirectory $path]} {return 0}
if {![file writable $path]} {return 0}
return 1
}
# # ## ### ##### ######## ############# #####################
## Ready
package provide cmdr::validate::common 1.2
return
|