Simplify -g option

Author: stecman

README.md

@@ -17,10 +17,12 @@ If you don't need any custom completion behaviour:
     }
 ```
 
-3. Run `eval $([your-application] _completion -g [program-name])` in a terminal, where `[program-name]` is the name you want to register bash completion for (this will be the same as `[your-application]` if your application is on your PATH).
+3. Run `eval $([program] _completion -g)` in a terminal.
 4. Add the above command to your bash profile if you want the completion to apply automatically for new terminal sessions.
 
-The command `_completion -g [program-name]` (`-g` being a shortcut for `--genhook`) generates a few lines of bash that, when run, register your application as a completion handler for `[program-name]`. Completion is handled by running the completion command on your application with no arguments: `[your-application] _completion`.
+The `-g` option generates a few lines of bash that, when run, register your application as a completion handler for your program name. Completion is handled by running the completion command on your application with no arguments: `[program] _completion`.
+
+If you need to use completion with an alias, specify the program name to complete for with the `-p` option: `_completion -g -p [alias-name]`.
 
 ## Custom completion
 

src/Stecman/Component/Symfony/Console/BashCompletion/CompletionCommand.php

@@ -21,14 +21,27 @@ protected function configure()
             ->setName('_completion')
             ->setDescription('BASH completion hook.')
             ->setHelp(<<<END
-To enable BASH completion, run: <comment>eval `beam completion --genhook="app-name"`</comment>
+To enable BASH completion, run:
+
+    <comment>eval `[program] _completion -g`</comment>.
+
+Or for an alias:
+
+    <comment>eval `[program] _completion -g -p [alias]`</comment>.
+
 END
             )
             ->addOption(
                 'genhook',
                 'g',
+                InputOption::VALUE_NONE,
+                'Generate BASH script to use completion with this application.'
+            )
+            ->addOption(
+                'program',
+                'p',
                 InputOption::VALUE_REQUIRED,
-                'Generate BASH script to use completion with this application. <comment>Requires program name as value.</comment>'
+                'Program name to add completion for.'
             );
     }
 
@@ -37,8 +50,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $this->handler = new CompletionHandler( $this->getApplication() );
         $handler = $this->handler;
 
-        if ($programName = $input->getOption('genhook')) {
-            $output->write( $handler->generateBashCompletionHook($programName), true );
+        if ( $input->getOption('genhook') ) {
+            $output->write( $handler->generateBashCompletionHook($input->getOption('program')), true );
         } else {
             $handler->configureFromEnvironment();
             $output->write($this->runCompletion(), true);

src/Stecman/Component/Symfony/Console/BashCompletion/CompletionHandler.php

@@ -70,7 +70,7 @@ public function configureFromEnvironment()
         $this->commandLine = getenv('COMP_LINE');
 
         if ($this->commandLine === false) {
-            throw new \RuntimeException('Failed to configure from environment; Environment var COMP_LINE not set');
+            throw new \RuntimeException('Failed to configure from environment; Environment var COMP_LINE not set.');
         }
 
         $this->wordIndex = intval(getenv('COMP_CWORD'));
@@ -154,6 +154,9 @@ protected function completeForOptionShortcuts()
      */
     protected function completeForOptionValues()
     {
+
+        fwrite(STDERR, "\n".print_r($this->words, true)."\n\nIndex: $this->wordIndex\n\n");
+
 //        if ($this->command && $this->wordIndex > 1) {
 //            $left = $this->words[$this->wordIndex-1];
 //
@@ -330,6 +333,7 @@ protected function mapArgumentsToWords($arguments)
     {
         $argIndex = 0;
         $wordNum = -1;
+        $prevWord = null;
         $argPositions = array();
 
         $words = $this->words;
@@ -349,6 +353,7 @@ protected function mapArgumentsToWords($arguments)
                 $argPositions[$argsArray[$argIndex]] = $wordNum;
             }
             $argIndex++;
+            $prevWord = $word;
         }
 
         return $argPositions;
@@ -363,7 +368,7 @@ protected function mapArgumentsToWords($arguments)
     protected function filterResults($array)
     {
         $curWord = $this->words[$this->wordIndex];
-        return implode(' ',
+        return implode("\n",
             array_filter($array, function($val) use ($curWord) {
                 return fnmatch($curWord.'*', $val);
             })
@@ -379,7 +384,16 @@ public function generateBashCompletionHook($programName)
     {
         global $argv;
         $command = $argv[0];
-        $funcName = "_{$programName}complete";
+
+        if (!$programName) {
+            $programName = $command;
+            $funcName = sprintf('_%s_%s_complete',
+                basename($programName),
+                substr(md5($command), 0, 12)
+            );
+        } else {
+            $funcName = "_{$programName}complete";
+        }
 
         return <<<"END"
 function $funcName {