Merge pull request #16 from cix-cdx/release

to master
cix-cdx · Jan 29, 2018 · 85d0f85 · 85d0f85
2 parents c9a2e05 + 7e68efd
commit 85d0f85
Show file tree

Hide file tree

Showing 14 changed files with 158 additions and 8 deletions.
diff --git a/lib/HFLicense.process.js b/lib/HFLicense.process.js
@@ -3,6 +3,7 @@ const HFLicensor = require('./licensors/HFLicensor');
 const HFLicenseProcess = {
   assert: (LICProps, callback) => HFLicensor.assert(LICProps.HFLcontent, LICProps.HFLqueries, callback, LICProps.assertAll),
   licensing: (LICProps, callback) => HFLicensor.process(LICProps.HFLcontent, LICProps.HFLqueries, callback),
+  unlicensing: (LICProps, callback) => HFLicensor.unlicense(LICProps.HFLcontent, LICProps.HFLqueries, callback),
 };
 
 module.exports = HFLicenseProcess;
diff --git a/lib/cli.js b/lib/cli.js
@@ -80,14 +80,54 @@ const LicensingProcess = {
     } else {
       console.log(Chalk.yellow('\n  - HFLicensing Process : Skipped!\n'));
     }
+  }
+};
+
+const UnlicensingProcess = {
+  LicenseProcess: () => {
+    console.log(Chalk.cyan('# UNLICENSING PROCESS : Processing..'));
 
-    console.log('\n  - Process Completed\n');
+    if (LICProps.proc.indexOf('lic') > -1) {
+      if (LicenseProcess.unlicensing(LICProps)) {
+        console.log(Chalk.green('\n    License File REMOVED..\n'));
+      } else {
+        console.log('\n  - License File NOT EXIST..\n');
+      }
+    } else {
+      console.log(Chalk.yellow('\n  - Unlicensing Process : Skipped!\n'));
+    }
+  },
+  HFLProcess: () => {
+    console.log(Chalk.cyan('# UNHFLICENSING PROCESS : Processing..'));
+
+    if (LICProps.proc.indexOf('file') > -1) {
+      const handler = (error, negative, positive) => {
+        if (negative) {
+          console.log(`    ${negative} - NOT EXIST..`);
+        } else if (positive) {
+          console.log(`    ${positive} - ${Chalk.green('REMOVED..')} `);
+        }
+      };
+
+      HFLicenseProcess.unlicensing(LICProps, handler);
+    } else {
+      console.log(Chalk.yellow('\n  - UnHFLicensing Process : Skipped!\n'));
+    }
   }
 };
 
+const outProps = (_licprops, _props) => console.log(`${Chalk.green('#LIC Properties')}
+  license: ${Chalk.yellow(_licprops.license)}
+  owner: ${Chalk.green(_licprops.owner)}
+  beginYear: ${Chalk.green(_licprops.beginYear)}
+  endYear: ${Chalk.green(_licprops.endYear)}
+  baseDir: ${Chalk.green(_props.baseDir)}
+`);
+
 // ::  CLI Process  ::
 
 console.log(`\n::  ${Chalk.cyan('CIX-LIC')}  ::\n`);
+outProps(LICProps, props);
 
 if (LICProps.assert) {
   console.log(Chalk.yellow('::  ASSERT MODE  ::\n'));
@@ -96,6 +136,13 @@ if (LICProps.assert) {
   console.log();
   AssertingProcess.HFLProcess();
 
+} else if (LICProps.unlicense) {
+  console.log(Chalk.yellow('::  UNLICENSE MODE  ::\n'));
+
+  UnlicensingProcess.LicenseProcess();
+  console.log();
+  UnlicensingProcess.HFLProcess();
+
 } else {
   console.log(Chalk.yellow('::  PROCESS MODE  ::\n'));
 

diff --git a/lib/core/argv.loader.js b/lib/core/argv.loader.js
@@ -61,6 +61,10 @@ const ArgvLoader = {
       }
     }
 
+    if (v.hasOwnProperty('unlicense')) {
+      props.unlicense = true;
+    }
+
     return props;
   }
 };

diff --git a/lib/license.process.js b/lib/license.process.js
@@ -3,6 +3,7 @@ const Licensor = require('./licensors/licensor');
 const LicenseProcess = {
   assert: (LICProps) => Licensor.assert(LICProps.licenseFile),
   licensing: (LICProps, callback) => Licensor.process(LICProps.licenseContent, LICProps.licenseFile, callback),
+  unlicensing: (LICProps, callback) => Licensor.unlicense(LICProps.licenseFile, callback),
 };
 
 module.exports = LicenseProcess;
