From 8189a6e74519113b523a74450b7204b0724f8071 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Fri, 4 Feb 2011 23:27:19 +0100
Subject: [PATCH] cleanup todos (and shrink them)

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
 ROADMAP               | 20 ----------------
 TODO                  | 54 -------------------------------------------
 TODO-1.0              | 52 +++++++++++++++++++++++++++++++++++++++++
 doc/dev/todo/post-1.0 |  9 ++++++++
 4 files changed, 61 insertions(+), 74 deletions(-)
 delete mode 100644 ROADMAP
 delete mode 100644 TODO
 create mode 100644 TODO-1.0
 create mode 100644 doc/dev/todo/post-1.0

diff --git a/ROADMAP b/ROADMAP
deleted file mode 100644
index 44d61987..00000000
--- a/ROADMAP
+++ /dev/null
@@ -1,20 +0,0 @@
-This document defines how to continue work on cdist:
-
-x Define how to get information from clients
-   x Create shell script that creates code to run on client (cdist-build-explorer)
-x Create configuration tree from manifest
-   x write binaries, which create the tree when called from manifest (cdist_tree_wrapper)
-x Define configuration paths (doc/internal/config-layout)
-x Redo explorers (see manpage)
-/ Write at least one type
-
-- Parse configuration tree/objects recursively
-   - can/may types modify tree?
-      - may open door for getting information from manifest / other stuff
-- generate code to be executed on client
-   - check return codes
-   - abort on first error?
-
-- Cleanup directories, cleanly document, what's possible
-
--> 1.0
diff --git a/TODO b/TODO
deleted file mode 100644
index 4b6c10b3..00000000
--- a/TODO
+++ /dev/null
@@ -1,54 +0,0 @@
-- doc:
-   - cdist manpage (main manpage)
-      - cleanup following man + their tree:
-         - cdist-language        [IMPORTANT]
-         - cdist-design.text     [IMPORTANT]
-         - cdist-push-pull
-         - cdist-quickstart
-         - cdist-types           [IMPORTANT]
-         - cdist.text            [IMPORTANT]
-      - add terminology
-      - define steps within configuration apply
-         - detect impossible/unsafe things:
-         - creating a file twice
-         - installing and removing a package
-         - and report location of occurence
-         - parse afterwards?
-      - multi master setups
-      - templating
-         - how to define templates
-            - variable substitution from shell may be problematic
-         - SHELL SCRIPTS! (executables? do not support?)
-            - stdout == output of template == what will be used
-- cdist-explore
-   - add more stuff to explore
-   - write manpage
-   - save in cache as well
-- Create usable Makefile 
-   - install
-- types needed:
-   - package management
-   - file / directory handling
-   - ssh-host-key: that uses cache / explored data from hosts!
-   - services
-   - user management
-      - including passwords
-   - file editing
-      - add_line_to_file_if_not_existing
-      - delete_line_from_file
-      - regexp replace (can probably cover all?)
-- release first public version, which includes at least:
-   - manpages
-   - only do necessary work [TYPE IMPLEMENTATION HINTS]
-      - install packages only if not existent
-      - copy file only if different
-
-Before initial release, document:
-      
-   - how to add package backends
-   - how to write a minimal host manifest
-   - create library with all functions (and their parameters)
-      - cdist_package
-      - cdist_file
-      - cdist_dir
-
diff --git a/TODO-1.0 b/TODO-1.0
new file mode 100644
index 00000000..fcbc27f4
--- /dev/null
+++ b/TODO-1.0
@@ -0,0 +1,52 @@
+This document defines how to continue work on cdist:
+
+x Define how to get information from clients
+   x Create shell script that creates code to run on client (cdist-build-explorer)
+x Create configuration tree from manifest
+   x write binaries, which create the tree when called from manifest (cdist_tree_wrapper)
+x Define configuration paths (doc/internal/config-layout)
+x Redo explorers (see manpage)
+/ Write at least one type
+
+- Parse configuration tree/objects recursively
+   - can/may types modify tree?
+      - may open door for getting information from manifest / other stuff
+- generate code to be executed on client
+   - check return codes
+   - abort on first error?
+
+- doc 1.0:
+   - cdist manpage (main manpage)
+      - cleanup following man + their tree:
+         - cdist-language        [IMPORTANT]
+         - cdist-design.text     [IMPORTANT]
+         - cdist-push-pull
+         - cdist-quickstart
+            - how to write a minimal host manifest
+         - cdist-types           [IMPORTANT]
+            - only do necessary work [TYPE IMPLEMENTATION HINTS]
+               - install packages only if not existent
+               - copy file only if different
+         - cdist                 [IMPORTANT]
+         - cdist-explorers
+      - add terminology
+      - define steps within configuration apply
+         - detect impossible/unsafe things:
+         - creating a file twice
+         - installing and removing a package
+         - and report location of occurence
+         - parse afterwards?
+      - multi master setups
+      - templating
+         - how to define templates
+            - variable substitution from shell may be problematic
+         - SHELL SCRIPTS! (executables? do not support?)
+            - stdout == output of template == what will be used
+- Add install target to Makefile
+
+- types needed
+   - file (with directory)
+   - package
+
+- Cleanup directories, cleanly document, what's possible
+
diff --git a/doc/dev/todo/post-1.0 b/doc/dev/todo/post-1.0
new file mode 100644
index 00000000..8835727e
--- /dev/null
+++ b/doc/dev/todo/post-1.0
@@ -0,0 +1,9 @@
+Types:
+   - ssh-keys (host/user)
+   - services
+   - user management
+   - file editing 
+      - add_line_to_file_if_not_existing
+      - delete_line_from_file
+      - regexp replace (can probably cover all?)
+