use @hayd's suggestion for flags

cli/flags.rs

@@ -61,8 +61,8 @@ pub struct DenoFlags {
  // Use tokio::runtime::current_thread
  pub current_thread: bool,
 
- pub lock_check: Option<String>,
- pub lock_write: Option<String>,
+ pub lock: Option<String>,
+ pub lock_write: bool,
 }
 
 static ENV_VARIABLES_HELP: &str = "ENVIRONMENT VARIABLES:
@@ -227,18 +227,16 @@ Examples: https://github.com/WICG/import-maps#the-import-map",
  })
  .global(true),
  ).arg(
- Arg::with_name("lock-check")
- .long("lock-check")
+ Arg::with_name("lock")
+ .long("lock")
  .value_name("FILE")
- .help("Check the specified lockfile")
+ .help("Check the specified lock file")
  .takes_value(true)
  .global(true),
  ).arg(
  Arg::with_name("lock-write")
  .long("lock-write")
- .value_name("FILE")
- .help("Write a lock file to specified filename")
- .takes_value(true)
+ .help("Write lock file. Use with --lock to specify file.")
  .global(true),
  ).arg(
  Arg::with_name("v8-options")
@@ -651,13 +649,12 @@ pub fn parse_flags(
  }
  }
  }
- if matches.is_present("lock-check") {
- let lockfile = matches.value_of("lock-check").unwrap();
- flags.lock_check = Some(lockfile.to_string());
+ if matches.is_present("lock") {
+ let lockfile = matches.value_of("lock").unwrap();
+ flags.lock = Some(lockfile.to_string());
  }
  if matches.is_present("lock-write") {
- let lockfile = matches.value_of("lock-write").unwrap();
- flags.lock_write = Some(lockfile.to_string());
+ flags.lock_write = true;
  }
 
  flags = parse_run_args(flags, matches);
@@ -1920,15 +1917,15 @@ mod tests {
  fn test_flags_from_vec_38() {
  let (flags, subcommand, argv) = flags_from_vec(svec![
  "deno",
- "--lock-write=deno_lock.json",
- "--lock-check=deno_lock2.json",
+ "--lock-write",
+ "--lock=lock.json",
  "script.ts"
  ]);
  assert_eq!(
  flags,
  DenoFlags {
- lock_write: Some("deno_lock.json".to_string()),
- lock_check: Some("deno_lock2.json".to_string()),
+ lock_write: true,
+ lock: Some("lock.json".to_string()),
  ..DenoFlags::default()
  }
  );

cli/lib.rs

@@ -365,9 +365,14 @@ fn run_script(flags: DenoFlags, argv: Vec<String>) {
  worker
  .execute_mod_async(&main_module, None, false)
  .and_then(move |()| {
- if let Some(ref lockfile) = state.lock_write {
- let g = lockfile.lock().unwrap();
- g.write()?;
+ if state.flags.lock_write {
+ if let Some(ref lockfile) = state.lockfile {
+ let g = lockfile.lock().unwrap();
+ g.write()?;
+ } else {
+ eprintln!("--lock flag must be specified when using --lock-write");
+ std::process::exit(11);
+ }
  }
  Ok(())
  })

cli/state.rs

@@ -90,8 +90,7 @@ pub struct State {
 
  pub include_deno_namespace: bool,
 
- pub lock_check: Option<Mutex<Lockfile>>,
- pub lock_write: Option<Mutex<Lockfile>>,
+ pub lockfile: Option<Mutex<Lockfile>>,
 }
 
 impl Clone for ThreadSafeState {
@@ -259,10 +258,8 @@ impl ThreadSafeState {
 
  let modules = Arc::new(Mutex::new(deno::Modules::new()));
 
- let lock_write = Lockfile::from_flag(&flags.lock_write).map(Mutex::new);
-
- // Note: reads lazily from disk on first call to lock_check.check()
- let lock_check = Lockfile::from_flag(&flags.lock_check).map(Mutex::new);
+ // Note: reads lazily from disk on first call to lockfile.check()
+ let lockfile = Lockfile::from_flag(&flags.lock).map(Mutex::new);
 
  let state = State {
  main_module,
@@ -285,8 +282,7 @@ impl ThreadSafeState {
  js_compiler: JsCompiler {},
  json_compiler: JsonCompiler {},
  include_deno_namespace,
- lock_check,
- lock_write,
+ lockfile,
  };
 
  Ok(ThreadSafeState(Arc::new(state)))
@@ -323,20 +319,20 @@ impl ThreadSafeState {
  }
  })
  .and_then(move |compiled_module| {
- if let Some(ref lockfile) = state2.lock_check {
+ if let Some(ref lockfile) = state2.lockfile {
  let mut g = lockfile.lock().unwrap();
- if !g.check(&compiled_module)? {
- eprintln!(
- "lock file check failed {} {}",
- g.filename, compiled_module.name
- );
- std::process::exit(10);
+ if state2.flags.lock_write {
+ g.insert(&compiled_module);
+ } else {
+ if !g.check(&compiled_module)? {
+ eprintln!(
+ "lock file check failed {} {}",
+ g.filename, compiled_module.name
+ );
+ std::process::exit(10);
+ }
  }
  }
- if let Some(ref lockfile) = state2.lock_write {
- let mut g = lockfile.lock().unwrap();
- g.insert(&compiled_module);
- }
  Ok(compiled_module)
  })
  }

cli/tests/integration_tests.rs

@@ -349,13 +349,13 @@ itest!(_050_more_jsons {
 });
 
 itest!(lock_check_ok {
- args: "run --lock-check=lock_check_ok.json https://127.0.0.1:4545/cli/tests/003_relative_import.ts",
+ args: "run --lock=lock_check_ok.json https://127.0.0.1:4545/cli/tests/003_relative_import.ts",
  output: "003_relative_import.ts.out",
  http_server: true,
 });
 
 itest!(lock_check_err {
- args: "run --lock-check=lock_check_err.json https://127.0.0.1:4545/cli/tests/003_relative_import.ts",
+ args: "run --lock=lock_check_err.json https://127.0.0.1:4545/cli/tests/003_relative_import.ts",
  output: "lock_check_err.out",
  check_stderr: true,
  exit_code: 10,