Alias list and config reload commands

Author: dantleech

features/shell_alias.feature

@@ -1,4 +1,4 @@
-Feature: Default aliases
+Feature: Command aliases
     In order to be more effective when using the shell
     As a user
     I want to be able to use the default command aliases
@@ -22,3 +22,14 @@ Feature: Default aliases
             | ls cms |
             | sl cms foobar |
             | cat cms |
+
+    Scenario: List aliases
+        Given I execute the "shell:alias:list" command
+        Then the command should not fail
+        And I should see a table containing the following rows:
+            | Alias | Command |
+            | cd    | shell:path:change {arg1} |
+            | ls    | node:list {arg1} |
+
+
+

features/shell_config_reload.feature

@@ -0,0 +1,8 @@
+Feature: Reload the configuration
+    In order to reload the configuration
+    As a user
+    I want to be able to execute a command which does that
+
+    Scenario: Reload configuration
+        Given I execute the "shell:config:reload" command
+        Then the command should not fail

src/PHPCR/Shell/Console/Application/ShellApplication.php

@@ -215,7 +215,9 @@ private function registerCommands()
         $this->add(new CommandPhpcr\LockUnlockCommand());
 
         // add shell-specific commands
+        $this->add(new CommandShell\AliasListCommand());
         $this->add(new CommandShell\ConfigInitCommand());
+        $this->add(new CommandShell\ConfigReloadCommand());
         $this->add(new CommandShell\PathChangeCommand());
         $this->add(new CommandShell\PathShowCommand());
         $this->add(new CommandShell\ExitCommand());

src/PHPCR/Shell/Console/Command/Shell/AliasListCommand.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace PHPCR\Shell\Console\Command\Shell;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class AliasListCommand extends Command
+{
+    public function configure()
+    {
+        $this->setName('shell:alias:list');
+        $this->setDescription('List all the registered aliases');
+        $this->setHelp(<<<EOT
+EOT
+        );
+    }
+
+    public function execute(InputInterface $input, OutputInterface $output)
+    {
+        $config = $this->getHelper('config');
+        $aliases = $config->getConfig('alias');
+
+        $table = clone $this->getHelper('table');
+        $table->setHeaders(array('Alias', 'Command'));
+
+        foreach ($aliases as $alias => $command) {
+            $table->addRow(array($alias, $command));
+        }
+
+        $table->render($output);
+    }
+}

src/PHPCR/Shell/Console/Command/Shell/ConfigReloadCommand.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace PHPCR\Shell\Console\Command\Shell;
+
+use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class ConfigReloadCommand extends Command
+{
+    protected $output;
+
+    public function configure()
+    {
+        $this->setName('shell:config:reload');
+        $this->setDescription('Reload the configuration');
+        $this->setHelp(<<<EOT
+Reload the configuration
+EOT
+        );
+    }
+
+    public function execute(InputInterface $input, OutputInterface $output)
+    {
+        $this->output = $output;
+        $config = $this->getHelper('config');
+        $config->loadConfig();
+    }
+}

src/PHPCR/Shell/Console/Helper/ConfigHelper.php

@@ -73,7 +73,10 @@ public function getConfigDir()
         return $home;
     }
 
-    private function loadConfig()
+    /**
+     * Load the configuration
+     */
+    public function loadConfig()
     {
         $config = array();
 
@@ -88,6 +91,8 @@ private function loadConfig()
             }
         }
 
+        $this->cachedConfig = $config;
+
         return $config;
     }
 
@@ -99,11 +104,10 @@ private function loadConfig()
     public function getConfig($type)
     {
         if (null !== $this->cachedConfig) {
-            return $this->cachedConfig['alias'];
+            return $this->cachedConfig[$type];
         }
 
-        $this->cachedConfig = $this->loadConfig();
-
-        return $this->cachedConfig['alias'];
+        $this->loadConfig();
+        return $this->cachedConfig[$type];
     }
 }

src/PHPCR/Shell/Resources/config.dist/alias.yml

@@ -1,11 +1,14 @@
+# Shell shortcuts
+aliases: shell:alias:list
+
 # MySQL commands
 use: workspace:use
 workspaces: workspace:list
 select: query:select
 
 # Filesystem commands
 cd: shell:path:change {arg1}
-rm: node:delete {arg1}
+rm: node:remove {arg1}
 mv: node:move {arg1} {arg2}
 pwd: shell:path:show
 exit: shell:exit