fix: do not require s3 credentials to pack

jdx · jdx · commit a5b73e0e843f · 2018-05-04T08:27:24.000-07:00
Fixes oclif/oclif#111
diff --git a/src/tarballs/build.ts b/src/tarballs/build.ts
@@ -1,4 +1,5 @@
 import {ArchTypes, PlatformTypes} from '@oclif/config'
+import * as Errors from '@oclif/errors'
 import * as path from 'path'
 import * as qq from 'qqjs'
 
@@ -43,6 +44,8 @@ export async function build(c: IConfig, options: {
     qq.cd(c.workspace())
     const pjson = await qq.readJSON('package.json')
     pjson.version = c.version
+    pjson.oclif.update = pjson.oclif.update || {}
+    pjson.oclif.update.s3 = pjson.oclif.update.s3 || {}
     pjson.oclif.update.s3.bucket = c.s3Config.bucket
     await qq.writeJSON('package.json', pjson)
   }
@@ -85,6 +88,7 @@ export async function build(c: IConfig, options: {
     if (options.pack === false) return
     await pack(workspace, c.dist(key))
     if (xz) await pack(workspace, c.dist(config.s3Key('versioned', '.tar.xz', target)))
+    if (!c.updateConfig.s3.host) return
     const manifest: IManifest = {
       rollout: (typeof c.updateConfig.autoupdate === 'object' && c.updateConfig.autoupdate.rollout) as number,
       version: c.version,
@@ -105,6 +109,10 @@ export async function build(c: IConfig, options: {
     if (options.pack === false) return
     await pack(c.workspace(), c.dist(config.s3Key('versioned', '.tar.gz')))
     if (xz) await pack(c.workspace(), c.dist(config.s3Key('versioned', '.tar.xz')))
+    if (!c.updateConfig.s3.host) {
+      Errors.warn('No S3 bucket or host configured. CLI will not be able to update.')
+      return
+    }
     const manifest: IManifest = {
       version: c.version,
       baseDir: config.s3Key('baseDir'),
diff --git a/src/tarballs/config.ts b/src/tarballs/config.ts
@@ -51,7 +51,8 @@ export async function buildConfig(root: string): Promise<IConfig> {
   const _gitSha = await gitSha(root, {short: true})
   const version = config.version.includes('-') ? `${config.version}.${_gitSha}` : config.version
   const tmp = await Tmp(config)
-  const updateConfig = config.pjson.oclif.update
+  const updateConfig = config.pjson.oclif.update || {}
+  updateConfig.s3 = updateConfig.s3 || {}
   return {
     root,
     gitSha: _gitSha,
