use release-it to handle releases

* fixes for expo outside universe

* move test scripts + fix typos

.circleci/config.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
       - checkout
       - run: yarn
-      - run: ./test-ci-unit.sh
+      - run: ./scripts/testUnitCI.sh
 
 workflows:
   version: 2

.gitignore

@@ -6,3 +6,6 @@
 shell.apk
 node_modules
 .secrets*
+
+*.swp
+*.swo

.release-it.beta.json

@@ -0,0 +1,9 @@
+{
+  "git": {
+    "commit": false,
+    "tag": true,
+    "push": true,
+    "requireUpstream": false,
+    "tagName": "v${version}"
+  }
+}

.release-it.json

@@ -0,0 +1,12 @@
+{
+  "npm": {
+    "tag": "latest"
+  },
+  "git": {
+    "requireUpstream": false,
+    "tagName": "v${version}"
+  },
+  "github": {
+    "release": true
+  }
+}

jsconfig.json

@@ -1,11 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "es2017",
-    "allowSyntheticDefaultImports": false,
-    "baseUrl": "./",
-    "paths": {
-      "turtle/*": ["src/*"],
-    }
-  },
-  "exclude": ["node_modules", "dist", "build"]
-}

package.json

@@ -4,20 +4,19 @@
   "description": "The command-line tool for building standalone Expo apps",
   "preferGlobal": true,
   "scripts": {
-    "start": "EXPENV_OVERRIDES=local-common,local expenv gulp",
+    "start": "EXPENV_OVERRIDES=local-common,local,local-queue expenv gulp",
     "start:ios": "PLATFORM=ios yarn start",
     "start:android": "PLATFORM=android yarn start",
-    "watch": "EXPENV_OVERRIDES=local-common,local expenv gulp watch:source",
+    "watch": "EXPENV_OVERRIDES=local-common,local,local-queue expenv gulp watch:source",
     "bin:turtle": "./bin/turtle.js",
     "lint": "tslint -c tslint.json 'src/**/*.ts'",
     "prepare": "yarn build",
     "build": "gulp build:server",
     "build:production": "./scripts/build.sh",
     "build:android-tarball:local": "./scripts/android/buildAndroidTarballLocally.sh",
-    "init-workingdir:local": "./scripts/initLocalWorkingdir.sh",
-    "init-workingdir:remote": "yarn init-workingdir:remote-android && yarn init-workingdir:remote-ios",
-    "init-workingdir:remote-android": "./scripts/android/fetchRemoteAndroidTarball.sh",
-    "init-workingdir:remote-ios": "./scripts/ios/fetchRemoteIosTarball.sh",
+    "secrets:init-private": "./scripts/initPrivateSecrets.sh",
+    "set-workingdir:remote": "./scripts/setWorkingdirMode.sh remote",
+    "set-workingdir:local": "./scripts/setWorkingdirMode.sh local",
     "docker:pull": "retry5 gcloud docker -- pull gcr.io/exponentjs/turtle-android:latest",
     "docker:pull:tag": "retry5 gcloud docker -- pull gcr.io/exponentjs/turtle-android:${TAG}",
     "docker:build": "yarn build:production android && gcloud docker -- build -t gcr.io/exponentjs/turtle-android:latest -t gcr.io/exponentjs/turtle-android:${TAG} .",
@@ -29,12 +28,13 @@
     "test:smoke": "yarn test --config jest/smoke-config.json --forceExit",
     "test:smoke:android": "yarn test:smoke --testNamePattern=android",
     "test:smoke:ios": "PLATFORM=ios yarn test:smoke --testNamePattern=iOS",
-    "secrets:init-private": "./scripts/initPrivateSecrets.sh",
+    "release": "release-it",
+    "release:beta": "yarn release -c .release-it.beta.json --preRelease=beta",
     "ssh:android:pods-names": "./scripts/ssh/findAndroidPods.sh",
     "ssh:android:connect": "./scripts/ssh/connectToAndroidPod.sh",
     "ssh:ios:ips": "./scripts/ssh/findIosIps.sh",
     "set-priorities": "yarn set-priorities:local",
-    "set-priorities:local": "EXPENV_OVERRIDES=local-common,local expenv babel-node scripts/setConfigurations.js",
+    "set-priorities:local": "EXPENV_OVERRIDES=local-common,local,local-queue expenv babel-node scripts/setConfigurations.js",
     "set-priorities:staging": "expenv babel-node scripts/setConfigurations.js",
     "set-priorities:production": "EXPENV_OVERRIDES=prod expenv babel-node scripts/setConfigurations.js"
   },
