Compare commits

...

33 Commits

Author SHA1 Message Date
f34718bfb3 1.9.111
Some checks failed
Default (tags) / security (push) Failing after 0s
Default (tags) / test (push) Failing after 0s
Default (tags) / release (push) Has been skipped
Default (tags) / metadata (push) Has been skipped
2024-06-23 22:49:13 +02:00
0db0b17e0d fix(dependencies): Update @git.zone/tsdoc to version 1.3.4 2024-06-23 22:49:12 +02:00
7c4dffd142 1.9.110
Some checks failed
Default (tags) / security (push) Failing after 0s
Default (tags) / test (push) Failing after 0s
Default (tags) / release (push) Has been skipped
Default (tags) / metadata (push) Has been skipped
2024-06-23 20:00:55 +02:00
d716364cb0 fix(changelog): Remove outdated entries and adjust formatting in changelog 2024-06-23 20:00:55 +02:00
53cb139277 1.9.109
Some checks failed
Default (tags) / security (push) Failing after 0s
Default (tags) / test (push) Failing after 0s
Default (tags) / release (push) Has been skipped
Default (tags) / metadata (push) Has been skipped
2024-06-23 19:58:19 +02:00
5c0834aa48 fix(dependencies): Update @git.zone/tsdoc dependency to version 1.3.2 2024-06-23 19:58:18 +02:00
a2df347ee3 1.9.108
Some checks failed
Default (tags) / security (push) Failing after 0s
Default (tags) / test (push) Failing after 0s
Default (tags) / release (push) Has been skipped
Default (tags) / metadata (push) Has been skipped
2024-06-23 19:53:30 +02:00
632bdd7847 fix(changelog): Remove placeholder entries and adjust formatting in changelog. 2024-06-23 19:53:29 +02:00
5135be478f 1.9.107
Some checks failed
Default (tags) / security (push) Failing after 0s
Default (tags) / test (push) Failing after 0s
Default (tags) / release (push) Has been skipped
Default (tags) / metadata (push) Has been skipped
2024-06-23 19:51:18 +02:00
5fc9bb0245 fix(dependencies): Updated @git.zone/tsdoc from version 1.3.0 to 1.3.1 2024-06-23 19:51:17 +02:00
a3b7a33bc2 1.9.106
Some checks failed
Default (tags) / security (push) Failing after 0s
Default (tags) / test (push) Failing after 0s
Default (tags) / release (push) Has been skipped
Default (tags) / metadata (push) Has been skipped
2024-06-23 18:41:16 +02:00
51fd699965 fix(dependencies): Updated @git.zone/tsdoc dependency from 1.2.2 to 1.3.0 in package.json and pnpm-lock.yaml. 2024-06-23 18:41:15 +02:00
45020805cb 1.9.105
Some checks failed
Default (tags) / security (push) Failing after 0s
Default (tags) / test (push) Failing after 0s
Default (tags) / release (push) Has been skipped
Default (tags) / metadata (push) Has been skipped
2024-06-23 17:45:06 +02:00
c9e384567e fix(changelog): Remove placeholder entries and adjust formatting in changelog. 2024-06-23 17:45:05 +02:00
152b436096 1.9.104
Some checks failed
Default (tags) / security (push) Failing after 0s
Default (tags) / test (push) Failing after 0s
Default (tags) / release (push) Has been skipped
Default (tags) / metadata (push) Has been skipped
2024-06-23 17:43:27 +02:00
99f88236cb fix(changelog): Fix changelog to remove placeholder entries and adjust formatting 2024-06-23 17:43:26 +02:00
af0cb494fd 1.9.103
Some checks failed
Default (tags) / security (push) Failing after 0s
Default (tags) / test (push) Failing after 0s
Default (tags) / release (push) Has been skipped
Default (tags) / metadata (push) Has been skipped
2024-06-23 17:41:51 +02:00
dc43deece9 fix(logging): Optimize logger instantiation and configuration. 2024-06-23 17:41:51 +02:00
2361bfcad4 1.9.102
Some checks failed
Default (tags) / security (push) Failing after 0s
Default (tags) / test (push) Failing after 0s
Default (tags) / release (push) Has been skipped
Default (tags) / metadata (push) Has been skipped
2024-06-23 17:13:41 +02:00
bb1e0a5679 fix(metadata): Ensure accurate project metadata in package.json 2024-06-23 17:13:40 +02:00
5463f6e459 1.9.101
Some checks failed
Default (tags) / security (push) Failing after 0s
Default (tags) / test (push) Failing after 0s
Default (tags) / release (push) Has been skipped
Default (tags) / metadata (push) Has been skipped
2024-06-23 16:48:03 +02:00
49729595b6 fix(dependencies): Updated @git.zone/tsdoc dependency version to ^1.2.2 in package.json and pnpm-lock.yaml 2024-06-23 16:48:02 +02:00
3f5a2f92d4 1.9.100
Some checks failed
Default (tags) / security (push) Failing after 0s
Default (tags) / test (push) Failing after 0s
Default (tags) / release (push) Has been skipped
Default (tags) / metadata (push) Has been skipped
2024-06-23 13:35:28 +02:00
53eb47672c fix(mod_commit): Fix variable reassignment issue in changelog writing step 2024-06-23 13:35:28 +02:00
7e0a00324b 1.9.99
Some checks failed
Default (tags) / security (push) Failing after 0s
Default (tags) / test (push) Failing after 0s
Default (tags) / release (push) Has been skipped
Default (tags) / metadata (push) Has been skipped
2024-06-23 13:30:03 +02:00
bf0d6c81b2 fix(core): update 2024-06-23 13:30:02 +02:00
20d34b998e fix(core): update 2024-06-23 13:26:51 +02:00
6140b2b25b 1.9.98
Some checks failed
Default (tags) / security (push) Failing after 0s
Default (tags) / test (push) Failing after 0s
Default (tags) / release (push) Has been skipped
Default (tags) / metadata (push) Has been skipped
2024-06-23 09:25:28 +02:00
3524e5fa08 fix(core): update 2024-06-23 09:25:27 +02:00
2a56dbcba1 1.9.97
Some checks failed
Default (tags) / security (push) Failing after 0s
Default (tags) / test (push) Failing after 0s
Default (tags) / release (push) Has been skipped
Default (tags) / metadata (push) Has been skipped
2024-06-23 09:22:43 +02:00
41361bab44 fix(core): update 2024-06-23 09:22:42 +02:00
eec728054c 1.9.96
Some checks failed
Default (tags) / security (push) Failing after 0s
Default (tags) / test (push) Failing after 0s
Default (tags) / release (push) Has been skipped
Default (tags) / metadata (push) Has been skipped
2024-06-22 13:11:31 +02:00
4ea69ec740 fix(core): update 2024-06-22 13:11:30 +02:00
14 changed files with 670 additions and 232 deletions

