From 9e487bfd01e0052ed1e8cc58c4b7e1fbdcb54d2d Mon Sep 17 00:00:00 2001 From: Justin Date: Sun, 29 Apr 2018 11:45:23 -0400 Subject: [PATCH] Updating dependancies --- .codeclimate.yaml | 17 +++++++++++++++++ .travis.yml | 1 + LICENCE.md | 23 +++++++++++++++++++++++ README.md | 3 ++- package.json | 26 ++++++++++++-------------- src/Hg.js | 2 +- src/HgRepo.js | 2 +- 7 files changed, 57 insertions(+), 17 deletions(-) create mode 100644 .codeclimate.yaml create mode 100644 LICENCE.md diff --git a/.codeclimate.yaml b/.codeclimate.yaml new file mode 100644 index 00000000..f7e53999 --- /dev/null +++ b/.codeclimate.yaml @@ -0,0 +1,17 @@ +engines: + eslint: + enabled: true + duplication: + enabled: true + config: + languages: + javascript: + mass_threshold: 65 + shellcheck: + enabled: true +checks: + method-count: + enabled: false +ratings: + paths: + - "**.js" \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index fd21c8e8..28650313 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ node_js: - "7.6" - "7" - "8" + - "9" before_install: - sudo apt-get update - sudo apt-get install python2.7 diff --git a/LICENCE.md b/LICENCE.md new file mode 100644 index 00000000..28dd83b0 --- /dev/null +++ b/LICENCE.md @@ -0,0 +1,23 @@ +The MIT License +=============== + +Copyright (c) + **2017 Justin Dalrymple** + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/README.md b/README.md index 71cb59a4..97073ff4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ -[![Coverage Status](https://coveralls.io/repos/github/jdalrymple/node-hg-plus/badge.svg?branch=master)](https://coveralls.io/github/jdalrymple/node-hg-plus?branch=master) [![Build Status](https://travis-ci.org/jdalrymple/node-hg-plus.svg?branch=master)](https://travis-ci.org/jdalrymple/node-hg-plus) [![Dependency Status](https://david-dm.org/jdalrymple/node-hg-plus/status.svg)](https://david-dm.org/jdalrymple/node-test#info=dependencies) [![devDependency Status](https://david-dm.org/jdalrymple/node-hg-plus/dev-status.svg)](https://david-dm.org/jdalrymple/node-test#info=devDependencies) +[![Coverage Status](https://coveralls.io/repos/github/jdalrymple/node-hg-plus/badge.svg?branch=master)](https://coveralls.io/github/jdalrymple/node-hg-plus?branch=master) [![Build Status](https://travis-ci.org/jdalrymple/node-hg-plus.svg?branch=master)](https://travis-ci.org/jdalrymple/node-hg-plus) [![Dependency Status](https://david-dm.org/jdalrymple/node-hg-plus/status.svg)](https://david-dm.org/jdalrymple/node-test#info=dependencies) [![devDependency Status](https://david-dm.org/jdalrymple/node-hg-plus/dev-status.svg)](https://david-dm.org/jdalrymple/node-test#info=devDependencies)[![Code Climate](https://codeclimate.com/github/jdalrymple/node-hg-plus/badges/gpa.svg)](https://codeclimate.com/github/jdalrymple/node-hg-plus)[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) + # node-hg-plus diff --git a/package.json b/package.json index c8dd8ec9..40ce7670 100644 --- a/package.json +++ b/package.json @@ -20,26 +20,24 @@ "coverall": "cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js" }, "devDependencies": { - "babel-eslint": "^7.1.1", - "babel-preset-latest": "^6.16.0", - "coveralls": "^2.11.15", - "eslint": "^4.3.0", - "eslint-config-airbnb": "^15.1.0", - "eslint-plugin-import": "^2.7.0", - "eslint-plugin-jsx-a11y": "^5.1.1", - "eslint-plugin-react": "^7.1.0", - "nyc": "^11.0.3", - "tape": "^4.6.3" + "coveralls": "^3.0.0", + "eslint": "^4.19.1", + "eslint-config-airbnb": "^16.1.0", + "eslint-plugin-import": "^2.11.0", + "eslint-plugin-jsx-a11y": "^6.0.3", + "eslint-plugin-react": "^7.7.0", + "nyc": "^11.7.1", + "tape": "^4.9.0" }, "dependencies": { "blue-tape": "^1.0.0", "bluebird": "^3.5.1", "dir-compare": "^1.4.0", - "fs-extra": "^4.0.2", - "globby": "^6.1.0", + "fs-extra": "^5.0.0", + "globby": "^8.0.1", "is-there": "^4.4.3", "shortid": "^2.2.8", - "tempy": "^0.1.0", - "winston": "^2.4.0" + "tempy": "^0.2.1", + "winston": "^2.4.2" } } diff --git a/src/Hg.js b/src/Hg.js index b91b4317..72675693 100644 --- a/src/Hg.js +++ b/src/Hg.js @@ -117,7 +117,7 @@ async function cloneMultipleAndMerge(from, to, pythonPath) { } class Hg { - constructor({ path = 'python' } = { path: 'python' }) { + constructor({ path = 'python' } = {}) { this.pythonPath = path; } diff --git a/src/HgRepo.js b/src/HgRepo.js index 299ee391..4b78a692 100644 --- a/src/HgRepo.js +++ b/src/HgRepo.js @@ -153,6 +153,7 @@ class HgRepo { lines.forEach((line) => { if (line === '') return; + const name = line.match(/(^.+)\s=/)[0]; const cleanedName = name.replace('=', '').trim(); @@ -235,7 +236,6 @@ class HgRepo { if (clean) optionArgs.push(' -C'); if (revision) optionArgs.push(` -r ${revision}`); if (revision) optionArgs.push(` -r ${revision}`); - if (check) optionArgs.push(' -c'); if (tool) optionArgs.push(` -t ${tool}`);