Merge branch 'preallocation' of github.com:trufflesuite/truffle into …

…preallocation

packages/truffle-artifactor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "truffle-artifactor",
-  "version": "4.0.0-beta.2",
+  "version": "4.0.0",
   "description": "A contract packager for Ethereum and Javascript",
   "author": "Tim Coulter",
   "main": "./index.js",
@@ -18,22 +18,22 @@
     "ganache-core": "^2.3.1",
     "mocha": "5.2.0",
     "require-nocache": "^1.0.0",
-    "solc": "^0.5.0",
+    "solc": "0.5.0",
     "temp": "^0.8.3",
-    "truffle-blockchain-utils": "^0.0.6-beta.1",
+    "truffle-blockchain-utils": "^0.0.6",
     "web3": "^1.0.0-beta.37"
   },
   "dependencies": {
     "async": "2.6.1",
     "debug": "^4.1.0",
     "fs-extra": "6.0.1",
     "lodash": "4.17.10",
-    "truffle-contract": "^4.0.0-beta.2",
-    "truffle-contract-schema": "3.0.0-beta.2",
-    "truffle-expect": "^0.0.5-beta.0"
+    "truffle-contract": "^4.0.0",
+    "truffle-contract-schema": "^3.0.0",
+    "truffle-expect": "^0.0.5"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f9f25a2d491394ac3df1bab56f9c743d871a1059"
+  "gitHead": "b207efb3c1409746537293b3e0fc27350029188e"
 }

packages/truffle-blockchain-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "truffle-blockchain-utils",
-  "version": "0.0.6-beta.1",
+  "version": "0.0.6",
   "description": "Utilities for identifying and managing blockchains",
   "main": "index.js",
   "scripts": {},
@@ -19,5 +19,5 @@
     "url": "https://github.com/trufflesuite/truffle-blockchain-utils/issues"
   },
   "homepage": "https://github.com/trufflesuite/truffle-blockchain-utils#readme",
-  "gitHead": "f9f25a2d491394ac3df1bab56f9c743d871a1059"
+  "gitHead": "b207efb3c1409746537293b3e0fc27350029188e"
 }

packages/truffle-box/package.json

@@ -1,6 +1,6 @@
 {
   "name": "truffle-box",
-  "version": "1.0.8-beta.2",
+  "version": "1.0.8",
   "description": "Truffle project boilerplate utility",
   "main": "box.js",
   "scripts": {
@@ -19,7 +19,7 @@
     "eslint": "^4.0.0",
     "mocha": "5.2.0",
     "sinon": "^6.3.4",
-    "truffle-config": "^1.1.0-next.1"
+    "truffle-config": "^1.1.0"
   },
   "dependencies": {
     "fs-extra": "6.0.1",
@@ -32,5 +32,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f9f25a2d491394ac3df1bab56f9c743d871a1059"
+  "gitHead": "b207efb3c1409746537293b3e0fc27350029188e"
 }

packages/truffle-code-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "truffle-code-utils",
-  "version": "1.1.2-beta.1",
+  "version": "1.1.2",
   "description": "",
   "main": "index.js",
   "scripts": {},
@@ -9,5 +9,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f9f25a2d491394ac3df1bab56f9c743d871a1059"
+  "gitHead": "b207efb3c1409746537293b3e0fc27350029188e"
 }

packages/truffle-compile-vyper/package.json