diff --git a/lib/licensors/HFLicensor.js b/lib/licensors/HFLicensor.js
@@ -83,6 +83,35 @@ const HFLicensor = {
     FS.closeSync(fd);
 
     return (content === HFLcontent) || (content.toLowerCase().indexOf(DefaultLICbol) > -1);
+  },
+  unlicense: (HFLcontent, filepaths, callback) => {
+    filepaths.forEach(filepath => {
+      const length = HFLcontent.length;
+      const fd = FS.openSync(filepath, 'r');
+      const data = Buffer.alloc(length);
+      FS.readSync(fd, data, 0, length);
+      const content = data.toString(DefaultEncoding);
+      FS.closeSync(fd);
+
+      if (content === HFLcontent) {
+        const rfname = filepath + DefaultTempExt;
+        const wfname = filepath;
+        FS.renameSync(filepath, rfname);
+
+        const rs = FS.createReadStream(rfname, { start: length });
+        const ws = FS.createWriteStream(wfname);
+        rs.pipe(ws);
+        FS.unlinkSync(rfname);
+
+        if (callback) {
+          callback(undefined, undefined, filepath);
+        }
+      } else {
+        if (callback) {
+          callback(undefined, filepath);
+        }
+      }
+    });
   }
 };
 

diff --git a/lib/licensors/licensor.js b/lib/licensors/licensor.js
@@ -36,6 +36,25 @@ const Licensor = {
     filepath = filepath || DefaultLicenseFile;
 
     return FS.existsSync(filepath);
+  },
+  unlicense: (filepath, callback) => {
+    filepath = filepath || DefaultLicenseFile;
+
+    if (FS.existsSync(filepath)) {
+      FS.unlinkSync(filepath);
+
+      if (callback) {
+        callback(undefined, undefined, filepath);
+      } else {
+        return true;
+      }
+    } else {
+      if (callback) {
+        callback(undefined, filepath);
+      } else {
+        return false;
+      }
+    }
   }
 };
 

diff --git a/lib/licprops.builder.js b/lib/licprops.builder.js
@@ -62,6 +62,10 @@ const LICPropsBuilder = {
       LICProps.assertAll = true;
     }
 
+    if (props.unlicense) {
+      LICProps.unlicense = true;
+    }
+
     return LICProps;
   },
   buildLicenseProcess: (base, props = {}) => {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cix-lic",
-  "version": "2.0.0-alpha.1",
+  "version": "2.0.0",
   "description": "Licensing via CLI (Command-Line), CI (Continuous Integration), and API",
   "main": "./lib/index.js",
   "bin": {
@@ -26,16 +26,16 @@
   "license": "MIT",
   "dependencies": {
     "archappenv": "^2.0.0-alpha.51",
-    "chalk": "^2.3.0",
-    "mock-require": "^3.0.1"
+    "chalk": "^2.3.0"
   },
   "devDependencies": {
     "chai": "^4.1.2",
     "coveralls": "^3.0.0",
-    "mocha": "^4.0.1",
+    "mocha": "^5.0.0",
+    "mock-require": "^3.0.1",
     "nyc": "^11.4.1",
-    "shelljs": "^0.7.8",
-    "sinon": "^4.1.3"
+    "shelljs": "^0.8.1",
+    "sinon": "^4.2.2"
   },
   "repository": "git+https://github.com/cix-cdx/cix-lic"
 }
diff --git a/test/lib/core/argv.loader.spec.js b/test/lib/core/argv.loader.spec.js
@@ -131,5 +131,23 @@ describe('argv.loader.js tests', () => {
       // asserts
       expect(result).to.deep.equal(expected);
     });
+
+    it('expect to load argument values from process, #4', () => {
+      // arranges
+      process.argv = [
+        '', '',
+        '--unlicense'
+      ];
+
+      const expected = {
+        unlicense: true,
+      };
+
+      // acts
+      const result = ArgvLoader.load();
+
+      // asserts
+      expect(result).to.deep.equal(expected);
+    });
   });
 });
diff --git a/test/lib/licprops.builder.spec.js b/test/lib/licprops.builder.spec.js
@@ -153,7 +153,6 @@ describe('licprops.builder.js tests', () => {
 
     it('expect to build data from props, #4', () => {
       // arranges
-      const json = AppEnv.Util.packageJSON();
       const props = {
         owner: 'Panit Tuangsuwan',
         proc: ['lic', 'file']
@@ -174,6 +173,30 @@ describe('licprops.builder.js tests', () => {
       expect(result).to.deep.equal(expected);
     });
 
+    it('expect to build data from props, #5', () => {
+      // arranges
+      const props = {
+        owner: 'Panit Tuangsuwan',
+        unlicense: true,
+        proc: ['lic', 'file']
+      };
+      const expected = {
+        lic: 'MIT',
+        license: 'MIT License',
+        owner: 'Panit Tuangsuwan',
+        beginYear: '2018',
+        endYear: 'Present',
+        unlicense: true,
+        proc: ['lic', 'file']
+      };
+
+      // acts
+      const result = LICPropsBuilder.buildBaseData(props);
+
+      // asserts
+      expect(result).to.deep.equal(expected);
+    });
+
     it('expect to throw an error on strict mode', () => {
       // arranges
       const json = AppEnv.Util.packageJSON();

diff --git a/test/resources/files/a.js b/test/resources/files/a.js
@@ -0,0 +1 @@
+// for test
diff --git a/test/resources/files/a.ts b/test/resources/files/a.ts
@@ -0,0 +1 @@
+// for test
diff --git a/test/resources/files/b.js b/test/resources/files/b.js
@@ -0,0 +1 @@
+// for test
diff --git a/test/resources/files/b.ts b/test/resources/files/b.ts
@@ -0,0 +1 @@
+// for test