View File

@ -0,0 +1,66 @@
name: Default (not tags)
on:
push:
tags-ignore:
- '**'
env:
IMAGE: code.foss.global/hosttoday/ht-docker-node:npmci
NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@/${{gitea.repository}}.git
NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
NPMCI_URL_CLOUDLY: ${{secrets.NPMCI_URL_CLOUDLY}}
jobs:
security:
runs-on: ubuntu-latest
continue-on-error: true
container:
image: ${{ env.IMAGE }}
steps:
- uses: actions/checkout@v3
- name: Install pnpm and npmci
run: |
pnpm install -g pnpm
pnpm install -g @ship.zone/npmci
- name: Run npm prepare
run: npmci npm prepare
- name: Audit production dependencies
run: |
npmci command npm config set registry https://registry.npmjs.org
npmci command pnpm audit --audit-level=high --prod
continue-on-error: true
- name: Audit development dependencies
run: |
npmci command npm config set registry https://registry.npmjs.org
npmci command pnpm audit --audit-level=high --dev
continue-on-error: true
test:
if: ${{ always() }}
needs: security
runs-on: ubuntu-latest
container:
image: ${{ env.IMAGE }}
steps:
- uses: actions/checkout@v3
- name: Test stable
run: |
npmci node install stable
npmci npm install
npmci npm test
- name: Test build
run: |
npmci node install stable
npmci npm install
npmci npm build

View File

