Merge branch 'feature/improved-console-support' into develop

Fix #9

Author: weynhamz

PHPCtags.class.php

@@ -235,7 +235,7 @@ public function export($file, $options)
         //@todo Check for existence
         $this->mFile = $file;
         $structs = $this->struct($this->mParser->parse(file_get_contents($this->mFile)), TRUE);
-        echo $this->render($structs, $options);
+        return $this->render($structs, $options);
     }
 
     private static function isMemoryLimitValid($memory_limit) {

phpctags

@@ -1,4 +1,4 @@
-#!/usr/bin/php -q
+#!/usr/bin/env php
 <?php
 if (file_exists($autoload = __DIR__ . '/vendor/autoload.php')) {
     require($autoload);
@@ -12,11 +12,14 @@ if (file_exists($autoload = __DIR__ . '/vendor/autoload.php')) {
     );
 }
 
-$options = getopt('f:',array(
+$options = getopt('af:R',array(
+    'append::',
     'debug',
+    'exclude:',
     'excmd::',
     'fields::',
     'format::',
+    'recurse::',
     'version',
     'memory::',
 ));
@@ -50,5 +53,64 @@ if(!isset($options['fields'])) {
     $options['fields'] = str_split($options['fields']);
 }
 
+if(isset($options['append'])) {
+    if ($options['append'] === FALSE || yes_or_no($options['append']) == 'yes') {
+        $options['a'] = FALSE;
+    } else if (yes_or_no($options['append']) != 'no') {
+        die('phpctags: Invalid value for "append" option');
+    }
+}
+
+if(isset($options['recurse'])) {
+    if ($options['recurse'] === FALSE || yes_or_no($options['recurse']) == 'yes') {
+        $options['R'] = FALSE;
+    } else if (yes_or_no($options['recurse']) != 'no') {
+        die('phpctags: Invalid value for "recurse" option');
+    }
+}
+
 $ctags = new PHPCtags();
-$ctags->export($file, $options);
+$result = '';
+if (isset($options['R'])) {
+    $iterator = new RecursiveIteratorIterator(
+        new RecursiveDirectoryIterator(
+            $file,
+            FilesystemIterator::SKIP_DOTS |
+            FilesystemIterator::FOLLOW_SYMLINKS
+        )
+    );
+
+    $extensions = array('.php', '.php3', '.php4', '.php5', '.phps');
+
+    foreach ($iterator as $filename) {
+        if (!in_array(substr($filename, strrpos($filename, '.')), $extensions)) {
+            continue;
+        }
+
+        if (isset($options['exclude']) && false !== strpos($filename, $options['exclude'])) {
+            continue;
+        }
+
+        $result .= $ctags->export($filename, $options);
+    }
+} else {
+    $result = $ctags->export($file, $options);
+}
+
+if (isset($options['f']) && $options['f'] !== '-') {
+    $tagfile = fopen($options['f'], isset($options['a']) ? 'a' : 'w');
+} else {
+    $tagfile = fopen('php://stdout', 'w');
+}
+fwrite($tagfile, $result);
+fclose($tagfile);
+
+function yes_or_no($arg) {
+    if (preg_match('/\b[Y|y]([E|e][S|s])?\b/', $arg)) {
+        return 'yes';
+    } else if (preg_match('/\b[N|n]([O|o])?\b/', $arg)) {
+        return 'no';
+    } else {
+        return false;
+    }
+}

tests/PHPCtagsTest.php

@@ -61,7 +61,7 @@ public function testExport($testcase)
         ob_start();
         $testcase_example = $testcase_object->getExample();
         $testcase_options = $testcase_object->getOptions();
-        $this->object->export($testcase_example, $testcase_options);
+        echo $this->object->export($testcase_example, $testcase_options);
         $testcase_result = ob_get_contents();
         ob_end_clean();