Build new release

Author: SleepWalker

build/Runner.js

@@ -4,6 +4,7 @@ import _extends from 'babel-runtime/helpers/extends';
 import _Promise from 'babel-runtime/core-js/promise';
 
 import { parse as parsePath } from 'path';
+import { lstatSync } from 'fs';
 import { exec } from 'child_process';
 
 
@@ -18,14 +19,14 @@ export default class Runner {
   }
 
   /**
-   * Runs an array of commands on file
+   * Runs hook on file
    *
    * @param {string} filePath
    * @param {string} hook
    *
    * @return {Promise<void>}
    */
-  run(filePath, hook) {
+  runHook(filePath, hook) {
     const commands = this.config.getCommands(filePath, hook);
     const vars = this.getVars(filePath);
 
@@ -60,6 +61,7 @@ export default class Runner {
    *   project: '/home/user',
    *   root: '/',
    *   path: '/home/user/dir/file.txt',
+   *   relative: 'dir/file.txt',
    *   dir: '/home/user/dir',
    *   base: 'file.txt',
    *   ext: '.txt',
@@ -71,12 +73,18 @@ export default class Runner {
    * @return {Object}
    */
   getVars(filePath) {
-    const [projectPath] = atom.project.relativizePath(filePath);
+    const [projectPath, relativePath] = atom.project.relativizePath(filePath);
     const pathParts = parsePath(filePath);
 
+    if (lstatSync(filePath).isDirectory()) {
+      pathParts.name = pathParts.name + pathParts.ext;
+      pathParts.ext = '';
+    }
+
     return _extends({
       project: projectPath || pathParts.dir,
-      path: filePath
+      path: filePath,
+      relative: projectPath ? relativePath : pathParts.base
     }, pathParts);
   }
 

build/atom-hooks.js

@@ -8,12 +8,7 @@ import StatusView from './views/StatusView';
 import Config from './Config';
 import Runner from './Runner';
 
-export default {
-  statusBarTile: null,
-  statusView: null,
-  subscriptions: null,
-  config: null,
-  runner: null,
+class AtomHooks {
 
   activate() {
     this.subscriptions = new CompositeDisposable();
@@ -32,7 +27,12 @@ export default {
 
     this.readConfig();
 
-    this.subscriptions.add(atom.commands.add('atom-text-editor', 'atom-hooks:show', () => this.onToggleHooksList()));
+    // this handler for modal hooks list
+    this.subscriptions.add(atom.commands.add('atom-workspace', 'atom-hooks:show', event => {
+      const filePath = event.target.getAttribute('data-path');
+
+      this.onToggleHooksList(filePath);
+    }));
 
     // reload our config when it is modified
     this.subscriptions.add(atom.config.observe('atom-hooks', () => this.readConfig()));
@@ -42,24 +42,24 @@ export default {
 
     // onSave hook
     this.subscriptions.add(atom.workspace.observeTextEditors(textEditor => this.subscriptions.add(textEditor.onDidSave(event => this.onSaveFile(event.path)))));
-  },
+  }
 
   readConfig() {
     this.config.setConfig({
       scripts: atom.config.get('atom-hooks.scripts') || {},
       hooks: atom.config.get('atom-hooks.hooks') || {}
     });
-  },
+  }
 
   getCurrentFile() {
-    const paneItem = atom.workspace.getActivePaneItem();
+    const paneItem = atom.workspace.getCenter().getActivePaneItem();
 
     if (paneItem && paneItem.getPath) {
       return paneItem.getPath();
     }
 
     return null;
-  },
+  }
 
   consumeStatusBar(statusBar) {
     this.statusBarTile = statusBar.addRightTile({
@@ -68,30 +68,35 @@ export default {
     });
 
     this.statusView.hide(); // do not show till the text editor will be active
-  },
+  }
 
   onChangeActivePane() {
-    if (this.getCurrentFile() && this.config.listHooks(this.getCurrentFile()).length) {
+    const filePath = this.getCurrentFile();
+
+    if (filePath && this.config.listHooks(filePath).length) {
       this.statusView.show();
     } else {
       this.statusView.hide();
     }
-  },
+  }
 
-  onToggleHooksList() {
+  onToggleHooksList(filePath) {
     if (!this.hooksListView) {
       this.hooksListView = new HooksListView({
-        listHooks: () => this.config.listHooks(this.getCurrentFile()),
-        runCommand: command => this.processExecutionResult(this.runner.runCommand(this.getCurrentFile(), command))
+        runCommand: (filePath, command) => this.processExecutionResult(this.runner.runCommand(filePath, command))
       });
     }
 
-    this.hooksListView.toggle();
-  },
+    filePath = filePath || this.getCurrentFile();
+
+    if (filePath) {
+      this.hooksListView.show(filePath, this.config.listHooks(filePath));
+    }
+  }
 
   onSaveFile(filePath) {
-    this.processExecutionResult(this.runner.run(filePath, 'onSave'));
-  },
+    this.processExecutionResult(this.runner.runHook(filePath, 'onSave'));
+  }
 
   processExecutionResult(result) {
     this.statusView.updateState('loading');
@@ -100,14 +105,14 @@ export default {
       this.statusView.updateState('fail');
       this.notifyError('Error executing onSave scripts', error);
     });
-  },
+  }
 
   notifyError(message, detail) {
     atom.notifications.addError(message, {
       detail: typeof detail === 'object' ? _JSON$stringify(detail, null, 2) : detail,
       dismissable: true
     });
-  },
+  }
 
   deactivate() {
     this.subscriptions.dispose();
@@ -120,9 +125,15 @@ export default {
 
     this.subscriptions = null;
     this.statusBarTile = null;
+    // $FlowFixMe
     this.hooksListView = null;
+    // $FlowFixMe
     this.statusView = null;
+    // $FlowFixMe
     this.config = null;
+    // $FlowFixMe
     this.runner = null;
   }
-};
+}
+
+export default new AtomHooks();

build/views/HooksListView.js

@@ -4,15 +4,11 @@ import SelectListView from 'atom-select-list';
 
 export default class HooksListView {
 
-  constructor({
-    listHooks,
-    runCommand
-  }) {
-    this.listHooks = listHooks;
+  constructor({ runCommand }) {
     this.runCommand = runCommand;
   }
 
-  toggle() {
+  show(filePath, hooks) {
     if (!this.listView) {
       this.listView = new SelectListView({
         items: [],
@@ -22,7 +18,7 @@ export default class HooksListView {
           return li;
         },
         didConfirmSelection: item => {
-          this.runCommand(item.command);
+          this.runCommand(this.filePath, item.command);
           this.destroyPanel();
         },
         didCancelSelection: () => {
@@ -31,8 +27,10 @@ export default class HooksListView {
       });
     }
 
+    this.filePath = filePath;
     this.listView.update({
-      items: this.listHooks()
+      infoMessage: filePath,
+      items: hooks
     });
 
     if (!this.panel) {

build/views/StatusView.js

@@ -69,7 +69,7 @@ export default class StatusView {
   onListHooks(event) {
     event.preventDefault();
 
-    atom.commands.dispatch(atom.workspace.getActiveTextEditor().element, 'atom-hooks:show');
+    atom.commands.dispatch(atom.workspace.getCenter().getActivePaneItem().element, 'atom-hooks:show');
   }
 
   getElement() {