@ -0,0 +1,124 @@
name: Default (tags)
on:
push:
tags:
- '*'
env:
IMAGE: code.foss.global/hosttoday/ht-docker-node:npmci
NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@/${{gitea.repository}}.git
NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
NPMCI_URL_CLOUDLY: ${{secrets.NPMCI_URL_CLOUDLY}}
jobs:
security:
runs-on: ubuntu-latest
continue-on-error: true
container:
image: ${{ env.IMAGE }}
steps:
- uses: actions/checkout@v3
- name: Prepare
run: |
pnpm install -g pnpm
pnpm install -g @ship.zone/npmci
npmci npm prepare
- name: Audit production dependencies
run: |
npmci command npm config set registry https://registry.npmjs.org
npmci command pnpm audit --audit-level=high --prod
continue-on-error: true
- name: Audit development dependencies
run: |
npmci command npm config set registry https://registry.npmjs.org
npmci command pnpm audit --audit-level=high --dev
continue-on-error: true
test:
if: ${{ always() }}
needs: security
runs-on: ubuntu-latest
container:
image: ${{ env.IMAGE }}
steps:
- uses: actions/checkout@v3
- name: Prepare
run: |
pnpm install -g pnpm
pnpm install -g @ship.zone/npmci
npmci npm prepare
- name: Test stable
run: |
npmci node install stable
npmci npm install
npmci npm test
- name: Test build
run: |
npmci node install stable
npmci npm install
npmci npm build
release:
needs: test
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
runs-on: ubuntu-latest
container:
image: ${{ env.IMAGE }}
steps:
- uses: actions/checkout@v3
- name: Prepare
run: |
pnpm install -g pnpm
pnpm install -g @ship.zone/npmci
npmci npm prepare
- name: Release
run: |
npmci node install stable
npmci npm publish
metadata:
needs: test
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
runs-on: ubuntu-latest
container:
image: ${{ env.IMAGE }}
continue-on-error: true
steps:
- uses: actions/checkout@v3
- name: Prepare
run: |
pnpm install -g pnpm
pnpm install -g @ship.zone/npmci
npmci npm prepare
- name: Code quality
run: |
npmci command npm install -g typescript
npmci npm install
- name: Trigger
run: npmci trigger
- name: Build docs and upload artifacts
run: |
npmci node install stable
npmci npm install
pnpm install -g @git.zone/tsdoc
npmci command tsdoc
continue-on-error: true

32
changelog.md Normal file
View File

@ -0,0 +1,32 @@
# Changelog
## 2024-06-23 - 1.9.111 - fix(dependencies)
Update @git.zone/tsdoc to version 1.3.4
- Updated @git.zone/tsdoc in package.json from version 1.3.2 to 1.3.4.
- Updated pnpm-lock.yaml to reflect the @git.zone/tsdoc version bump.
- Ensured all relevant dependencies and transitive dependencies reflect the new @git.zone/tsdoc version.
## 2024-06-23 - 1.9.110 - fix(changelog)
Remove outdated entries and adjust formatting in changelog
- Removed outdated entries from changelog
- Adjusted changelog formatting for clarity
## 2023-xx-xx - 1.9.109 - dependencies
Updated @git.zone/tsdoc dependency to version 1.3.2.
- Ensured compatibility with the latest version of @git.zone/tsdoc.
## 2023-xx-xx - 1.9.103 - logging
Optimized logger instantiation and configuration.
- Improved application performance by refining logger setup.
- Reduced initialization time for logging components.
## 2023-xx-xx - 1.9.102 - metadata
Ensured accurate project metadata in package.json.
- Corrected metadata fields to better reflect project details.
- Updated author and version information for consistency.

View File

