Merge branch 'release/1.0.0'.

petrbroz · Jun 10, 2019 · e09dc36 · e09dc36
2 parents 99208b6 + d13cef4
commit e09dc36
Show file tree

Hide file tree

Showing 7 changed files with 233 additions and 210 deletions.
diff --git a/examples/inventor-thumbnail/setup-pipeline.ps1 b/examples/inventor-thumbnail/setup-pipeline.ps1
@@ -18,55 +18,19 @@ $activity_name = "MyTestActivity"
 $activity_alias = "dev"
 
 # Create or update an appbundle
-Write-Host "Creating an appbundle $appbundle_name"
-$result = Request-DA "list-appbundles --short"
-$result = $result | Select-String -Pattern $appbundle_name | Measure-Object -Line
-if ($result.Lines -eq 0) {
-    Write-Host "Creating new appbundle"
-    Request-DA "create-appbundle $appbundle_name $appbundle_file $appbundle_engine"
-} else {
-    Write-Host "Updating existing appbundle"
-    Request-DA "update-appbundle $appbundle_name $appbundle_file $appbundle_engine"
-}
+Write-Host "Creating/updating an appbundle $appbundle_name"
+Request-DA "create-appbundle $appbundle_name $appbundle_file $appbundle_engine --update"
 
 # Create or update an appbundle alias
-Write-Host "Creating an appbundle alias $appbundle_alias"
-$result = Request-DA "list-appbundle-versions $appbundle_name --short"
+Write-Host "Creating/updating an appbundle alias $appbundle_alias"
 $appbundle_version = $result | Select-Object -Last 1
-Write-Host "Last appbundle version: $appbundle_version"
-$result = Request-DA "list-appbundle-aliases $appbundle_name --short"
-$result = $result | Select-String -Pattern $appbundle_alias | Measure-Object -Line
-if ($result.Lines -eq 0) {
-    Write-Host "Creating new appbundle alias"
-    Request-DA "create-appbundle-alias $appbundle_alias $appbundle_name $appbundle_version"
-} else {
-    Write-Host "Updating existing appbundle alias"
-    Request-DA "update-appbundle-alias $appbundle_alias $appbundle_name $appbundle_version"
-}
+Request-DA "create-appbundle-alias $appbundle_alias $appbundle_name $appbundle_version --update"
 
 # Create or update an activity
-Write-Host "Creating an activity $activity_name"
-$result = Request-DA "list-activities --short"
-$result = $result | Select-String -Pattern $activity_name | Measure-Object -Line
-if ($result.Lines -eq 0) {
-    Write-Host "Creating new activity"
-    Request-DA "create-activity $activity_name $appbundle_name $appbundle_alias $appbundle_engine --input PartFile --output Thumbnail --output-local-name thumbnail.bmp"
-} else {
-    Write-Host "Updating existing activity"
-    Request-DA "update-activity $activity_name $appbundle_name $appbundle_alias $appbundle_engine --input PartFile --output Thumbnail --output-local-name thumbnail.bmp"
-}
+Write-Host "Creating/updating an activity $activity_name"
+Request-DA "create-activity $activity_name $appbundle_name $appbundle_alias $appbundle_engine --input PartFile --output Thumbnail --output-local-name thumbnail.bmp --update"
 
 # Create or update an activity alias
-Write-Host "Creating an activity alias $activity_alias"
-$result = Request-DA "list-activity-versions $activity_name --short"
+Write-Host "Creating/updating an activity alias $activity_alias"
 $activity_version = $result | Select-Object -Last 1
-Write-Host "Last activity version: $activity_version"
-$result = Request-DA "list-activity-aliases $activity_name --short"
-$result = $result | Select-String -Pattern $activity_alias | Measure-Object -Line
-if ($result.Lines -eq 0) {
-    Write-Host "Creating new activity alias"
-    Request-DA "create-activity-alias $activity_alias $activity_name $activity_version"
-} else {
-    Write-Host "Updating existing activity alias"
-    Request-DA "update-activity-alias $activity_alias $activity_name $activity_version"
-}
+Request-DA "create-activity-alias $activity_alias $activity_name $activity_version --update"
diff --git a/examples/inventor-thumbnail/setup-pipeline.sh b/examples/inventor-thumbnail/setup-pipeline.sh
@@ -15,43 +15,19 @@ ACTIVITY_NAME=TestActivity
 ACTIVITY_ALIAS=dev
 
 # Create or update an appbundle
