Update deps

Author: rtfpessoa

.eslintignore

@@ -0,0 +1,3 @@
+# Skip bin and coverage folders
+bin/**
+coverage/**

.eslintrc .eslintrc.json.eslintrc renamed to .eslintrc.json

@@ -1,4 +1,4 @@
-Copyright 2014 Rodrigo Fernandes https://rtfpessoa.github.io/
+Copyright 2014-2016 Rodrigo Fernandes
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

LICENSE

@@ -32,7 +32,7 @@ Diff to Html generates pretty HTML diffs from git diff output in your terminal
 
 ## Online Example
 
-> Go to [Diff2HTML](http://rtfpessoa.github.io/diff2html/)
+> Go to [Diff2HTML](https://diff2html.xyz/)
 
 ## Distributions
 
@@ -55,19 +55,20 @@ Diff to Html generates pretty HTML diffs from git diff output in your terminal
     Usage: diff2html [options] -- [diff args]
 
     Options:
-      -s, --style                       Output style   [string] [choices: "line", "side"] [default: "line"]
-      --su, --summary                   Show files summary   [string] [choices: "closed", "open", "hidden"] [default: "closed"]
-      --lm, --matching                  Diff line matching type   [string] [choices: "lines", "words", "none"] [default: "none"]
-      --lmt, --matchWordsThreshold      Diff line matching word threshold   [string] [default: "0.25"]
+      -s, --style                       Output style   [choices: "line", "side"] [default: "line"]
+      --sc, --synchronisedScroll        Synchronised horizontal scroll   [choices: "enabled", "disabled"] [default: "enabled"]
+      --su, --summary                   Show files summary   [choices: "closed", "open", "hidden"] [default: "closed"]
+      --lm, --matching                  Diff line matching type   [choices: "lines", "words", "none"] [default: "none"]
+      --lmt, --matchWordsThreshold      Diff line matching word threshold   [default: "0.25"]
       --lmm, --matchingMaxComparisons   Diff line matching maximum line comparisons of a block of changes [default: 2500]
-      -f, --format                      Output format   [string] [choices: "html", "json"] [default: "html"]
-      -d, --diff                        Diff style   [string] [choices: "word", "char"] [default: "word"]
-      -i, --input                       Diff input source   [string] [choices: "file", "command", "stdin"] [default: "command"]
-      -o, --output                      Output destination   [string] [choices: "preview", "stdout"] [default: "preview"]
-      -u, --diffy                       Upload to diffy.org   [string] [choices: "browser", "pbcopy", "print"]
+      -f, --format                      Output format   [choices: "html", "json"] [default: "html"]
+      -d, --diff                        Diff style   [choices: "word", "char"] [default: "word"]
+      -i, --input                       Diff input source   [choices: "file", "command", "stdin"] [default: "command"]
+      -o, --output                      Output destination   [choices: "preview", "stdout"] [default: "preview"]
+      -u, --diffy                       Upload to diffy.org   [choices: "browser", "pbcopy", "print"]
       -F, --file                        Send output to file (overrides output option)   [string]
-      --version                         Show version number                    [boolean]
-      -h, --help                        Show help                              [boolean]
+      --version                         Show version number
+      -h, --help                        Show help
 
     Examples:
       diff2html -s line -f html -d word -i command -o preview -- -M HEAD~1
@@ -80,7 +81,7 @@ Diff to Html generates pretty HTML diffs from git diff output in your terminal
       diff2html -F my-pretty-diff.html -- -M HEAD~1
           ->  print to file
 
-    © 2014 rtfpessoa
+    © 2014-2016 rtfpessoa
     For support, check out https://github.com/rtfpessoa/diff2html-cli
 
 > NOTE: notice the `--` in the examples
@@ -93,7 +94,7 @@ I will try to review them as soon as possible.
 
 ## License
 
-Copyright 2014 Rodrigo Fernandes. Released under the terms of the MIT license.
+Copyright 2014-2016 Rodrigo Fernandes. Released under the terms of the MIT license.
 
 ## Thanks
 

README.md

@@ -1,8 +1,28 @@
+machine:
+  node:
+    version: 6
+dependencies:
+  cache_directories:
+    - ~/nvm
+    - ~/.npm
+  override:
+    - git clean -dfx
+    - nvm use 0.12 && nvm alias default 0.12
+    - npm install
+    - npm run test
+    - git clean -dfx
+    - nvm use 4 && nvm alias default 4
+    - npm install
+    - npm run test
+    - git clean -dfx
+    - nvm use 5 && nvm alias default 5
+    - npm install
+    - npm run test
+    - git clean -dfx
+    - nvm use 6 && nvm alias default 6
+    - npm install
 test:
   override:
-    - nvm install 0.12 && npm test
-    - nvm install 4 && npm run style && npm test
-    - nvm install 5 && npm run style && npm test
-  post:
-    - nvm install 5 && npm install && npm run style && npm test
-    - cat ./coverage/lcov.info | ./node_modules/.bin/codacy-coverage
+    - npm run style
+    - npm run test
+    - npm run codacy

circle.yml

@@ -36,10 +36,11 @@
   },
   "preferGlobal": true,
   "scripts": {
-    "style": "eslint src/*.js",
+    "style": "eslint .",
     "coverage": "istanbul cover _mocha -- -u exports -R spec ./test/**/*",