@@ -60,6 +60,9 @@
     "url": "https://github.com/expo/turtle/issues"
   },
   "homepage": "https://github.com/expo/turtle#readme",
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/"
+  },
   "devDependencies": {
     "@types/decompress": "^4.2.3",
     "@types/fs-extra": "^5.0.4",
@@ -88,6 +91,7 @@
     "jest": "^23.6.0",
     "nock": "^10.0.1",
     "nodemon": "^1.18.7",
+    "release-it": "^10.0.0",
     "rimraf": "^2.6.2",
     "source-map-loader": "^0.2.3",
     "ts-jest": "^23.10.4",

scripts/android/fetchRemoteAndroidTarball.sh

@@ -12,7 +12,13 @@ mkdir -p $ARTIFACTS_DIR
 for SDK_VERSION in `ls $ANDROID_SHELL_TARBALLS_DIRECTORY`; do
   mkdir -p $WORKING_DIR/$SDK_VERSION
   TARBALL_URI=$(head -n 1 $ANDROID_SHELL_TARBALLS_DIRECTORY/$SDK_VERSION)
-  run expo.s3env --keep AWS_ACCESS_KEY_ID --keep AWS_SECRET_ACCESS_KEY --command retry5 aws s3 cp $TARBALL_URI $ARTIFACTS_DIR/$SDK_VERSION.tar.gz --no-progress
+  if command -v run  >/dev/null 2>&1 ; then
+    run expo.s3env --keep AWS_ACCESS_KEY_ID --keep AWS_SECRET_ACCESS_KEY --command retry5 aws s3 cp $TARBALL_URI $ARTIFACTS_DIR/$SDK_VERSION.tar.gz --no-progress
+  else
+    # outside of universe aws credentials might not be set
+    if ! aws iam get-user >/dev/null 2>&1 ; then aws configure ; fi
+    aws s3 cp $TARBALL_URI $ARTIFACTS_DIR/$SDK_VERSION.tar.gz --no-progress
+  fi
   tar zxf $ARTIFACTS_DIR/$SDK_VERSION.tar.gz -C $WORKING_DIR/$SDK_VERSION
   rm -rf $TARBALL_URI $ARTIFACTS_DIR/$SDK_VERSION.tar.gz
 done

scripts/build.sh

@@ -7,11 +7,11 @@ if [ -z "$1" ]; then
   exit 1
 fi
 
-PLATFORM=$1
+export PLATFORM=$1
 
 yarn
 yarn run build
-yarn init-workingdir:remote-$PLATFORM
+yarn set-workingdir:remote
 
 if [[ -z "${TARBALL}" ]]; then
   echo "TARBALL is not set, building tarball skipped"

scripts/initLocalWorkingdir.sh

@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-
-ensure_link_exists() {
-  if [ ! -L "$2" ]; then
-    ln -s $1 $2
-    echo "$2 link created"
-  fi
-}
-
-ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/.. && pwd )"
-WORKINGDIR="$ROOT_DIR/workingdir/local"
-
-if [ ! -d "$WORKINGDIR" ]; then
-  mkdir -p $WORKINGDIR
-  echo "$WORKINGDIR directory created"
-fi
-
-LINKS=( "template-files" "package.json" "android" "expokit-npm-package" "packages" "client-builds" "cpp" "exponent-view-template" "ios" "shellAppBase-builds" "shellAppWorkspaces")
-
-for LINKNAME in ${LINKS[@]}; do
-  ensure_link_exists "$EXPO_UNIVERSE_DIR/exponent/$LINKNAME" "$WORKINGDIR/$LINKNAME"
-done

