Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add file modification before merging #8

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add file modification before merging #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,4 @@ npm-debug.log
node_modules
build
test/c
test/d
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ mergedirs('/folder/a', '/folder/b', 'overwrite');
mergedirs('/folder/a', '/folder/b', 'ask');
// copy folder/a into folder/b with conflict resolution 'skip'
mergedirs('/folder/a', '/folder/b', 'skip');
// copy folder/a into folder/b and prepend every file with the letter 'a'
mergedirs('/folder/a', '/folder/b', 'skip', fileName => 'a' + fileName);
```

mergedirs can also be used from the command line
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"main": "dist/index.js",
"bin": "dist/bin.js",
"scripts": {
"clean": "rimraf test/c",
"clean": "rimraf test/c test/d",
"prepublish": "babel src --out-dir dist",
"mocha": "mocha --reporter spec --timeout 300 --require should --growl --compilers js:babel-register test/test.js",
"test": "npm run clean && npm run mocha"
Expand Down
4 changes: 2 additions & 2 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ function fileAsk (src, dest) {
inquirer.prompt([question], resolveConflict(src, dest))
}

export default function mergeDirs (src, dest, conflictResolver = conflictResolvers.skip) {
export default function mergeDirs (src, dest, conflictResolver = conflictResolvers.skip, fileModification = fileName => fileName) {
// handle false, for backward compatability
if (conflictResolver === false) {
conflictResolver = conflictResolvers.skip
Expand All @@ -84,7 +84,7 @@ export default function mergeDirs (src, dest, conflictResolver = conflictResolve

files.forEach((file) => {
const srcFile = '' + src + '/' + file
const destFile = '' + dest + '/' + file
const destFile = '' + dest + '/' + fileModification(file)
const stats = fs.lstatSync(srcFile)

if (stats.isDirectory()) {
Expand Down
10 changes: 10 additions & 0 deletions test/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,14 @@ describe('merge dirs', function () {
fs.existsSync(__dirname + '/c/world.txt').should.equal(true)
done()
})
it('should merge 2 folders and change the extension', function (done) {
fs.mkdirSync(__dirname + '/d')
mergedirs(__dirname + '/a', __dirname + '/d')
mergedirs(__dirname + '/b', __dirname + '/d', 'skip', (fileName) => fileName.substr(0, fileName.lastIndexOf(".")) + ".html")
//
fs.existsSync(__dirname + '/d/hello.txt').should.equal(true)
fs.existsSync(__dirname + '/d/hello.html').should.equal(true)
fs.existsSync(__dirname + '/d/world.html').should.equal(true)
done()
})
})