[catalog] v0.3.2

add helper to `-d` for "beta"

Author: thedannywahl

.gitignore

@@ -0,0 +1,2 @@
+
+.DS_Store

catalog/README

@@ -43,14 +43,23 @@ OPTIONS
         This option allows querying a specified domain,
         overriding the value set in the .inst config file.
 
+        A helper is provided for "beta", reserving it for use with
+        the domain provided in the .inst config file.  Using the
+        reserved word  will not require the -t option to be included
+        as described below. E.g. the config file has the a stored
+        token and a value for canvas_domain of "foobar", in
+        order to connect to https://foobar.beta.instructure.com
+        simply use "-d beta"
+
         The value only requires the subdomain string of
         catalogapp.com.  E.g. if the desired domain to query
         is https://foobar.catalog.instructure.com then pass the option
         "-d foobar"
 
         -d also requires that -t <token> be included
-        in the query.  catalog will not allow you to pass one
-        authentication parameter and read the others from config.
+        in the query unless the value of -d is "beta".
+        canvas will not allow you to pass one authentication
+        parameter and read the others from config.
 
     -F <name=content>
         The Form option transparently passes to curl.  Please read

catalog/catalog

@@ -166,7 +166,7 @@ usage() {
 
 version() {
   logo
-  echo >&2 "    catalog-cli version 0.3.1"
+  echo >&2 "    catalog-cli version 0.3.2"
   exit
 }
 
@@ -175,13 +175,6 @@ license() {
   exit
 }
 
-examples() {
-  echo >&2 "$0 courses";
-  echo >&2 "$0 -x PUT users/self/settings -F 'manual_mark_as_read=false'";
-  echo >&2 "$0 <token> DELETE <domain> users/self/activity_stream";
-  echo >&2 "$0 <token> POST <domain> users/self/files -F 'url=http://www.canvaslms.com/img/logo_instructure.png' -F 'name=instructure.png'";
-}
-
 # HANDLE DEPENDENCIES ##########################################################
 # Requires: jsontool (npm), pygmentize (pip), curl, and getopts                #
 # ##############################################################################
@@ -429,7 +422,11 @@ fi
 
 if [ -z "$catalog_domain" ] && [ -z "$catalog_token" ]; then
   readconfig
-elif [ -z "$catalog_domain" ] || [ -z "$catalog_token" ]; then
+elif [ $catalog_domain = "beta" ]; then
+  sd=$catalog_domain
+  readconfig
+  canvas_domain="$catalog_domain.$sd"
+elif [ -z "$catalog_domain" ] || [ -z "$catalog_domain" ]; then
   echo >&2 "Both \`-d\` and \`-t\` are requied when not using a config file"
   usage
   exit 2