ic-mops 0.7.4 → 0.8.1

package/.gitignore

@@ -0,0 +1,2 @@
+identity.pem
+network.txt

package/README.md

@@ -67,7 +67,7 @@ Now you can import installed packages in your Motoko code
 import PackageName "mo:<package_name>";
 ```
 for example
-```
+```motoko
 import Itertools "mo:itertools/Iter";
 ```
 

package/cli.js

@@ -16,7 +16,8 @@ import {search} from './commands/search.js';
 import {add} from './commands/add.js';
 import {cacheSize, cleanCache} from './cache.js';
 import {test} from './commands/test.js';
-// import {upgrade} from './commands/upgrade.js';
+import {template} from './commands/template.js';
+import {upgrade} from './commands/upgrade.js';
 
 let cwd = process.cwd();
 let configFile = path.join(cwd, 'mops.toml');
@@ -155,19 +156,28 @@ program
 
 // test
 program
-	.command('test')
+	.command('test [filter]')
 	.description('Run tests')
 	.option('--watch', 'Enable watch mode')
+	.action(async (filter, options) => {
+		await test(filter, options);
+	});
+
+// template
+program
+	.command('template')
+	.description('Apply template')
 	.action(async (options) => {
-		await test(options);
+		await template(options);
 	});
 
-// // upgrade
-// program
-// 	.command('upgrade')
-// 	.description('Upgrade mops CLI to the latest version')
-// 	.action(async () => {
-// 		upgrade();
-// 	});
+// upgrade
+program
+	.command('self-update')
+	.description('Upgrade mops CLI to the latest version')
+	.option('--detached')
+	.action(async (options) => {
+		upgrade(options);
+	});
 
 program.parse();

package/commands/sources.js

@@ -20,7 +20,7 @@ function rootDir(cwd = process.cwd()) {
 export async function sources({verbose} = {}) {
 	let root = rootDir();
 	if (!root) {
-		return;
+		return [];
 	}
 
 	let packages = {};

package/commands/template.js

@@ -0,0 +1,28 @@
+import fs from 'fs';
+import path from 'path';
+import chalk from 'chalk';
+import prompts from 'prompts';
+
+export async function template() {
+	let res = await prompts({
+		type: 'select',
+		name: 'value',
+		message: 'Select template:',
+		choices: [
+			{title: 'GitHub Workflow to run \'mops test\'', value: 'github-workflow:mops-test'},
+			{title: '× Cancel', value: ''},
+		],
+		initial: 0,
+	});
+
+	if (res.value === 'github-workflow:mops-test') {
+		let dest = path.resolve(process.cwd(), '.github/workflows/mops-test.yml');
+		if (fs.existsSync(dest)) {
+			console.log(chalk.yellow('Workflow already exists:'), dest);
+			return;
+		}
+		let mopsTestYml = new URL('../templates/mops-test.yml', import.meta.url);
+		fs.copyFileSync(mopsTestYml, dest);
+		console.log(chalk.green('Workflow created:'), dest);
+	}
+}

package/commands/test.js

@@ -18,14 +18,14 @@ let globConfig = {
 	ignore: ignore,
 };
 
-export async function test({watch = false} = {}) {
+export async function test(filter = '', {watch = false} = {}) {
 	if (watch) {
 		// todo: run only changed for *.test.mo?
 		// todo: run all for *.mo?
 		let run = debounce(async () => {
 			console.clear();
 			process.stdout.write('\x1Bc');
-			await runAll();
+			await runAll(filter);
 			console.log('-'.repeat(50));
 			console.log('Waiting for file changes...');
 			console.log(chalk.gray((`Press ${chalk.gray('Ctrl+C')} to exit.`)));
@@ -42,7 +42,7 @@ export async function test({watch = false} = {}) {
 		run();
 	}
 	else {
-		let passed = await runAll();
+		let passed = await runAll(filter);
 		if (!passed) {
 			process.exit(1);
 		}
@@ -51,7 +51,7 @@ export async function test({watch = false} = {}) {
 
 let dfxCache;
 
-export async function runAll() {
+export async function runAll(filter = '') {
 	let start = Date.now();
 
 	let files = [];
@@ -60,7 +60,11 @@ export async function runAll() {
 		files = [libFiles[0]];
 	}
 	else {
-		files = glob.sync('**/test?(s)/**/*.test.mo', globConfig);
+		let globStr = '**/test?(s)/**/*.test.mo';
+		if (filter) {
+			globStr = `**/test?(s)/**/*${filter}*`;
+		}
+		files = glob.sync(globStr, globConfig);
 	}
 	if (!files.length) {
 		console.log('No test files found');
@@ -72,7 +76,7 @@ export async function runAll() {
 	for (let file of files) {
 		console.log(chalk.gray(`• ${file}`));
 	}
-	console.log('-'.repeat(50));
+	console.log('='.repeat(50));
 
 	let failed = 0;
 	let passed = 0;
@@ -86,6 +90,7 @@ export async function runAll() {
 		let mmf1 = new MMF1;
 
 		await new Promise((resolve) => {
+			file !== files[0] && console.log('-'.repeat(50));
 			console.log(`Running ${chalk.gray(file)}`);
 
 			let proc = spawn(`${dfxCache}/moc`, ['-r', '-wasi-system-api', '-ref-system-api', '--hide-warnings', '--error-detail=2', ...sourcesArr.join(' ').split(' '), file]);
@@ -123,7 +128,8 @@ export async function runAll() {
 		failed += mmf1.failed;
 		skipped += mmf1.skipped;
 	}
-	console.log('-'.repeat(50));
+
+	console.log('='.repeat(50));
 	if (failed) {
 		console.log(chalk.redBright('Tests failed'));
 	}

package/commands/upgrade.js

@@ -1,6 +1,6 @@
 import child_process from 'child_process';
 
-export function upgrade() {
+export function upgrade({detached = false} = {}) {
 	console.log('Upgrading mops CLI...');
-	child_process.execSync('npm i ic-mops -g', {stdio: 'inherit'});
+	child_process.execSync('npm i ic-mops -g', {stdio: 'inherit', detached});
 }

package/package.json

@@ -1,10 +1,14 @@
 {
 	"name": "ic-mops",
-	"version": "0.7.4",
+	"version": "0.8.1",
 	"type": "module",
 	"bin": {
 		"mops": "cli.js"
 	},
+	"files": [
+		"*",
+		"/templates"
+	],
 	"homepage": "https://mops.one",
 	"repository": {
 		"type": "git",

package/templates/mops-test.yml

@@ -0,0 +1,29 @@
+name: mops test
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+      - uses: aviate-labs/setup-dfx@v0.2.3
+        with:
+          vessel-version: 0.6.3
+          dfx-version: 0.13.0
+
+      - name: install dfx
+        run: dfx cache install
+
+      - name: install mops
+        run: npm i ic-mops -g --yes
+
+      - name: install mops packages
+        run: mops install
+
+      - name: run tests
+        run: mops test