added linting

jameslamb · Sep 30, 2019 · 2973992 · 2973992 · lintr-bot · Sep 30, 2019
1 parent fae6045
commit 2973992
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 16 deletions.
diff --git a/.ci/lint_r_code.R b/.ci/lint_r_code.R
@@ -2,35 +2,33 @@
 library(argparse)
 library(lintr)
 
-parser <- argparse::ArgumentParser()
-parser$add_argument(
-    "--package-dir"
-    , type = "character"
-    , help = "Fully-qualified directory to an R package"
+args <- commandArgs(
+    trailingOnly = TRUE
 )
-args <- parser$parse_args()
-
-PACKAGE_DIR_TO_LINT <- args[["package_dir"]]
+SOURCE_DIR <- args[[1]]
 
 LINTERS_TO_USE <-list(
-    "open_curly" = lintr::open_curly_linter
-    , "closed_curly" = lintr::closed_curly_linter
-    , "tabz" = lintr::no_tab_linter
-    , "spaces" = lintr::infix_spaces_linter
+    "closed_curly" = lintr::closed_curly_linter
+    , "infix_spaces" = lintr::infix_spaces_linter
+    , "long_lines" = lintr::line_length_linter(length = 120)
+    , "tabs" = lintr::no_tab_linter
+    , "open_curly" = lintr::open_curly_linter
+    , "spaces_inside" = lintr::spaces_inside_linter
+    , "spaces_left_parens" = lintr::spaces_left_parentheses_linter
     , "trailing_blank" = lintr::trailing_blank_lines_linter
     , "trailing_white" = lintr::trailing_whitespace_linter
 )
 
 result <- lintr::lint_package(
-    path = PACKAGE_DIR_TO_LINT
+    path = SOURCE_DIR
     , relative_path = FALSE
     , linters = LINTERS_TO_USE
 )
 
 cat(sprintf(
     "Found %i linting errors in %s\n"
     , length(result)
-    , PACKAGE_DIR_TO_LINT
+    , SOURCE_DIR
 ))
 
 if (length(result) > 0){

diff --git a/.ci/test.sh b/.ci/test.sh
@@ -16,8 +16,7 @@ echo "========================================="
 echo "= Checking code for R style problems... ="
 echo "========================================="
 
-    Rscript ${CI_TOOLS}/lint_r_code.R \
-        --package-dir $(pwd)/
+    Rscript ${CI_TOOLS}/lint_r_code.R $(pwd)
 
 echo "done checking code for style problems."