+    "check-coverage": "istanbul check-coverage --statements 90 --functions 90 --branches 85 --lines 90 ./coverage/coverage.json",
     "test": "npm run coverage",
-    "codacy": "npm run coverage && cat ./coverage/lcov.info | codacy-coverage",
+    "codacy": "cat ./coverage/lcov.info | codacy-coverage",
     "preversion": "npm test",
     "postversion": "git push && git push --tags"
   },
@@ -49,19 +50,19 @@
   "main": "./src/main.js",
   "dependencies": {
     "copy-paste": "^1.3.0",
-    "diff2html": "^2.0.1",
+    "diff2html": "^2.0.6",
     "extend": "^3.0.0",
     "open": "0.0.5",
-    "request": "^2.73.0",
-    "yargs": "^4.8.0"
+    "request": "^2.74.0",
+    "yargs": "^5.0.0"
   },
   "devDependencies": {
-    "codacy-coverage": "^1.1.3",
-    "eslint": "^3.0.1",
-    "eslint-plugin-promise": "^1.3.2",
-    "eslint-plugin-standard": "^1.3.2",
-    "istanbul": "^0.4.4",
-    "mocha": "^2.5.3"
+    "codacy-coverage": "^2.0.0",
+    "eslint": "^3.5.0",
+    "eslint-plugin-promise": "^2.0.1",
+    "eslint-plugin-standard": "^2.0.0",
+    "istanbul": "^0.4.5",
+    "mocha": "^3.0.2"
   },
   "license": "MIT",
   "files": [

package.json

@@ -83,6 +83,8 @@
         config.showFilesOpen = baseConfig.summary === 'open';
       }
 
+      config.synchronisedScroll = (baseConfig.synchronisedScroll === 'enabled');
+
       var htmlContent = diff2Html.getPrettyHtml(jsonContent, config);
       return callback(null, that._prepareHTML(htmlContent, config.showFilesOpen));
     } else if (baseConfig.format === 'json') {

src/cli.js

@@ -24,6 +24,15 @@ var argv = yargs.usage('Usage: diff2html [options] -- [diff args]')
       default: 'line'
     }
   })
+  .options({
+    'sc': {
+      alias: 'synchronisedScroll',
+      describe: 'Synchronised horizontal scroll',
+      type: 'string',
+      choices: ['enabled', 'disabled'],
+      default: 'enabled'
+    }
+  })
   .options({
     'su': {
       alias: 'summary',