Merge pull request #5 from r-lib/feature/short-opts

Implement short opts

Author: t-kalinowski

NEWS.md

@@ -1,5 +1,7 @@
 # Rapp (development version)
 
+* Added support for short opts (#4, #5).
+
 # Rapp 0.2.0
 
 * Updated default `--help` output.

R/app.R

@@ -139,7 +139,10 @@ get_app_inputs <- function(app) {
       while (is_hashpipe[anno_start - 1L])
         subtract(anno_start) <- 1L
 
-      anno <- parse_hashpipe_yaml(lines[anno_start:anno_end])
+      anno <- parse_hashpipe_yaml(lines[anno_start:anno_end],
+                                  handlers = list("bool#yes"= identity,
+                                                  "bool#no" = identity))
+
       arg <- utils::modifyList(arg, anno)
     }
 

R/args.R

@@ -10,6 +10,12 @@ process_args <- function(args, app) {
     on.exit(close(args))
   }
 
+  short_opt_to_long_opt <- local({
+    table <- unlist(lapply(app$opts, function(opt) opt$short))
+    table <- setNames(as.list(sprintf("--%s", names(table))),
+                      sprintf("-%s", table))
+    function(short_opt) table[[short_opt]]
+  })
   positional_args <- character()
   while(length(a <- readLines(args, 1L))) {
 
@@ -42,9 +48,12 @@ process_args <- function(args, app) {
       next
     }
 
-    if(arg_type == "short-opt") {
-      # convert to a long opt, possibly pushBack()ing val to args
-      .NotYetImplemented()
+    if (arg_type == "short-opt") {
+      long_name <- short_opt_to_long_opt(a)
+      if (!is.null(long_name)) {
+        pushBack(long_name, args)
+        next
+      }
     }
 
     # resolve these values in this block

inst/examples/flip-coin.R

@@ -5,18 +5,24 @@
 
 
 #| description: Number of coin flips
-n <- 1L
+#| short: n
+flips <- 1L
 
 sep <- " "
 wrap <- TRUE
 
-cat(sample(c("heads", "tails"), n, TRUE),
+seed <- NA_integer_
+if (!is.na(seed))
+  set.seed(seed)
+
+cat(sample(c("heads", "tails"), flips, TRUE),
     sep = sep, fill = wrap)
 
 
-# Rapp flip-coin.R
-# Rapp flip-coin.R --n 3
-# Rapp flip-coin.R --n=30
-# Rapp flip-coin.R --n=30 --wrap
-# Rapp flip-coin.R --n 30 --no-wrap --sep __
-# Rapp flip-coin.R --n 30 --no-wrap
+# flip-coin.R
+# flip-coin.R --flips 3
+# flip-coin.R -n 3
+# flip-coin.R --flips=30
+# flip-coin.R --flips=30 --wrap
+# flip-coin.R -n 30 --no-wrap --sep __
+# flip-coin.R -n 30 --no-wrap

tests/testthat/test-basics.R

@@ -42,4 +42,19 @@ test_that("examples work", {
     c("c", "b", "a")
   )
 
+  expect_all_equal <- function(...) {
+    if(...length()<2) stop("not enough args")
+    for(i in 2:...length()) {
+      expect_equal(..1, ...elt(i))
+    }
+  }
+
+  expect_all_equal(
+    "tails tails tails",
+    run_app("flip-coin.R --flips 3 --seed 1234"),
+    run_app("flip-coin.R --flips=3 --seed 1234"),
+    run_app("flip-coin.R -n 3 --seed 1234"),
+    run_app("flip-coin.R -n 3 --seed=1234")
+  )
+
 })