Merge 8ca3ca0 into c72be4c

README.md

@@ -50,8 +50,15 @@ Create a `.handpick` file to override configuration:
 			"--no-lockfile"
 		]
 	},
-	"path": ".",
-	"file": "package.json",
+	"range": "exact",
+	"rangeArray":
+	[
+		"dirty",
+		"exact",
+		"patch",
+		"minor"
+	],
+	"ignorePrefix": "__",
 	"ignoreArray":
 	[
 		"dependencies",
@@ -63,7 +70,8 @@ Create a `.handpick` file to override configuration:
 		"devDependencies"
 	],
 	"filterArray": [],
-	"prefix": "__"
+	"path": ".",
+	"file": "package.json"
 }
 ```
 
@@ -81,6 +89,7 @@ handpick [options]
 -T, --target <target>
 -F, --filter <filter>
 -M, --manager <manager>
+-R, --range <range>
 -P, --path <path>
 -h, --help
 ```
@@ -89,13 +98,14 @@ handpick [options]
 Options
 -------
 
-| Name    | Type    | Default                        | Mandatory |
-|---------|---------|--------------------------------|-----------|
-| config  | string  | .handpick                      | optional  |
-| target  | string  | dependencies / devDependencies | optional  |
-| filter  | string  |                                | optional  |
-| manager | string  | npm                            | optional  |
-| path    | string  | .                              | optional  |
+| Name    | Type   | Default                        | Mandatory |
+|---------|--------|--------------------------------|-----------|
+| config  | string | .handpick                      | optional  |
+| target  | string | dependencies / devDependencies | optional  |
+| filter  | string |                                | optional  |
+| manager | string | npm                            | optional  |
+| range   | string | exact                          | optional  |
+| path    | string | .                              | optional  |
 
 
 Examples
@@ -113,7 +123,7 @@ Define unofficial dependencies inside `package.json` file:
 	"testDependencies":
 	{
 		"chai": "4.2.0",
-		"mocha": "7.1.2"
+		"mocha": "7.2.0"
 	}
 }
 ```
@@ -142,6 +152,12 @@ Install the `dependencies` and `devDependencies` within path:
 handpick --path=../shared
 ```
 
+Install the `dependencies` with `exact` range:
+
+```
+handpick --target=dependencies --range=exact
+```
+
 
 Managers
 --------

bin/handpick

@@ -8,6 +8,8 @@ const option = handpick.option;
 const packageObject = require('../package.json');
 const targetArray = [];
 const filterArray = [];
+const managerArray = Object.keys(option.get('managerObject'));
+const rangeArray = option.get('rangeArray');
 
 let CORE;
 
@@ -16,7 +18,8 @@ program
 	.option('-C, --config <config>')
 	.option('-T, --target <target>', null, target => targetArray.push(target))
 	.option('-F, --filter <target>', null, filter => filterArray.push(filter))
-	.option('-M, --manager <manager>')
+	.option('-M, --manager <manager>', managerArray.join(' | '))
+	.option('-R, --range <range>', rangeArray.join(' | '))
 	.option('-P, --path <path>')
 	.parse(process.argv);
 
@@ -25,8 +28,9 @@ option.initWithConfig(
 	config: program.config,
 	targetArray: targetArray.length > 0 ? targetArray : option.get('targetArray'),
 	filterArray: filterArray.length > 0 ? filterArray : option.get('filterArray'),
-	manager: program.manager,
-	path: program.path
+	manager: managerArray.includes(program.manager) ? program.manager : option.get('manager'),
+	path: program.path,
+	range: rangeArray.includes(program.range) ? program.range : option.get('range')
 });
 CORE = new core(
 {

option.json

@@ -18,8 +18,15 @@
 			"--no-lockfile"
 		]
 	},
-	"path": ".",
-	"file": "package.json",
+	"range": "exact",
+	"rangeArray":
+	[
+		"dirty",
+		"exact",
+		"patch",
+		"minor"
+	],
+	"ignorePrefix": "__",
 	"ignoreArray":
 	[
 		"dependencies",
@@ -31,5 +38,6 @@
 		"devDependencies"
 	],
 	"filterArray": [],
