From cfd369f4f67bde9bda73d53fe871ed0eacbecf9f Mon Sep 17 00:00:00 2001 From: cgewecke Date: Sun, 24 Nov 2019 16:38:47 -0800 Subject: [PATCH 1/2] Rename dist to plugins --- index.js | 2 -- package.json | 4 ++-- {dist => plugins}/bin.js | 0 {dist => plugins}/buidler.plugin.js | 0 {dist => plugins}/plugin-assets/buidler.ui.js | 0 {dist => plugins}/plugin-assets/buidler.utils.js | 0 {dist => plugins}/plugin-assets/plugin.utils.js | 0 {dist => plugins}/plugin-assets/truffle.library.js | 0 {dist => plugins}/plugin-assets/truffle.library.js.map | 0 {dist => plugins}/plugin-assets/truffle.ui.js | 0 {dist => plugins}/plugin-assets/truffle.utils.js | 0 {dist => plugins}/truffle.plugin.js | 0 test/integration/projects/bad-solcoverjs/buidler.config.js | 2 +- .../integration/projects/ganache-solcoverjs/buidler.config.js | 2 +- test/integration/projects/import-paths/buidler.config.js | 2 +- test/integration/projects/libraries/buidler.config.js | 2 +- test/integration/projects/multiple-suites/buidler.config.js | 2 +- test/integration/projects/no-sources/buidler.config.js | 2 +- test/integration/projects/skipping/buidler.config.js | 2 +- test/integration/projects/test-files/buidler.config.js | 2 +- test/units/buidler/errors.js | 2 +- test/units/buidler/flags.js | 2 +- test/units/buidler/standard.js | 2 +- test/units/truffle/errors.js | 4 ++-- test/units/truffle/flags.js | 2 +- test/units/truffle/standard.js | 2 +- test/util/integration.js | 2 +- 27 files changed, 18 insertions(+), 20 deletions(-) delete mode 100644 index.js rename {dist => plugins}/bin.js (100%) rename {dist => plugins}/buidler.plugin.js (100%) rename {dist => plugins}/plugin-assets/buidler.ui.js (100%) rename {dist => plugins}/plugin-assets/buidler.utils.js (100%) rename {dist => plugins}/plugin-assets/plugin.utils.js (100%) rename {dist => plugins}/plugin-assets/truffle.library.js (100%) rename {dist => plugins}/plugin-assets/truffle.library.js.map (100%) rename {dist => plugins}/plugin-assets/truffle.ui.js (100%) rename {dist => plugins}/plugin-assets/truffle.utils.js (100%) rename {dist => plugins}/truffle.plugin.js (100%) diff --git a/index.js b/index.js deleted file mode 100644 index 36fdc6fc..00000000 --- a/index.js +++ /dev/null @@ -1,2 +0,0 @@ -// stub: this is package.json's "main" -// truffle require.resolve's this in order to check plugin is installed \ No newline at end of file diff --git a/package.json b/package.json index 065270f6..ed1ff650 100644 --- a/package.json +++ b/package.json @@ -2,9 +2,9 @@ "name": "solidity-coverage", "version": "0.7.0-beta.2", "description": "", - "main": "dist/buidler.plugin.js", + "main": "plugins/buidler.plugin.js", "bin": { - "solidity-coverage": "./dist/bin.js" + "solidity-coverage": "./plugins/bin.js" }, "directories": { "test": "test" diff --git a/dist/bin.js b/plugins/bin.js similarity index 100% rename from dist/bin.js rename to plugins/bin.js diff --git a/dist/buidler.plugin.js b/plugins/buidler.plugin.js similarity index 100% rename from dist/buidler.plugin.js rename to plugins/buidler.plugin.js diff --git a/dist/plugin-assets/buidler.ui.js b/plugins/plugin-assets/buidler.ui.js similarity index 100% rename from dist/plugin-assets/buidler.ui.js rename to plugins/plugin-assets/buidler.ui.js diff --git a/dist/plugin-assets/buidler.utils.js b/plugins/plugin-assets/buidler.utils.js similarity index 100% rename from dist/plugin-assets/buidler.utils.js rename to plugins/plugin-assets/buidler.utils.js diff --git a/dist/plugin-assets/plugin.utils.js b/plugins/plugin-assets/plugin.utils.js similarity index 100% rename from dist/plugin-assets/plugin.utils.js rename to plugins/plugin-assets/plugin.utils.js diff --git a/dist/plugin-assets/truffle.library.js b/plugins/plugin-assets/truffle.library.js similarity index 100% rename from dist/plugin-assets/truffle.library.js rename to plugins/plugin-assets/truffle.library.js diff --git a/dist/plugin-assets/truffle.library.js.map b/plugins/plugin-assets/truffle.library.js.map similarity index 100% rename from dist/plugin-assets/truffle.library.js.map rename to plugins/plugin-assets/truffle.library.js.map diff --git a/dist/plugin-assets/truffle.ui.js b/plugins/plugin-assets/truffle.ui.js similarity index 100% rename from dist/plugin-assets/truffle.ui.js rename to plugins/plugin-assets/truffle.ui.js diff --git a/dist/plugin-assets/truffle.utils.js b/plugins/plugin-assets/truffle.utils.js similarity index 100% rename from dist/plugin-assets/truffle.utils.js rename to plugins/plugin-assets/truffle.utils.js diff --git a/dist/truffle.plugin.js b/plugins/truffle.plugin.js similarity index 100% rename from dist/truffle.plugin.js rename to plugins/truffle.plugin.js diff --git a/test/integration/projects/bad-solcoverjs/buidler.config.js b/test/integration/projects/bad-solcoverjs/buidler.config.js index 084a9f23..d1f48df0 100644 --- a/test/integration/projects/bad-solcoverjs/buidler.config.js +++ b/test/integration/projects/bad-solcoverjs/buidler.config.js @@ -1,5 +1,5 @@ const { loadPluginFile } = require("@nomiclabs/buidler/plugins-testing"); -loadPluginFile(__dirname + "/../dist/buidler.plugin"); +loadPluginFile(__dirname + "/../plugins/buidler.plugin"); usePlugin("@nomiclabs/buidler-truffle5"); module.exports={ diff --git a/test/integration/projects/ganache-solcoverjs/buidler.config.js b/test/integration/projects/ganache-solcoverjs/buidler.config.js index 084a9f23..d1f48df0 100644 --- a/test/integration/projects/ganache-solcoverjs/buidler.config.js +++ b/test/integration/projects/ganache-solcoverjs/buidler.config.js @@ -1,5 +1,5 @@ const { loadPluginFile } = require("@nomiclabs/buidler/plugins-testing"); -loadPluginFile(__dirname + "/../dist/buidler.plugin"); +loadPluginFile(__dirname + "/../plugins/buidler.plugin"); usePlugin("@nomiclabs/buidler-truffle5"); module.exports={ diff --git a/test/integration/projects/import-paths/buidler.config.js b/test/integration/projects/import-paths/buidler.config.js index f170d4cc..347da202 100644 --- a/test/integration/projects/import-paths/buidler.config.js +++ b/test/integration/projects/import-paths/buidler.config.js @@ -1,5 +1,5 @@ const { loadPluginFile } = require("@nomiclabs/buidler/plugins-testing"); -loadPluginFile(__dirname + "/../dist/buidler.plugin"); +loadPluginFile(__dirname + "/../plugins/buidler.plugin"); usePlugin("@nomiclabs/buidler-truffle5"); module.exports={ diff --git a/test/integration/projects/libraries/buidler.config.js b/test/integration/projects/libraries/buidler.config.js index 46ea0f59..ba0d0937 100644 --- a/test/integration/projects/libraries/buidler.config.js +++ b/test/integration/projects/libraries/buidler.config.js @@ -1,5 +1,5 @@ const { loadPluginFile } = require("@nomiclabs/buidler/plugins-testing"); -loadPluginFile(__dirname + "/../dist/buidler.plugin"); +loadPluginFile(__dirname + "/../plugins/buidler.plugin"); usePlugin("@nomiclabs/buidler-truffle5"); module.exports={ diff --git a/test/integration/projects/multiple-suites/buidler.config.js b/test/integration/projects/multiple-suites/buidler.config.js index 084a9f23..d1f48df0 100644 --- a/test/integration/projects/multiple-suites/buidler.config.js +++ b/test/integration/projects/multiple-suites/buidler.config.js @@ -1,5 +1,5 @@ const { loadPluginFile } = require("@nomiclabs/buidler/plugins-testing"); -loadPluginFile(__dirname + "/../dist/buidler.plugin"); +loadPluginFile(__dirname + "/../plugins/buidler.plugin"); usePlugin("@nomiclabs/buidler-truffle5"); module.exports={ diff --git a/test/integration/projects/no-sources/buidler.config.js b/test/integration/projects/no-sources/buidler.config.js index 46ea0f59..ba0d0937 100644 --- a/test/integration/projects/no-sources/buidler.config.js +++ b/test/integration/projects/no-sources/buidler.config.js @@ -1,5 +1,5 @@ const { loadPluginFile } = require("@nomiclabs/buidler/plugins-testing"); -loadPluginFile(__dirname + "/../dist/buidler.plugin"); +loadPluginFile(__dirname + "/../plugins/buidler.plugin"); usePlugin("@nomiclabs/buidler-truffle5"); module.exports={ diff --git a/test/integration/projects/skipping/buidler.config.js b/test/integration/projects/skipping/buidler.config.js index 084a9f23..d1f48df0 100644 --- a/test/integration/projects/skipping/buidler.config.js +++ b/test/integration/projects/skipping/buidler.config.js @@ -1,5 +1,5 @@ const { loadPluginFile } = require("@nomiclabs/buidler/plugins-testing"); -loadPluginFile(__dirname + "/../dist/buidler.plugin"); +loadPluginFile(__dirname + "/../plugins/buidler.plugin"); usePlugin("@nomiclabs/buidler-truffle5"); module.exports={ diff --git a/test/integration/projects/test-files/buidler.config.js b/test/integration/projects/test-files/buidler.config.js index 817a3eb3..a0b6dbc8 100644 --- a/test/integration/projects/test-files/buidler.config.js +++ b/test/integration/projects/test-files/buidler.config.js @@ -1,5 +1,5 @@ const { loadPluginFile } = require("@nomiclabs/buidler/plugins-testing"); -loadPluginFile(__dirname + "/../dist/buidler.plugin"); +loadPluginFile(__dirname + "/../plugins/buidler.plugin"); usePlugin("@nomiclabs/buidler-truffle5"); module.exports={ diff --git a/test/units/buidler/errors.js b/test/units/buidler/errors.js index 9ab3e485..d425c257 100644 --- a/test/units/buidler/errors.js +++ b/test/units/buidler/errors.js @@ -7,7 +7,7 @@ const ganache = require('ganache-cli') const verify = require('../../util/verifiers') const mock = require('../../util/integration'); -const plugin = require('../../../dist/buidler.plugin'); +const plugin = require('../../../plugins/buidler.plugin'); // ======= // Errors diff --git a/test/units/buidler/flags.js b/test/units/buidler/flags.js index e5ee9946..8dad0ec5 100644 --- a/test/units/buidler/flags.js +++ b/test/units/buidler/flags.js @@ -5,7 +5,7 @@ const shell = require('shelljs'); const verify = require('../../util/verifiers') const mock = require('../../util/integration'); -const plugin = require('../../../dist/buidler.plugin'); +const plugin = require('../../../plugins/buidler.plugin'); // ======================= // CLI Options / Flags diff --git a/test/units/buidler/standard.js b/test/units/buidler/standard.js index 36a7abf4..fcba2bf8 100644 --- a/test/units/buidler/standard.js +++ b/test/units/buidler/standard.js @@ -5,7 +5,7 @@ const shell = require('shelljs'); const verify = require('../../util/verifiers') const mock = require('../../util/integration'); -const plugin = require('../../../dist/buidler.plugin'); +const plugin = require('../../../plugins/buidler.plugin'); // ======================= // Standard Use-case Tests diff --git a/test/units/truffle/errors.js b/test/units/truffle/errors.js index 0521ec34..2a5dc17a 100644 --- a/test/units/truffle/errors.js +++ b/test/units/truffle/errors.js @@ -7,7 +7,7 @@ const ganache = require('ganache-core-sc'); const verify = require('../../util/verifiers') const mock = require('../../util/integration'); -const plugin = require('../../../dist/truffle.plugin'); +const plugin = require('../../../plugins/truffle.plugin'); // ======= // Errors @@ -208,7 +208,7 @@ describe('Truffle Plugin: error cases', function() { }) it('user runs "solidity-coverage" as shell command', function(){ - const pathToCommand = './dist/bin.js'; + const pathToCommand = './plugins/bin.js'; const pkg = require('../../../package.json'); assert( diff --git a/test/units/truffle/flags.js b/test/units/truffle/flags.js index f3c63cc0..bbd62eb6 100644 --- a/test/units/truffle/flags.js +++ b/test/units/truffle/flags.js @@ -5,7 +5,7 @@ const shell = require('shelljs'); const verify = require('../../util/verifiers') const mock = require('../../util/integration'); -const plugin = require('../../../dist/truffle.plugin'); +const plugin = require('../../../plugins/truffle.plugin'); // ======================= // CLI Options / Flags diff --git a/test/units/truffle/standard.js b/test/units/truffle/standard.js index 5d0824bf..1c281fe6 100644 --- a/test/units/truffle/standard.js +++ b/test/units/truffle/standard.js @@ -5,7 +5,7 @@ const shell = require('shelljs'); const verify = require('../../util/verifiers') const mock = require('../../util/integration'); -const plugin = require('../../../dist/truffle.plugin'); +const plugin = require('../../../plugins/truffle.plugin'); // ======================= // Standard Use-case Tests diff --git a/test/util/integration.js b/test/util/integration.js index dbc6d420..60d2ddc5 100644 --- a/test/util/integration.js +++ b/test/util/integration.js @@ -159,7 +159,7 @@ function getDefaultBuidlerConfig() { function getBuidlerConfigJS(config){ const prefix =` const { loadPluginFile } = require("@nomiclabs/buidler/plugins-testing"); - loadPluginFile(__dirname + "/../dist/buidler.plugin"); + loadPluginFile(__dirname + "/../plugins/buidler.plugin"); usePlugin("@nomiclabs/buidler-truffle5"); ` From 44e12d4b3956032e0eeda28e121ed549c25997a9 Mon Sep 17 00:00:00 2001 From: cgewecke Date: Thu, 28 Nov 2019 15:28:12 -0800 Subject: [PATCH 2/2] Rename plugin-assets --> resources --- plugins/buidler.plugin.js | 6 +++--- plugins/{plugin-assets => resources}/buidler.ui.js | 0 plugins/{plugin-assets => resources}/buidler.utils.js | 0 plugins/{plugin-assets => resources}/plugin.utils.js | 0 plugins/{plugin-assets => resources}/truffle.library.js | 0 plugins/{plugin-assets => resources}/truffle.library.js.map | 0 plugins/{plugin-assets => resources}/truffle.ui.js | 0 plugins/{plugin-assets => resources}/truffle.utils.js | 0 plugins/truffle.plugin.js | 6 +++--- test/units/buidler/flags.js | 2 +- 10 files changed, 7 insertions(+), 7 deletions(-) rename plugins/{plugin-assets => resources}/buidler.ui.js (100%) rename plugins/{plugin-assets => resources}/buidler.utils.js (100%) rename plugins/{plugin-assets => resources}/plugin.utils.js (100%) rename plugins/{plugin-assets => resources}/truffle.library.js (100%) rename plugins/{plugin-assets => resources}/truffle.library.js.map (100%) rename plugins/{plugin-assets => resources}/truffle.ui.js (100%) rename plugins/{plugin-assets => resources}/truffle.utils.js (100%) diff --git a/plugins/buidler.plugin.js b/plugins/buidler.plugin.js index 3f33867b..46071621 100644 --- a/plugins/buidler.plugin.js +++ b/plugins/buidler.plugin.js @@ -1,7 +1,7 @@ const API = require('./../lib/api'); -const utils = require('./plugin-assets/plugin.utils'); -const buidlerUtils = require('./plugin-assets/buidler.utils'); -const PluginUI = require('./plugin-assets/buidler.ui'); +const utils = require('./resources/plugin.utils'); +const buidlerUtils = require('./resources/buidler.utils'); +const PluginUI = require('./resources/buidler.ui'); const pkg = require('./../package.json'); const death = require('death'); diff --git a/plugins/plugin-assets/buidler.ui.js b/plugins/resources/buidler.ui.js similarity index 100% rename from plugins/plugin-assets/buidler.ui.js rename to plugins/resources/buidler.ui.js diff --git a/plugins/plugin-assets/buidler.utils.js b/plugins/resources/buidler.utils.js similarity index 100% rename from plugins/plugin-assets/buidler.utils.js rename to plugins/resources/buidler.utils.js diff --git a/plugins/plugin-assets/plugin.utils.js b/plugins/resources/plugin.utils.js similarity index 100% rename from plugins/plugin-assets/plugin.utils.js rename to plugins/resources/plugin.utils.js diff --git a/plugins/plugin-assets/truffle.library.js b/plugins/resources/truffle.library.js similarity index 100% rename from plugins/plugin-assets/truffle.library.js rename to plugins/resources/truffle.library.js diff --git a/plugins/plugin-assets/truffle.library.js.map b/plugins/resources/truffle.library.js.map similarity index 100% rename from plugins/plugin-assets/truffle.library.js.map rename to plugins/resources/truffle.library.js.map diff --git a/plugins/plugin-assets/truffle.ui.js b/plugins/resources/truffle.ui.js similarity index 100% rename from plugins/plugin-assets/truffle.ui.js rename to plugins/resources/truffle.ui.js diff --git a/plugins/plugin-assets/truffle.utils.js b/plugins/resources/truffle.utils.js similarity index 100% rename from plugins/plugin-assets/truffle.utils.js rename to plugins/resources/truffle.utils.js diff --git a/plugins/truffle.plugin.js b/plugins/truffle.plugin.js index dce3c9d2..06bbadeb 100644 --- a/plugins/truffle.plugin.js +++ b/plugins/truffle.plugin.js @@ -1,7 +1,7 @@ const API = require('./../lib/api'); -const utils = require('./plugin-assets/plugin.utils'); -const truffleUtils = require('./plugin-assets/truffle.utils'); -const PluginUI = require('./plugin-assets/truffle.ui'); +const utils = require('./resources/plugin.utils'); +const truffleUtils = require('./resources/truffle.utils'); +const PluginUI = require('./resources/truffle.ui'); const pkg = require('./../package.json'); const death = require('death'); diff --git a/test/units/buidler/flags.js b/test/units/buidler/flags.js index 8dad0ec5..e2471935 100644 --- a/test/units/buidler/flags.js +++ b/test/units/buidler/flags.js @@ -85,7 +85,7 @@ describe('Buidler Plugin: command line options', function() { verify.lineCoverage(expected); }); - it.only('--testfiles test/', async function() { + it('--testfiles test/', async function() { const taskArgs = { testfiles: path.join( buidlerConfig.paths.root,