@farris/cli 1.0.6 → 1.0.9

package/ci/cli.js

@@ -5,6 +5,7 @@
 const fs = require('fs');
 const path = require('path');
 const childProcess = require("@lerna/child-process");
+const { Project } = require("@lerna/project");
 
 const yargs = require('yargs/yargs');
 const cli = yargs(process.argv.slice(2), process.cwd())
@@ -17,8 +18,8 @@ cli
             return yargs;
         },
         (argv) => {
-            const project = argv.project;
-            checkProjectChanges(project);
+            const projectPath = argv.project;
+            checkProjectChanges(projectPath);
         }
     )
     .command(
@@ -29,12 +30,13 @@ cli
         },
         (argv) => {
             const project = argv.project;
+            const url = argv.url;
             let chain = Promise.resolve();
 
             chain = chain.then(() => checkProjectChanges(project));
             chain = chain.then((hasChanged) => {
                 if (hasChanged) {
-                    return updateProjectPrereleaseVersion(project)
+                    return updateProjectPrereleaseVersion(project, url)
                 }
             });
         }
@@ -57,6 +59,18 @@ cli
             });
         }
     )
+    .command(
+        'publishAll',
+        'Publish all packages that have changed sence latst publish.',
+        (yargs) => {
+            return yargs;
+        },
+        (argv) => {
+            const projectPath = argv.project;
+            const url = argv.url;
+            publishAll(url);
+        }
+    )
     .argv;
 
 /**
@@ -76,7 +90,7 @@ function checkProjectChanges(projectPath) {
             if (hasChanges) {
                 console.log(`${projectPath} has changed.`)
             } else {
-                console.log(`Did not detect any changes from ${projectPath} sence last commit.`)
+                console.log(`Did not detect any changes from ${projectPath} sence last commit`)
             }
             // 返回检测结果
             return hasChanges;
@@ -88,7 +102,7 @@ function checkProjectChanges(projectPath) {
  * @param {string} projectPath 目标工程路径
  * @returns 更新后的版本
  */
-function updateProjectPrereleaseVersion(projectPath) {
+function updateProjectPrereleaseVersion(projectPath, projectUrl) {
     return childProcess
         // 使用 npm version prerelease 更新指定工程的预发布版本
         .exec('npm', ['version', 'prerelease', '--preid=beta', '--prefix', projectPath])
@@ -98,21 +112,51 @@ function updateProjectPrereleaseVersion(projectPath) {
             const packageConfig = JSON.parse(fs.readFileSync(packageJsonFilePath, 'utf-8'));
             // 提取更新后的版本
             const updatedVersion = returnValue.stdout;
-            // 向git缓冲区中添加变更
-            childProcess.execSync('git', ['add', '.']);
-            // 提交变更记录
-            childProcess.execSync('git', ['commit', '-m', `update ${packageConfig.name} prerelease version to ${updatedVersion}`]);
             console.log(`update ${packageConfig.name} prerelease version to ${updatedVersion}`);
-            // 提交变更集
-            // return childProcess.exec('git', ['push']);
-            const branch = childProcess.execSync("git", ["rev-parse", "--abbrev-ref", "HEAD"]);
-            console.log(`executing git push origin ${branch}`);
-            const url = `https://project_4166_bot:8sTE2mjQyAycz13EPJAA@git.iec.io/webadp/farris-ide.git/`
-            return childProcess.exec("git", ["push", url]);
-            // git push https://myusername:${PROJECT_ACCESS_TOKEN}@gitlab.mydomain.com/mygroup/myproject.git
+            const updateResult = {};
+            updateResult[packageConfig.name] = updatedVersion;
+            return updateResult;
         })
 }
 
