Build next version

Author: SleepWalker

build/Runner.js

@@ -30,7 +30,7 @@ export default class Runner {
     const commands = this.config.getCommands(filePath, hook);
     const vars = this.getVars(filePath);
 
-    return commands.reduce((promise, command) => promise.then(() => this.execute(this.interpolate(command, vars), {
+    return commands.reduce((promise, command) => promise.then(() => this.execute(this.buildCommand(command, filePath), {
       cwd: vars.project,
       timeout: 10000 // protect from infinite loops in commands
     })), _Promise.resolve());
@@ -53,6 +53,12 @@ export default class Runner {
     });
   }
 
+  buildCommand(command, filePath) {
+    const vars = this.getVars(filePath);
+
+    return this.interpolate(command, vars);
+  }
+
   /**
    * Collects the data related to current file and project
    *
@@ -113,6 +119,8 @@ export default class Runner {
    * @return {Promise}
    */
   execute(command, { timeout, cwd } = {}) {
+    console.log(`atom-hooks: executing ${command}`);
+
     return new _Promise((resolve, reject) => exec(command, {
       cwd,
       timeout

build/atom-hooks.js

@@ -1,8 +1,10 @@
 'use babel';
 
 import _JSON$stringify from 'babel-runtime/core-js/json/stringify';
+import _extends from 'babel-runtime/helpers/extends';
 
 import { CompositeDisposable } from 'atom';
+
 import HooksListView from './views/HooksListView';
 import StatusView from './views/StatusView';
 import Config from './Config';
@@ -15,6 +17,9 @@ class AtomHooks {
     this.config = new Config();
     this.runner = new Runner({ config: this.config });
     this.statusView = new StatusView();
+    this.hooksListView = new HooksListView({
+      runCommand: (filePath, command) => this.processExecutionResult(this.runner.runCommand(filePath, command))
+    });
 
     if (!atom.config.get('atom-hooks')) {
       atom.config.set('atom-hooks', {
@@ -67,7 +72,7 @@ class AtomHooks {
       priority: 100
     });
 
-    this.statusView.hide(); // do not show till the text editor will be active
+    this.onChangeActivePane();
   }
 
   onChangeActivePane() {
@@ -80,17 +85,17 @@ class AtomHooks {
     }
   }
 
-  onToggleHooksList(filePath) {
-    if (!this.hooksListView) {
-      this.hooksListView = new HooksListView({
-        runCommand: (filePath, command) => this.processExecutionResult(this.runner.runCommand(filePath, command))
-      });
-    }
-
-    filePath = filePath || this.getCurrentFile();
+  onToggleHooksList(customFilePath) {
+    const filePath = customFilePath || this.getCurrentFile();
 
     if (filePath) {
-      this.hooksListView.show(filePath, this.config.listHooks(filePath));
+      const availableHooks = this.config.listHooks(filePath).map(hook => {
+        return _extends({}, hook, {
+          interpolated: this.runner.buildCommand(hook.command, filePath)
+        });
+      });
+
+      this.hooksListView.show(filePath, availableHooks);
     }
   }
 

build/views/HooksListView.js

@@ -12,9 +12,22 @@ export default class HooksListView {
     if (!this.listView) {
       this.listView = new SelectListView({
         items: [],
+        itemsClassList: ['atom-hooks-list-item'],
         elementForItem: item => {
           const li = document.createElement('li');
-          li.textContent = `${item.name}: ${item.command}`;
+          li.classList.add('two-lines');
+
+          const primaryLine = document.createElement('div');
+          primaryLine.textContent = `${item.name}: ${item.command}`;
+          primaryLine.classList.add('primary-line');
+
+          const secondaryLine = document.createElement('div');
+          secondaryLine.textContent = `${item.interpolated}`;
+          secondaryLine.classList.add('secondary-line');
+
+          li.appendChild(primaryLine);
+          li.appendChild(secondaryLine);
+
           return li;
         },
         didConfirmSelection: item => {

build/views/StatusView.js

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