Upgrade the package version to 0.0.8 and run roxygen

ibm-watson-data-lab · Aug 29, 2017 · c5eafb8 · c5eafb8
1 parent df14e14
commit c5eafb8
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 115 deletions.
diff --git a/r/sparkr/DESCRIPTION b/r/sparkr/DESCRIPTION
@@ -1,13 +1,13 @@
 Package: ibmos2sparkR
 Title: Loads Object Store data into Softlayer and Bluemix
-Version: 0.0.7
+Version: 0.0.8
 Authors@R: person("Jim", "Crozier", email = "jim.crozier@ibm.com",
                   role = c("aut", "cre"))
-Description: Loads data from Object Store in Softlayer and Bluemix
+Description: Loads data from Object Store in Softlayer and Bluemix and ObjectStorage
 Depends:
     R (>= 3.1.0)
 License: Apache
 LazyData: true
 RoxygenNote: 5.0.1
-Imports: 
-  SparkR
+Imports:
+    SparkR
diff --git a/r/sparkr/NAMESPACE b/r/sparkr/NAMESPACE
@@ -1,6 +1,8 @@
 # Generated by roxygen2: do not edit by hand
 
+export(CloudObjectStorage)
 export(bluemix)
 export(softlayer)
+exportClasses(CloudObjectStorage)
 exportClasses(bluemix)
 exportClasses(softlayer)
diff --git a/r/sparkr/R/osconfig.R b/r/sparkr/R/osconfig.R
@@ -131,8 +131,8 @@ bluemix <- setRefClass("bluemix",
 #' instances, the values for these credentials can be obtained
 #' by clicking on the 'insert to code' link just below a data
 #' source.
-#' @export bluemix
-#' @exportClass bluemix
+#' @export CloudObjectStorage
+#' @exportClass CloudObjectStorage
 CloudObjectStorage <- setRefClass("CloudObjectStorage",
   fields=list(configName="character"),
   methods=list(

diff --git a/r/sparkr/man/CloudObjectStorage-class.Rd b/r/sparkr/man/CloudObjectStorage-class.Rd
diff --git a/r/sparkr/man/bluemix-class.Rd b/r/sparkr/man/bluemix-class.Rd
diff --git a/r/sparkr/man/bluemix2d-class.Rd b/r/sparkr/man/bluemix2d-class.Rd
diff --git a/r/sparkr/man/softlayer-class.Rd b/r/sparkr/man/softlayer-class.Rd
diff --git a/r/sparkr/man/softlayer2d-class.Rd b/r/sparkr/man/softlayer2d-class.Rd