From 1ca78906a9f94281b96190ffb890ebd28db4d4f7 Mon Sep 17 00:00:00 2001 From: Luis Blanco Date: Tue, 10 Oct 2023 19:07:30 +0400 Subject: [PATCH] Use cpcpplint util --- .github/workflows/cpplint.yml | 1 + package-lock.json | 4 ++-- package.json | 2 +- CPPLINT.cfg => utils/CPPLINT.cfg | 15 ++++++++------- utils/cpcpplint.js | 24 ++++++++++++++++++++++++ utils/index.js | 1 + 6 files changed, 37 insertions(+), 10 deletions(-) rename CPPLINT.cfg => utils/CPPLINT.cfg (94%) create mode 100644 utils/cpcpplint.js diff --git a/.github/workflows/cpplint.yml b/.github/workflows/cpplint.yml index 6e49bc9..ac0e244 100644 --- a/.github/workflows/cpplint.yml +++ b/.github/workflows/cpplint.yml @@ -42,5 +42,6 @@ jobs: - name: Run Cpplint run: | + node -e "require('.').cpcpplint()" cpplint --recursive ./test-addon cpplint --recursive ./include diff --git a/package-lock.json b/package-lock.json index 3818d58..2af5ced 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "addon-tools-raub", - "version": "7.3.1", + "version": "7.4.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "addon-tools-raub", - "version": "7.3.1", + "version": "7.4.0", "license": "MIT", "devDependencies": { "@types/node": "^20.8.3", diff --git a/package.json b/package.json index ad06097..0a9993d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "author": "Luis Blanco ", "name": "addon-tools-raub", - "version": "7.3.1", + "version": "7.4.0", "description": "Helpers for Node.js addons and dependency packages", "license": "MIT", "main": "index.js", diff --git a/CPPLINT.cfg b/utils/CPPLINT.cfg similarity index 94% rename from CPPLINT.cfg rename to utils/CPPLINT.cfg index 002e85b..f9b4e45 100644 --- a/CPPLINT.cfg +++ b/utils/CPPLINT.cfg @@ -1,17 +1,18 @@ set noparent linelength=110 -filter=-legal/copyright -filter=-build/include_order -filter=-build/include filter=-build/header_guard -filter=-build/namespaces +filter=-build/include +filter=-build/include_order filter=-build/include_what_you_use +filter=-build/namespaces +filter=-legal/copyright +filter=-readability/todo +filter=-runtime/indentation_namespace filter=-whitespace/blank_line +filter=-whitespace/braces filter=-whitespace/comments -filter=-whitespace/tab filter=-whitespace/end_of_line filter=-whitespace/indent filter=-whitespace/operators filter=-whitespace/parens -filter=-readability/todo -filter=-runtime/indentation_namespace +filter=-whitespace/tab diff --git a/utils/cpcpplint.js b/utils/cpcpplint.js new file mode 100644 index 0000000..e4ad825 --- /dev/null +++ b/utils/cpcpplint.js @@ -0,0 +1,24 @@ +'use strict'; + +const { copy, exists } = require('./files'); + + +const cpcpplint = async () => { + const cpplintDest = `${process.cwd()}/CPPLINT.cfg`.replace(/\\/g, '/'); + const cpplintSrc = `${__dirname}/CPPLINT.cfg`.replace(/\\/g, '/'); + + if (!await exists(cpplintSrc) ) { + console.error('Error. File "CPPLINT.cfg" not found.'); + return; + } + + if (await exists(cpplintDest) ) { + console.warn('Warning. Dest "CPPLINT.cfg" exists and will be overwritten.'); + } + + await copy(cpplintSrc, cpplintDest); + + console.log(`"CPPLINT.cfg" was copied to "${cpplintDest}".`); +}; + +module.exports = { cpcpplint }; diff --git a/utils/index.js b/utils/index.js index 72d5296..57dac22 100644 --- a/utils/index.js +++ b/utils/index.js @@ -5,6 +5,7 @@ module.exports = Object.assign( {}, require('./action-pack'), require('./cpbin'), + require('./cpcpplint'), require('./download'), require('./files'), require('./install'),