-if [ $($FORGE_DA_SCRIPT list-appbundles --short | grep $APPBUNDLE_NAME | wc -l) -eq "0" ] # TODO: use better matching
-then
-echo "Creating new appbundle"
-$FORGE_DA_SCRIPT create-appbundle $APPBUNDLE_NAME $APPBUNDLE_FILE $APPBUNDLE_ENGINE "Bundle for testing Forge CLI tool"
-else
-echo "Updating existing appbundle"
-$FORGE_DA_SCRIPT update-appbundle $APPBUNDLE_NAME $APPBUNDLE_FILE $APPBUNDLE_ENGINE "Bundle for testing Forge CLI tool"
-fi
+echo "Creating/updating appbundle"
+$FORGE_DA_SCRIPT create-appbundle $APPBUNDLE_NAME $APPBUNDLE_FILE $APPBUNDLE_ENGINE "Bundle for testing Forge CLI tool" --update
 
 # Create or update an appbundle alias
 APPBUNDLE_VERSION=$($FORGE_DA_SCRIPT list-appbundle-versions $APPBUNDLE_NAME --short | tail -n 1)
-if [ $($FORGE_DA_SCRIPT list-appbundle-aliases $APPBUNDLE_NAME --short | grep $APPBUNDLE_ALIAS | wc -l) -eq "0" ] # TODO: use better matching
-then
-echo "Creating new appbundle alias"
-$FORGE_DA_SCRIPT create-appbundle-alias $APPBUNDLE_ALIAS $APPBUNDLE_NAME $APPBUNDLE_VERSION
-else
-echo "Updating existing appbundle alias"
-$FORGE_DA_SCRIPT update-appbundle-alias $APPBUNDLE_ALIAS $APPBUNDLE_NAME $APPBUNDLE_VERSION
-fi
+echo "Creating/updating appbundle alias"
+$FORGE_DA_SCRIPT create-appbundle-alias $APPBUNDLE_ALIAS $APPBUNDLE_NAME $APPBUNDLE_VERSION --update
 
 # Create or update an activity
-if [ $($FORGE_DA_SCRIPT list-activities --short | grep $ACTIVITY_NAME | wc -l) -eq "0" ] # TODO: use better matching
-then
-echo "Creating new activity"
-$FORGE_DA_SCRIPT create-activity $ACTIVITY_NAME $APPBUNDLE_NAME $APPBUNDLE_ALIAS $APPBUNDLE_ENGINE --input PartFile --output Thumbnail --output-local-name thumbnail.bmp
-else
-echo "Updating existing activity"
-$FORGE_DA_SCRIPT update-activity $ACTIVITY_NAME $APPBUNDLE_NAME $APPBUNDLE_ALIAS $APPBUNDLE_ENGINE --input PartFile --output Thumbnail --output-local-name thumbnail.bmp
-fi
+echo "Creating/updating activity"
+$FORGE_DA_SCRIPT create-activity $ACTIVITY_NAME $APPBUNDLE_NAME $APPBUNDLE_ALIAS $APPBUNDLE_ENGINE --input PartFile --output Thumbnail --output-local-name thumbnail.bmp --update
 
 # Create or update an activity alias
 ACTIVITY_VERSION=$($FORGE_DA_SCRIPT list-activity-versions $ACTIVITY_NAME --short | tail -n 1)
-if [ $($FORGE_DA_SCRIPT list-activity-aliases $ACTIVITY_NAME --short | grep $ACTIVITY_ALIAS | wc -l) -eq "0" ] # TODO: use better matching
-then
-echo "Creating new activity alias"
-$FORGE_DA_SCRIPT create-activity-alias $ACTIVITY_ALIAS $ACTIVITY_NAME $ACTIVITY_VERSION
-else
-echo "Updating existing activity alias"
-$FORGE_DA_SCRIPT update-activity-alias $ACTIVITY_ALIAS $ACTIVITY_NAME $ACTIVITY_VERSION
-fi
+echo "Creating/updating activity alias"
+$FORGE_DA_SCRIPT create-activity-alias $ACTIVITY_ALIAS $ACTIVITY_NAME $ACTIVITY_VERSION --update
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "forge-cli-utils",
-  "version": "0.11.0",
+  "version": "1.0.0",
   "description": "Command line tools for Autodesk Forge services.",
   "author": "Petr Broz <[email protected]>",
   "license": "MIT",
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "commander": "^2.20.0",
-    "forge-nodejs-utils": "^1.4.1",
+    "forge-nodejs-utils": "^1.5.1",
     "form-data": "^2.3.3",
     "inquirer": "^6.3.1"
   },

diff --git a/src/common.js b/src/common.js
@@ -23,12 +23,12 @@ function warn(result) {
 }
 
 function error(err) {
-    if (err instanceof ForgeError) {
-        console.error(`Request to ${err.url} failed: ${err.message}.`);
-        process.exit(1);
+    if (err instanceof Error) {
+        console.error(err.message);
     } else {
-        throw err;
+        console.error(err);
     }
+    process.exit(1);
 }
 
 module.exports = {