Merge branch 'alpha' into beta

Author: mavilein

cli/packages/prisma-cli-core/src/commands/deploy/deploy.ts

@@ -312,6 +312,7 @@ ${chalk.gray(
       const splittedHook = hook.split(' ')
       this.out.action.start(`Running ${chalk.cyan(hook)}`)
       const isPackaged = fs.existsSync('/snapshot')
+      debug({ isPackaged })
       const spawnPath = isPackaged ? nativeSpawnSync : spawnSync
       const child = spawnPath(splittedHook[0], splittedHook.slice(1))
       const stderr = child.stderr && child.stderr.toString()

cli/packages/prisma-cli-core/src/commands/generate/generate.ts

@@ -19,6 +19,7 @@ import generateCRUDSchemaString, {
 import { DatabaseType, IGQLType } from 'prisma-datamodel'
 import { fetchAndPrintSchema } from '../deploy/printSchema'
 
+const debug = require('debug')('generate')
 export default class GenereateCommand extends Command {
   static topic = 'generate'
   static description = 'Generate a schema or Prisma Bindings'
@@ -267,6 +268,7 @@ export default class GenereateCommand extends Command {
     this.out.log(`Saving Prisma Client (Go) at ${output}`)
     // Run "go fmt" on the file if user has it installed.
     const isPackaged = fs.existsSync('/snapshot')
+    debug({isPackaged})
     const spawnPath = isPackaged ? nativeSpawnSync : spawnSync
     spawnPath('go', ['fmt', path.join(output, 'prisma.go')])
   }

cli/packages/prisma-cli-core/src/commands/init/init.ts

@@ -173,6 +173,7 @@ datamodel: datamodel.prisma${databaseTypeString}`
       results.datamodel,
     )
     if (results.cluster!.local && results.writeDockerComposeYml) {
+      debug(`prisma init: writing docker-compose.yml`)
       fs.writeFileSync(
         path.join(this.config.definitionDir, 'docker-compose.yml'),
         results.dockerComposeYml,
@@ -261,6 +262,7 @@ ${steps.map((step, index) => `  ${index + 1}. ${step}`).join('\n')}`)
         this.out.log(chalk.red(err))
       }
       const isPackaged = fs.existsSync('/snapshot')
+      debug({ isPackaged })
       const spawnPath = isPackaged ? nativeSpawnSync : spawnSync
       const child = spawnPath('prisma', ['generate'])
       const stderr = child.stderr && child.stderr.toString()

cli/packages/prisma-cli/package.json

@@ -29,17 +29,20 @@
   "author": "Tim Suchanek <suchanek@prisma.io>",
   "license": "Apache-2.0",
   "devDependencies": {
+    "@expo/spawn-async": "1.4.0",
     "@types/fs-extra": "^5.0.0",
     "@types/node": "^8.0.22",
     "aws-sdk": "^2.373.0",
     "axios": "^0.18.0",
     "dotenv-cli": "^1.4.0",
-    "git-commit-push-via-github-api": "^1.0.1",
+    "git-commit-push-via-github-api": "1.0.1",
     "husky": "^0.14.3",
     "lint-staged": "^4.0.3",
     "pkg": "^4.3.5",
     "prettier": "1.14.3",
+    "progress-estimator": "0.2.2",
     "rimraf": "^2.6.1",
+    "ts-node": "8.0.2",
     "tslint": "^5.6.0",
     "tslint-config-prettier": "^1.17.0",
     "tslint-eslint-rules": "^5.4.0",
@@ -48,13 +51,13 @@
   "scripts": {
     "build": "rimraf dist && tsc -d && chmod +x dist/index.js",
     "lint": "tslint src/**/*.ts",
-    "publish-homebrew": "dotenv -e scripts/.env ts-node ./scripts/release-brew.ts",
-    "make-binary": "npm run build && npm run package",
+    "publish-macos": "dotenv -e scripts/.env ts-node ./scripts/release/macos.ts",
+    "publish-linux": "dotenv -e scripts/.env ts-node ./scripts/release/linux.ts",
+    "binary-macos": "npm run build && ./scripts/cp-assets.sh && dotenv -e scripts/.env ts-node ./scripts/release/pre-release.ts && pkg package.json --targets node10-macos-x64",
+    "binary-linux": "npm run build && ./scripts/cp-assets.sh && dotenv -e scripts/.env ts-node ./scripts/release/pre-release.ts && pkg package.json --targets node10-linux-x64",
     "precommit": "lint-staged",
     "prettier": "prettier --single-quote --no-semi --trailing-comma all --write '*.ts' 'src/**/*.ts'",
-    "prepublishOnly": "npm run lint && npm run build",
-    "package": "./scripts/cp-assets.sh && pkg package.json --targets node10-macos-x64",
-    "package-linux": "./scripts/cp-assets.sh && pkg package.json --targets node10-linux-x64"
+    "prepublishOnly": "npm run lint && npm run build"
   },
   "cli-engine": {
     "bin": "prisma",

cli/packages/prisma-cli/scripts/cp-assets.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 set -e
 
- cp -r ../prisma-cli-core/src/commands/init/boilerplate ../prisma-cli-core/dist/commands/init/boilerplate
+cp -r ../prisma-cli-core/src/commands/init/boilerplate ../prisma-cli-core/dist/commands/init/boilerplate

cli/packages/prisma-cli/scripts/release-brew.ts

@@ -0,0 +1,14 @@
+import { getReleaseFromGithubAPI, linux, checkEnvs, updateFiles } from './release-lib'
+
+async function main() {
+  try {
+    checkEnvs()
+    const version = await getReleaseFromGithubAPI()
+    // Files are updated from binary-X commands which in invoked by the following function using spawn sync
+    await linux(version)
+  } catch (e) {
+    throw new Error(e)
+  }
+}
+
+main()

cli/packages/prisma-cli/scripts/release/linux.ts

@@ -0,0 +1,15 @@
+import { getReleaseFromGithubAPI, brew, checkEnvs, updateFiles } from './release-lib'
+
+async function main() {
+  try {
+    checkEnvs()
+    const version = await getReleaseFromGithubAPI()
+    // Files are updated from binary-X commands which in invoked by the following function using spawn sync
+    await brew(version)
+  } catch (e) {
+    console.error(e)
+    process.exit(1)
+  }
+}
+
+main()

cli/packages/prisma-cli/scripts/release/macos.ts

@@ -0,0 +1,9 @@
+import { getReleaseFromGithubAPI, updateFiles } from './release-lib'
+
+async function main() {
+    const version = await getReleaseFromGithubAPI()
+    updateFiles(version)
+    console.log(`Version: ${version}`)
+}
+
+main()