pull

Merge branch 'master' of github.com:stemangiola/tidygate

Conflicts:
	DESCRIPTION

.github/workflows/R-CMD-check.yaml

@@ -0,0 +1,103 @@
+# For help debugging build failures open an issue on the RStudio community with the 'github-actions' tag.
+# https://community.rstudio.com/new-topic?category=Package%20development&tags=github-actions
+on:
+  push:
+    branches:
+      - dev
+      - master
+  pull_request:
+    branches:
+      - dev
+      - master
+
+name: R-CMD-check
+
+jobs:
+  R-CMD-check:
+    runs-on: ${{ matrix.config.os }}
+
+    name: ${{ matrix.config.os }} (${{ matrix.config.r }})
+
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+          - {os: windows-latest, r: 'release'}
+          - {os: macOS-latest, r: 'release'}
+          - {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
+        # - {os: ubuntu-20.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
+
+    env:
+      R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
+      RSPM: ${{ matrix.config.rspm }}
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: r-lib/actions/setup-r@v1
+        with:
+          r-version: ${{ matrix.config.r }}
+
+      - uses: r-lib/actions/setup-pandoc@v1
+
+      - name: Query dependencies
+        run: |
+          install.packages('remotes')
+          saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2)
+          writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version")
+        shell: Rscript {0}
+
+      - name: Cache R packages
+        if: runner.os != 'Windows'
+        uses: actions/cache@v2
+        with:
+          path: ${{ env.R_LIBS_USER }}
+          key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
+          restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-
+
+      - name: Install system dependencies
+        if: runner.os == 'Linux'
+        run: |
+          while read -r cmd
+          do
+            eval sudo $cmd
+          done < <(Rscript -e 'writeLines(remotes::system_requirements("ubuntu", "20.04"))')
+
+      - name: Install dependencies
+        run: |
+          remotes::install_deps(dependencies = TRUE)
+          remotes::install_cran("rcmdcheck")
+        shell: Rscript {0}
+
+      - name: Check
+        env:
+          _R_CHECK_CRAN_INCOMING_REMOTE_: false
+          _R_CHECK_FORCE_SUGGESTS_ : false
+        run: rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), build_args = "--no-manual", error_on = "warning", check_dir = "check")
+        shell: Rscript {0}
+
+      - name: Install pkgdown
+        if: github.ref == 'refs/heads/master' && runner.os == 'Linux'
+        run: |
+          remotes::install_deps(dependencies = TRUE)
+          install.packages("pkgdown")
+        shell: Rscript {0}
+
+      - name: Install package
+        if: github.ref == 'refs/heads/master' && runner.os == 'Linux'
+        run: R CMD INSTALL .
+
+      - name: Deploy package
+        if: github.ref == 'refs/heads/master' && runner.os == 'Linux'
+        run: |
+          git config --local user.email "[email protected]"
+          git config --local user.name "GitHub Actions"
+          Rscript -e 'pkgdown::deploy_to_branch(new_process = FALSE)'
+        shell: bash {0}
+
+      - name: Upload check results
+        if: failure()
+        uses: actions/upload-artifact@main
+        with:
+          name: ${{ runner.os }}-r${{ matrix.config.r }}-results
+          path: check

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: tidygate
 Type: Package
 Title: Add Gate Information to Your Tibble
-Version: 0.4.9
+Version: 0.5.3
 Authors@R: 
     c(person(given = "Stefano",
            family = "Mangiola",
@@ -20,7 +20,7 @@ Depends:
     R (>= 3.6.0)
 Encoding: UTF-8
 LazyData: true
-RoxygenNote: 7.1.2
+RoxygenNote: 7.3.1
 Imports: 
     utils,
     graphics,
@@ -35,7 +35,10 @@ Imports:
     viridis,
     grDevices,
     RColorBrewer,
-    stringr
+    stringr,
+    shiny,
+    plotly,
+    ggplot2
 RdMacros: lifecycle
 Suggests: 
     testthat,

NAMESPACE

@@ -7,11 +7,23 @@ S3method(gate_int,numeric)
 export(fhs)
 export(gate)
 export(gate_chr)
+export(gate_custom)
 export(gate_int)
+export(gate_simple)
+export(server)
+export(ui)
 import(dplyr)
 import(tibble)
 import(tidyr)
 importFrom(RColorBrewer,brewer.pal)
+importFrom(dplyr,mutate)
+importFrom(dplyr,rename)
+importFrom(dplyr,select)
+importFrom(ggplot2,aes)
+importFrom(ggplot2,geom_point)
+importFrom(ggplot2,ggplot)
+importFrom(ggplot2,ggplot_build)
+importFrom(ggplot2,theme_bw)
 importFrom(grDevices,colorRampPalette)
 importFrom(graphics,axis)
 importFrom(graphics,legend)
@@ -24,19 +36,34 @@ importFrom(lifecycle,deprecate_warn)
 importFrom(magrittr,"%>%")
 importFrom(magrittr,equals)
 importFrom(magrittr,set_rownames)
+importFrom(plotly,event_data)
+importFrom(plotly,ggplotly)
+importFrom(plotly,plotlyOutput)
+importFrom(plotly,renderPlotly)
 importFrom(purrr,imap)
 importFrom(purrr,map)
+importFrom(purrr,map_lgl)
+importFrom(purrr,pluck)
 importFrom(purrr,reduce)
 importFrom(purrr,when)
 importFrom(rlang,":=")
 importFrom(rlang,enquo)
+importFrom(rlang,env)
 importFrom(rlang,quo_is_null)
 importFrom(rlang,quo_is_symbol)
 importFrom(rlang,quo_is_symbolic)
 importFrom(rlang,quo_name)
 importFrom(rlang,quo_squash)
 importFrom(scales,alpha)
 importFrom(scales,rescale)
+importFrom(shiny,actionButton)
+importFrom(shiny,fluidPage)
+importFrom(shiny,observe)
+importFrom(shiny,runApp)
+importFrom(shiny,shinyApp)
+importFrom(shiny,stopApp)
 importFrom(stringr,str_pad)
+importFrom(tibble,as_tibble)
+importFrom(tibble,tibble)
 importFrom(utils,head)
 importFrom(viridis,viridis)

R/functions_OLD.R

@@ -356,7 +356,8 @@ gate_programmatic <-
            .dim1,
            .dim2, 
            gate_list,
-           name = "gate") {
+           name = "gate", 
+           ...) {
 
     # Comply with CRAN NOTES
     . = NULL