Merge pull request #8 from DeployGate/add_fixture

Bump up version

.gitignore

@@ -4,4 +4,4 @@
 _tmp/
 
 .idea/
-upload-app-bitrise-step.iml
+upload-app-bitrise-step.iml

bitrise.yml

@@ -18,7 +18,7 @@ app:
 
   # If you want to share this step into a StepLib
   - BITRISE_STEP_ID: deploygate--upload-app-bitrise-step
-  - BITRISE_STEP_VERSION: "1.0.1"
+  - BITRISE_STEP_VERSION: "1.1.0"
   - BITRISE_STEP_GIT_CLONE_URL: https://github.com/DeployGate/upload-app-bitrise-step.git
   - MY_STEPLIB_REPO_FORK_GIT_URL: "https://github.com/DeployGate/bitrise-steplib"
 
@@ -66,8 +66,16 @@ workflows:
         inputs:
         - api_key: "$TEST_PAID_API_KEY"
         - owner_name: "$TEST_PAID_OWNER_NAME"
-        - app_path: sample.apk
+        - app_path: ../fixture/sample.apk
         - message: "via Bitrise CLI test"
+    - script:
+        title: Check if the previous step has added a response to envman properly
+        run_if: true
+        inputs:
+        - content: |
+            #!/bin/bash
+            set -eu
+            echo "The response was: $DEPLOYGATE_UPLOAD_APP_STEP_RESULT_JSON"
     - path::./:
         title: Upload an application with a short message
         description: |
@@ -76,7 +84,7 @@ workflows:
         inputs:
         - api_key: "$TEST_PAID_API_KEY"
         - owner_name: "$TEST_PAID_OWNER_NAME"
-        - app_path: sample.apk
+        - app_path: ../fixture/sample.apk
         - message: "via Bitrise CLI test"
     - path::./:
         title: Upload an application with a distribution name
@@ -86,7 +94,7 @@ workflows:
         inputs:
         - api_key: "$TEST_PAID_API_KEY"
         - owner_name: "$TEST_PAID_OWNER_NAME"
-        - app_path: sample.apk
+        - app_path: ../fixture/sample.apk
         - distribution_name: "BITRISE_CLI_TEST"
     - path::./:
         title: Upload an application with a distribution key
@@ -96,7 +104,7 @@ workflows:
         inputs:
         - api_key: "$TEST_PAID_API_KEY"
         - owner_name: "$TEST_PAID_OWNER_NAME"
-        - app_path: sample.apk
+        - app_path: ../fixture/sample.apk
         - distribution_key: "$TEST_DISTRIBUTION_KEY"
     - path::./:
         title: Upload an application with a visibility
@@ -106,7 +114,7 @@ workflows:
         inputs:
         - api_key: "$TEST_API_KEY"
         - owner_name: "$TEST_OWNER_NAME"
-        - app_path: sample.apk
+        - app_path: ../fixture/sample.apk
         - visibility: "public"
     - path::./:
         title: Upload an application with a release note
@@ -116,9 +124,9 @@ workflows:
         inputs:
         - api_key: "$TEST_PAID_API_KEY"
         - owner_name: "$TEST_PAID_OWNER_NAME"
-        - app_path: sample.apk
+        - app_path: ../fixture/sample.apk
         - distribution_name: "BITRISE_CLI_TEST"
-        - release_note: "distribution dayo"
+        - release_note: "Can you see me?"
     - path::./:
         title: Upload an application with disabling notififications
         description: |
@@ -127,7 +135,7 @@ workflows:
         inputs:
         - api_key: "$TEST_PAID_API_KEY"
         - owner_name: "$TEST_PAID_OWNER_NAME"
-        - app_path: sample.ipa
+        - app_path: ../fixture/sample.ipa
         - disable_notify: "true"
 
 

step.sh

@@ -1,12 +1,9 @@
 #!/bin/bash
 
-STEP_VERSION=1.0.1
-
-set -ex
+readonly STEP_VERSION=1.1.0
+readonly output_file="output.json"
 
 upload_app() {
-  set +ex
-
   local -r all_fields=(
       "file=@$app_path"
       "message=$message"
@@ -30,13 +27,12 @@ upload_app() {
   done
 
   curl -# -X POST \
+    -o "$output_file" \
     -H "Authorization: token $api_key" \
+    -H "Accept: application/json" \
     -A "DeployGateUploadAppBitriseStep/$STEP_VERSION" \
     "${fields[@]}" \
-    "https://deploygate.com/api/users/$owner_name/apps" > output.json
-
-  set -ex
-  return 0
+    "https://deploygate.com/api/users/$owner_name/apps"
 }
 
 parse_error_field() {
@@ -45,14 +41,8 @@ parse_error_field() {
 
 upload_app # this will create the `output.json``
 
-envman add --key DEPLOYGATE_UPLOAD_APP_STEP_RESULT_JSON --valuefile output.json
-
-if [[ "$(cat output.json | parse_error_field)" == "false" ]]; then
-  # upload successfully
-  cat output.json
-  exit 0
-else
-  # WTF
-  cat output.json
-  exit 1
-fi
+envman add --key DEPLOYGATE_UPLOAD_APP_STEP_RESULT_JSON --valuefile "$output_file"
+
+cat "$output_file"
+
+[[ "$(cat output.json | parse_error_field)" == "false" ]]

step.yml

@@ -60,9 +60,9 @@ inputs:
   - app_path: ""
     opts:
       title: "App file path"
-      summary: "App's binary file (IPA/APK) to be uploaded"
+      summary: "App's binary file (IPA/APK/AAB) to be uploaded"
       description: |
-        App's binary file (IPA/APK) to be uploaded.
+        App's binary file (IPA/APK/AAB) to be uploaded.
         $BITRISE\_APK\_PATH, $BITRISE\_IPA\_PATH, and so on.
       is_required: true
   - visibility: "private"