fix(opts): move validation of the opts to later stage (#104)

contentful · Nov 29, 2016 · a5123cf · a5123cf
1 parent 8485db5
commit a5123cf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/lib/run-space-sync.js b/lib/run-space-sync.js
@@ -13,7 +13,13 @@ import dumpErrorBuffer from './dump-error-buffer'
 import getTransformedDestinationResponse from './get-transformed-destination-response'
 
 export default function runSpaceSync (usageParams) {
-  const {opts, syncTokenFile, errorLogFile} = usageParams
+  let {opts, errorLogFile, syncTokenFile} = usageParams
+  opts.sourceManagementToken = opts.sourceManagementToken || opts.managementToken
+  opts.destinationManagementToken = opts.destinationManagementToken || opts.managementToken
+  const tokenDir = opts.syncTokenDir || process.cwd()
+  errorLogFile = errorLogFile || tokenDir + '/contentful-space-sync-' + Date.now() + '.log'
+  syncTokenFile = syncTokenFile || tokenDir + '/contentful-space-sync-token-' + opts.sourceSpace + '-to-' + opts.destinationSpace
+
   if (opts.proxyHost && opts.proxyPort) {
     opts.proxy = {host: opts.proxyHost, port: opts.proxyPort}
   }
@@ -72,7 +78,7 @@ export default function runSpaceSync (usageParams) {
           const nextSyncToken = responses.source.nextSyncToken
           if (!opts.contentModelOnly && nextSyncToken) {
             fs.writeFileSync(syncTokenFile, nextSyncToken)
-            log.info('Successfully sychronized the content and saved the sync token to:\n ', syncTokenFile)
+            log.info('Successfully sychronized the content and saved the sync token to:\n ', opts.syncTokenFile)
           } else {
             log.info('Successfully sychronized the content model')
           }

diff --git a/lib/usageParams.js b/lib/usageParams.js
@@ -149,13 +149,6 @@ var opts = yargs
   })
   .argv
 
-opts.sourceManagementToken = opts.sourceManagementToken || opts.managementToken
-opts.destinationManagementToken = opts.destinationManagementToken || opts.managementToken
-
-var tokenDir = opts.syncTokenDir || process.cwd()
-
 module.exports = {
-  opts: opts,
-  errorLogFile: tokenDir + '/contentful-space-sync-' + Date.now() + '.log',
-  syncTokenFile: tokenDir + '/contentful-space-sync-token-' + opts.sourceSpace + '-to-' + opts.destinationSpace
+  opts: opts
 }