Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Version 0.5

Updated NEWS and DESCRIPTION.
(Also fixed a problem with COLLATE)
  • Loading branch information...
commit eb81baffa0b6f8a674c6bdacbcfd64046e380536 1 parent 8e1a41c
@talgalili authored
View
2  .Rbuildignore
@@ -1,2 +1,2 @@
^.*\.Rproj$
-^\.Rproj\.user$
+^\.Rproj\.user$
View
10 DESCRIPTION
@@ -1,8 +1,8 @@
Package: installr
Type: Package
Title: Functions for updating and installing R and other softwares - from R
-Version: 0.2
-Date: 2013-02-28
+Version: 0.5
+Date: 2013-04-04
Author: Tal Galili
Maintainer: Tal Galili <tal.galili@gmail.com>
Description: The installr package contains a set of functions allowing useRs to
@@ -18,8 +18,4 @@ Depends:
R (>= 2.11.0)
Suggests:
XML
-License: GPL-2
-Collate:
- 'create.global.library.r'
- 'install.r'
- 'update.R.r'
+License: GPL-2
View
3  NAMESPACE
@@ -8,5 +8,6 @@ export(install.R)
export(install.RStudio)
export(install.Rtools)
export(install.URL)
-export(source_https)
+export(is.windows)
+export(source.https)
export(update.R)
View
37 NEWS
@@ -1,28 +1,45 @@
-installr 0.3
-------------
+NEW FUNCTIONS ADDED:
+ * source.https
+ * install.MikTeX
+ * install.git
+ * install.RStudio
+ * install.GitHub
+ * create.global.library - a merge of create.global.library.oldR and create.global.library.newR (from the post: http://www.r-statistics.com/2011/04/how-to-upgrade-r-on-windows-7/)
+ * is.windows() - so when the function is loaded it is checked if the current OS is windows or not.
-NEW FEATURES
+UPDATED FUNCTIONS:
+ * isntall.R - removed extra parameter.
+ * update.R - allow the user to review the NEWS of the newer version
- * Added the functions create.global.library.oldR and create.global.library.newR
+OTHER NOTES:
+ * Updated the NEWS format and text
+ * Updated the description file
+ * Changed the name of the package from installR to installr.
+ * Added a README.md
+ * Added dcoumentation to all the functions in install.r (via roxygen2)
installR 0.2
------------
-NEW FEATURES
+NEW FUNCTIONS ADDED:
- * Added the function install.packages.zip - for installing package from a url of the ZIP file
- * Added the function install.Rtools - for installing Rtools (allowing the user to choose which version to download)
- * Added the function update.R - for checking if we have the latest version of R - and if not - download and install it.
+ * install.packages.zip - for installing package from a url of the ZIP file
+ * install.Rtools - for installing Rtools (allowing the user to choose which version to download)
+ * update.R - for checking if we have the latest version of R - and if not - download and install it.
+ * install.R
installR 0.1
------------
-NEW FEATURES
+NEW FUNCTIONS ADDED:
+
+ * install.pandoc() function is created.
+
+OTHER NOTES:
- * Added the install.pandoc() function is created.
* Includes skeletons for some functions that will be added in the future.
View
16 R/install.r
@@ -376,7 +376,7 @@ install.GitHub <- function(URL = "http://github-windows.s3.amazonaws.com/GitHubS
#' @title Read R Code from a File in an https URL
-#' @description source_https causes R to accept its input from a File in an https URL.
+#' @description source.https causes R to accept its input from a File in an https URL.
#' Input is read and parsed from that file until the end of the file is reached, then the parsed expressions are evaluated sequentially in the chosen environment.
#' @details
#' "The easiest way to use Git on Windows." (at least so they say...)
@@ -387,16 +387,16 @@ install.GitHub <- function(URL = "http://github-windows.s3.amazonaws.com/GitHubS
#' @export
#' @seealso \link{source}
#' @references
-#' Other solutions to the source_https problem:
+#' Other solutions to the source.https problem:
#' \itemize{
-#' \item Using RCurl: \url{http://tonybreyal.wordpress.com/2011/11/24/source_https-sourcing-an-r-script-from-github/}
+#' \item Using RCurl: \url{http://tonybreyal.wordpress.com/2011/11/24/source.https-sourcing-an-r-script-from-github/}
#' \item devtools::source_url \link{http://rgm3.lab.nig.ac.jp/RGM/r_function?p=devtools&f=source_url}
#' \item A erlevant (OLD) discussion: http://stackoverflow.com/questions/7715723/sourcing-r-script-over-https
#' }
#' @examples
-#' source_https("https://raw.github.com/talgalili/installr/master/R/install.r")
-source_https <- function(URL,..., remove_r_file = T) {
- # this is an alternative to this code: http://tonybreyal.wordpress.com/2011/11/24/source_https-sourcing-an-r-script-from-github/
+#' source.https("https://raw.github.com/talgalili/installr/master/R/install.r")
+source.https <- function(URL,..., remove_r_file = T) {
+ # this is an alternative to this code: http://tonybreyal.wordpress.com/2011/11/24/source.https-sourcing-an-r-script-from-github/
# but one which does not require RCurl
r_filename <- file.path(tempdir(), file.name.from.url(URL)) # the name of the zip file MUST be as it was downloaded...
download.file(URL, destfile=exe_filename, mode = 'wb')
@@ -407,8 +407,8 @@ source_https <- function(URL,..., remove_r_file = T) {
#
# # being able to source from github
-# source("http://www.r-statistics.com/wp-content/uploads/2012/01/source_https.r.txt")
-# source_https("source url for install.packages.zip")
+# source("http://www.r-statistics.com/wp-content/uploads/2012/01/source.https.r.txt")
+# source.https("source url for install.packages.zip")
# install.packages.zip("URL/installR.zip")
# # actually use functions...
#
View
6 R/zzz.r
@@ -20,3 +20,9 @@ is.windows <- function(...) unname(Sys.info()["sysname"] == "Windows")
# using "zzz.r" like in devtools...
+
+# When adding new files, make sure they are listed in DESCRIPTION:
+# Collate:
+# 'create.global.library.r'
+# 'install.r'
+# 'update.R.r'
View
14 man/source_https.Rd → man/source.https.Rd
@@ -1,8 +1,8 @@
-\name{source_https}
-\alias{source_https}
+\name{source.https}
+\alias{source.https}
\title{Read R Code from a File in an https URL}
\usage{
- source_https(URL, ..., remove_r_file = T)
+ source.https(URL, ..., remove_r_file = T)
}
\arguments{
\item{URL}{the URL of the .r file to download and
@@ -17,7 +17,7 @@
Nothing.
}
\description{
- source_https causes R to accept its input from a File in
+ source.https causes R to accept its input from a File in
an https URL. Input is read and parsed from that file
until the end of the file is reached, then the parsed
expressions are evaluated sequentially in the chosen
@@ -28,12 +28,12 @@
they say...)
}
\examples{
-source_https("https://raw.github.com/talgalili/installr/master/R/install.r")
+source.https("https://raw.github.com/talgalili/installr/master/R/install.r")
}
\references{
- Other solutions to the source_https problem: \itemize{
+ Other solutions to the source.https problem: \itemize{
\item Using RCurl:
- \url{http://tonybreyal.wordpress.com/2011/11/24/source_https-sourcing-an-r-script-from-github/}
+ \url{http://tonybreyal.wordpress.com/2011/11/24/source.https-sourcing-an-r-script-from-github/}
\item devtools::source_url
\link{http://rgm3.lab.nig.ac.jp/RGM/r_function?p=devtools&f=source_url}
\item A erlevant (OLD) discussion:
Please sign in to comment.
Something went wrong with that request. Please try again.