From 24ec74fd0573cab3c6909e49c046e139f8923307 Mon Sep 17 00:00:00 2001
From: Gunnar Wrobel <p@rdus.de>
Date: Wed, 29 Dec 2010 11:03:58 +0100
Subject: [PATCH] Rename the 'folders' action to 'list'. Add 'type' subaction
 (lists all folders of a specific type).

---
 .../Kolab/Cli/Module/{Folder.php => List.php}      | 40 +++++++++++++++++-----
 framework/Kolab_Cli/package.xml                    | 14 +++++---
 2 files changed, 40 insertions(+), 14 deletions(-)
 rename framework/Kolab_Cli/lib/Horde/Kolab/Cli/Module/{Folder.php => List.php} (76%)

diff --git a/framework/Kolab_Cli/lib/Horde/Kolab/Cli/Module/Folder.php b/framework/Kolab_Cli/lib/Horde/Kolab/Cli/Module/List.php
similarity index 76%
rename from framework/Kolab_Cli/lib/Horde/Kolab/Cli/Module/Folder.php
rename to framework/Kolab_Cli/lib/Horde/Kolab/Cli/Module/List.php
index 750d8a535..9c68f5a4a 100644
--- a/framework/Kolab_Cli/lib/Horde/Kolab/Cli/Module/Folder.php
+++ b/framework/Kolab_Cli/lib/Horde/Kolab/Cli/Module/List.php
@@ -1,7 +1,6 @@
 <?php
 /**
- * The Horde_Kolab_Cli_Module_Base:: module provides the base options of the
- * Kolab CLI.
+ * The Horde_Kolab_Cli_Module_List:: handles folder lists.
  *
  * PHP version 5
  *
@@ -13,8 +12,7 @@
  */
 
 /**
- * The Horde_Kolab_Cli_Module_Base:: module provides the base options of the
- * Kolab CLI.
+ * The Horde_Kolab_Cli_Module_List:: handles folder lists.
  *
  * Copyright 2010 The Horde Project (http://www.horde.org/)
  *
@@ -27,7 +25,7 @@
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Cli_Modular
  */
-class Horde_Kolab_Cli_Module_Folder
+class Horde_Kolab_Cli_Module_List
 implements Horde_Kolab_Cli_Module
 {
     /**
@@ -37,8 +35,10 @@ implements Horde_Kolab_Cli_Module
      */
     public function getUsage()
     {
-        return Horde_Kolab_Cli_Translation::t("  folder - Handle folders
-  - list [default]: List the folders in the backend
+        return Horde_Kolab_Cli_Translation::t("  list - Handle folder lists
+  - folders [default]: List the folders in the backend
+  - types            : Display all folders that have a folder type.
+  - type TYPE        : Display the folders of type TYPE.
 ");
     }
 
@@ -117,17 +117,39 @@ implements Horde_Kolab_Cli_Module
     public function run($cli, $options, $arguments)
     {
         if (!isset($arguments[1])) {
-            $action = 'list';
+            $action = 'folders';
         } else {
             $action = $arguments[1];
         }
         switch ($action) {
-        case 'list':
+        case 'folders':
             $folders = $this->_getStorage($options)->getList()->listFolders();
             foreach ($folders as $folder) {
                 $cli->writeln($folder);
             }
             break;
+        case 'types':
+            $types = $this->_getStorage($options)->getList()->listTypes();
+            if (!empty($types)) {
+                $pad = max(array_map('strlen', array_keys($types))) + 2;
+                foreach ($types as $folder => $type) {
+                    $cli->writeln(Horde_String::pad($folder . ':', $pad) . $type);
+                }
+            }
+            break;
+        case 'type':
+            if (!isset($arguments[2])) {
+                throw new Horde_Kolab_Cli_Exception('You must provide a TYPE argument!');
+            }
+            $type = $arguments[2];
+            $folders = $this->_getStorage($options)
+                ->getList()
+                ->getQuery('Base')
+                ->listByType($type);
+            foreach ($folders as $folder) {
+                $cli->writeln($folder);
+            }
+            break;
         case 'show':
             if (!isset($arguments[2])) {
                 $folder_name = 'INBOX';
diff --git a/framework/Kolab_Cli/package.xml b/framework/Kolab_Cli/package.xml
index 62ff61fda..4c364a25a 100644
--- a/framework/Kolab_Cli/package.xml
+++ b/framework/Kolab_Cli/package.xml
@@ -22,8 +22,8 @@
   <email>jan@horde.org</email>
   <active>yes</active>
  </lead>
- <date>2010-12-21</date>
- <time>07:16:30</time>
+ <date>2010-12-29</date>
+ <time>11:02:02</time>
  <version>
   <release>0.0.1</release>
   <api>0.0.1</api>
@@ -47,7 +47,7 @@
       <dir name="Cli">
        <dir name="Module">
         <file name="Base.php" role="php" />
-        <file name="Folder.php" role="php" />
+        <file name="List.php" role="php" />
        </dir> <!-- /lib/Horde/Kolab/Cli/Module -->
        <file name="Module.php" role="php" />
        <file name="Translation.php" role="php" />
@@ -104,6 +104,10 @@
     <channel>pear.horde.org</channel>
    </package>
    <package>
+    <name>Util</name>
+    <channel>pear.horde.org</channel>
+   </package>
+   <package>
     <name>Log</name>
     <channel>pear.horde.org</channel>
    </package>
@@ -116,7 +120,7 @@
    <install as="Horde/Kolab/Cli/Module.php" name="lib/Horde/Kolab/Cli/Module.php" />
    <install as="Horde/Kolab/Cli/Translation.php" name="lib/Horde/Kolab/Cli/Translation.php" />
    <install as="Horde/Kolab/Cli/Module/Base.php" name="lib/Horde/Kolab/Cli/Module/Base.php" />
-   <install as="Horde/Kolab/Cli/Module/Folder.php" name="lib/Horde/Kolab/Cli/Module/Folder.php" />
+   <install as="Horde/Kolab/Cli/Module/List.php" name="lib/Horde/Kolab/Cli/Module/List.php" />
    <install as="Horde/Kolab/Cli/AllTests.php" name="test/Horde/Kolab/Cli/AllTests.php" />
    <install as="Horde/Kolab/Cli/Autoload.php" name="test/Horde/Kolab/Cli/Autoload.php" />
    <install as="Horde/Kolab/Cli/phpunit.xml" name="test/Horde/Kolab/Cli/phpunit.xml" />
@@ -138,7 +142,7 @@
     <release>alpha</release>
     <api>alpha</api>
    </stability>
-   <date>2010-12-21</date>
+   <date>2010-12-29</date>
    <license uri="http://www.gnu.org/licenses/gpl.html">GPL</license>
    <notes>
 * Initial release.
-- 
2.11.0