Merge branch 'master' of github.com:cxxpods/cxxpods

cxxpods · Jun 30, 2019 · f59f5f6 · f59f5f6
2 parents 941d1a6 + 3658596
commit f59f5f6
Show file tree

Hide file tree

Showing 19 changed files with 488 additions and 282 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "cxxpods",
   "description": "CXXPods enables simple CMake dependency management",
   "license": "MIT",
-  "version": "0.0.49",
+  "version": "0.0.51",
   "repository": {
     "type": "git",
     "url": "https://github.com/cxxpods/cxxpods.git"
@@ -77,7 +77,10 @@
     "@babel/preset-env": "^7.4.3",
     "@types/handlebars": "^4.0.38",
     "@types/jest": "^23.1.4",
-    "@types/shelljs": "^0.8.0",
+    "@types/lockfile": "^1.0.1",
+    "@types/lodash": "^4.14.132",
+    "@types/node": "^12.0.2",
+    "@types/shelljs": "^0.8.5",
     "@types/yargs": "^11.0.0",
     "babel-core": "^7.0.0-bridge.0",
     "babel-jest": "^23.4.2",

diff --git a/src/Config.js b/src/Config.js
@@ -150,7 +150,7 @@ class Configuration {
 
 export const Config = new Configuration()
 export const Environment = {
-  CXXPODS_PROC_COUNT: Math.max(1,Math.floor(OS.cpus().length / 2))
+  CXXPODS_PROC_COUNT: Math.max(1,Math.floor(OS.cpus().length))
 }
 
 export const Paths = {

diff --git a/src/Log.js b/src/Log.js
@@ -20,11 +20,16 @@ const alignedWithColorsAndTime = winston.format.combine(
 
 // CONSOLE LOGGER
 const ConsoleLogger = new winston.transports.Console({
-  level: 'info',
+  level: verboseEnabled() ? 'info' : 'warn',
   format: alignedWithColorsAndTime
 })
 
 
+export function verboseEnabled() {
+  return process.argv.includes("-v")
+}
+
+
 /**
  * Create a logger
  *