Update options generator scripts

bin/spec/options/generate_source.py

@@ -32,7 +32,7 @@
 def generate_source(options: List[Option]):
  s = COPYRIGHT
  s += "\n" + "// Generated - Do not modify"
- s += "\nuse clap::{value_parser, ArgAction};"
+ # s += "\nuse clap::{value_parser, ArgAction};"
  s += """\n\npub fn input_files() -> clap::Arg {
  clap::Arg::new("input_files")
  .value_name("FILES")
@@ -63,13 +63,14 @@ def generate_source_option(option: Option):
  s += f"\n .allow_hyphen_values(true)"
  s += f'\n .help("{option.help}")'
  if option.conflict is not None:
- s += f'\n .conflicts_with("{option.conflict}")'
+ for conflict in option.conflict:
+ s += f'\n .conflicts_with("{conflict}")'
  if option.value is not None:
  s += f"\n .num_args(1)"
  else:
- s += f"\n .action(ArgAction::SetTrue)"
+ s += f"\n .action(clap::ArgAction::SetTrue)"
  if option.append:
- s += f"\n .action(ArgAction::Append)"
+ s += f"\n .action(clap::ArgAction::Append)"
  if option.deprecated:
  s += f"\n .hide(true)"
  s += "\n}"

bin/spec/options/option.py

@@ -60,7 +60,7 @@ def __str__(self):
  if self.help is not None:
  s += "\nhelp: " + self.help
  if self.conflict is not None:
- s += "\nconflict: " + self.conflict
+ s += "\nconflict: " + ", ".join(self.conflict)
  if self.append:
  s += "\nmulti: append"
  if self.deprecated:
@@ -122,7 +122,7 @@ def parse(s):
  elif key == "help":
  help = v
  elif key == "conflict":
- conflict = v
+ conflict = [a.strip() for a in v.split(",")]
  elif key == "multi":
  if v == "append":
  append = True

docs/spec/options/hurl/connect_timeout.option

@@ -2,7 +2,7 @@ name: connect_timeout
 long: connect-timeout
 value: SECONDS
 value_default: 300
-value_parser: value_parser!(u64)
+value_parser: clap::value_parser!(u64)
 help: Maximum time allowed for connection
 ---
 Maximum time in seconds that you allow Hurl's connection to take.

docs/spec/options/hurl/delay.option

@@ -2,7 +2,7 @@ name: delay
 long: delay
 value: MILLISECONDS
 value_default: 0
-value_parser: value_parser!(u64)
+value_parser: clap::value_parser!(u64)
 help: Sets delay before each request.
 ---
 Sets delay before each request.

docs/spec/options/hurl/max_redirects.option

@@ -2,7 +2,7 @@ name: max_redirects
 long: max-redirs
 value: NUM
 value_default: 50
-value_parser: value_parser!(i32).range(-1..)
+value_parser: clap::value_parser!(i32).range(-1..)
 help: Maximum number of redirects allowed, -1 for unlimited redirects
 ---
 Set maximum number of redirection-followings allowed

docs/spec/options/hurl/max_time.option

@@ -3,7 +3,7 @@ long: max-time
 short: m
 value: SECONDS
 value_default: 300
-value_parser: value_parser!(u64)
+value_parser: clap::value_parser!(u64)
 help: Maximum time allowed for the transfer
 ---
 Maximum time in seconds that you allow a request/response to take. This is the standard timeout.

docs/spec/options/hurl/retry.option

@@ -2,7 +2,7 @@ name: retry
 long: retry
 value: NUM
 value_default: 0
-value_parser: value_parser!(i32).range(-1..)
+value_parser: clap::value_parser!(i32).range(-1..)
 help: Maximum number of retries, 0 for no retries, -1 for unlimited retries
 ---
 Maximum number of retries, 0 for no retries, -1 for unlimited retries. Retry happens if any error occurs (asserts, captures, runtimes etc...).

docs/spec/options/hurl/retry_interval.option

@@ -2,7 +2,7 @@ name: retry_interval
 long: retry-interval
 value: MILLISECONDS
 value_default: 1000
-value_parser: value_parser!(u64)
+value_parser: clap::value_parser!(u64)
 help: Interval in milliseconds before a retry
 ---
 Duration in milliseconds between each retry. Default is 1000 ms.

docs/spec/options/hurl/to_entry.option

@@ -1,7 +1,7 @@
 name: to_entry
 long: to-entry
 value: ENTRY_NUMBER
-value_parser: value_parser!(u32).range(1..)
+value_parser: clap::value_parser!(u32).range(1..)
 help: Execute Hurl file to ENTRY_NUMBER (starting at 1)
 conflict: interactive
 ---

docs/spec/options/hurlfmt/check.option

@@ -1,6 +1,7 @@
 name: check
 long: check
 help: Run in 'check' mode
+conflict: format, output
 ---
 Run in 'check' mode. Exits with 0 if input is formatted correctly, 1 otherwise.
 

docs/spec/options/hurlfmt/in_place.option

@@ -1,6 +1,7 @@
 name: in_place
 long: in-place
 help: Modify files in place
+conflict: output, color
 ---
 Modify file in place.
 

docs/spec/options/hurlfmt/output_format.option

@@ -3,5 +3,6 @@ long: out
 value: FORMAT
 value_default: hurl
 help: Specify output format: hurl, json or html
+conflict: check
 ---
 Specify output format: hurl, json or html.