From 6fdafec304f4337d24af482dcaabe89a51b97059 Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Mon, 28 Oct 2019 03:36:04 -0600 Subject: [PATCH] v3.0.1: feeling confident --- bin/plugins.js | 131 ---------------------------------------------- package-lock.json | 29 +++++----- package.json | 10 ++-- 3 files changed, 19 insertions(+), 151 deletions(-) delete mode 100644 bin/plugins.js diff --git a/bin/plugins.js b/bin/plugins.js deleted file mode 100644 index f6fd809..0000000 --- a/bin/plugins.js +++ /dev/null @@ -1,131 +0,0 @@ -'use strict'; - -var spawn = require('child_process').spawn; -var spawnSync = require('child_process').spawnSync; -var path = require('path'); -var PKG_DIR = path.join(__dirname, '..'); - -module.exports.installSync = function(moduleName) { - var npm = 'npm'; - var args = ['install', '--save', moduleName]; - var out = ''; - var cmd; - - try { - cmd = spawnSync(npm, args, { - cwd: PKG_DIR, - windowsHide: true - }); - } catch (e) { - console.error( - "Failed to start: '" + - npm + - ' ' + - args.join(' ') + - "' in '" + - PKG_DIR + - "'" - ); - console.error(e.message); - process.exit(1); - } - - if (!cmd.status) { - return; - } - - out += cmd.stdout.toString('utf8'); - out += cmd.stderr.toString('utf8'); - - if (out) { - console.error(out); - console.error(); - console.error(); - } - - console.error( - "Failed to run: '" + - npm + - ' ' + - args.join(' ') + - "' in '" + - PKG_DIR + - "'" - ); - - console.error( - 'Try for yourself:\n\tcd ' + PKG_DIR + '\n\tnpm ' + args.join(' ') - ); - - process.exit(1); -}; - -module.exports.install = function(moduleName) { - return new Promise(function(resolve) { - if (!moduleName) { - throw new Error('no module name given'); - } - - var npm = 'npm'; - var args = ['install', '--save', moduleName]; - var out = ''; - var cmd = spawn(npm, args, { - cwd: PKG_DIR, - windowsHide: true - }); - - cmd.stdout.on('data', function(chunk) { - out += chunk.toString('utf8'); - }); - cmd.stdout.on('data', function(chunk) { - out += chunk.toString('utf8'); - }); - - cmd.on('error', function(e) { - console.error( - "Failed to start: '" + - npm + - ' ' + - args.join(' ') + - "' in '" + - PKG_DIR + - "'" - ); - console.error(e.message); - process.exit(1); - }); - - cmd.on('exit', function(code) { - if (!code) { - resolve(); - return; - } - - if (out) { - console.error(out); - console.error(); - console.error(); - } - console.error( - "Failed to run: '" + - npm + - ' ' + - args.join(' ') + - "' in '" + - PKG_DIR + - "'" - ); - console.error( - 'Try for yourself:\n\tcd ' + - PKG_DIR + - '\n\tnpm ' + - args.join(' ') - ); - process.exit(1); - }); - }); -}; - -if (require.main === module) { - module.exports.installSync(process.argv[2]); -} diff --git a/package-lock.json b/package-lock.json index 25a45e4..80e911c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,13 +1,13 @@ { "name": "@root/greenlock", - "version": "3.0.0-wip.0", + "version": "3.0.1", "lockfileVersion": 1, "requires": true, "dependencies": { "@root/acme": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@root/acme/-/acme-3.0.5.tgz", - "integrity": "sha512-qtAE7E0yPlajlhiojT6Fz8PV0BIvq+eNKY1mbG3zFf+idppYn66R7nrn17mvrXsQaRhabZ/C+M9MAk4Xt8UBBA==", + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/@root/acme/-/acme-3.0.6.tgz", + "integrity": "sha512-KfgwcyWDsT90vz+gmWbCwuOBolwV5Gcg0WHsG8/dznDC7a6QF4AmZsil7mIWKGJxHdi6MElkyrHZyK53OhPnug==", "requires": { "@root/encoding": "^1.0.1", "@root/keypairs": "^0.9.0", @@ -73,11 +73,6 @@ "@root/encoding": "^1.0.1" } }, - "acme-dns-01-digitalocean": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/acme-dns-01-digitalocean/-/acme-dns-01-digitalocean-3.0.1.tgz", - "integrity": "sha512-LUdOGluDERQWJG4CwlC9HbzUai4mtKzCz8nzpVTirXup2WwH60iRFAcd81hRGaoWbd0Bc0m6RVjN9YFkXB84yA==" - }, "acme-http-01-standalone": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/acme-http-01-standalone/-/acme-http-01-standalone-3.0.0.tgz", @@ -95,14 +90,18 @@ "dev": true }, "greenlock-manager-fs": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/greenlock-manager-fs/-/greenlock-manager-fs-0.1.0.tgz", - "integrity": "sha512-tEt9npVDDR27FThVsh2PizkNPLS9V60ljbxpYnLRUkv5LoMvOTm4hHfNCEanOIL5PY8rfilh96+8v519xeYKQg==" + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/greenlock-manager-fs/-/greenlock-manager-fs-0.6.0.tgz", + "integrity": "sha512-o5RZ/T4j6eaUXCVnZ2dScE1pAjFuS8/R4ZDn7mCyRkxBjZvXJU7TpYe5Bc/wmN8x+gLHqVUECZWC6VdA/DbShQ==", + "requires": { + "@root/mkdirp": "^1.0.0", + "safe-replace": "^1.1.0" + } }, "greenlock-store-fs": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/greenlock-store-fs/-/greenlock-store-fs-3.0.2.tgz", - "integrity": "sha512-t4So75yKs1+7TqmxD5UKdf+zOQU0/4o0lb2auf5zUcAo7fwwNLOAXyWnnZRL3WuFBUiBGh1qXWleuMua0d3LPg==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/greenlock-store-fs/-/greenlock-store-fs-3.2.0.tgz", + "integrity": "sha512-zqcPnF+173oYq5qU7FoGtuqeG8dmmvAiSnz98kEHAHyvgRF9pE1T0MM0AuqDdj45I3kXlCj2gZBwutnRi37J3g==", "requires": { "@root/mkdirp": "^1.0.0", "safe-replace": "^1.1.0" diff --git a/package.json b/package.json index 5a0b304..00d85ad 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@root/greenlock", - "version": "3.0.0-wip.0", + "version": "3.0.1", "description": "The easiest Let's Encrypt client for Node.js and Browsers", "homepage": "https://rootprojects.org/greenlock/", "main": "greenlock.js", @@ -8,6 +8,7 @@ "files": [ "*.js", "lib", + "bin", "dist" ], "scripts": { @@ -34,16 +35,15 @@ "author": "AJ ONeal (https://coolaj86.com/)", "license": "MPL-2.0", "dependencies": { - "@root/acme": "^3.0.5", + "@root/acme": "^3.0.6", "@root/csr": "^0.8.1", "@root/keypairs": "^0.9.0", "@root/mkdirp": "^1.0.0", "@root/request": "^1.3.10", - "acme-dns-01-digitalocean": "^3.0.1", "acme-http-01-standalone": "^3.0.0", "cert-info": "^1.5.1", - "greenlock-manager-fs": "^0.1.0", - "greenlock-store-fs": "^3.0.2", + "greenlock-manager-fs": "^0.6.0", + "greenlock-store-fs": "^3.2.0", "safe-replace": "^1.1.0" }, "devDependencies": {