feature(putout) add --staged

README.md

@@ -37,10 +37,7 @@ Options:
   -h, --help              display this help and exit
   -v, --version           output version information and exit
   -f, --format            use a specific output format - default: dump
-  -m, --modified          add "modified" files when in git repository
-  -u, --untracked         add "untracked" files when in git repository
-  -a, --added             add "added" files when in git repository
-  -r, --renamed           add "renamed" files when in git repository
+  -s, --staged            add staged files when in git repository
   --fix                   aply found fixes of errors to code
   --fix-count             count of fixes rounds (defaults to 10)
   --rulesdir              specify custom rulesdir

package.json

@@ -22,7 +22,7 @@
   },
   "husky": {
     "hooks": {
-      "pre-commit": "putout -ar"
+      "pre-commit": "putout --staged"
     }
   },
   "nyc": {

packages/putout/README.md

@@ -89,10 +89,7 @@ Options:
   -h, --help              display this help and exit
   -v, --version           output version information and exit
   -f, --format            use a specific output format - default: dump
-  -m, --modified          add "modified" files when in git repository
-  -u, --untracked         add "untracked" files when in git repository
-  -a, --added             add "added" files when in git repository
-  -r, --renamed           add "renamed" files when in git repository
+  -s, --staged            add staged files when in git repository
   --fix                   aply found fixes of errors to code
   --fix-count             count of fixes rounds (defaults to 10)
   --rulesdir              specify custom rulesdir

packages/putout/help.json

@@ -2,10 +2,7 @@
     "-h, --help             ": "display this help and exit",
     "-v, --version          ": "output version information and exit",
     "-f, --format           ": "use a specific output format - default: dump",
-    "-m, --modified         ": "add \"modified\" files when in git repository",
-    "-u, --untracked        ": "add \"untracked\" files when in git repository",
-    "-a, --added            ": "add \"added\" files when in git repository",
-    "-r, --renamed          ": "add \"renamed\" files when in git repository",
+    "-s, --staged"          :  "add staged files when in git repository",
     "--fix                  ": "apply fixes of errors to code",
     "--fix-count            ": "count of fixes rounds (defaults to 10)",
     "--rulesdir             ": "specify custom rulesdir",

packages/putout/lib/cli/index.js

@@ -12,7 +12,7 @@ const isString = (a) => typeof a === 'string';
 const isStringAll = (...a) => a.filter(isString).length;
 const isRuler = (a) => a.disableAll || a.enableAll || isStringAll(a.disable, a.enable);
 
-module.exports = ({argv, halt, log, write, logError}) => {
+module.exports = async ({argv, halt, log, write, logError}) => {
     const args = yargsParser(argv, {
         boolean: [
             'cache',
@@ -26,11 +26,8 @@ module.exports = ({argv, halt, log, write, logError}) => {
             'disable-all',
             'jsx',
             'flow',
-            'added',
-            'renamed',
-            'modified',
-            'untracked',
             'options',
+            'staged',
         ],
         number: [
             'fixCount',
@@ -47,10 +44,7 @@ module.exports = ({argv, halt, log, write, logError}) => {
             h: 'help',
             c: 'config',
             f: 'format',
-            a: 'added',
-            r: 'renamed',
-            m: 'modified',
-            u: 'untracked',
+            s: 'staged',
         },
         default: {
             fix: false,
@@ -73,10 +67,7 @@ module.exports = ({argv, halt, log, write, logError}) => {
         disableAll,
         enable,
         enableAll,
-        added,
-        renamed,
-        modified,
-        untracked,
+        staged,
         updateCache,
         removeCache,
     } = args;
@@ -87,17 +78,11 @@ module.exports = ({argv, halt, log, write, logError}) => {
         logError,
     });
 
-    let gitNames = [];
+    let stagedNames = [];
 
-    if (untracked || added || modified || renamed) {
-        const getGitNames = require('./get-git-names');
-
-        gitNames = getGitNames({
-            untracked,
-            added,
-            modified,
-            renamed,
-        });
+    if (staged) {
+        const {get} = require('./staged');
+        stagedNames = await get();
     }
 
     if (args.version) {
@@ -112,7 +97,7 @@ module.exports = ({argv, halt, log, write, logError}) => {
     }
 
     const globFiles = [
-        ...gitNames,
+        ...stagedNames,
         ...args._.map(String),
     ];
 
@@ -174,6 +159,11 @@ module.exports = ({argv, halt, log, write, logError}) => {
         return exit();
     }
 
+    if (fix && staged) {
+        const {set} = require('./staged');
+        await set();
+    }
+
     if (mergedPlaces.length)
         return exit(1);
 };

packages/putout/lib/cli/index.spec.js

@@ -122,18 +122,64 @@ test('putout: cli: no files', (t) => {
     t.end();
 });
 
-test('putout: cli: get git names', (t) => {
+test('putout: cli: --fix --staged', async (t) => {
+    const name = './xxx.js';
     const logError = stub();
-    const getGitNames = stub().returns(['./xxx.js']);
+    const get = stub().returns([
+        name,
+    ]);
+    const set = stub();
     const argv = [
-        '--untracked',
+        '--staged',
+        '--fix',
     ];
 
-    mockRequire('./get-git-names', getGitNames);
+    const getFiles = stub().returns([null, [
+        name,
+    ]]);
+
+    const process = stub().returns([]);
+    const processFile = stub().returns(process);
+
+    mockRequire('./get-files', getFiles);
+    mockRequire('./process-file', processFile);
+
+    mockRequire('./staged', {
+        get,
+        set,
+    });
 
     const cli = reRequire('.');
 
-    runCli({
+    await runCli({
+        cli,
+        argv,
+        logError,
+    });
+
+    stopAll();
+
+    t.ok(set.calledWith());
+    t.end();
+});
+
+test('putout: cli: --staged --fix', async (t) => {
+    const logError = stub();
+    const get = stub().returns(['./xxx.js']);
+    const set = stub();
+    const argv = [
+        '--staged',
+        '--fix',
+    ];
+
+    mockRequire('./staged', {
+        get,
+        set,
+    });
+
+    const cli = reRequire('.');
+
+    await runCli({
         cli,
         argv,
         logError,
@@ -145,6 +191,8 @@ test('putout: cli: get git names', (t) => {
     const output = stripAnsi(arg);
     const message = 'No files matching the pattern "./xxx.js" were found';
 
+    stopAll();
+
     t.equal(output, message, 'should equal');
     t.end();
 });
@@ -168,11 +216,13 @@ test('putout: cli: ruler processor', (t) => {
         logError,
     });
 
+    stopAll();
+
     t.ok(rullerProcessor.called);
     t.end();
 });
 
-function runCli(options) {
+async function runCli(options) {
     const {
         halt = stub(),
         log = stub(),
@@ -182,7 +232,7 @@ function runCli(options) {
         cli = _cli,
     } = options;
 
-    cli({
+    await cli({
         write,
         halt,
         log,