-	"prefix": "__"
+	"path": ".",
+	"file": "package.json"
 }

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "handpick",
 	"description": "Handpick conditional dependencies like a boss",
-	"version": "2.1.0",
+	"version": "3.0.0-beta.1",
 	"license": "MIT",
 	"keywords":
 	[
@@ -25,8 +25,9 @@
 	},
 	"dependencies":
 	{
-		"commander": "5.1.0",
-		"ora": "4.0.4",
+		"commander": "6.0.0",
+		"ora": "5.0.0",
+		"semver": "7.3.2",
 		"utility-redaxmedia": "1.0.0"
 	},
 	"devDependencies":

src/core.js

@@ -1,3 +1,4 @@
+const semver = require('semver');
 const { promisify } = require('util');
 const fs = require('fs');
 const spawn = require('child_process').spawn;
@@ -85,16 +86,19 @@ function prepare(packageObject)
 	const ignoreArray = option.get('ignoreArray');
 	const targetArray = option.get('targetArray');
 	const filterArray = option.get('filterArray');
+	const range = option.get('range');
 	const filterObject = {};
 	const resultObject = {};
 
+	/* handle prefix */
+
 	Object.keys(packageObject).map(packageValue =>
 	{
-		const prefixValue = option.get('prefix') + packageValue;
+		const ignorePrefix = option.get('ignorePrefix') + packageValue;
 
 		if (ignoreArray.includes(packageValue))
 		{
-			resultObject[prefixValue] = packageObject[packageValue];
+			resultObject[ignorePrefix] = packageObject[packageValue];
 		}
 		else
 		{
@@ -109,6 +113,9 @@ function prepare(packageObject)
 			};
 		}
 	});
+
+	/* handle filter */
+
 	filterArray.map(filterValue =>
 	{
 		Object.keys(resultObject['dependencies']).filter(resultValue =>
@@ -120,6 +127,26 @@ function prepare(packageObject)
 		});
 		resultObject['dependencies'] = filterObject;
 	});
+
+	/* handle range */
+
+	Object.keys(resultObject['dependencies']).map(resultValue =>
+	{
+		const resultVersion = semver.coerce(resultObject['dependencies'][resultValue]).version;
+
+		if (range === 'exact')
+		{
+			resultObject['dependencies'][resultValue] = resultVersion;
+		}
+		if (range === 'patch')
+		{
+			resultObject['dependencies'][resultValue] = '~' + resultVersion;
+		}
+		if (range === 'minor')
+		{
+			resultObject['dependencies'][resultValue] = '^' + resultVersion;
+		}
+	});
 	return resultObject;
 }
 
@@ -136,9 +163,11 @@ function startWording()
 	const manager = option.get('manager');
 	const targetArray = option.get('targetArray');
 	const filterArray = option.get('filterArray');
+	const range = option.get('range');
 	const wordingArray =
 	[
 		wordingObject.handpick,
+		range.toUpperCase(),
 		targetArray.join(' ' + wordingObject.and + ' ')
 	];
 

tests/coreTest.js

@@ -32,6 +32,7 @@ describe('core', () =>
 				expect(packageObject).to.have.property('devDependencies');
 				expect(packageObject).to.have.property('lintDependencies');
 				expect(packageObject).to.have.property('testDependencies');
+				expect(packageObject).to.have.property('dirtyDependencies');
 				done();
 			})
 			.catch(() => done('error'));
@@ -82,6 +83,40 @@ describe('core', () =>
 			.catch(() => done('error'));
 	});
 
