fix(log): get logging config to propagate correctly

Also made current tink config globally accessible (will remove in --production mode)

Author: zkat

bin/tink.js

@@ -45,4 +45,5 @@ function runCommandWithYargs (argv, log, npmConfig) {
   require('../lib/node/index.js')
   const yargv = npmConfig(config.argv).concat({ log })
   log.level = yargv.loglevel || 'notice'
+  process.tink.config = yargv
 }

lib/config.js

@@ -6,7 +6,7 @@ const CONFIG_NAMES = ['tinkrc', '.tinkrc', 'npmrc', '.npmrc']
 const ENV_PREFIX = /^(?:npm|tink)_config_/i
 module.exports = getConfigs
 function getConfigs (argv) {
-  return config.read({
+  return config.read(argv, {
     configNames: CONFIG_NAMES,
     envPrefix: ENV_PREFIX
   })

lib/lock-worker.js

@@ -1,39 +1,39 @@
 'use strict'
 
-let config
 let ensurePkg
 let prepare
 
+const figgyPudding = require('figgy-pudding')
+
+const MainOpts = figgyPudding({
+  log: { default: () => require('libnpm').log },
+  loglevel: { default: 'notice' }
+}, {
+  other () { return true }
+})
+
 if (require.main === module && process.argv[2] === 'ensure-pkg') {
   main(...process.argv.slice(3))
 }
 
 module.exports = main
-async function main (cache, integrity, pkg) {
-  pkg = JSON.parse(pkg)
-  if (!config) { config = require('./config.js') }
-  const opts = config().concat({
+async function main (cache, integrity, pkg, opts) {
+  opts = MainOpts(JSON.parse(opts)).concat({
     cache,
     integrity,
-    log: require('npmlog'),
-    // loglevel: 'silly',
     'restore-missing': true,
     force: true
-  }, {
-    other () { return true }
   })
+  pkg = JSON.parse(pkg)
   opts.log.heading = 'tink'
-  opts.log.notice('fs', 'unpacking', `${pkg.name}@${pkg.version}`)
+  opts.log.level = opts.loglevel
+  opts.log.notice('fs', 'fetching', `${pkg.name}@${pkg.version}`)
   try {
     if (!prepare) { prepare = require('./commands/prepare.js') }
-    opts.log.level = 'silent'
-    const res = await prepare.handler(opts.concat({
-      loglevel: 'silent'
-    }), [pkg.name])
+    const res = await prepare.handler(opts, [pkg.name])
     if (res && !res.pkgCount) { throw new Error('no packages installed') }
   } catch (err) {
     if (!ensurePkg) { ensurePkg = require('./ensure-package.js') }
-    opts.log.level = opts.loglevel
     await ensurePkg(cache, pkg.name, pkg, opts)
   }
 }

lib/pkglock.js

@@ -304,13 +304,11 @@ function getPkg (cache, scope, pkgName) {
 }
 
 let ensurePkg
-let config
 let ensureDep
 async function fetchPackage (cache, pkg, hash) {
   if (!ensurePkg) { ensurePkg = require('./ensure-package.js') }
-  if (!config) { config = require('./config.js') }
   if (!ensureDep) { ensureDep = require('./lock-worker.js') }
-  await ensureDep(cache, hash, pkg)
+  await ensureDep(cache, hash, pkg, process.tink.config)
 }
 
 function fetchPackageSync (cache, pkg, integrity) {
@@ -319,6 +317,7 @@ function fetchPackageSync (cache, pkg, integrity) {
     'ensure-pkg',
     cache,
     integrity,
-    JSON.stringify(pkg)
+    JSON.stringify(pkg),
+    JSON.stringify(process.tink.config.concat({ log: undefined }) || {})
   ], { stdio: 'inherit' })
 }