Skip to content

Commit

Permalink
Merge pull request #51 from vnijs/master
Browse files Browse the repository at this point in the history
CRAN prep for 0.3.0
  • Loading branch information
vnijs authored Apr 3, 2018
2 parents e949e75 + 11f5781 commit 3f8a12f
Show file tree
Hide file tree
Showing 8 changed files with 62 additions and 15 deletions.
4 changes: 3 additions & 1 deletion .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
^.*\.Rproj$
^\.Rproj\.user$
.travis.yml
.travis.yml
^revdep$
cran-comments.md
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.Rproj.user
.Rhistory
.RData
revdep/
4 changes: 2 additions & 2 deletions NEWS → NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ shinyAce 0.3.0

* Clear editor using "" (@dmenne, #30)

* Fix when ace is initialize with \r or \f (@The-Dub, #46)
* Fix when ace is initialized with \r or \f (@The-Dub, #46)

shinyAce 0.2.0
--------------------------------------------------------------------------------
Expand All @@ -36,4 +36,4 @@ shinyAce 0.1.1
shinyAce 0.1.0
--------------------------------------------------------------------------------

* Initial release
* Initial release
7 changes: 4 additions & 3 deletions R/ace-editor.R
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,10 @@
#' should be a character array whose words will be listed under the element key.
#' For example, to suggests column names from \code{mtcars} and \code{airquality},
#' you can use \code{list(mtcars = colnames(mtcars), airquality = colnames(airquality))}.
#' @param tabSize Set tab size (e.g., 4)
#' @param useSoftTabs Replace tabs by spaces
#' @param showInvisibles Show invisible characters (e.g., spaces, tabs, newline characters)
#' @param tabSize Set tab size. Default value is 4
#' @param useSoftTabs Replace tabs by spaces. Default value is TRUE
#' @param showInvisibles Show invisible characters (e.g., spaces, tabs, newline characters).
#' Default value is FALSE
#'
#' @import shiny
#' @importFrom utils compareVersion
Expand Down
7 changes: 4 additions & 3 deletions R/update-ace-editor.R
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@
#' Should be an integer.
#' @param wordWrap If set to \code{TRUE}, Ace will enable word wrapping.
#' Default value is \code{FALSE}.
#' @param tabSize Set tab size (e.g., 4)
#' @param useSoftTabs Replace tabs by spaces
#' @param showInvisibles Show invisible characters (e.g., spaces, tabs, newline characters)
#' @param tabSize Set tab size. Default value is 4
#' @param useSoftTabs Replace tabs by spaces. Default value is TRUE
#' @param showInvisibles Show invisible characters (e.g., spaces, tabs, newline characters).
#' Default value is FALSE
#' @param border Set the \code{border} 'normal', 'alert', or 'flash'.
#' @param autoComplete Enable/Disable code completion. See \code{\link{aceEditor}}
#' for details.
Expand Down
40 changes: 40 additions & 0 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
## Resubmission

This is a resubmission. The new maintainer of the shinyAce package is Vincent Nijs (radiant@rady.ucsd.edu). In this version several bugs have been fixed and some new features have been added (see NEWS.md for details).

## Test environments

* local macOS install, R 3.4.4
* local Windows install, R 3.4.4
* ubuntu on travis-ci, R 3.4.4
* win-builder, R version 3.5.0 alpha (2018-03-30 r74499)

## R CMD check results

There were no ERRORs or WARNINGs. There were 2 NOTEs however. The first is about the maintainer change. The second is about the size of the www sub-directory and the resulting installed package size (7.6MB). This is due to the size of the JavaScript [Ace](https://github.com/ajaxorg) library shinyAce provides an interface for.

* checking CRAN incoming feasibility ... NOTE
Maintainer: 'Vincent Nijs <radiant@rady.ucsd.edu>'

New maintainer:
Vincent Nijs <radiant@rady.ucsd.edu>
Old maintainer(s):
Jeff Allen <cran@trestletechnology.net>

* checking installed package size ... NOTE
installed size is 7.6Mb
sub-directories of 1Mb or more:
www 7.5Mb

## Reverse dependencies

A reverse decency check using `devtools::revdep_check()` produced no errors or notes. It did, however, produce the warning below for the shinyjs package. The warning does not seem to be related to shinyAce however, as confirmed in an email exchange with the author of the shinyjs package.

checking re-building of vignette outputs ... WARNING
Error in re-building vignettes:
...
pandoc: Could not fetch https://www.r-pkg.org/badges/version/shinyjs
TlsExceptionHostPort (HandshakeFailed Error_EOF) "www.r-pkg.org" 443
Error: processing vignette 'shinyjs.Rmd' failed with diagnostics:
pandoc document conversion failed with error 67
Execution halted
7 changes: 4 additions & 3 deletions man/aceEditor.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions man/updateAceEditor.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 3f8a12f

Please sign in to comment.