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.

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

JSHint to ESLint && modifying code (i.e. ES2015) #64

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
node_modules/*
coverage/*
.tmp/*
.git/*
66 changes: 66 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
{
"extends": 'usecases/usecase/nodejs',
"env": {
"browser": true,
"node": true
},
"globals": {
"describe": true,
"it": true,
"before": true,
"afterEach": true,
"beforeEach": true,
"after": true
},
"rules": {
"global-require": 0,
"no-bitwise": 2,
"camelcase": 0,
"curly": 2,
"eqeqeq": 2,
"guard-for-in": 0,
"wrap-iife": 0,
"indent": 0,
"no-use-before-define": 0,
"new-cap": 0,
"no-caller": 2,
"no-empty": 2,
"no-new": 0,
"no-plusplus": 0,
"quotes": 0,
"no-undef": 2,
"no-unused-vars": 0,
"strict": 0,
"max-params": 0,
"max-depth": 0,
"max-statements": 0,
"complexity": 0,
"max-len": 0,
"semi": 0,
"no-cond-assign": [
2,
"except-parens"
],
"no-debugger": 0,
"no-eq-null": 0,
"no-eval": 0,
"no-unused-expressions": 2,
"block-scoped-var": 0,
"no-iterator": 0,
"linebreak-style": 2,
"comma-style": [
2,
"first"
],
"no-loop-func": 0,
"no-multi-str": 2,
"no-proto": 0,
"no-script-url": 0,
"no-shadow": 0,
"dot-notation": 2,
"no-new-func": 0,
"no-new-wrappers": 0,
"no-invalid-this": 2,
"require-yield": 2
}
}
20 changes: 10 additions & 10 deletions lib/gitlab.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
* Module dependencies.
*/

var debug = require('debug')('gitlab');
var RESTFulClient = require('restful-client').RESTFulClient;
var util = require('util');
var resources = require('./resources');
let debug = require('debug')('gitlab');
let RESTFulClient = require('restful-client').RESTFulClient;
let util = require('util');
let resources = require('./resources');

module.exports = Gitlab;

