Merge branch 'release/0.2-2'

DESCRIPTION

@@ -2,8 +2,8 @@ Encoding: UTF-8
 Package: kimisc
 Type: Package
 Title: Kirill's miscellaneous functions
-Version: 0.2-1.7
-Date: 2015-09-08
+Version: 0.2-2
+Date: 16687
 Authors@R: as.person("Kirill Müller <krlmlr+r@mailbox.org> [aut, cre]")
 Description: A collection of useful functions not found anywhere else,
         mainly for programming: Generalized lagged differences,

NEWS.md

@@ -1,42 +1,16 @@
-Version 0.2-1.7 (2015-09-08)
+Version 0.2-2 (2015-09-09)
 ===
 
-- new function `df_to_list`
-
-Version 0.2-1.6 (2015-09-08)
-===
-
-- new function `list_to_df`
-
-Version 0.2-1.5 (2015-09-08)
-===
-
-- `gdiff` does not attempt to maintain class information, the function is
+- new functions `list_to_df` and `df_to_list`
+- new vecctorized switch function `vswitch`
+- `gdiff` does not attempt to maintain class information, the called function is
   supposed to do this
 - `gdiff` accepts a factor as input
-- use AppVeyor (checks on Windows), Coveralls (coverage analysis) and lintr
-  (static code analysis)
-
-Version 0.2-1.4 (2014-12-18)
-===
-
-- Fix CRAN checks.
-
-Version 0.2-1.3 (2014-12-18)
-===
-
-- first implementation of vecctorized switch function `vswitch`
-
-Version 0.2-1.2 (2014-12-12)
-===
-
-- Fix CRAN checks.
-
-Version 0.2-1.1 (2014-12-12)
-===
-
 - determine knitr input via `knitr::current_input` (#6)
 - export all helper functions used by `thisfile`
+- use AppVeyor (checks on Windows), Coveralls (coverage analysis) and lintr
+  (static code analysis)
+- fix CRAN checks
 
 Version 0.2-1 (2014-04-02)
 ===

R/gdiff.R

@@ -1,6 +1,6 @@
 #' Generalized lagged differences
 #'
-#' Returns suitably lagged and iterated differences using arbitrary differce
+#' Returns suitably lagged and iterated differences using arbitrary difference
 #' functions.
 #'
 #' @param FUN A distance function that accepts two parameters

README.md

@@ -1,14 +1,27 @@
-kimisc [![wercker status](https://app.wercker.com/status/956d581f6bb8958ec85fd7d2585d138b/s/master "wercker status")](https://app.wercker.com/project/bykey/956d581f6bb8958ec85fd7d2585d138b) [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/krlmlr/kimisc?branch=master)](https://ci.appveyor.com/project/krlmlr/kimisc) [![codecov.io](https://codecov.io/github/krlmlr/kimisc/coverage.svg?branch=master)](https://codecov.io/github/krlmlr/kimisc?branch=master)
+kimisc [![CRAN](http://www.r-pkg.org/badges/version/kimisc)](https://cran.rstudio.com/web/packages/kimisc/)
 ======
 
-A collection of useful functions not found anywhere else. Install from CRAN using
+A collection of useful functions not found anywhere else.
+
+`master`: [![wercker status](https://app.wercker.com/status/956d581f6bb8958ec85fd7d2585d138b/s/master "wercker status")](https://app.wercker.com/project/bykey/956d581f6bb8958ec85fd7d2585d138b) [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/krlmlr/kimisc?branch=master&svg=true)](https://ci.appveyor.com/project/krlmlr/kimisc) [![codecov.io](https://codecov.io/github/krlmlr/kimisc/coverage.svg?branch=master)](https://codecov.io/github/krlmlr/kimisc?branch=master) [![GitHub release](https://img.shields.io/github/release/krlmlr/kimisc.svg)](https://github.com/krlmlr/kimisc/releases)
+
+`develop`: [![wercker status](https://app.wercker.com/status/956d581f6bb8958ec85fd7d2585d138b/s/develop "wercker status")](https://app.wercker.com/project/bykey/956d581f6bb8958ec85fd7d2585d138b) [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/krlmlr/kimisc?branch=develop&svg=true)](https://ci.appveyor.com/project/krlmlr/kimisc) [![codecov.io](https://codecov.io/github/krlmlr/kimisc/coverage.svg?branch=develop)](https://codecov.io/github/krlmlr/kimisc?branch=develop)
+
+
+## Installation
 
 ```
 install.packages('kimisc')
 ```
 
-or the lastest development version (with `devtools` 1.4 or later)
+or the latest stable version using
 
 ```
 devtools::install_github('krlmlr/kimisc')
 ```
+
+or the most recent development version using
+
+```
+devtools::install_github('krlmlr/kimisc@develop')
+```

makeR/Makefile

@@ -51,7 +51,7 @@ git-is-clean branch-is-master init-gh-pages init-staticdocs gh-pages-build posti
 dt_add_rstudio_project dt_add_test_infrastructure dt_add_travis dt_bash dt_build dt_build_vignettes dt_build_win dt_check dt_check_doc dt_clean_dll dt_clean_vignettes dt_compile_dll dt_document dt_imports_env dt_install dt_install_deps dt_lint dt_load_all dt_load_code dt_load_data dt_load_dll dt_missing_s3 dt_ns_env dt_parse_ns_file dt_pkg_env dt_release dt_release_checks dt_reload dt_revdep dt_revdep_check dt_revdep_maintainers dt_run_examples dt_show_news dt_submit_cran dt_test dt_unload dt_use_appveyor dt_use_cran_comments dt_use_data_raw dt_use_package_doc dt_use_rcpp dt_use_readme_rmd dt_use_revdep dt_use_rstudio dt_use_testthat dt_use_travis dt_wd:
 
 dt_%: git-is-clean
-	Rscript -e "devtools::$(subst dt_,,$@)()"
+	r -e "devtools::$(subst dt_,,$@)()"
 	git add .
 	git commit -m "$(subst dt_,,$@)"
 
@@ -80,7 +80,7 @@ bump-desc: git-is-clean rd
 	crant -u 4 -C
 
 inst/NEWS.Rd: git-is-clean NEWS.md
-	Rscript -e "tools:::news2Rd('$(word 2,$^)', '$@')"
+	r -e "tools:::news2Rd('$(word 2,$^)', '$@')"
 	sed -r -i 's/`([^`]+)`/\\code{\1}/g' $@
 	git add $@
 	test "$$(git status --porcelain | wc -c)" = "0" || git commit -m "update NEWS.Rd"
@@ -115,7 +115,7 @@ bump: bump-desc inst/NEWS.Rd tag
 ## Documentation
 
 rd: git-is-clean
-	Rscript -e "library(methods); devtools::document()"
+	r -e "library(methods); devtools::document()"
 	git add man/ NAMESPACE
 	test "$$(git status --porcelain | wc -c)" = "0" || git commit -m "document"
 
@@ -126,18 +126,18 @@ rd: git-is-clean
 dependencies-hook:
 
 install dependencies: dependencies-hook
-	Rscript -e "sessionInfo()"
-	Rscript -e "options(repos = c(CRAN = 'http://cran.rstudio.com')); devtools::install_deps(dependencies = TRUE)"
+	r -e "sessionInfo()"
+	r -e "options(repos = c(CRAN = 'http://cran.rstudio.com')); devtools::install_deps(dependencies = TRUE)"
 
 test:
-	Rscript -e "devtools::check(document = TRUE, check_dir = '.', cleanup = FALSE)"
+	r -e "devtools::check(document = TRUE, check_dir = '.', cleanup = FALSE)"
 	! egrep -A 5 "ERROR|WARNING|NOTE" *.Rcheck/00check.log
 
 covr:
 	Rscript -e 'if (!requireNamespace("covr")) devtools::install_github("jimhester/covr"); covr::codecov()'
 
 lintr:
-	Rscript -e 'if (!requireNamespace("lintr")) devtools::install_github("jimhester/lintr"); lintr::lint_package()'
+	r -e 'if (!requireNamespace("lintr")) devtools::install_github("jimhester/lintr"); lintr::lint_package()'
 
 check-rev-dep:
 	echo "Running reverse dependency checks for CRAN ..."
@@ -160,7 +160,7 @@ gh-pages-init:
 init-staticdocs:
 
 staticdocs: inst/web
-	Rscript -e 'if (!requireNamespace("staticdocs")) devtools::install_github("gaborcsardi/staticdocs"); staticdocs::build_site()'
+	r -e 'if (!requireNamespace("staticdocs")) devtools::install_github("gaborcsardi/staticdocs"); staticdocs::build_site()'
 
 gh-pages-build: staticdocs
 

makeR/gitflow/post-flow-hotfix-start

@@ -0,0 +1,18 @@
+#!/usr/bin/env Rscript
+
+library(magrittr)
+repo <- git2r::repository()
+branch_name <- (git2r::branches(repo) %>% Filter(git2r::is_head, .) %>% extract2(1))@name
+version <- gsub("^.*/([^/]*)$", "\\1", branch_name)
+package_version(version)
+desc <- read.dcf("DESCRIPTION")
+desc[, "Version"] <- version
+date <- Sys.Date()
+desc[, "Date"] <- date
+write.dcf(desc, "DESCRIPTION")
+git2r::add(repo, "DESCRIPTION")
+git2r::commit(repo, paste("bump version to", version))
+
+news <- readLines("NEWS.md")
+news <- c(paste0("Version ", version, " (", date, ")"), "===", "", "", "", news)
+writeLines(news, "NEWS.md")

makeR/gitflow/post-flow-release-finish

@@ -0,0 +1,4 @@
+#!/usr/bin/env Rscript
+
+devtools::install()
+autoroxy::rox_off()

makeR/gitflow/post-flow-release-start

@@ -0,0 +1,20 @@
+#!/usr/bin/env Rscript
+
+autoroxy::rox_on()
+
+library(magrittr)
+repo <- git2r::repository()
+branch_name <- (git2r::branches(repo) %>% Filter(git2r::is_head, .) %>% extract2(1))@name
+version <- gsub("^.*/([^/]*)$", "\\1", branch_name)
+package_version(version)
+desc <- read.dcf("DESCRIPTION")
+desc[, "Version"] <- version
+date <- Sys.Date()
+desc[, "Date"] <- date
+write.dcf(desc, "DESCRIPTION")
+git2r::add(repo, "DESCRIPTION")
+git2r::commit(repo, paste("bump version to", version))
+
+news <- readLines("NEWS.md")
+news <- c(paste0("Version ", version, " (", date, ")"), "===", "", "", "", news)
+writeLines(news, "NEWS.md")

makeR/gitflow/pre-flow-release-finish

@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+# Runs before git flow release finish
+#
+# Positional arguments:
+# $1    The version (including the version prefix)
+# $2    The origin remote
+# $3    The full branch name (including the release prefix)
+#
+# The following variables are available as they are exported by git-flow:
+#
+# MASTER_BRANCH - The branch defined as Master
+# DEVELOP_BRANCH - The branch defined as Develop
+#
+VERSION=$1
+ORIGIN=$2
+BRANCH=$3
+
+# Implement your script here.
+
+set -e
+hub ci-status -v

makeR/init-wercker

@@ -3,6 +3,6 @@
 set -e
 
 cp makeR/res/wercker.yml .
-Rscript -e 'devtools::use_build_ignore(c("wercker.yml", "_builds", "_projects", "_steps")); devtools:::add_git_ignore(ignores = c("_builds", "_projects", "_steps"))'
+r -e 'devtools::use_build_ignore(c("wercker.yml", "_builds", "_projects", "_steps")); devtools:::add_git_ignore(ignores = c("_builds", "_projects", "_steps"))'
 git add wercker.yml .Rbuildignore .gitignore
 git commit -m "init wercker"

makeR/postinstall

@@ -5,6 +5,6 @@ set -e
 rm -f Makefile
 cp makeR/Makefile.tmpl Makefile
 
-Rscript -e 'devtools::use_build_ignore(c("Makefile", "Makefile.in", "makeR"))'
+r -e 'devtools::use_build_ignore(c("Makefile", "Makefile.in", "makeR"))'
 git add Makefile .Rbuildignore
 if ! sh $(dirname $0)/git-is-clean; then git commit -m "install makeR as subtree"; fi

man/gdiff.Rd

@@ -31,7 +31,7 @@ If x is a vector of length \code{n} and \code{differences = 1}, then
   column separately.
 }
 \description{
-Returns suitably lagged and iterated differences using arbitrary differce
+Returns suitably lagged and iterated differences using arbitrary difference
 functions.
 }
 \examples{