Update to use new ids

.travis.yml

@@ -16,6 +16,7 @@ before_install:
 install:
   - ./travis-tool.sh install_deps
   - ./travis-tool.sh install_aptget libhiredis-dev
+  - ./travis-tool.sh install_aptget libcurl4-openssl-dev
   - ./travis-tool.sh github_package gaborcsardi/progress
   - ./travis-tool.sh github_package ropensci/RedisAPI
   - ./travis-tool.sh github_package richfitz/redux

DESCRIPTION

@@ -15,7 +15,7 @@ Imports:
   crayon,
   digest,
   docopt,
-  ids,
+  ids (>= 0.0.2),
   progress,
   redux (>= 0.3.0),
   storr (>= 1.0.0)

R/common.R

@@ -80,7 +80,7 @@ rrqueue_key_task_complete <- function(queue, task_id) {
   sprintf("%s:tasks:%s:complete", queue, task_id)
 }
 rrqueue_key_worker_alive <- function(queue) {
-  sprintf("%s:workers:alive:%s", queue, ids::aa(1)())
+  sprintf("%s:workers:alive:%s", queue, ids::adjective_animal())
 }
 
 ## TODO: come up with a way of scheduling object deletion.  Things

R/utils.R

@@ -212,10 +212,9 @@ match_value <- function(arg, choices, name=deparse(substitute(arg))) {
   arg
 }
 
-##' @importFrom ids aa
 create_group <- function(group, verbose) {
   if (is.null(group)) {
-    group <- ids::aa(1)()
+    group <- ids::adjective_animal()
     if (verbose) {
       message(sprintf("Creating group: '%s'", group))
     }

tests/testthat/myfuns.R

@@ -28,6 +28,6 @@ failure <- function(controlled) {
 ## This is a blocking call that skips the R interrupt loop; we won't
 ## listen for SIGINT during this and the stop request will fail.
 block <- function(n) {
-  key <- ids::aa(1)(1)
+  key <- ids::adjective_animal()
   rrqueue:::redis_connection(NULL)$BLPOP(key, n)
 }