Expand All @@ -44,21 +44,21 @@ function Gitlab(options) {

util.inherits(Gitlab, RESTFulClient);

Gitlab.prototype.setAuthentication = function (req) {
Gitlab.prototype.setAuthentication = function(req) {
req.params.data.private_token = req.params.data.private_token || this.privateToken;
return req;
};

Gitlab.create = function (options) {
Gitlab.create = function(options) {
return new Gitlab(options);
};

Gitlab.createPromise = function (options) {
var client = Gitlab.create(options);
Gitlab.createPromise = function(options) {
let client = Gitlab.create(options);
return require('./promisify')(client);
};

Gitlab.createThunk = function (options) {
var client = Gitlab.create(options);
Gitlab.createThunk = function(options) {
let client = Gitlab.create(options);
return require('./thunkify')(client);
};
14 changes: 7 additions & 7 deletions lib/promisify.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,20 @@
*/

/* jshint ignore:start */
var Promise = require('any-promise');
let Promise = require('any-promise');
/* jshint ignore:end */
var properties = require('./properties');
let properties = require('./properties');

module.exports = promisifyAll;

function promisifyAll(source) {
var target = {
let target = {
request: promisify('request', source.request.bind(source))
};
Object.keys(properties).forEach(function (name) {
var methods = properties[name];
Object.keys(properties).forEach((name) => {
let methods = properties[name];
target[name] = {};
methods.forEach(function (method) {
methods.forEach((method) => {
target[name][method] = promisify(method, source[name][method].bind(source[name]));
});
});
Expand All @@ -50,7 +50,7 @@ function promisify(name, fn) {
}

function makeCallback(resolve, reject) {
return function (err, result) {
return function(err, result) {
if (err) {
reject(err);
} else {
Expand Down
102 changes: 51 additions & 51 deletions lib/properties.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,62 +14,62 @@
* Module dependencies.
*/

var defaultMethods = ['get', 'list', 'create', 'update', 'remove'];
let defaultMethods = ['get', 'list', 'create', 'update', 'remove'];

var properties = {
let properties = {
milestones: [
'listIssues',
],
members: [],
hooks: [],
globalHooks: [],
users: [],
mergeRequests: [
'listNotes',
'createNote',
'getNote',
'updateNote',
'merge'
],
repositoryFiles: [],
repositoryBranches: [
'protect',
'unprotect',
],
repository: [
'getBranches',
'protectBranch',
'unprotectBranch',
'getBranch',
'getTags',
'getCommits',
'getTree',
'getBlob',
'archive',
'compare'
],
issues: [
'listNotes',
'createNote',
'getNote',
'updateNote'
],
projects: [
'getByPath',
'listEvents',
'fork',
'search',
],
deployKeys: [],
projectMembers: [],
groups: [
'listIssues'
]
, members: []
, hooks: []
, globalHooks: []
, users: []
, mergeRequests: [
'listNotes'
, 'createNote'
, 'getNote'
, 'updateNote'
, 'merge'
]
, repositoryFiles: []
, repositoryBranches: [
'protect'
, 'unprotect'
]
, repository: [
'getBranches'
, 'protectBranch'
, 'unprotectBranch'
, 'getBranch'
, 'getTags'
, 'getCommits'
, 'getTree'
, 'getBlob'
, 'archive'
, 'compare'
]
, issues: [
'listNotes'
, 'createNote'
, 'getNote'
, 'updateNote'
]
, projects: [
'getByPath'
, 'listEvents'
, 'fork'
, 'search'
]
, deployKeys: []
, projectMembers: []
, groups: [
'transferProject'
],
groupMembers: [],
]
, groupMembers: [],
};

for (var key in properties) {
var methods = properties[key];
for (let key in properties) {
let methods = properties[key];
properties[key] = defaultMethods.concat(methods);
}

Expand Down
6 changes: 3 additions & 3 deletions lib/resources/group.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* Module dependencies.
*/

var util = require('util');
var restful = require('restful-client');
let util = require('util');
let restful = require('restful-client');

module.exports = Group;

Expand All @@ -34,7 +34,7 @@ util.inherits(Group, restful.RESTFulResource);
* - {String} project_id project id
* @param {Function(err, project)} callback
*/
Group.prototype.transferProject = function (params, callback) {
Group.prototype.transferProject = function(params, callback) {
this.client.request('post', '/groups/:id/projects/:project_id', params, callback);
return this;
};
64 changes: 32 additions & 32 deletions lib/resources/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,51 +15,51 @@
*/

module.exports = {
projects: require('./project'),
projects: require('./project')

projectMembers: {
resourcePath: '/projects/:id/members',
idName: 'user_id',
},
, projectMembers: {
resourcePath: '/projects/:id/members'
, idName: 'user_id',
}

repository: require('./repository'),
, repository: require('./repository')

repositoryBranches: require('./repository_branch'),
, repositoryBranches: require('./repository_branch')

repositoryFiles: {
, repositoryFiles: {
resourcePath: '/projects/:id/repository/files'
},
}

mergeRequests: require('./merge_request'),
, mergeRequests: require('./merge_request')

users: {
resourcePath: '/users',
idName: 'user_id'
},
, users: {
resourcePath: '/users'
, idName: 'user_id'
}

issues: require('./issue'),
, issues: require('./issue')

globalHooks: {
resourcePath: '/hooks',
idName: 'hook_id'
},
, globalHooks: {
resourcePath: '/hooks'
, idName: 'hook_id'
}

milestones: require('./milestone'),
, milestones: require('./milestone')

hooks: {
resourcePath: '/projects/:id/hooks',
idName: 'hook_id',
},
, hooks: {
resourcePath: '/projects/:id/hooks'
, idName: 'hook_id',
}

groups: require('./group'),
, groups: require('./group')

groupMembers: {
resourcePath: '/groups/:id/members',
idName: 'user_id',
},
, groupMembers: {
resourcePath: '/groups/:id/members'
, idName: 'user_id',
}

deployKeys: {
resourcePath: '/projects/:id/keys',
idName: 'key_id',
, deployKeys: {
resourcePath: '/projects/:id/keys'
, idName: 'key_id',
},
};
Loading