@@ -1,18 +1,18 @@
 {
   "name": "truffle-compile-vyper",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0",
   "description": "Vyper compiler support",
   "main": "index.js",
   "dependencies": {
     "async": "2.6.1",
     "colors": "^1.1.2",
     "eslint": "^5.5.0",
     "minimatch": "^3.0.4",
-    "truffle-compile": "^4.0.0-beta.2"
+    "truffle-compile": "^4.0.0"
   },
   "devDependencies": {
     "mocha": "^5.2.0",
-    "truffle-config": "^1.1.0-next.1"
+    "truffle-config": "^1.1.0"
   },
   "scripts": {
     "test": "mocha"
@@ -28,5 +28,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f9f25a2d491394ac3df1bab56f9c743d871a1059"
+  "gitHead": "b207efb3c1409746537293b3e0fc27350029188e"
 }

packages/truffle-compile/index.js

@@ -44,10 +44,8 @@ var compile = function(sources, options, callback) {
 
   // Grandfather in old solc config
   if (options.solc) {
-    options.compilers.solc.settings.evmVersion =
-      options.solc.settings.evmVersion || options.solc.evmVersion;
-    options.compilers.solc.settings.optimizer =
-      options.solc.settings.optimizer || options.solc.optimizer;
+    options.compilers.solc.settings.evmVersion = options.solc.evmVersion;
+    options.compilers.solc.settings.optimizer = options.solc.optimizer;
   }
 
   // Ensure sources have operating system independent paths

packages/truffle-compile/package.json

@@ -1,6 +1,6 @@
 {
   "name": "truffle-compile",
-  "version": "4.0.0-beta.2",
+  "version": "4.0.0",
   "description": "Compiler helper and artifact manager",
   "main": "index.js",
   "dependencies": {
@@ -14,19 +14,19 @@
     "request-promise": "^4.2.2",
     "require-from-string": "^2.0.2",
     "semver": "^5.6.0",
-    "solc": "^0.5.0",
-    "truffle-config": "^1.1.0-next.1",
-    "truffle-contract-sources": "^0.1.0-beta.2",
+    "solc": "0.5.0",
+    "truffle-config": "^1.1.0",
+    "truffle-contract-sources": "^0.1.0",
     "truffle-error": "^0.0.3",
-    "truffle-expect": "^0.0.5-beta.0"
+    "truffle-expect": "^0.0.5"
   },
   "devDependencies": {
     "babel-core": "^6.26.0",
     "babel-polyfill": "^6.26.0",
     "babel-preset-env": "^1.6.1",
     "mocha": "5.2.0",
     "tmp": "0.0.33",
-    "truffle-resolver": "^5.0.0-beta.2"
+    "truffle-resolver": "^5.0.0"
   },
   "babel": {
     "presets": [
@@ -55,5 +55,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f9f25a2d491394ac3df1bab56f9c743d871a1059"
+  "gitHead": "b207efb3c1409746537293b3e0fc27350029188e"
 }

packages/truffle-config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "truffle-config",
-  "version": "1.1.0-next.1",
+  "version": "1.1.0",
   "description": "Utility for interacting with truffle.js files",
   "main": "index.js",
   "scripts": {},
@@ -25,10 +25,10 @@
     "lodash": "4.17.10",
     "original-require": "1.0.1",
     "truffle-error": "^0.0.3",
-    "truffle-provider": "^0.1.0-beta.2"
+    "truffle-provider": "^0.1.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f9f25a2d491394ac3df1bab56f9c743d871a1059"
+  "gitHead": "b207efb3c1409746537293b3e0fc27350029188e"
 }

packages/truffle-contract-schema/package.json

@@ -1,6 +1,6 @@
 {
   "name": "truffle-contract-schema",
-  "version": "3.0.0-beta.2",
+  "version": "3.0.0",
   "description": "JSON schema for contract artifacts",
   "main": "index.js",
   "scripts": {
@@ -33,10 +33,10 @@
   "devDependencies": {
     "json-schema-to-typescript": "^5.5.0",
     "mocha": "5.2.0",
-    "solc": "^0.5.0"
+    "solc": "0.5.0"
   },
   "directories": {
     "spec": "./spec"
   },
-  "gitHead": "f9f25a2d491394ac3df1bab56f9c743d871a1059"
+  "gitHead": "b207efb3c1409746537293b3e0fc27350029188e"
 }

packages/truffle-contract-sources/package.json

@@ -1,6 +1,6 @@
 {
   "name": "truffle-contract-sources",
-  "version": "0.1.0-beta.2",
+  "version": "0.1.0",
   "description": "Utility for finding all contracts within a directory",
   "main": "index.js",
   "scripts": {},
@@ -27,5 +27,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f9f25a2d491394ac3df1bab56f9c743d871a1059"
+  "gitHead": "b207efb3c1409746537293b3e0fc27350029188e"
 }

packages/truffle-contract/package.json

@@ -1,6 +1,6 @@
 {
   "name": "truffle-contract",
-  "version": "4.0.0-beta.2",
+  "version": "4.0.0",
   "description": "A better contract abstraction for Ethereum (formerly EtherPudding)",
   "main": "index.js",
   "scripts": {
@@ -31,8 +31,8 @@
     "bignumber.js": "^7.2.1",
     "ethereumjs-util": "^5.2.0",
     "ethjs-abi": "0.1.8",
-    "truffle-blockchain-utils": "^0.0.6-beta.1",
-    "truffle-contract-schema": "3.0.0-beta.2",
+    "truffle-blockchain-utils": "^0.0.6",
+    "truffle-contract-schema": "^3.0.0",
     "truffle-error": "^0.0.3",
     "uglify-es": "^3.3.9",
     "web3": "^1.0.0-beta.37",
@@ -52,7 +52,7 @@
     "lodash": "4.17.10",
     "mocha": "5.2.0",
     "require-nocache": "^1.0.0",
-    "solc": "^0.5.0",
+    "solc": "0.5.0",
     "temp": "^0.8.3"
   },
   "publishConfig": {
@@ -63,5 +63,5 @@
       "env"
     ]
   },
-  "gitHead": "f9f25a2d491394ac3df1bab56f9c743d871a1059"
+  "gitHead": "b207efb3c1409746537293b3e0fc27350029188e"
 }

packages/truffle-core/lib/commands/test.js

@@ -10,7 +10,7 @@ var command = {
   },
   help: {
     usage:
-      "truffle test [<test_file>] [--compile-all] [--network <name>] [--verbose-rpc]",
+      "truffle test [<test_file>] [--compile-all] [--network <name>] [--verbose-rpc] [--show-events]",
     options: [
       {
         option: "<test_file>",
@@ -34,6 +34,10 @@ var command = {
         option: "--verbose-rpc",
         description:
           "Log communication between Truffle and the Ethereum client."
+      },
+      {
+        option: "--show-events",
+        description: "Log all contract events."
       }
     ]
   },
@@ -91,7 +95,7 @@ var command = {
         function cleanup() {
           var args = arguments;
           // Ensure directory cleanup.
-          temp.cleanup(function(err) {
+          temp.cleanup(function() {
             // Ignore cleanup errors.
             done.apply(null, args);
             if (ipcDisconnect) {
@@ -119,7 +123,7 @@ var command = {
           // Copy all the built files over to a temporary directory, because we
           // don't want to save any tests artifacts. Only do this if the build directory
           // exists.
-          fs.stat(config.contracts_build_directory, function(err, stat) {
+          fs.stat(config.contracts_build_directory, function(err) {
             if (err) return run();
 
             copy(config.contracts_build_directory, temporaryDirectory, function(

packages/truffle-core/lib/commands/version.js

@@ -7,10 +7,22 @@ const command = {
     options: []
   },
   run: function(options, done) {
+    let config;
     const version = require("../version");
     const { logger } = options;
     const Config = require("truffle-config");
-    const config = Config.detect(options);
+
+    try {
+      config = Config.detect(options);
+    } catch (error) {
+      // Suppress error when truffle can't find a config
+      if (error.message === "Could not find suitable configuration file.") {
+        config = null;
+      } else {
+        return done(error);
+      }
+    }
+
     version.logAll(logger, config);
     done();
   }

packages/truffle-core/lib/testing/testrunner.js

@@ -188,7 +188,7 @@ TestRunner.prototype.endTest = function(mocha, callback) {
         }
         index += 1;
 
-        return input.name + ": " + value.toString();
+        return input.name + ": " + `${value}`
       }).join(", ");
       line += ")";
       self.logger.log(line);

packages/truffle-core/lib/version.js

@@ -26,9 +26,10 @@ const logNode = (logger = console) => {
   logger.log(`Node ${process.version}`);
 };
 
-const logSolidity = (logger = console, versionInformation, config = {}) => {
+const logSolidity = (logger = console, versionInformation, config) => {
   let solcVersion;
   if (
+    config &&
     config.compilers &&
     config.compilers.solc &&
     config.compilers.solc.version