merge master

Author: Boris Yakubchik

.circleci/config.yml

@@ -36,16 +36,6 @@ jobs:
       - run: yarn run coverage-lcov
       - run: yarn run codacy
 
-  build-node_6:
-    <<: *common-build
-    docker:
-      - image: node:6
-
-  build-node_7:
-    <<: *common-build
-    docker:
-      - image: node:7
-
   build-node_8:
     <<: *common-build
     docker:
@@ -70,8 +60,6 @@ workflows:
   version: 2
   build:
     jobs:
-      - build-node_6
-      - build-node_7
       - build-node_8
       - build-node_9
       - build-node_10

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,31 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. Windows, Linux, Mac]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

CODE_OF_CONDUCT.md

@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at rtfrodrigo [at] gmail [dot] com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq

SECURITY.md

@@ -0,0 +1,42 @@
+# Security Policy
+
+## Supported Versions
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 2.7.x   | :white_check_mark: |
+| < 2.7   | :x:                |
+
+## Reporting a Vulnerability
+
+We take all security bugs in `diff2html-cli` seriously.
+Thank you for the help improving the security of `diff2html-cli`.
+We appreciate your efforts and responsible disclosure and
+will make every effort to acknowledge your contributions.
+
+Report security bugs by emailing the lead maintainer at `rtfrodrigo [at] gmail [dot] com`.
+
+The lead maintainer will acknowledge your email within 48 hours, and will send a
+more detailed response within 48 hours indicating the next steps in handling
+your report. After the initial reply to your report, the security team will
+endeavor to keep you informed of the progress towards a fix and full
+announcement, and may ask for additional information or guidance.
+
+Report security bugs in third-party modules to the person or team maintaining
+the module.
+
+## Disclosure Policy
+
+When the security team receives a security bug report, they will assign it to a
+primary handler. This person will coordinate the fix and release process,
+involving the following steps:
+
+  * Confirm the problem and determine the affected versions.
+  * Audit code to find any potential similar problems.
+  * Prepare fixes for all releases still under maintenance. These fixes will be
+    released as fast as possible.
+
+## Comments on this Policy
+
+If you have suggestions on how this process could be improved please submit a
+pull request.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "diff2html-cli",
-  "version": "2.7.0",
+  "version": "3.0.4",
   "homepage": "https://www.github.com/rtfpessoa/diff2html-cli",
   "description": "Fast Diff to colorized HTML",
   "keywords": [
@@ -32,7 +32,7 @@
     "url": "https://www.github.com/rtfpessoa/diff2html-cli/issues"
   },
   "engines": {
-    "node": ">=6"
+    "node": ">=8"
   },
   "preferGlobal": true,
   "scripts": {
@@ -54,10 +54,10 @@
   },
   "main": "./src/main.js",
   "dependencies": {
-    "copy-paste": "^1.3.0",
+    "clipboardy": "^2.1.0",
     "diff2html": "^2.7.0",
     "extend": "^3.0.2",
-    "opn": "^5.4.0",
+    "open": "^6.0.0",
     "request": "^2.88.0",
     "yargs": "^13.2.1"
   },

src/cli.ts

@@ -14,9 +14,8 @@ const path = require('path');
 
 const diff2Html = require('diff2html').Diff2Html;
 
-const log = require('./logger.js').Logger;
-const http = require('./http-utils.js').HttpUtils;
-const utils = require('./utils.js').Utils;
+var open = require('open');
+var clipboardy = require('clipboardy');
 
 const ncp = require('copy-paste');
 const opn = require('opn');
@@ -153,26 +152,21 @@ module.exports = {
   postToDiffy(diff: string, postType: PostType, callback) {
     var jsonParams = {udiff: diff};
 
-    http.post('http://diffy.org/api/new', jsonParams, (err, response) => {
+    http.put('https://diffy.org/api/diff/', jsonParams, (err, response) => {
       if (err) {
         log.error(err);
         return;
       }
 
-      if (response.status !== 'error') {
-        log.print('Link powered by diffy.org:');
-        log.print(response.url);
-
-        if (postType === 'browser') {
-          open(response.url);
-          return callback(null, response.url);
-        } else if (postType === 'pbcopy') {
-          ncp.copy(response.url, () => {
-            return callback(null, response.url);
-          });
-        }
-      } else {
-        log.error('Error: ' + response.statusCode);
+      log.print('Link powered by https://diffy.org');
+      log.print(url);
+
+      if (postType === 'browser') {
+        open(url);
+        return callback(null, url);
+      } else if (postType === 'pbcopy') {
+        clipboardy.writeSync(url);
+        return callback(null, url);
       }
     });
   }

src/http-utils.js

@@ -11,16 +11,25 @@
   function HttpUtils() {
   }
 
-  HttpUtils.prototype.post = function(url, payload, callback) {
+  HttpUtils.prototype.put = function(url, payload, callback) {
     request({
       url: url,
-      method: 'POST',
-      form: payload
+      method: 'PUT',
+      headers: {},
+      body: payload,
+      json: true
     })
       .on('response', function(response) {
         response.on('data', function(body) {
           try {
-            return callback(null, JSON.parse(body.toString('utf8')));
+            var object = JSON.parse(body.toString('utf8'));
+            if(object.id) {
+              return callback(null, "https://diffy.org/diff/" + object.id);
+            } else if (object.error) {
+              return callback(new Error(object.error));
+            }else {
+              return callback(new Error(body.toString('utf8')));
+            }
           } catch (err) {
             return callback(new Error('could not parse response'));
           }

test/cli-tests.js

@@ -42,11 +42,11 @@ describe('Cli', function() {
   });
 
   describe('postToDiffy', function() {
-    it('should call `http.post`', function() {
-      var spy = sinon.stub(http, 'post');
+    it('should call `http.put`', function() {
+      var spy = sinon.stub(http, 'put');
       Cli.postToDiffy('a', 'b', 'callback');
       assert(spy.calledOnce);
-      assert(spy.calledWith('http://diffy.org/api/new', { udiff: 'a' }));
+      assert(spy.calledWith('https://diffy.org/api/diff/', { diff: 'a' }));
     });
   });
 });