Bug #1043

- Fixed bug where bash autocompletion did not work for aliases.
- Added new '_aliases' helper command.

ChangeLog

@@ -3,11 +3,13 @@
 2.2.0 ()
 
 Features
+ + New helper command '_aliases' for autocompletion purposes.
  + Stop consider new tasks after quitting a bulk change.
  + Removed deprecated 'fg:' and 'bg:' attributes.
  + The 'diagnostics' command now reports libuuid details.
 
 Bugs
+ + Fixed bug #1043, where aliases were not recognized by bash autocompletion.
  + Fixed bug #1038, which prints blank lines with bulk changes and when the
    verbose attributes does not specify it. Lines do a better separation between
    each changes also.

NEWS

@@ -1,6 +1,8 @@
 
 New Features in taskwarrior 2.2.0
 
+  - Bash autocompletion now works with aliases.
+
   - Deprectated 'fg' and 'bg' attributes removed.  Any residual use of those
     will appear as orphaned UDAs.
 
@@ -9,7 +11,7 @@ New Features in taskwarrior 2.2.0
 
 New commands in taskwarrior 2.2.0
 
-  - 
+  - New '_aliases' helper command lists aliases for completion purposes.
 
 New configuration options in taskwarrior 2.2.0
 

doc/man/task.1.in

@@ -467,6 +467,10 @@ Shows the taskwarrior version number.
 
 .SH HELPER SUBCOMMANDS
 
+.TP
+.B task _aliases
+Generates a list of all aliases, for autocompletion purposes.
+
 .TP
 .B task _columns
 Displays only a list of supported columns.

scripts/bash/task.sh

@@ -88,7 +88,8 @@ _task()
 #   echo "prev='$prev'"
 #   echo "prev2='$prev2'"
 
-    opts="$(task _commands) $(task _ids) $(task _columns)"
+    commands_aliases=$(echo $(task _commands; task _aliases) | tr " " "\n"|sort|tr "\n" " ")
+    opts="$commands_aliases $(task _ids) $(task _columns)"
 
     case "${prev}" in
         :)

src/commands/CMakeLists.txt

@@ -7,6 +7,7 @@ include_directories (${CMAKE_SOURCE_DIR}
 
 set (commands_SRCS Command.cpp        Command.h
                    CmdAdd.cpp         CmdAdd.h
+                   CmdAliases.cpp     CmdAliases.h
                    CmdAnnotate.cpp    CmdAnnotate.h
                    CmdAppend.cpp      CmdAppend.h
                    CmdBurndown.cpp    CmdBurndown.h

src/commands/CmdAliases.cpp

@@ -0,0 +1,72 @@
+////////////////////////////////////////////////////////////////////////////////
+// taskwarrior - a command line task list manager.
+//
+// Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+// http://www.opensource.org/licenses/mit-license.php
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#define L10N                                           // Localization complete.
+
+#include <sstream>
+#include <algorithm>
+#include <stdlib.h>
+#include <Context.h>
+#include <Command.h>
+#include <CmdAliases.h>
+#include <i18n.h>
+
+extern Context context;
+
+////////////////////////////////////////////////////////////////////////////////
+CmdCompletionAliases::CmdCompletionAliases ()
+{
+  _keyword     = "_aliases";
+  _usage       = "task          _aliases";
+  _description = STRING_CMD_ALIASES_USAGE;
+  _read_only   = true;
+  _displays_id = false;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+int CmdCompletionAliases::execute (std::string& output)
+{
+  // Get a list of all aliases.
+  std::vector <std::string> aliases;
+
+  std::map <std::string, std::string>::iterator it;
+  for (it = context.aliases.begin (); it != context.aliases.end (); ++it)
+    aliases.push_back (it->first);
+
+  // Sort alphabetically.
+  std::sort (aliases.begin (), aliases.end ());
+
+  std::stringstream out;
+  std::vector <std::string>::iterator a;
+  for (a = aliases.begin (); a != aliases.end (); ++a)
+    out << *a << "\n";
+
+  output = out.str ();
+  return 0;
+}
+
+////////////////////////////////////////////////////////////////////////////////

src/commands/CmdAliases.h

@@ -0,0 +1,43 @@
+////////////////////////////////////////////////////////////////////////////////
+// taskwarrior - a command line task list manager.
+//
+// Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+// http://www.opensource.org/licenses/mit-license.php
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef INCLUDED_CMDALIASES
+#define INCLUDED_CMDALIASES
+#define L10N                                           // Localization complete.
+
+#include <string>
+#include <Command.h>
+
+class CmdCompletionAliases : public Command
+{
+public:
+  CmdCompletionAliases ();
+  int execute (std::string&);
+};
+
+#endif
+////////////////////////////////////////////////////////////////////////////////

src/commands/Command.cpp

@@ -41,6 +41,7 @@
 #include <main.h>
 
 #include <CmdAdd.h>
+#include <CmdAliases.h>
 #include <CmdAnnotate.h>
 #include <CmdAppend.h>
 #include <CmdBurndown.h>
@@ -111,6 +112,7 @@ void Command::factory (std::map <std::string, Command*>& all)
   c = new CmdCalendar ();           all[c->keyword ()] = c;
   c = new CmdColor ();              all[c->keyword ()] = c;
   c = new CmdColumns ();            all[c->keyword ()] = c;
+  c = new CmdCompletionAliases ();  all[c->keyword ()] = c;
   c = new CmdCompletionColumns ();  all[c->keyword ()] = c;
   c = new CmdCompletionCommands (); all[c->keyword ()] = c;
   c = new CmdCompletionConfig ();   all[c->keyword ()] = c;

src/en-US.h

@@ -443,6 +443,7 @@
 #define STRING_CMD_PULL_NOT_DIR      "The uri '{1}' is not a directory.  Did you forget a trailing '/'?"
 #define STRING_CMD_HCOMMANDS_USAGE   "Generates a list of all commands, for autocompletion purposes"
 #define STRING_CMD_ZSHCOMMANDS_USAGE "Generates a list of all commands, for zsh autocompletion purposes"
+#define STRING_CMD_ALIASES_USAGE     "Generates a list of all aliases, for autocompletion purposes"
 #define STRING_CMD_INSTALL_USAGE     "Installs extensions and external scripts"
 
 #define STRING_CMD_MODIFY_USAGE1     "Modifies the existing task with provided arguments."