+function commitChanges(updatedVersions, commitUrl) {
+    const commitMessage = updatedVersions.reduce((latestMessage, updateVersion, index, originalArray) => {
+        if (Object.keys(updateVersion).length) {
+            const packageName = Object.keys(updateVersion)[0];
+            const version = updateVersion[packageName];
+            let message = `${packageName} to ${version}`;
+            if (index <= originalArray.length - 2) {
+                message = message + ', ';
+            }
+            latestMessage = latestMessage + message;
+        }
+        return latestMessage;
+    }, 'update ');
+
+    if (commitMessage) {
+        // 向git缓冲区中添加变更
+        childProcess.execSync('git', ['add', '.']);
+        // // 提交变更记录
+        childProcess.execSync('git', ['commit', '-m', `${commitMessage}. [skip ci]`]);
+
+        console.log(commitMessage);
+
+        const branch = childProcess.execSync("git", ["rev-parse", "--abbrev-ref", "HEAD"]);
+        console.log(`executing git push ${branch}`);
+        // 提交变更集
+        if (commitUrl) {
+            return childProcess.exec("git", ["push", '-o', 'ci.skip', commitUrl]);
+        } else {
+            return childProcess.exec('git', ['push', '-o', 'ci.skip']);
+        }
+    }
+}
+
+function buildWorkspace(workspace) {
+    return childProcess.exec('lerna', ['run', 'build', `--scope=${workspace.packageName}`]);
+    // lerna run build --scope=@farris/ide-framework
+}
+
 /**
  * 发布指定路径下的npm包
  * @param {string} projectPath 目标工程路径
@@ -127,3 +171,122 @@ function publish(projectPath) {
     // 调用 npm publish 发布指定路径下的npm包
     return childProcess.exec('npm', ['publish', packagePath])
 }
+
+function publishAll(commitUrl) {
+    const monoRepoProject = new Project(process.cwd());
+    let chain = Promise.resolve();
+    chain = chain.then(() => {
+        return monoRepoProject.getPackages()
+            .then(packages => {
+                const monoWorkspace = { packages };
+                return monoWorkspace;
+            })
+    });
+    chain = chain.then((monoWorkspace) => {
+        const packages = monoWorkspace.packages;
+        monoWorkspace.workspaces = [];
+        monoWorkspace.projects = [];
+        packages.forEach(packageJson => {
+            const workspacePath = packageJson.location;
+            const angularJson = readAngularJson(workspacePath)
+            const workspace = readWorkspace(angularJson, packageJson);
+            monoWorkspace.workspaces.push(workspace);
+            workspace.projects.reduce((monoWorkspace, projectInfo) => {
+                monoWorkspace.projects.push(projectInfo);
+                return monoWorkspace;
+            }, monoWorkspace);
+            // .forEach((projectInfo) => monoWorkspace.projects.push(projectInfo));
+        });
+        return monoWorkspace;
+    });
+    chain = chain.then(monoWorkspace => {
+        const projects = monoWorkspace.projects;
+        const checkProjects = projects.map((projectInfo) => {
+            let checkPromise = checkProjectChanges(projectInfo.project.path);
+            let changedPromise = checkPromise.then(hasChanged => {
+                projectInfo.hasChanged = hasChanged;
+                return Promise.resolve(projectInfo);
+            });
+            return changedPromise;
+        });
+        return Promise.all(checkProjects)
+            .then(changedProjects => {
+                monoWorkspace.changedProjects = changedProjects;
+                return Promise.resolve(monoWorkspace);
+            });
+    });
+    chain = chain.then(monoWorkspace => {
+        const changedProjects = monoWorkspace.changedProjects;
+        const prereleasePromise = changedProjects.map(projectInfo => updateProjectPrereleaseVersion(projectInfo.project.path));
+        return Promise.all(prereleasePromise)
+            .then((updatedVersions) => {
+                commitChanges(updatedVersions, commitUrl);
+                return Promise.resolve(monoWorkspace);
+            });
+    });
+    chain = chain.then(monoWorkspace => {
+        const buildPromises = monoWorkspace.workspaces.map((workspace) => buildWorkspace(workspace));
+        return Promise.all(buildPromises)
+            .then(() => {
+                return Promise.resolve(monoWorkspace);
+            });
+    });
+    chain = chain.then(monoWorkspace => {
+        const changedProjects = monoWorkspace.changedProjects;
+        const publishPromises = changedProjects.map(projectInfo => publish(projectInfo.project.path));
+        Promise.all(publishPromises)
+            .then(() => {
+                console.log('published');
+            })
+    });
+}
+
+function readAngularJson(workspacePath) {
+    const angularJsonPath = path.normalize(`${workspacePath}/angular.json`);
+    return JSON.parse(fs.readFileSync(angularJsonPath, 'utf-8'));
+}
+
+function readWorkspace(angularJson, packageJson) {
+    const projects = angularJson.projects;
+    const workspacePath = packageJson.location;
+    const packageName = packageJson.name;
+    const workspace = {
+        packageName,
+        path: workspacePath,
+        projects: []
+    };
+    Object.keys(projects)
+        .reduce((workspace, projectName) => {
+            const projectInfo = readProjectInfo(projectName, projects[projectName], workspacePath);
+            if (projectInfo) {
+                // workspace.set(projectName, projectInfo);
+                workspace.projects.push(projectInfo);
+            }
+            return workspace; ßß
+        }, workspace);
+    return workspace;
+}
+
+function readProjectInfo(projectName, project, workspacePath) {
+    const projectPath = path.normalize(`${workspacePath}/${project.root}`);
+    const projectType = project.projectType;
+    if (projectType === 'library') {
+        const packageJsonPath = path.normalize(`${projectPath}/package.json`);
+        const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+        const packageName = packageJson.name;
+        const ngPackagePath = path.normalize(`${projectPath}/ng-package.json`);
+        const ngPackage = JSON.parse(fs.readFileSync(ngPackagePath, 'utf-8'));
+        const packagePath = path.normalize(`${projectPath}/${ngPackage.dest}`);
+        return {
+            project: {
+                name: projectName,
+                path: projectPath,
+                type: projectType
+            },
+            package: {
+                name: packageName,
+                path: packagePath
+            }
+        }
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@farris/cli",
-  "version": "1.0.6",
+  "version": "1.0.9",
   "description": "Farris command line interface",
   "main": "index.js",
   "scripts": {