scripts/initPrivateSecrets.sh

@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 
+if [ -z "$EXPO_UNIVERSE_DIR" ]; then
+  echo "You need to specify EXPO_UNIVERSE_DIR to use this script. Alternatively you can create .secrets.local-queue file yourself with AWS_SQS_ANDROID_QUEUE_URL, AWS_SQS_IOS_QUEUE_URL and AWS_SQS_OUT_QUEUE_URL variables."
+  exit 1
+fi
+
 if [ -z "$1" ]; then
   echo "Please specify a nickname you used to create AWS SQS queues"
   exit 1
@@ -12,12 +17,9 @@ ANDROID=`cd $TERRAFORM_DIR; terraform state show module.turtle_queues_local_$1.a
 IOS=`cd $TERRAFORM_DIR; terraform state show module.turtle_queues_local_$1.aws_sqs_queue.jobs_ios_in | head -1 | cut -d"=" -f2 | xargs`
 OUT=`cd $TERRAFORM_DIR; terraform state show module.turtle_queues_local_$1.aws_sqs_queue.jobs_out | head -1 | cut -d"=" -f2 | xargs`
 
-cat << EOF > $TURTLE_DIR/.secrets.local
+cat << EOF > $TURTLE_DIR/.secrets.local-queue
 AWS_SQS_ANDROID_QUEUE_URL="$ANDROID"
 AWS_SQS_IOS_QUEUE_URL="$IOS"
 AWS_SQS_OUT_QUEUE_URL="$OUT"
-TURTLE_FAKE_UPLOAD="1"
-TURTLE_FAKE_UPLOAD_DIR="/Users/$USER/Downloads"
-TURTLE_WORKING_DIR_PATH="$EXPO_UNIVERSE_DIR/server/turtle/workingdir"
-TURTLE_USE_LOCAL_WORKING_DIR="1"
 EOF
+

scripts/ios/fetchRemoteIosTarball.sh

@@ -12,7 +12,13 @@ mkdir -p $ARTIFACTS_DIR
 for SDK_VERSION in `ls $IOS_SHELL_TARBALLS_DIRECTORY`; do
   mkdir -p $WORKING_DIR/$SDK_VERSION
   TARBALL_URI=$(head -n 1 $IOS_SHELL_TARBALLS_DIRECTORY/$SDK_VERSION)
-  run expo.s3env --keep AWS_ACCESS_KEY_ID --keep AWS_SECRET_ACCESS_KEY --command retry5 aws s3 cp $TARBALL_URI $ARTIFACTS_DIR/$SDK_VERSION.tar.gz --no-progress
+  if command -v run  >/dev/null 2>&1 ; then
+    run expo.s3env --keep AWS_ACCESS_KEY_ID --keep AWS_SECRET_ACCESS_KEY --command retry5 aws s3 cp $TARBALL_URI $ARTIFACTS_DIR/$SDK_VERSION.tar.gz --no-progress
+  else
+    # outside of universe aws credentials might not be set
+    if ! aws iam get-user >/dev/null 2>&1 ; then aws configure ; fi
+    aws s3 cp $TARBALL_URI $ARTIFACTS_DIR/$SDK_VERSION.tar.gz --no-progress
+  fi
   tar zxf $ARTIFACTS_DIR/$SDK_VERSION.tar.gz -C $WORKING_DIR/$SDK_VERSION
   rm -rf $TARBALL_URI $ARTIFACTS_DIR/$SDK_VERSION.tar.gz
 done

scripts/setWorkingdirMode.sh

@@ -0,0 +1,86 @@
+#!/usr/bin/env bash
+
+ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/.. && pwd )"
+
+DOWNLOAD_DIR="${EXPO_DOWNLOAD_DIR:-$HOME/Downloads}"
+
+mkdir -p $DOWNLOAD_DIR
+
+if [ ! -f "$ROOT_DIR/.secrets.local-queue" ]; then 
+  echo "You need to run \"yarn secrets:init-private [SQS_NAME]\" or create .secrets.local-queue file yourself with AWS_SQS_ANDROID_QUEUE_URL, AWS_SQS_IOS_QUEUE_URL and AWS_SQS_OUT_QUEUE_URL variables."
+  exit 1
+fi
+
+setup_local() {
+  ensure_link_exists() {
+    if [ ! -L "$2" ]; then
+      ln -s $1 $2
+      echo "$2 link created"
+    fi
+  }
+  WORKINGDIR="$ROOT_DIR/workingdir/local"
+  
+  if [[ -d $WORKINGDIR ]]; then
+    echo "Local workingdir already prepared"
+    return
+  fi
+
+  if [[ -z "$EXPO_UNIVERSE_DIR" ]]; then
+    echo "EXPO_UNIVERSE_DIR needs to be set"
+    exit -1
+  fi
+
+  cd $EXPO_UNIVERSE_DIR/exponent && yarn
+  cd $EXPO_UNIVERSE_DIR/exponent/tools-public && yarn && ./generate-dynamic-macros-android.sh
+
+  mkdir -p $WORKINGDIR
+  echo "$WORKINGDIR directory created"
+
+  LINKS=("template-files" "package.json" "android" "expokit-npm-package" "packages" "client-builds" "cpp" "exponent-view-template" "ios" "shellAppBase-builds" "shellAppWorkspaces")
+
+  for LINKNAME in ${LINKS[@]}; do
+    ensure_link_exists "$EXPO_UNIVERSE_DIR/exponent/$LINKNAME" "$WORKINGDIR/$LINKNAME"
+  done
+}
+
+setup_remote() {
+  if [[ -d $ROOT_DIR/workingdir/android && -d $ROOT_DIR/workingdir/ios ]]; then
+    echo "Shell apps already fetched"
+  else
+    echo "Fetching shell apps"
+    if [ "$PLATFORM" != 'ios']; then
+      $ROOT_DIR/scripts/android/fetchRemoteAndroidTarball.sh
+    fi
+    if [ "$PLATFORM" != 'android']; then
+      $ROOT_DIR/scripts/ios/fetchRemoteIosTarball.sh
+    fi
+  fi
+}
+
+switch_local() {
+cat << EOF > $ROOT_DIR/.secrets.local
+TURTLE_FAKE_UPLOAD="1"
+TURTLE_FAKE_UPLOAD_DIR="$HOME/Downloads"
+TURTLE_WORKING_DIR_PATH="$ROOT_DIR/workingdir"
+TURTLE_USE_LOCAL_WORKING_DIR="1"
+EOF
+}
+
+switch_remote() {
+cat << EOF > $ROOT_DIR/.secrets.local
+TURTLE_FAKE_UPLOAD="1"
+TURTLE_FAKE_UPLOAD_DIR="$HOME/Downloads"
+TURTLE_WORKING_DIR_PATH="$ROOT_DIR/workingdir"
+EOF
+}
+
+if [ "$1" == "local" ]; then
+  setup_local
+  switch_local
+elif [ "$1" == "remote" ]; then
+  setup_remote
+  switch_remote
+else
+  echo "You need to pass remote or local as argument"
+  exit -1
+fi

scripts/testAndroidCI.sh

@@ -20,6 +20,8 @@ export API_PORT="3000"
 export REDIS_URL="noop"
 export REDIS_CONFIG_URL="noop"
 
+PLATFORM=android yarn set-workingdir:remote
+
 yarn test:smoke:android
 smoke_result=$?
 

scripts/testIosCI.sh

@@ -18,7 +18,7 @@ export API_PORT="443"
 export REDIS_URL="noop"
 export REDIS_CONFIG_URL="noop"
 
-yarn init-workingdir:remote-ios
+PLATFORM=ios yarn set-workingdir:remote
 
 yarn test:smoke:ios
 smoke_result=$?

tools/bin/unlock

@@ -8,4 +8,9 @@ if [ ! -f "$KEYFILE" ]; then
   update-local-secrets --keyfile-only
 fi
 
+if ! command -v git-crypt >/dev/null 2>&1 ; then
+  echo "You need to have git-crypt installed."
+  exit 1
+fi
+
 git-crypt unlock "$KEYFILE"