Refactor and fix errors

Author: lgaticaq

.gitignore

@@ -25,4 +25,3 @@ build/Release
 # Dependency directory
 # https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
 node_modules
-lib

.node-version

@@ -1,2 +1,3 @@
 node_modules
-src
+LICENSE
+.*

.npmignore

@@ -1 +1 @@
-v5
+v6

.nvmrc

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Leonardo Gatica
+Copyright (c) 2016 Leonardo Gatica
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

LICENSE

@@ -2,19 +2,15 @@
   "name": "totp-cli",
   "version": "1.0.0",
   "description": "Insert/Generate a TOTP for a service from pass",
-  "main": "lib",
+  "main": "src",
   "scripts": {
-    "prepublish": "npm run build -s",
-    "prebuild": "npm run lint -s && npm run clean -s",
-    "build": "babel src --out-dir lib --source-maps",
-    "lint": "eslint src",
-    "clean": "rimraf lib"
+    "prepublish": "eslint src"
   },
   "engines": {
-    "node": ">=0.12"
+    "node": ">=4"
   },
   "bin": {
-    "totp": "lib/totp.js"
+    "totp": "src/totp.js"
   },
   "preferGlobal": true,
   "repository": {
@@ -33,54 +29,43 @@
   },
   "homepage": "https://github.com/lgaticaq/node-totp-cli#readme",
   "dependencies": {
+    "chalk": "^1.1.3",
     "commander": "^2.9.0",
     "copy-paste": "^1.2.0",
-    "inquirer": "^0.11.1",
+    "inquirer": "^1.0.2",
     "notp": "^2.0.3",
-    "thirty-two": "^1.0.1"
+    "thirty-two": "^1.0.1",
+    "update-notifier": "^0.7.0"
   },
   "devDependencies": {
-    "babel-cli": "^6.8.0",
-    "babel-core": "^6.8.0",
-    "babel-preset-es2015": "^6.3.13",
-    "eslint": "^2.10.0",
-    "rimraf": "^2.5.0"
+    "eslint": "^2.10.1"
   },
   "eslintConfig": {
+    "env": {
+      "es6": true,
+      "node": true
+    },
+    "extends": "eslint:recommended",
     "rules": {
       "indent": [
         2,
         2
       ],
-      "quotes": [
-        2,
-        "single"
-      ],
       "linebreak-style": [
         2,
         "unix"
       ],
+      "quotes": [
+        2,
+        "single"
+      ],
       "semi": [
         2,
         "always"
       ],
       "no-console": [
         0
       ]
-    },
-    "ecmaFeatures": {
-      "modules": true
-    },
-    "env": {
-      "es6": true,
-      "node": true,
-      "mocha": true
-    },
-    "extends": "eslint:recommended"
-  },
-  "babel": {
-    "presets": [
-      "es2015"
-    ]
+    }
   }
 }

package.json

@@ -2,26 +2,31 @@
 
 'use strict';
 
-import {exec} from 'child_process';
-import program from 'commander';
-import notp from 'notp';
-import ncp from 'copy-paste';
-import base32 from 'thirty-two';
+const exec = require('child_process').exec;
+const program = require('commander');
+const chalk = require('chalk');
+const notp = require('notp');
+const ncp = require('copy-paste');
+const base32 = require('thirty-two');
+const updateNotifier = require('update-notifier');
+const pkg = require('../package.json');
 
+updateNotifier({pkg}).notify();
 
-const getCode = (service) => {
+const getCode = service => {
   let key;
   const pass = exec(`pass 2fa/${service}/code`);
 
-  pass.stdout.on('data', (data) => {
+  pass.stdout.on('data', data => {
     key = data;
   });
-  pass.stderr.on('data', (data) => {
-    console.log(`Error: ${data}`);
+  pass.stderr.on('data', () => {
+    console.log(chalk.red(`Error: ${service} not stored`));
+    process.exit(1);
   });
   pass.on('close', () => {
     const totp = notp.totp.gen(base32.decode(key));
-    console.log(totp);
+    console.log(chalk.green(totp));
     ncp.copy(totp.toString());
     process.exit(0);
   });
@@ -32,7 +37,7 @@ program
   .parse(process.argv);
 
 if (program.args.length === 0) {
-  console.error('service required');
+  console.log(chalk.red('Service required'));
   process.exit(1);
 } else {
   getCode(program.args[0]);

src/totp-generate.js

@@ -2,11 +2,16 @@
 
 'use strict';
 
-import {exec} from 'child_process';
-import program from 'commander';
-import inquirer from 'inquirer';
+const exec = require('child_process').exec;
+const program = require('commander');
+const chalk = require('chalk');
+const inquirer = require('inquirer');
+const updateNotifier = require('update-notifier');
+const pkg = require('../package.json');
 
-const setCode = (service) => {
+updateNotifier({pkg}).notify();
+
+const setCode = service => {
   inquirer.prompt([
     {
       type: 'password',
@@ -24,14 +29,15 @@ const setCode = (service) => {
       pass.stdin.write(`${answers.code1}\n`);
       pass.stdin.write(`${answers.code1}\n`);
 
-      pass.stderr.on('data', (data) => {
-        console.log(`Error: ${data}`);
+      pass.stderr.on('data', data => {
+        console.log(chalk.red(`Error: ${data}`));
       });
       pass.on('close', () => {
+        console.log(chalk.green('Stored code'));
         process.exit(0);
       });
     } else {
-      console.log('Wrong code');
+      console.log(chalk.red('Wrong code'));
     }
   });
 };
@@ -41,7 +47,7 @@ program
   .parse(process.argv);
 
 if (program.args.length === 0) {
-  console.error('service required');
+  console.log(chalk.red('Service required'));
   process.exit(1);
 } else {
   setCode(program.args[0]);

src/totp-insert.js

@@ -2,8 +2,11 @@
 
 'use strict';
 
-import program from 'commander';
-import pkg from '../package.json';
+const program = require('commander');
+const updateNotifier = require('update-notifier');
+const pkg = require('../package.json');
+
+updateNotifier({pkg}).notify();
 
 program
   .version(pkg.version)