Use ESLint and JSCS

Author: tommy351

.eslintignore

@@ -0,0 +1,3 @@
+node_modules/
+coverage/
+tmp/

.eslintrc

@@ -0,0 +1,4 @@
+{
+  "extends": "hexo",
+  "root": true
+}

.jscsrc

@@ -0,0 +1,4 @@
+{
+  "excludeFiles": ["node_modules/**", "coverage/**", "tmp/**"],
+  "preset": "hexo"
+}

.jshintrc

@@ -2,7 +2,6 @@ test/
 tmp/
 coverage/
 *.log
-.jshintrc
 .travis.yml
 gulpfile.js
 .idea/

.npmignore

@@ -1,15 +1,22 @@
 language: node_js
 
-node_js:
-  - "0.10"
-  - "0.11"
+sudo: false
+
+cache:
+  apt: true
+  directories:
+    - node_modules
 
-before_script:
-  - git config --global user.email "[email protected]"
-  - git config --global user.name "John Doe"
+node_js:
+  - "0.12"
+  - "4"
+  - "5"
 
 script:
-  - npm test
+  - npm run eslint
+  - npm run jscs
+  - npm run test-cov
 
 after_script:
+  - npm install coveralls
   - cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js

.travis.yml

@@ -1,42 +1,36 @@
-# Based on https://github.com/gruntjs/grunt/blob/master/appveyor.yml
-# http://www.appveyor.com/docs/appveyor-yml
-
 # Fix line endings in Windows. (runs before repo cloning)
 init:
   - git config --global core.autocrlf input
-  - git config --global user.email "[email protected]"
-  - git config --global user.name "John Doe"
 
 # Test against these versions of Node.js.
 environment:
   matrix:
-    - nodejs_version: "0.10"
-    - nodejs_version: "0.11"
+    - nodejs_version: "0.12"
+    - nodejs_version: "4"
+    - nodejs_version: "5"
 
-# Allow failing jobs for bleeding-edge Node.js versions.
 matrix:
-  allow_failures:
-    - nodejs_version: "0.11"
+  fast_finish: true
 
 # Install scripts. (runs after repo cloning)
 install:
-  # Get the latest stable version of Node 0.STABLE.latest
   - ps: Install-Product node $env:nodejs_version
-  # Typical npm stuff.
+  - npm install -g npm
   - npm install
 
+cache:
+  - node_modules -> package.json
+
 # Post-install test scripts.
 test_script:
   # Output useful info for debugging.
   - node --version
   - npm --version
-  # We test multiple Windows shells because of prior stdout buffering issues
-  # filed against Grunt. https://github.com/joyent/node/issues/3584
-  - ps: "npm test # PowerShell" # Pass comment to PS for easier debugging
-  - cmd: npm test
+  # Run tests
+  - npm test
 
 # Don't actually build.
 build: off
 
 # Set build version format here instead of in the admin panel.
-version: "{build}"
+version: "{build}"

appveyor.yml

@@ -1 +1,4 @@
-hexo.extend.deployer.register('git', require('./lib/deployer'));
+/* global hexo */
+'use strict';
+
+hexo.extend.deployer.register('git', require('./lib/deployer'));

gulpfile.js

@@ -1,27 +1,28 @@
+'use strict';
+
 var pathFn = require('path');
 var fs = require('hexo-fs');
 var chalk = require('chalk');
 var swig = require('swig');
 var moment = require('moment');
-var util = require('hexo-util');
+var spawn = require('hexo-util/lib/spawn');
 var parseConfig = require('./parse_config');
