livingdocs-cli 1.3.1 → 2.1.0

package/src/commands/project-config/plan.js

@@ -6,20 +6,19 @@ const errorReporter = require('../../lib/api/error_reporter')
 const resultReporter = require('../../lib/api/channel_config_result_reporter')
 const readChannelConfig = require('../../lib/read_channel_config')
 
-const description = `See what would be updated in a publish command`
-const commandFlags = {
-  project: sharedFlags.project,
-  env: sharedFlags.env,
-  token: {...sharedFlags.configWriteToken, required: true},
-  host: {...sharedFlags.host, required: true},
-  dist: {
-    ...sharedFlags.dist,
-    required: true,
-    description: 'The folder or filename to the channelConfig.'
-  }
-}
-
 class PlanCommand extends Command {
+  static description = `See what would be updated in a publish command`
+  static flags = {
+    project: sharedFlags.project,
+    env: sharedFlags.env,
+    token: {...sharedFlags.configWriteToken, required: true},
+    host: {...sharedFlags.host, required: true},
+    dist: {
+      ...sharedFlags.dist,
+      required: true,
+      description: 'The folder or filename to the channelConfig.'
+    }
+  }
 
   async run () {
     const {token, host, dist} = this.parse(PlanCommand).flags
@@ -35,6 +34,4 @@ class PlanCommand extends Command {
   }
 }
 
-PlanCommand.description = description
-PlanCommand.flags = commandFlags
 module.exports = PlanCommand

package/src/commands/project-config/publish.js

@@ -9,20 +9,19 @@ const resultReporter = require('../../lib/api/channel_config_result_reporter')
 const readChannelConfig = require('../../lib/read_channel_config')
 const updateRevisionNumber = require('../../lib/update_revision_number')
 
-const description = `Publish a ChannelConfig to your project`
-const commandFlags = {
-  project: sharedFlags.project,
-  env: sharedFlags.env,
-  token: {...sharedFlags.configWriteToken, required: true},
-  host: {...sharedFlags.host, required: true},
-  dist: {
-    ...sharedFlags.dist,
-    required: true,
-    description: 'The folder or filename to the channelConfig.'
-  }
-}
-
 class PublishCommand extends Command {
+  static description = `Publish a ChannelConfig to your project`
+  static flags = {
+    project: sharedFlags.project,
+    env: sharedFlags.env,
+    token: {...sharedFlags.configWriteToken, required: true},
+    host: {...sharedFlags.host, required: true},
+    dist: {
+      ...sharedFlags.dist,
+      required: true,
+      description: 'The folder or filename to the channelConfig.'
+    }
+  }
 
   async run () {
     const {token, host, dist, env} = this.parse(PublishCommand).flags
@@ -59,6 +58,4 @@ class PublishCommand extends Command {
   }
 }
 
-PublishCommand.description = description
-PublishCommand.flags = commandFlags
 module.exports = PublishCommand

package/src/commands/project-config/upload.js

@@ -7,24 +7,23 @@ const errorReporter = require('../../lib/api/error_reporter')
 const resultReporter = require('../../lib/api/channel_config_result_reporter')
 const readChannelConfig = require('../../lib/read_channel_config')
 
-const description = `Upload a ChannelConfig into a draft for your project`
-const commandFlags = {
-  project: sharedFlags.project,
-  env: sharedFlags.env,
-  token: {...sharedFlags.configWriteToken, required: true},
-  host: {...sharedFlags.host, required: true},
-  dist: flags.string({
-    char: 'd',
-    required: true,
-    description: 'The folder or filename to the channelConfig.'
-  }),
-  draftName: flags.string({
-    description: 'The name of the draft the config will be saved under.',
-    required: true
-  })
-}
-
 class UploadCommand extends Command {
+  static description = `Upload a ChannelConfig into a draft for your project`
+  static flags = {
+    project: sharedFlags.project,
+    env: sharedFlags.env,
+    token: {...sharedFlags.configWriteToken, required: true},
+    host: {...sharedFlags.host, required: true},
+    dist: flags.string({
+      char: 'd',
+      required: true,
+      description: 'The folder or filename to the channelConfig.'
+    }),
+    draftName: flags.string({
+      description: 'The name of the draft the config will be saved under.',
+      required: true
+    })
+  }
 
   async run () {
     const {token, host, dist} = this.parse(UploadCommand).flags
@@ -45,6 +44,4 @@ class UploadCommand extends Command {
   }
 }
 
-UploadCommand.description = description
-UploadCommand.flags = commandFlags
 module.exports = UploadCommand

package/src/commands/project-config/upload_assets.js

@@ -5,17 +5,16 @@ const {Command, flags} = require('@oclif/command')
 const sharedFlags = require('../../lib/cli/shared_flags')
 const liApi = require('../../lib/api/livingdocs_api')
 
-const description = `Upload assets to your project`
-const commandFlags = {
-  token: {...sharedFlags.configWriteToken, required: true},
-  host: sharedFlags.host,
-  assets: flags.string({
-    char: 'a',
-    description: 'The folder where you asset files are located.'
-  })
-}
-
 class UploadAssetsCommand extends Command {
+  static description = `Upload assets to your project`
+  static flags = {
+    token: {...sharedFlags.configWriteToken, required: true},
+    host: sharedFlags.host,
+    assets: flags.string({
+      char: 'a',
+      description: 'The folder where you asset files are located.'
+    })
+  }
 
   async run () {
     const {token, host, assets} = this.parse(UploadAssetsCommand).flags
@@ -44,6 +43,4 @@ class UploadAssetsCommand extends Command {
 
 }
 
-UploadAssetsCommand.description = description
-UploadAssetsCommand.flags = commandFlags
 module.exports = UploadAssetsCommand

package/src/lib/cli/load_cli_config.js

@@ -1,4 +1,6 @@
 const fs = require('fs-extra')
+const yaml = require('js-yaml')
+
 const _get = require('lodash/get')
 
 let cliConfig
@@ -31,7 +33,8 @@ function readFile () {
   const filepath = `${workingDir}/.livingdocs-cli`
 
   if (fs.existsSync(filepath)) {
-    const config = fs.readJsonSync(filepath)
+
+    const config = yaml.load(fs.readFileSync(filepath))
     return config
 
   }