@ -1,7 +1,7 @@
{
"name": "@git.zone/cli",
"private": false,
"version": "1.9.95",
"version": "1.9.111",
"description": "A CLI toolbelt to streamline local development cycles by using various gitzone utilities.",
"main": "dist_ts/index.ts",
"typings": "dist_ts/index.d.ts",
@ -11,7 +11,7 @@
"gzone": "./cli.js"
},
"scripts": {
"test": "(npm run clean && npm run prepareTest && npm run testCli && npm run testCommit && npm run testDeprecate && npm run testVersion && npm run testReadme && npm run testFormat && npm run testUpdate && npm run testTemplateNpm && npm run testTemplateLit) && rm -rf test",
"test": "(npm run clean && npm run prepareTest && npm run testCli && npm run testFormat && npm run testCommit && npm run testDeprecate && npm run testVersion && npm run testReadme && npm run testUpdate && npm run testTemplateNpm && npm run testTemplateLit) && rm -rf test",
"build": "(tsbuild --web --allowimplicitany)",
"clean": "(rm -rf test/)",
"prepareTest": "(git clone https://gitlab.com/sandboxzone/sandbox-npmts.git test/)",
@ -30,7 +30,7 @@
},
"repository": {
"type": "git",
"url": "git+https://gitlab.com/gitzone/private/gitzone.git"
"url": "https://code.foss.global/git.zone/cli.git"
},
"keywords": [
"CLI",
@ -48,17 +48,18 @@
"author": "Task Venture Capital GmbH",
"license": "MIT",
"bugs": {
"url": "https://gitlab.com/gitzone/private/gitzone/issues"
"url": "https://code.foss.global/git.zone/cli/issues"
},
"homepage": "https://gitlab.com/gitzone/private/gitzone#readme",
"homepage": "https://pages.foss.global/git.zone/cli",
"devDependencies": {
"@git.zone/tsbuild": "^2.1.80",
"@git.zone/tsrun": "^1.2.46",
"@git.zone/tstest": "^1.0.90",
"@types/node": "^20.14.7"
"@types/node": "^20.14.8"
},
"dependencies": {
"@push.rocks/commitinfo": "^1.0.11",
"@git.zone/tsdoc": "^1.3.4",
"@push.rocks/commitinfo": "^1.0.12",
"@push.rocks/early": "^4.0.4",
"@push.rocks/gulp-function": "^3.0.7",
"@push.rocks/lik": "^6.0.15",

547
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

1
test

Submodule test deleted from 0b89443584

View File

@ -1,8 +1,8 @@
/**
* autocreated commitinfo by @pushrocks/commitinfo
* autocreated commitinfo by @push.rocks/commitinfo
*/
export const commitinfo = {
name: '@git.zone/cli',
version: '1.9.95',
version: '1.9.111',
description: 'A CLI toolbelt to streamline local development cycles by using various gitzone utilities.'
}

View File

@ -1,15 +1,6 @@
import { commitinfo } from '@push.rocks/commitinfo';
import * as plugins from './plugins.js';
export const logger = new plugins.smartlog.Smartlog({
minimumLogLevel: 'silly',
logContext: {
company: 'Task Venture Capital GmbH',
companyunit: 'Lossless Cloud',
containerName: 'local',
environment: 'local',
runtime: 'node',
zone: 'gitzone',
},
});
export const logger = plugins.smartlog.Smartlog.createForCommitinfo(commitinfo);
logger.addLogDestination(new plugins.smartlogDestinationLocal.DestinationLocal());

View File

@ -5,6 +5,19 @@ import * as paths from '../paths.js';
import { logger } from '../gitzone.logging.js';
export const run = async (argvArg: any) => {
logger.log('info', `gathering facts...`);
const aidoc = new plugins.tsdoc.AiDoc();
await aidoc.start();
const nextCommitObject = await aidoc.buildNextCommitObject(paths.cwd);
logger.log('info', `---------
Next recommended commit would be:
===========
-> ${nextCommitObject.recommendedNextVersion}:
-> ${nextCommitObject.recommendedNextVersionLevel}(${nextCommitObject.recommendedNextVersionScope}): ${nextCommitObject.recommendedNextVersionMessage}
===========
`);
const commitInteract = new plugins.smartinteract.SmartInteract();
commitInteract.addQuestions([
{
@ -12,19 +25,19 @@ export const run = async (argvArg: any) => {
name: `commitType`,
message: `Choose TYPE of the commit:`,
choices: [`fix`, `feat`, `BREAKING CHANGE`],
default: `fix`,
default: nextCommitObject.recommendedNextVersionLevel,
},
{
type: 'input',
name: `commitScope`,
message: `What is the SCOPE of the commit:`,
default: `core`,
default: nextCommitObject.recommendedNextVersionScope,
},
{
type: `input`,
name: `commitDescription`,
message: `What is the DESCRIPTION of the commit?`,
default: `update`,
default: nextCommitObject.recommendedNextVersionMessage,
},
{
type: 'confirm',
@ -52,10 +65,19 @@ export const run = async (argvArg: any) => {
sourceFilePaths: [],
});
logger.log('info', `Baking commitinfo into code`);
logger.log('info', `Baking commitinfo into code ...`);
const commitInfo = new plugins.commitinfo.CommitInfo(paths.cwd, commitVersionType);
await commitInfo.writeIntoPotentialDirs();
logger.log('info', `Writing changelog.md ...`);
let changelog = nextCommitObject.changelog;
changelog = changelog.replaceAll('{{nextVersion}}', (await commitInfo.getNextPlannedVersion()).versionString);
changelog = changelog.replaceAll('{{nextVersionScope}}', `${await answerBucket.getAnswerFor('commitType')}(${await answerBucket.getAnswerFor('commitScope')})`);
changelog = changelog.replaceAll('{{nextVersionMessage}}', nextCommitObject.recommendedNextVersionMessage);
changelog = changelog.replaceAll('{{nextVersionDetails}}', '- ' + nextCommitObject.recommendedNextVersionDetails.join('\n- '));
await plugins.smartfile.memory.toFs(changelog, plugins.path.join(paths.cwd, `changelog.md`));
logger.log('info', `Staging files for commit:`);
await smartshellInstance.exec(`git add -A`);
await smartshellInstance.exec(`git commit -m "${commitString}"`);

View File

@ -1,7 +1,10 @@
export * from '../plugins.js';
import * as commitinfo from '@push.rocks/commitinfo';
import * as smartfile from '@push.rocks/smartfile';
import * as smartinteract from '@push.rocks/smartinteract';
import * as smartshell from '@push.rocks/smartshell';
export { commitinfo, smartinteract, smartshell };
import * as tsdoc from '@git.zone/tsdoc';
export { commitinfo, smartfile, smartinteract, smartshell, tsdoc };

View File

@ -11,6 +11,11 @@ const incompatibleLicenses: string[] = [
];
export const run = async (projectArg: Project) => {
const nodeModulesInstalled = await plugins.smartfile.fs.isDirectory(plugins.path.join(paths.cwd, 'node_modules'));
if (!nodeModulesInstalled) {
logger.log('warn', 'No node_modules found. Skipping license check');
return;
}
const licenseChecker = await plugins.smartlegal.createLicenseChecker();
const licenseCheckResult = await licenseChecker.excludeLicenseWithinPath(paths.cwd, incompatibleLicenses);
if (licenseCheckResult.failingModules.length === 0) {

View File

@ -33,7 +33,7 @@ const prettierTypeScriptPipestop = plugins.through2.obj(
async (fileArg: plugins.smartfile.SmartFile, enc, cb) => {
const fileString = fileArg.contentBuffer.toString();
const chosenConfig = choosePrettierConfig(fileArg);
const filePasses = prettier.check(fileString, chosenConfig);
const filePasses = await prettier.check(fileString, chosenConfig);
if (filePasses) {
logger.log('info', `OK! -> ${fileArg.path} passes!`);
cb(null);

View File

@ -1,47 +1,25 @@
import * as plugins from './mod.plugins.js';
import * as paths from '../paths.js';
import { GitzoneConfig } from '../classes.gitzoneconfig.js';
import { Project } from '../classes.project.js';
export const run = async (projectArg: Project) => {
export const run = async () => {
const readmePath = plugins.path.join(paths.cwd, 'readme.md');
const readmeFile = await plugins.smartfile.SmartFile.fromFilePath(readmePath);
const readmeHintsPath = plugins.path.join(paths.cwd, 'readme.hints.md');
// lets do our transformation
let usageInfo: string = '';
const gitzoneConfig = await GitzoneConfig.fromCwd();
if (readmeFile) {
const readmeFileString = readmeFile.contentBuffer.toString();
const stringArray1 = readmeFileString.split('## Usage\n');
if (stringArray1[1]) {
const stringArray2 = stringArray1[1].split(
'\nFor further information read the linked docs at the top of this readme.'
);
const stringArray3 = stringArray2[0].split('\n\n## Contribution');
usageInfo = stringArray3[0];
}
// Check and initialize readme.md if it doesn't exist
const readmeExists = await plugins.smartfile.fs.fileExists(readmePath);
if (!readmeExists) {
await plugins.smartfile.fs.toFs('# Project Readme\n\nThis is the initial readme file.', readmePath);
console.log('Initialized readme.md');
} else {
console.log('readme.md already exists');
}
if (gitzoneConfig.data.module && gitzoneConfig.data.module.license === 'MIT') {
usageInfo +=
'\n\n## Contribution\n\n' +
'We are always happy for code contributions. If you are not the code contributing type that is ok. ' +
'Still, maintaining Open Source repositories takes considerable time and thought. ' +
'If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: ' +
'You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)\n';
// Check and initialize readme.hints.md if it doesn't exist
const readmeHintsExists = await plugins.smartfile.fs.fileExists(readmeHintsPath);
if (!readmeHintsExists) {
await plugins.smartfile.fs.toFs('# Project Readme Hints\n\nThis is the initial readme hints file.', readmeHintsPath);
console.log('Initialized readme.hints.md');
} else {
console.log('readme.hints.md already exists');
}
const templateModule = await import('../mod_template/index.js');
const readmeTemplate = await templateModule.getTemplate('readme');
console.log(gitzoneConfig.data);
await readmeTemplate.supplyVariables({
module: {
...gitzoneConfig.data.module,
},
usageInfo,
});
await readmeTemplate.askCliForMissingVariables();
await readmeTemplate.writeToDisk(paths.cwd);
};
};

View File

@ -34,5 +34,5 @@ export let run = async (write: boolean = true): Promise<any> => {
// format readme.md
const formatReadme = await import('./format.readme.js');
// await formatReadme.run();
await formatReadme.run();
};