-var spawn = util.spawn;
 
 var swigHelpers = {
-  now: function(format){
+  now: function(format) {
     return moment().format(format);
   }
 };
 
-module.exports = function(args){
+module.exports = function(args) {
   var baseDir = this.base_dir;
   var deployDir = pathFn.join(baseDir, '.deploy_git');
   var publicDir = this.public_dir;
   var log = this.log;
   var message = commitMessage(args);
   var verbose = !args.silent;
 
-  if (!args.repo && !args.repository){
+  if (!args.repo && !args.repository) {
     var help = '';
 
     help += 'You have to configure the deployment settings in _config.yml first!\n\n';
@@ -37,11 +38,11 @@ module.exports = function(args){
     return;
   }
 
-  function git(){
+  function git() {
     var len = arguments.length;
     var args = new Array(len);
 
-    for (var i = 0; i < len; i++){
+    for (var i = 0; i < len; i++) {
       args[i] = arguments[i];
     }
 
@@ -51,46 +52,46 @@ module.exports = function(args){
     });
   }
 
-  function setup(){
+  function setup() {
     // Create a placeholder for the first commit
-    return fs.writeFile(pathFn.join(deployDir, 'placeholder'), '').then(function(){
+    return fs.writeFile(pathFn.join(deployDir, 'placeholder'), '').then(function() {
       return git('init');
-    }).then(function(){
+    }).then(function() {
       return git('add', '-A');
-    }).then(function(){
+    }).then(function() {
       return git('commit', '-m', 'First commit');
     });
   }
 
-  function push(repo){
-    return git('add', '-A').then(function(){
-      return git('commit', '-m', message).catch(function(){
+  function push(repo) {
+    return git('add', '-A').then(function() {
+      return git('commit', '-m', message).catch(function() {
         // Do nothing. It's OK if nothing to commit.
       });
-    }).then(function(){
+    }).then(function() {
       return git('push', '-u', repo.url, 'HEAD:' + repo.branch, '--force');
     });
   }
 
-  return fs.exists(deployDir).then(function(exist){
+  return fs.exists(deployDir).then(function(exist) {
     if (exist) return;
 
     log.info('Setting up Git deployment...');
     return setup();
-  }).then(function(){
+  }).then(function() {
     log.info('Clearing .deploy_git folder...');
     return fs.emptyDir(deployDir);
-  }).then(function(){
+  }).then(function() {
     log.info('Copying files from public folder...');
     return fs.copyDir(publicDir, deployDir);
-  }).then(function(){
+  }).then(function() {
     return parseConfig(args);
-  }).each(function(repo){
+  }).each(function(repo) {
     return push(repo);
   });
 };
 
-function commitMessage(args){
+function commitMessage(args) {
   var message = args.m || args.msg || args.message || 'Site updated: {{ now(\'YYYY-MM-DD HH:mm:ss\') }}';
   return swig.compile(message)(swigHelpers);
-}
+}

index.js

@@ -1,19 +1,21 @@
+'use strict';
+
 var rRepoURL = /^(?:(?:git|https?|git\+https|git\+ssh):\/\/)?(?:[^@]+@)?([^\/]+?)[\/:](.+?)\.git$/;
 var rGithubPage = /\.github\.(io|com)$/;
 
-function parseRepo(repo){
+function parseRepo(repo) {
   var split = repo.split(',');
   var url = split.shift();
   var branch = split[0];
 
-  if (!branch && rRepoURL.test(url)){
+  if (!branch && rRepoURL.test(url)) {
     var match = url.match(rRepoURL);
     var host = match[1];
     var path = match[2];
 
-    if (host === 'github.com'){
+    if (host === 'github.com') {
       branch = rGithubPage.test(path) ? 'master' : 'gh-pages';
-    } else if (host === 'gitcafe.com'){
+    } else if (host === 'gitcafe.com') {
       branch = 'gitcafe-pages';
     }
   }
@@ -24,11 +26,11 @@ function parseRepo(repo){
   };
 }
 
-module.exports = function(args){
+module.exports = function(args) {
   var repo = args.repo || args.repository;
   if (!repo) throw new TypeError('repo is required!');
 
-  if (typeof repo === 'string'){
+  if (typeof repo === 'string') {
     var data = parseRepo(repo);
     data.branch = args.branch || data.branch;
 
@@ -38,9 +40,9 @@ module.exports = function(args){
   var result = [];
   var keys = Object.keys(repo);
 
-  for (var i = 0, len = keys.length; i < len; i++){
+  for (var i = 0, len = keys.length; i < len; i++) {
     result.push(parseRepo(repo[keys[i]]));
   }
 
   return result;
-};
+};

lib/deployer.js

@@ -4,16 +4,16 @@
   "description": "Git deployer plugin of Hexo.",
   "main": "index",
   "scripts": {
-    "test": "gulp test"
+    "eslint": "eslint .",
+    "jscs": "jscs .",
+    "test": "mocha test/index.js",
+    "test-cov": "istanbul cover --print both _mocha -- test/index.js"
   },
   "directories": {
     "lib": "./lib"
   },
-  "engines": {
-    "node": ">= 0.10.0"
-  },
   "repository": "hexojs/hexo-deployer-git",
-  "homepage": "http://hexo.io/",
+  "homepage": "https://hexo.io/",
   "keywords": [
     "hexo",
     "git",
@@ -23,22 +23,19 @@
   "author": "Tommy Chen <[email protected]> (http://zespia.tw)",
   "license": "MIT",
   "devDependencies": {
-    "chai": "^1.9.1",
-    "coveralls": "^2.11.2",
-    "gulp": "^3.8.9",
-    "gulp-istanbul": "^0.5.0",
-    "gulp-jshint": "^1.8.6",
-    "gulp-load-plugins": "^0.8.0",
-    "gulp-mocha": "^2.0.0",
-    "jshint-stylish": "^1.0.0",
-    "mocha": "^2.0.1",
-    "rimraf": "^2.2.8"
+    "chai": "^3.5.0",
+    "eslint": "^1.10.3",
+    "eslint-config-hexo": "^1.0.2",
+    "istanbul": "^0.4.2",
+    "jscs": "^2.9.0",
+    "jscs-preset-hexo": "^1.0.1",
+    "mocha": "^2.4.5"
   },
   "dependencies": {
-    "chalk": "^0.5.1",
-    "hexo-fs": "^0.1.0",
-    "hexo-util": "^0.1.0",
-    "moment": "^2.8.4",
+    "chalk": "^1.1.1",
+    "hexo-fs": "^0.1.5",
+    "hexo-util": "^0.5.3",
+    "moment": "^2.11.2",
     "swig": "^1.4.2"
   }
 }

lib/parse_config.js

@@ -0,0 +1,3 @@
+{
+  "extends": "hexo/test"
+}