+	[
+		'exact',
+		'patch',
+		'minor'
+	]
+	.map(range =>
+	{
+		it('prepare dirty to ' + range, done =>
+		{
+			option.initWithConfig(
+			{
+				path: 'tests/provider/core',
+				range,
+				targetArray:
+				[
+					'dirtyDependencies'
+				]
+			});
+			CORE.readObjectFromFile()
+				.then(packageObject =>
+				{
+					option.set('file', 'package_prepare_dirty_to_' + range + '.json');
+					CORE.readObjectFromFile()
+						.then(expectObject =>
+						{
+							expect(CORE.prepare(packageObject)).to.deep.equal(expectObject);
+							done();
+						})
+						.catch(() => done('error'));
+				})
+				.catch(() => done('error'));
+		});
+	});
+
 	it('prepare lint and test', done =>
 	{
 		option.initWithConfig(
@@ -143,8 +178,9 @@ describe('core', () =>
 		{
 			path: 'tests/provider/core'
 		});
-		expect(CORE.startWording()).to.equal('Hand picking dependencies and devDependencies via NPM');
+		expect(CORE.startWording()).to.equal('Hand picking EXACT dependencies and devDependencies via NPM');
 		option.set('manager', 'yarn');
+		option.set('range', 'patch');
 		option.set('targetArray',
 		[
 			'devDependencies'
@@ -153,6 +189,6 @@ describe('core', () =>
 		[
 			'lintDependencies'
 		]);
-		expect(CORE.startWording()).to.equal('Hand picking devDependencies without lintDependencies via YARN');
+		expect(CORE.startWording()).to.equal('Hand picking PATCH devDependencies without lintDependencies via YARN');
 	});
 });

tests/optionTest.js

@@ -9,10 +9,10 @@ describe('option', () =>
 		option.initWithConfig(
 		{
 			config: 'tests/provider/option/.handpick',
-			prefix: "____"
+			ignorePrefix: "____"
 		});
 		expect(option.get('config')).to.equal('tests/provider/option/.handpick');
-		expect(option.get('prefix')).to.equal('____');
+		expect(option.get('ignorePrefix')).to.equal('____');
 		expect(option.get('manager')).to.equal('yarn');
 		expect(option.get('file')).to.equal('package.json');
 	});

tests/provider/core/package.json

@@ -23,5 +23,12 @@
 	{
 		"chai": "1.0.0",
 		"mocha": "1.0.0"
+	},
+	"dirtyDependencies":
+	{
+		"chai": "v2.0",
+		"eslint": "^2.0.0",
+		"eslint-config-redaxmedia": "~2.0.0",
+		"mocha": ">2"
 	}
 }

tests/provider/core/package_prepare_dev_without_lint.json

@@ -24,6 +24,13 @@
 		"chai": "1.0.0",
 		"mocha": "1.0.0"
 	},
+	"dirtyDependencies":
+	{
+		"chai": "v2.0",
+		"eslint": "^2.0.0",
+		"eslint-config-redaxmedia": "~2.0.0",
+		"mocha": ">2"
+	},
 	"dependencies":
 	{
 		"chai": "1.0.0",

tests/provider/core/package_prepare_dirty_to_exact.json

@@ -0,0 +1,41 @@
+{
+	"name": "handpick",
+	"version": "1.0.0",
+	"__dependencies":
+	{
+		"commander": "1.0.0",
+		"ora": "1.0.0",
+		"utility-redaxmedia": "1.0.0"
+	},
+	"__devDependencies":
+	{
+		"chai": "1.0.0",
+		"eslint": "1.0.0",
+		"eslint-config-redaxmedia": "1.0.0",
+		"mocha": "1.0.0"
+	},
+	"lintDependencies":
+	{
+		"eslint": "1.0.0",
+		"eslint-config-redaxmedia": "1.0.0"
+	},
+	"testDependencies":
+	{
+		"chai": "1.0.0",
+		"mocha": "1.0.0"
+	},
+	"dirtyDependencies":
+	{
+		"chai": "v2.0",
+		"eslint": "^2.0.0",
+		"eslint-config-redaxmedia": "~2.0.0",
+		"mocha": ">2"
+	},
+	"dependencies":
+	{
+		"chai": "2.0.0",
+		"eslint": "2.0.0",
+		"eslint-config-redaxmedia": "2.0.0",
+		"mocha": "2.0.0"
+	}
+}