Added error handling for token file

mattwg · Jun 10, 2015 · 5fd8e3f · 5fd8e3f
1 parent d8406d2
commit 5fd8e3f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: alation
 Type: Package
 Title: Package to connect to Alation API
-Version: 1.3
+Version: 1.4
 Date: 2015-06-02
 Author: Matt Gardner <magardner@ebay.com>
 Maintainer: Matt Gardner <magardner@ebay.com>

diff --git a/R/alation.R b/R/alation.R
@@ -78,7 +78,7 @@ getToken <- function(user="", password="", url="")
 
 
   if( result == "EXISTING"){
-    cat("Token already exists - to create a new token use changeToken().\n")
+    cat("Token already exists - to update your token use changeToken().\n")
     return(NULL)
   }
 
@@ -196,6 +196,10 @@ getQuery <- function(id)
 
   path <- path.package("alation")
   f <- paste(path,"/.token",sep="")
+
+  if(!file.exists(f)) {
+    stop("You need an Alation token before calling getQuery() - see getToken() for details.")
+  }
   load(f)
 
   header <- basicTextGatherer()
@@ -234,6 +238,10 @@ getResult <- function(id)
 
   path <- path.package("alation")
   f <- paste(path,"/.token",sep="")
+
+  if(!file.exists(f)) {
+    stop("You need an Alation token before calling getResult() - see getToken() for details.")
+  }
   load(f)
 
   header <- basicTextGatherer()