From b1b86b2ebfbb321060b293f2fa25bd11228d8072 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 20 Sep 2012 17:46:03 +0200 Subject: [PATCH 001/104] remove __addifnosuchline and __removeline in 2.1 branch Signed-off-by: Nico Schottelius --- conf/type/__addifnosuchline/explorer/findline | 48 ----------------- conf/type/__addifnosuchline/gencode-remote | 33 ------------ conf/type/__addifnosuchline/man.text | 52 ------------------- conf/type/__addifnosuchline/manifest | 1 - .../type/__addifnosuchline/parameter/optional | 2 - .../type/__addifnosuchline/parameter/required | 1 - conf/type/__removeline/gencode-remote | 31 ----------- conf/type/__removeline/man.text | 50 ------------------ conf/type/__removeline/manifest | 1 - conf/type/__removeline/parameter/optional | 1 - conf/type/__removeline/parameter/required | 1 - 11 files changed, 221 deletions(-) delete mode 100755 conf/type/__addifnosuchline/explorer/findline delete mode 100755 conf/type/__addifnosuchline/gencode-remote delete mode 100644 conf/type/__addifnosuchline/man.text delete mode 100644 conf/type/__addifnosuchline/manifest delete mode 100644 conf/type/__addifnosuchline/parameter/optional delete mode 100644 conf/type/__addifnosuchline/parameter/required delete mode 100755 conf/type/__removeline/gencode-remote delete mode 100644 conf/type/__removeline/man.text delete mode 100644 conf/type/__removeline/manifest delete mode 100644 conf/type/__removeline/parameter/optional delete mode 100644 conf/type/__removeline/parameter/required diff --git a/conf/type/__addifnosuchline/explorer/findline b/conf/type/__addifnosuchline/explorer/findline deleted file mode 100755 index b45bd6ea..00000000 --- a/conf/type/__addifnosuchline/explorer/findline +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -# -# 2010-2011 Daniel Roth (dani-cdist@d-roth.li) -# 2011 Nico Schottelius (nico-cdist at schottelius.org) -# -# This file is part of cdist. -# -# cdist is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# cdist is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with cdist. If not, see . -# -# - -if [ -f "$__object/parameter/file" ]; then - file=$(cat "$__object/parameter/file") -else - file="/$__object_id" -fi - -if [ -f "$__object/parameter/regex" ]; then - regex=$(cat "$__object/parameter/regex") -else - wrap=$(cat "$__object/parameter/line") - regex="^$wrap\$" -fi - -if [ -f "$file" ]; then - # sh -e is our environment, we know what we do, - # skip error detection for now - set +e - grep -q "$regex" "$file" - if [ $? -eq 1 ]; then - echo "NOTFOUND" - else - echo "FOUND" - fi -else - echo "NOTFOUND" -fi diff --git a/conf/type/__addifnosuchline/gencode-remote b/conf/type/__addifnosuchline/gencode-remote deleted file mode 100755 index 1276e5d0..00000000 --- a/conf/type/__addifnosuchline/gencode-remote +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# -# 2010-2011 Daniel Roth (dani-cdist@d-roth.li) -# -# This file is part of cdist. -# -# cdist is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# cdist is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with cdist. If not, see . -# -# - -if [ -f "$__object/parameter/file" ]; then - file=$(cat "$__object/parameter/file") -else - file="/$__object_id" -fi - -result=$(cat "$__object/explorer/findline") - -if [ "$result" = "NOTFOUND" ]; then - line=$(cat "$__object/parameter/line") - echo "echo \"$line\" >> $file" -fi diff --git a/conf/type/__addifnosuchline/man.text b/conf/type/__addifnosuchline/man.text deleted file mode 100644 index ba3825ff..00000000 --- a/conf/type/__addifnosuchline/man.text +++ /dev/null @@ -1,52 +0,0 @@ -cdist-type__addifnosuchline(7) -============================== -Daniel Roth - - -NAME ----- -cdist-type__addifnosuchline - Add a line (if not existing already) - - -DESCRIPTION ------------ -This type can be used to check a file for existence of a -specific line and adding it, if it was not found. - - -REQUIRED PARAMETERS -------------------- -line:: - Specifies the content which shall be added if not existing. - - -OPTIONAL PARAMETERS -------------------- -file:: - If supplied, use this as the destination file. - Otherwise the object_id is used. -regex:: - If supplied, search for this regex. - Otherwise entire line must be matched. - -EXAMPLES --------- - --------------------------------------------------------------------------------- -# Creates or appends the line specified in "include_www" to the file "lighttpd.conf" -__addifnosuchline www --file /etc/lighttpd.conf --line include_www - -# Adds the line "include_git" to the file "lighttpd.conf" -__addifnosuchline /etc/lighttpd.conf --line include_git --------------------------------------------------------------------------------- - - -SEE ALSO --------- -- cdist-type(7) - - -COPYING -------- -Copyright \(C) 2011 Daniel Roth. Free use of this software is -granted under the terms of the GNU General Public License version 3 (GPLv3). diff --git a/conf/type/__addifnosuchline/manifest b/conf/type/__addifnosuchline/manifest deleted file mode 100644 index ccc82471..00000000 --- a/conf/type/__addifnosuchline/manifest +++ /dev/null @@ -1 +0,0 @@ -echo "WARNING: Type __addifnosuchline is deprecated and will be removed in cdist 2.1. Please use __line instead" >&2 diff --git a/conf/type/__addifnosuchline/parameter/optional b/conf/type/__addifnosuchline/parameter/optional deleted file mode 100644 index 7ecfcde9..00000000 --- a/conf/type/__addifnosuchline/parameter/optional +++ /dev/null @@ -1,2 +0,0 @@ -file -regex diff --git a/conf/type/__addifnosuchline/parameter/required b/conf/type/__addifnosuchline/parameter/required deleted file mode 100644 index a999a0c2..00000000 --- a/conf/type/__addifnosuchline/parameter/required +++ /dev/null @@ -1 +0,0 @@ -line diff --git a/conf/type/__removeline/gencode-remote b/conf/type/__removeline/gencode-remote deleted file mode 100755 index 3ec466b9..00000000 --- a/conf/type/__removeline/gencode-remote +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# -# 2010-2011 Daniel Roth (dani-cdist@d-roth.li) -# -# This file is part of cdist. -# -# cdist is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# cdist is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with cdist. If not, see . -# -# - -if [ -f "$__object/parameter/file" ]; then - file=$(cat "$__object/parameter/file") -else - file="/$__object_id" -fi - -line=$(cat "$__object/parameter/line") -echo "ex -c \"/${line}/d|w|q\" \"${file}\" < - - -NAME ----- -cdist-type__removeline - Remove a line (if existing) - - -DESCRIPTION ------------ -This type can be used to check a file for existence of a -specific line and removeing it, if it was found. - - -REQUIRED PARAMETERS -------------------- -line:: - Specifies the content which shall be removed if existing. - - -OPTIONAL PARAMETERS -------------------- -file:: - If supplied, use this as the destination file. - Otherwise the object_id is used. - - -EXAMPLES --------- - --------------------------------------------------------------------------------- -# Removes the line specifiend in "include_www" from the file "lighttpd.conf" -__removeline www --file /etc/lighttpd.conf --line include_www - -# Removes the line "include_git" from the file "lighttpd.conf" -__removeline /etc/lighttpd.conf --line include_git --------------------------------------------------------------------------------- - - -SEE ALSO --------- -- cdist-type(7) - - -COPYING -------- -Copyright \(C) 2011 Daniel Roth. Free use of this software is -granted under the terms of the GNU General Public License version 3 (GPLv3). diff --git a/conf/type/__removeline/manifest b/conf/type/__removeline/manifest deleted file mode 100644 index 63528795..00000000 --- a/conf/type/__removeline/manifest +++ /dev/null @@ -1 +0,0 @@ -echo "WARNING: Type __removeline is deprecated and will be removed in cdist 2.1. Please use __line instead" >&2 diff --git a/conf/type/__removeline/parameter/optional b/conf/type/__removeline/parameter/optional deleted file mode 100644 index f73f3093..00000000 --- a/conf/type/__removeline/parameter/optional +++ /dev/null @@ -1 +0,0 @@ -file diff --git a/conf/type/__removeline/parameter/required b/conf/type/__removeline/parameter/required deleted file mode 100644 index a999a0c2..00000000 --- a/conf/type/__removeline/parameter/required +++ /dev/null @@ -1 +0,0 @@ -line From 24cae3cb21c5aeca4c350df387bf1b84cf067d3b Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 20 Sep 2012 17:47:40 +0200 Subject: [PATCH 002/104] +changelog for 2.1 Signed-off-by: Nico Schottelius --- doc/changelog-2.1 | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 doc/changelog-2.1 diff --git a/doc/changelog-2.1 b/doc/changelog-2.1 new file mode 100644 index 00000000..24de88f3 --- /dev/null +++ b/doc/changelog-2.1 @@ -0,0 +1,9 @@ +Changelog (v2.1 specific) +------------------------- + + * Changes are always commented with their author in (braces) + * Exception: No braces means author == Nico Schottelius + +2.1.0: + * Removed type __addifnosuchline (replaced by __line) + * Removed type __removeline (replaced by __line) From e4d1ea5bc9f9874048aeb14cbc9a872bd5e7c123 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 21 Sep 2012 10:40:37 +0200 Subject: [PATCH 003/104] change --parents and --recurse to boolean Signed-off-by: Nico Schottelius --- conf/type/__directory/man.text | 7 ++++--- conf/type/__directory/parameter/boolean | 2 ++ conf/type/__directory/parameter/optional | 2 -- 3 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 conf/type/__directory/parameter/boolean diff --git a/conf/type/__directory/man.text b/conf/type/__directory/man.text index afba0875..3f005b55 100644 --- a/conf/type/__directory/man.text +++ b/conf/type/__directory/man.text @@ -32,14 +32,15 @@ mode:: owner:: User to chown to. + +OPTIONAL BOOLEAN PARAMETERS +--------------------------- parents:: - Whether to create parents as well (mkdir -p behaviour). Must be yes or no. + Whether to create parents as well (mkdir -p behaviour) recursive:: If supplied the chgrp and chown call will run recursively. This does *not* influence the behaviour of chmod. - Must be yes or no. - EXAMPLES -------- diff --git a/conf/type/__directory/parameter/boolean b/conf/type/__directory/parameter/boolean new file mode 100644 index 00000000..357c5e81 --- /dev/null +++ b/conf/type/__directory/parameter/boolean @@ -0,0 +1,2 @@ +parents +recursive diff --git a/conf/type/__directory/parameter/optional b/conf/type/__directory/parameter/optional index 27f9d76a..08798bc5 100644 --- a/conf/type/__directory/parameter/optional +++ b/conf/type/__directory/parameter/optional @@ -2,5 +2,3 @@ state group mode owner -parents -recursive From e82c11cce429ce68befbc5126e11ffb47b170997 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 21 Sep 2012 11:10:38 +0200 Subject: [PATCH 004/104] add changes for 2.1 boolean version Signed-off-by: Nico Schottelius --- conf/type/__directory/gencode-remote | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/conf/type/__directory/gencode-remote b/conf/type/__directory/gencode-remote index 56bd73a1..21f4c5b6 100755 --- a/conf/type/__directory/gencode-remote +++ b/conf/type/__directory/gencode-remote @@ -18,7 +18,6 @@ # along with cdist. If not, see . # -# Check state and exit if nothing needs to be done state_should="present" [ -f "$__object/parameter/state" ] && state_should="$(cat "$__object/parameter/state")" state_is="$(cat "$__object/explorer/state")" @@ -27,9 +26,9 @@ state_is="$(cat "$__object/explorer/state")" destination="/$__object_id" mkdiropt="" -grep yes "$__object/parameter/parents" >/dev/null 2>&1 && mkdiropt="-p" +[ -f "$__object/parameter/parents" ] && mkdiropt="-p" recursive="" -grep yes "$__object/parameter/recursive" >/dev/null 2>&1 && recursive="-R" +[ -f "$__object/parameter/recursive" ] && recursive="-R" case "$state_should" in present) From bc203df95f76661f433e2d7b5f30c6afe09e9fe8 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 21 Sep 2012 11:12:32 +0200 Subject: [PATCH 005/104] update man for 2.1 Signed-off-by: Nico Schottelius --- conf/type/__directory/man.text | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/conf/type/__directory/man.text b/conf/type/__directory/man.text index 3f005b55..1f4def7d 100644 --- a/conf/type/__directory/man.text +++ b/conf/type/__directory/man.text @@ -33,8 +33,8 @@ owner:: User to chown to. -OPTIONAL BOOLEAN PARAMETERS ---------------------------- +BOOLEAN PARAMETERS +------------------ parents:: Whether to create parents as well (mkdir -p behaviour) @@ -42,6 +42,7 @@ recursive:: If supplied the chgrp and chown call will run recursively. This does *not* influence the behaviour of chmod. + EXAMPLES -------- @@ -56,13 +57,18 @@ __directory /tmp/foobar --state absent __directory /etc --owner root --group root --mode 0755 # Create nfs service directory, including parents -__directory /home/services/nfs --parents yes +__directory /home/services/nfs --parents # Change permissions recursively -__directory /home/services --recursive yes --owner root --group root +__directory /home/services --recursive --owner root --group root # Setup a temp directory __directory /local --mode 1777 + +# Take it all +__directory /home/services/kvm --recursive --parents \ + --owner root --group root --mode 0755 --state present + -------------------------------------------------------------------------------- From 9fbdfda3023b2f58f3d817f5af7d5ffdc56bebdc Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 21 Sep 2012 11:13:04 +0200 Subject: [PATCH 006/104] ++changes(2.1.0) Signed-off-by: Nico Schottelius --- doc/changelog-2.1 | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/changelog-2.1 b/doc/changelog-2.1 index 24de88f3..fd03e69c 100644 --- a/doc/changelog-2.1 +++ b/doc/changelog-2.1 @@ -7,3 +7,4 @@ Changelog (v2.1 specific) 2.1.0: * Removed type __addifnosuchline (replaced by __line) * Removed type __removeline (replaced by __line) + * Type __directory: Parameter --parents and --recursive are now boolean From 1b80f2806b55d52d6d7fe4c31d9b88aab88c10f6 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 21 Sep 2012 11:32:04 +0200 Subject: [PATCH 007/104] remove installed/removed state parameters (2.1 cleanup) Signed-off-by: Nico Schottelius --- conf/type/__package/man.text | 1 - conf/type/__package_apt/gencode-remote | 12 ------------ conf/type/__package_apt/man.text | 3 +-- conf/type/__package_luarocks/gencode-remote | 12 ------------ conf/type/__package_luarocks/man.text | 1 - conf/type/__package_opkg/gencode-remote | 1 - conf/type/__package_pacman/gencode-remote | 10 ---------- conf/type/__package_pacman/man.text | 1 - conf/type/__package_pkg_freebsd/gencode-remote | 1 - conf/type/__package_pkg_freebsd/man.text | 8 ++++---- conf/type/__package_pkg_openbsd/gencode-remote | 11 ----------- conf/type/__package_pkg_openbsd/man.text | 1 - conf/type/__package_rubygem/gencode-remote | 11 ----------- conf/type/__package_rubygem/man.text | 1 - conf/type/__package_yum/gencode-remote | 10 ---------- conf/type/__package_yum/man.text | 3 +-- conf/type/__process/gencode-remote | 10 ---------- 17 files changed, 6 insertions(+), 91 deletions(-) diff --git a/conf/type/__package/man.text b/conf/type/__package/man.text index 071a8bfb..0d8f8c9e 100644 --- a/conf/type/__package/man.text +++ b/conf/type/__package/man.text @@ -18,7 +18,6 @@ REQUIRED PARAMETERS ------------------- state:: The state the package should be in, either "present" or "absent" - (the old values "installed" or "removed" will be removed in cdist 2.1). OPTIONAL PARAMETERS diff --git a/conf/type/__package_apt/gencode-remote b/conf/type/__package_apt/gencode-remote index 0bcdb946..a5bd7708 100755 --- a/conf/type/__package_apt/gencode-remote +++ b/conf/type/__package_apt/gencode-remote @@ -29,18 +29,6 @@ fi state_should="$(cat "$__object/parameter/state")" -# Correct pre 2.1 naming - FIXME in 2.1 -case "$state_should" in - installed) - echo "WARNING: ${__object_name}: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2 - state_should="present" - ;; - removed) - echo "WARNING: ${__object_name}: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2 - state_should="absent" - ;; -esac - # FIXME: use grep directly, state is a list, not a line! state_is="$(cat "$__object/explorer/state")" case "$state_is" in diff --git a/conf/type/__package_apt/man.text b/conf/type/__package_apt/man.text index fd9c1a9c..5848a131 100644 --- a/conf/type/__package_apt/man.text +++ b/conf/type/__package_apt/man.text @@ -18,7 +18,6 @@ REQUIRED PARAMETERS ------------------- state:: The state the package should be in, either "present" or "absent" - (the old values "installed" or "removed" will be removed in cdist 2.1). OPTIONAL PARAMETERS @@ -50,5 +49,5 @@ SEE ALSO COPYING ------- -Copyright \(C) 2011 Nico Schottelius. Free use of this software is +Copyright \(C) 2011-2012 Nico Schottelius. Free use of this software is granted under the terms of the GNU General Public License version 3 (GPLv3). diff --git a/conf/type/__package_luarocks/gencode-remote b/conf/type/__package_luarocks/gencode-remote index 327f812c..1046a936 100755 --- a/conf/type/__package_luarocks/gencode-remote +++ b/conf/type/__package_luarocks/gencode-remote @@ -30,18 +30,6 @@ else fi state_should="$(cat "$__object/parameter/state")" -# Correct pre 2.1 naming - FIXME in 2.1 -case "$state_should" in - installed) - echo "WARNING: ${__object_name}: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2 - state_should="present" - ;; - removed) - echo "WARNING: ${__object_name}: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2 - state_should="absent" - ;; -esac - if grep -q "(installed)" "$__object/explorer/pkg_status"; then state_is="present" diff --git a/conf/type/__package_luarocks/man.text b/conf/type/__package_luarocks/man.text index 8b041b7c..75ac93fb 100644 --- a/conf/type/__package_luarocks/man.text +++ b/conf/type/__package_luarocks/man.text @@ -17,7 +17,6 @@ REQUIRED PARAMETERS ------------------- state:: The state the package should be in, either "present" or "absent" - (the old values "installed" or "removed" will be removed in cdist 2.1). OPTIONAL PARAMETERS diff --git a/conf/type/__package_opkg/gencode-remote b/conf/type/__package_opkg/gencode-remote index bd9a599b..ab8b5ee8 100755 --- a/conf/type/__package_opkg/gencode-remote +++ b/conf/type/__package_opkg/gencode-remote @@ -54,4 +54,3 @@ if [ "$state_is" != "$state_should" ]; then ;; esac fi - diff --git a/conf/type/__package_pacman/gencode-remote b/conf/type/__package_pacman/gencode-remote index e585ee86..da1ac7c2 100755 --- a/conf/type/__package_pacman/gencode-remote +++ b/conf/type/__package_pacman/gencode-remote @@ -32,16 +32,6 @@ else fi state_should="$(cat "$__object/parameter/state")" -case "$state_should" in - installed) - echo "WARNING: ${__object_name}: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2 - state_should="present" - ;; - removed) - echo "WARNING: ${__object_name}: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2 - state_should="absent" - ;; -esac pkg_version="$(cat "$__object/explorer/pkg_version")" if [ -z "$pkg_version" ]; then diff --git a/conf/type/__package_pacman/man.text b/conf/type/__package_pacman/man.text index fe2abac8..4c23a2bd 100644 --- a/conf/type/__package_pacman/man.text +++ b/conf/type/__package_pacman/man.text @@ -18,7 +18,6 @@ REQUIRED PARAMETERS ------------------- state:: The state the package should be in, either "present" or "absent" - (the old values "installed" or "removed" will be removed in cdist 2.1). OPTIONAL PARAMETERS diff --git a/conf/type/__package_pkg_freebsd/gencode-remote b/conf/type/__package_pkg_freebsd/gencode-remote index ef6632c0..21120d41 100755 --- a/conf/type/__package_pkg_freebsd/gencode-remote +++ b/conf/type/__package_pkg_freebsd/gencode-remote @@ -133,4 +133,3 @@ fi # Debug #set +x - diff --git a/conf/type/__package_pkg_freebsd/man.text b/conf/type/__package_pkg_freebsd/man.text index f41ac47a..fd9a6792 100644 --- a/conf/type/__package_pkg_freebsd/man.text +++ b/conf/type/__package_pkg_freebsd/man.text @@ -39,16 +39,16 @@ EXAMPLES -------------------------------------------------------------------------------- # Ensure zsh is installed -__package_pkg_freebsd zsh --state installed +__package_pkg_freebsd zsh --state present # Ensure vim is installed, use flavor no_x11 -__package_pkg_freebsd vim --state installed --flavor no_x11 +__package_pkg_freebsd vim --state present --flavor no_x11 # If you don't want to follow pythonX packages, but always use python -__package_pkg_freebsd python --state installed --name python2 +__package_pkg_freebsd python --state present --name python2 # Remove obsolete package -__package_pkg_freebsd puppet --state removed +__package_pkg_freebsd puppet --state absent -------------------------------------------------------------------------------- diff --git a/conf/type/__package_pkg_openbsd/gencode-remote b/conf/type/__package_pkg_openbsd/gencode-remote index 26dd4689..ed36f04a 100755 --- a/conf/type/__package_pkg_openbsd/gencode-remote +++ b/conf/type/__package_pkg_openbsd/gencode-remote @@ -43,17 +43,6 @@ else fi state_should="$(cat "$__object/parameter/state")" -# Correct pre 2.1 naming - FIXME in 2.1 -case "$state_should" in - installed) - echo "WARNING: ${__object_name}: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2 - state_should="present" - ;; - removed) - echo "WARNING: ${__object_name}: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2 - state_should="absent" - ;; -esac pkg_version="$(cat "$__object/explorer/pkg_version")" diff --git a/conf/type/__package_pkg_openbsd/man.text b/conf/type/__package_pkg_openbsd/man.text index 71cf9d4e..19bb2094 100644 --- a/conf/type/__package_pkg_openbsd/man.text +++ b/conf/type/__package_pkg_openbsd/man.text @@ -17,7 +17,6 @@ REQUIRED PARAMETERS ------------------- state:: The state the package should be in, either "present" or "absent" - (the old values "installed" or "removed" will be removed in cdist 2.1). OPTIONAL PARAMETERS diff --git a/conf/type/__package_rubygem/gencode-remote b/conf/type/__package_rubygem/gencode-remote index 638c4252..dc755ad3 100755 --- a/conf/type/__package_rubygem/gencode-remote +++ b/conf/type/__package_rubygem/gencode-remote @@ -28,17 +28,6 @@ else fi state_should="$(cat "$__object/parameter/state")" -# Correct pre 2.1 naming - FIXME in 2.1 -case "$state_should" in - installed) - echo "WARNING: ${__object_name}: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2 - state_should="present" - ;; - removed) - echo "WARNING: ${__object_name}: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2 - state_should="absent" - ;; -esac if grep -q true "$__object/explorer/pkg_status"; then state_is="present" diff --git a/conf/type/__package_rubygem/man.text b/conf/type/__package_rubygem/man.text index 79bb8b52..afe2b358 100644 --- a/conf/type/__package_rubygem/man.text +++ b/conf/type/__package_rubygem/man.text @@ -17,7 +17,6 @@ REQUIRED PARAMETERS ------------------- state:: The state the package should be in, either "present" or "absent" - (the old values "installed" or "removed" will be removed in cdist 2.1). OPTIONAL PARAMETERS diff --git a/conf/type/__package_yum/gencode-remote b/conf/type/__package_yum/gencode-remote index df2bf405..5f0e8ac8 100755 --- a/conf/type/__package_yum/gencode-remote +++ b/conf/type/__package_yum/gencode-remote @@ -28,16 +28,6 @@ else fi state_should="$(cat "$__object/parameter/state")" -case "$state_should" in - installed) - echo "WARNING: ${__object_name}: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2 - state_should="present" - ;; - removed) - echo "WARNING: ${__object_name}: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2 - state_should="absent" - ;; -esac if grep -q -E "(centos|redhat|amazon)" "$__global/explorer/os"; then opts="-y --quiet" diff --git a/conf/type/__package_yum/man.text b/conf/type/__package_yum/man.text index 9dfb394e..4aa3ddc0 100644 --- a/conf/type/__package_yum/man.text +++ b/conf/type/__package_yum/man.text @@ -19,7 +19,6 @@ REQUIRED PARAMETERS ------------------- state:: The state the package should be in, either "present" or "absent" - (the old values "installed" or "removed" will be removed in cdist 2.1). OPTIONAL PARAMETERS @@ -51,5 +50,5 @@ SEE ALSO COPYING ------- -Copyright \(C) 2011 Nico Schottelius. Free use of this software is +Copyright \(C) 2011-2012 Nico Schottelius. Free use of this software is granted under the terms of the GNU General Public License version 3 (GPLv3). diff --git a/conf/type/__process/gencode-remote b/conf/type/__process/gencode-remote index 3411734e..e4519f3c 100755 --- a/conf/type/__process/gencode-remote +++ b/conf/type/__process/gencode-remote @@ -26,16 +26,6 @@ else fi state_should="$(cat "$__object/parameter/state")" -case "$state_should" in - running) - echo "WARNING: ${__object_name}: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2 - state_should="present" - ;; - stopped) - echo "WARNING: ${__object_name}: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2 - state_should="absent" - ;; -esac runs="$(cat "$__object/explorer/runs")" if [ "$runs" ]; then From 3333df602b3f8c85ee092c69d23b53b304351790 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 21 Sep 2012 11:35:56 +0200 Subject: [PATCH 008/104] change several type to accept only state absent/present Signed-off-by: Nico Schottelius --- doc/changelog-2.1 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/changelog-2.1 b/doc/changelog-2.1 index fd03e69c..973dae99 100644 --- a/doc/changelog-2.1 +++ b/doc/changelog-2.1 @@ -8,3 +8,7 @@ Changelog (v2.1 specific) * Removed type __addifnosuchline (replaced by __line) * Removed type __removeline (replaced by __line) * Type __directory: Parameter --parents and --recursive are now boolean + * Type __package_apt, __package_luarocks, __package_opkg, + __package_pacman, __package_pkg_freebsd, __package_pkg_openbsd, + __package_rubygem, __package_yum, __process: + Parameter state accepts only "present" and "absent" From 57ed946414a9fe66bf5738ac6b287b56eed334d6 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 21 Sep 2012 20:25:37 +0200 Subject: [PATCH 009/104] Remove __self variable Signed-off-by: Nico Schottelius --- doc/changelog-2.1 | 1 + doc/man/cdist-reference.text.sh | 3 --- lib/cdist/core/code.py | 1 - lib/cdist/core/manifest.py | 1 - lib/cdist/test/code/__init__.py | 2 -- .../code/fixtures/conf/type/__dump_environment/gencode-local | 1 - lib/cdist/test/manifest/__init__.py | 1 - 7 files changed, 1 insertion(+), 9 deletions(-) diff --git a/doc/changelog-2.1 b/doc/changelog-2.1 index 973dae99..6398e7dc 100644 --- a/doc/changelog-2.1 +++ b/doc/changelog-2.1 @@ -5,6 +5,7 @@ Changelog (v2.1 specific) * Exception: No braces means author == Nico Schottelius 2.1.0: + * Core: Removed obsolete variable __self * Removed type __addifnosuchline (replaced by __line) * Removed type __removeline (replaced by __line) * Type __directory: Parameter --parents and --recursive are now boolean diff --git a/doc/man/cdist-reference.text.sh b/doc/man/cdist-reference.text.sh index 3f4f7c98..cf1b852f 100755 --- a/doc/man/cdist-reference.text.sh +++ b/doc/man/cdist-reference.text.sh @@ -184,9 +184,6 @@ __object_id:: the filesystem database and ensured by the core). Note: Double slashes ("//") will not be fixed and result in an error. -__self:: - DEPRECATED: Same as __object_name, do not use anymore, use __object_name instead. - Will be removed in cdist 2.1. __object_name:: The full qualified name of the current object. Available for: type manifest, type explorer, type gencode diff --git a/lib/cdist/core/code.py b/lib/cdist/core/code.py index 2ffef9cf..fa1ed3c1 100644 --- a/lib/cdist/core/code.py +++ b/lib/cdist/core/code.py @@ -103,7 +103,6 @@ class Code(object): '__object': cdist_object.absolute_path, '__object_id': cdist_object.object_id, '__object_name': cdist_object.name, - '__self': cdist_object.name, }) return self.local.run_script(script, env=env, return_output=True) diff --git a/lib/cdist/core/manifest.py b/lib/cdist/core/manifest.py index 4b798883..5faeccd1 100644 --- a/lib/cdist/core/manifest.py +++ b/lib/cdist/core/manifest.py @@ -96,7 +96,6 @@ class Manifest(object): '__object': cdist_object.absolute_path, '__object_id': cdist_object.object_id, '__object_name': cdist_object.name, - '__self': cdist_object.name, '__type': cdist_object.cdist_type.absolute_path, '__cdist_manifest': script, }) diff --git a/lib/cdist/test/code/__init__.py b/lib/cdist/test/code/__init__.py index dc701cce..8a8583d7 100644 --- a/lib/cdist/test/code/__init__.py +++ b/lib/cdist/test/code/__init__.py @@ -78,7 +78,6 @@ class CodeTestCase(test.CdistTestCase): self.assertEqual(output_dict['__object'], self.cdist_object.absolute_path) self.assertEqual(output_dict['__object_id'], self.cdist_object.object_id) self.assertEqual(output_dict['__object_name'], self.cdist_object.name) - self.assertEqual(output_dict['__self'], self.cdist_object.name) def test_run_gencode_remote_environment(self): output_string = self.code.run_gencode_remote(self.cdist_object) @@ -94,7 +93,6 @@ class CodeTestCase(test.CdistTestCase): self.assertEqual(output_dict['__object'], self.cdist_object.absolute_path) self.assertEqual(output_dict['__object_id'], self.cdist_object.object_id) self.assertEqual(output_dict['__object_name'], self.cdist_object.name) - self.assertEqual(output_dict['__self'], self.cdist_object.name) def test_transfer_code_remote(self): self.cdist_object.code_remote = self.code.run_gencode_remote(self.cdist_object) diff --git a/lib/cdist/test/code/fixtures/conf/type/__dump_environment/gencode-local b/lib/cdist/test/code/fixtures/conf/type/__dump_environment/gencode-local index ed1265c9..771894fb 100755 --- a/lib/cdist/test/code/fixtures/conf/type/__dump_environment/gencode-local +++ b/lib/cdist/test/code/fixtures/conf/type/__dump_environment/gencode-local @@ -6,4 +6,3 @@ echo "echo __type: $__type" echo "echo __object: $__object" echo "echo __object_id: $__object_id" echo "echo __object_name: $__object_name" -echo "echo __self: $__self" diff --git a/lib/cdist/test/manifest/__init__.py b/lib/cdist/test/manifest/__init__.py index a188c788..a9846b1d 100644 --- a/lib/cdist/test/manifest/__init__.py +++ b/lib/cdist/test/manifest/__init__.py @@ -101,7 +101,6 @@ class ManifestTestCase(test.CdistTestCase): self.assertEqual(output_dict['__object'], cdist_object.absolute_path) self.assertEqual(output_dict['__object_id'], cdist_object.object_id) self.assertEqual(output_dict['__object_name'], cdist_object.name) - self.assertEqual(output_dict['__self'], cdist_object.name) def test_debug_env_setup(self): self.log.setLevel(logging.DEBUG) From 6d1e4d06cf0b3052ba9806973b74b358a72ee589 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 25 Oct 2012 17:17:52 +0200 Subject: [PATCH 010/104] doc -> docs (pypi) Signed-off-by: Nico Schottelius --- .gitignore | 16 ++++++++-------- build | 8 ++++---- {doc => docs}/changelog | 0 {doc => docs}/changelog-2.1 | 0 {doc => docs}/dev/benchmark-oprofile | 0 {doc => docs}/dev/benchmark-parallel-deploy | 0 .../dev/debug/bach25-1.6.2-373-g6fd31f8 | 0 .../dev/debug/ikq04-1.6.2-373-g6fd31f8-dbg | 0 {doc => docs}/dev/fancy-ideas | 0 {doc => docs}/dev/git-post-commit-hook | 0 {doc => docs}/dev/header | 0 {doc => docs}/dev/lastchanges | 0 {doc => docs}/dev/logs/2010-09-25 | 0 {doc => docs}/dev/logs/2010-11-02.steven | 0 {doc => docs}/dev/logs/2010-11-09 | 0 {doc => docs}/dev/logs/2010-11-21 | 0 {doc => docs}/dev/logs/2010-11-29 | 0 {doc => docs}/dev/logs/2010-12-01 | 0 .../logs/2010-12-01.handwritten/SCAN0000.PDF | Bin .../logs/2010-12-01.handwritten/SCAN0001.PDF | Bin .../logs/2010-12-01.handwritten/SCAN0002.PDF | Bin .../logs/2010-12-01.handwritten/SCAN0003.PDF | Bin .../logs/2010-12-01.handwritten/SCAN0004.PDF | Bin {doc => docs}/dev/logs/2011-01-17 | 0 {doc => docs}/dev/logs/2011-01-18.type-creation | 0 {doc => docs}/dev/logs/2011-01-24 | 0 {doc => docs}/dev/logs/2011-02-03 | 0 {doc => docs}/dev/logs/2011-02-04.steven | 0 {doc => docs}/dev/logs/2011-02-22 | 0 {doc => docs}/dev/logs/2011-02-24 | 0 {doc => docs}/dev/logs/2011-02-27 | 0 {doc => docs}/dev/logs/2011-03-03 | 0 {doc => docs}/dev/logs/2011-03-07 | 0 {doc => docs}/dev/logs/2011-03-09 | 0 {doc => docs}/dev/logs/2011-03-15 | 0 .../dev/logs/2011-03-15.file_directory_link | 0 {doc => docs}/dev/logs/2011-03-23.autorequire | 0 .../dev/logs/2011-03-23.manifest_use_explorer | 0 {doc => docs}/dev/logs/2011-03-27.pgrep | 0 .../dev/logs/2011-03-28.execution-order | 0 {doc => docs}/dev/logs/2011-04-02.yum | 0 {doc => docs}/dev/logs/2011-04-04.openbsd | 0 {doc => docs}/dev/logs/2011-04-19 | 0 .../dev/logs/2011-04-20.slashdot-articles | 0 {doc => docs}/dev/logs/2011-04-21.benchmark-eth | 0 .../2011-04-21.benchmark-from-home.with-stdout | 0 {doc => docs}/dev/logs/2011-04-27 | 0 {doc => docs}/dev/logs/2011-04-27.benchmark | 0 .../dev/logs/2011-04-27.benchmark.dash | 0 {doc => docs}/dev/logs/2011-04-27.debug-timing | 0 {doc => docs}/dev/logs/2011-05-09 | 0 {doc => docs}/dev/logs/2011-05-10 | 0 {doc => docs}/dev/logs/2011-05-10.benchmark | 0 {doc => docs}/dev/logs/2011-05-12 | 0 .../dev/logs/2011-06-13.installation-via-cdist | 0 .../dev/logs/2011-06-14.library_for_user | 0 {doc => docs}/dev/logs/2011-06-24.cinst_preos | 0 .../dev/logs/2011-06-25.trigger-graphic | 0 {doc => docs}/dev/logs/2011-07-01.type-gencode | 0 .../dev/logs/2011-07-01.type-global-explorers | 0 .../dev/logs/2011-09-08.obsolete_debugging | 0 {doc => docs}/dev/logs/2011-09-12 | 0 .../dev/logs/2011-09-12.benchmark-home | 0 {doc => docs}/dev/logs/2011-09-13 | 0 .../2011-09-16.benchmark-r815-no-control-socket | 0 ...6.benchmark-r815-no-control-socket.dmidecode | 0 {doc => docs}/dev/logs/2011-10-04 | 0 {doc => docs}/dev/logs/2011-10-05 | 0 {doc => docs}/dev/logs/2011-10-06 | 0 .../dev/logs/2011-10-06.ssh_scp_sudo_chroot | 0 .../dev/logs/2011-10-11.emulator-output | 0 {doc => docs}/dev/logs/2011-10-12 | 0 {doc => docs}/dev/logs/2011-10-13.output | 0 {doc => docs}/dev/logs/2011-10-14.error-output | 0 .../dev/logs/2011-10-15.prefix-output-missing | 0 .../2011-10-15.ugly-output-on-breaking-explorer | 0 .../dev/logs/2011-10-16.keyboardirqoutputs | 0 .../dev/logs/2011-10-18.requirement-object | 0 .../dev/logs/2011-10-18.traceback-gencode | 0 .../dev/logs/2011-11-15.startup-yannick | 0 .../dev/logs/2012-01-06.python3-in-distros | 0 {doc => docs}/dev/logs/2012-01-07.urls | 0 {doc => docs}/dev/logs/2012-01-18.urls | 0 .../2012-02-08.explorer-depends-on-another-type | 0 .../dev/logs/2012-02-10.object_id-and-slashes | 0 {doc => docs}/dev/logs/2012-02-13.dependencies | 0 {doc => docs}/dev/logs/2012-02-15.steven | 0 {doc => docs}/dev/logs/2012-02-17.keyboardirq | 0 .../dev/logs/2012-02-20.debug-jake-deps | 0 .../logs/2012-02-20.error-does-not-contain-host | 0 .../dev/logs/2012-05-24.makedirs.py-python3.1 | 0 .../dev/logs/2012-05-30.ifconfig-outputs | 0 .../dev/logs/2012-05-31.csh-compatibilty | 0 {doc => docs}/dev/logs/2012-06-06.wikipedia | 0 .../dev/logs/2012-06-15.explorer-dep-problem | 0 .../logs/2012-10-17.conflicting-types-problem | 0 {doc => docs}/dev/logs/README | 0 {doc => docs}/dev/logs/linklist | 0 {doc => docs}/dev/logs/times | 0 {doc => docs}/dev/releasechecklist | 0 {doc => docs}/dev/show_all_exported_variables | 0 {doc => docs}/dev/sync-to-testhost | 0 {doc => docs}/dev/todo/3.0 | 0 {doc => docs}/dev/todo/TAKEME | 0 {doc => docs}/dev/todo/niconext | 0 {doc => docs}/dev/todo/performance-ideas | 0 {doc => docs}/dev/todo/steven | 0 {doc => docs}/dev/todo/tests | 0 {doc => docs}/gfx/cdist-automated-inverted.png | Bin {doc => docs}/gfx/cdist-automated.png | Bin {doc => docs}/gfx/cdist-automated.text | 0 {doc => docs}/gfx/cdist-logo-cm.png | Bin {doc => docs}/gfx/cdist-logo-inverted.png | Bin {doc => docs}/gfx/cdist-logo.png | Bin {doc => docs}/gfx/cdist-logo.text | 0 {doc => docs}/gfx/font-used | 0 {doc => docs}/man/cdist-reference.text.sh | 0 {doc => docs}/man/man1/cdist.text | 0 {doc => docs}/man/man7/cdist-best-practice.text | 0 {doc => docs}/man/man7/cdist-bootstrap.text | 0 {doc => docs}/man/man7/cdist-explorer.text | 0 {doc => docs}/man/man7/cdist-hacker.text | 0 {doc => docs}/man/man7/cdist-manifest.text | 0 {doc => docs}/man/man7/cdist-quickstart.text | 0 .../man/man7/cdist-remote-exec-copy.text | 0 {doc => docs}/man/man7/cdist-stages.text | 0 {doc => docs}/man/man7/cdist-tutorial.text | 0 {doc => docs}/man/man7/cdist-type.text | 0 {doc => docs}/speeches/.gitignore | 0 .../speeches/2011-03-18_hacker_erwachen.tex | 0 {doc => docs}/speeches/2011-04-27_sans.tex | 0 {doc => docs}/speeches/2011-05-20_cosin.tex | 0 ...ist-installation-in-less-than-60-seconds.mp4 | Bin 133 files changed, 12 insertions(+), 12 deletions(-) rename {doc => docs}/changelog (100%) rename {doc => docs}/changelog-2.1 (100%) rename {doc => docs}/dev/benchmark-oprofile (100%) rename {doc => docs}/dev/benchmark-parallel-deploy (100%) rename {doc => docs}/dev/debug/bach25-1.6.2-373-g6fd31f8 (100%) rename {doc => docs}/dev/debug/ikq04-1.6.2-373-g6fd31f8-dbg (100%) rename {doc => docs}/dev/fancy-ideas (100%) rename {doc => docs}/dev/git-post-commit-hook (100%) rename {doc => docs}/dev/header (100%) rename {doc => docs}/dev/lastchanges (100%) rename {doc => docs}/dev/logs/2010-09-25 (100%) rename {doc => docs}/dev/logs/2010-11-02.steven (100%) rename {doc => docs}/dev/logs/2010-11-09 (100%) rename {doc => docs}/dev/logs/2010-11-21 (100%) rename {doc => docs}/dev/logs/2010-11-29 (100%) rename {doc => docs}/dev/logs/2010-12-01 (100%) rename {doc => docs}/dev/logs/2010-12-01.handwritten/SCAN0000.PDF (100%) rename {doc => docs}/dev/logs/2010-12-01.handwritten/SCAN0001.PDF (100%) rename {doc => docs}/dev/logs/2010-12-01.handwritten/SCAN0002.PDF (100%) rename {doc => docs}/dev/logs/2010-12-01.handwritten/SCAN0003.PDF (100%) rename {doc => docs}/dev/logs/2010-12-01.handwritten/SCAN0004.PDF (100%) rename {doc => docs}/dev/logs/2011-01-17 (100%) rename {doc => docs}/dev/logs/2011-01-18.type-creation (100%) rename {doc => docs}/dev/logs/2011-01-24 (100%) rename {doc => docs}/dev/logs/2011-02-03 (100%) rename {doc => docs}/dev/logs/2011-02-04.steven (100%) rename {doc => docs}/dev/logs/2011-02-22 (100%) rename {doc => docs}/dev/logs/2011-02-24 (100%) rename {doc => docs}/dev/logs/2011-02-27 (100%) rename {doc => docs}/dev/logs/2011-03-03 (100%) rename {doc => docs}/dev/logs/2011-03-07 (100%) rename {doc => docs}/dev/logs/2011-03-09 (100%) rename {doc => docs}/dev/logs/2011-03-15 (100%) rename {doc => docs}/dev/logs/2011-03-15.file_directory_link (100%) rename {doc => docs}/dev/logs/2011-03-23.autorequire (100%) rename {doc => docs}/dev/logs/2011-03-23.manifest_use_explorer (100%) rename {doc => docs}/dev/logs/2011-03-27.pgrep (100%) rename {doc => docs}/dev/logs/2011-03-28.execution-order (100%) rename {doc => docs}/dev/logs/2011-04-02.yum (100%) rename {doc => docs}/dev/logs/2011-04-04.openbsd (100%) rename {doc => docs}/dev/logs/2011-04-19 (100%) rename {doc => docs}/dev/logs/2011-04-20.slashdot-articles (100%) rename {doc => docs}/dev/logs/2011-04-21.benchmark-eth (100%) rename {doc => docs}/dev/logs/2011-04-21.benchmark-from-home.with-stdout (100%) rename {doc => docs}/dev/logs/2011-04-27 (100%) rename {doc => docs}/dev/logs/2011-04-27.benchmark (100%) rename {doc => docs}/dev/logs/2011-04-27.benchmark.dash (100%) rename {doc => docs}/dev/logs/2011-04-27.debug-timing (100%) rename {doc => docs}/dev/logs/2011-05-09 (100%) rename {doc => docs}/dev/logs/2011-05-10 (100%) rename {doc => docs}/dev/logs/2011-05-10.benchmark (100%) rename {doc => docs}/dev/logs/2011-05-12 (100%) rename {doc => docs}/dev/logs/2011-06-13.installation-via-cdist (100%) rename {doc => docs}/dev/logs/2011-06-14.library_for_user (100%) rename {doc => docs}/dev/logs/2011-06-24.cinst_preos (100%) rename {doc => docs}/dev/logs/2011-06-25.trigger-graphic (100%) rename {doc => docs}/dev/logs/2011-07-01.type-gencode (100%) rename {doc => docs}/dev/logs/2011-07-01.type-global-explorers (100%) rename {doc => docs}/dev/logs/2011-09-08.obsolete_debugging (100%) rename {doc => docs}/dev/logs/2011-09-12 (100%) rename {doc => docs}/dev/logs/2011-09-12.benchmark-home (100%) rename {doc => docs}/dev/logs/2011-09-13 (100%) rename {doc => docs}/dev/logs/2011-09-16.benchmark-r815-no-control-socket (100%) rename {doc => docs}/dev/logs/2011-09-16.benchmark-r815-no-control-socket.dmidecode (100%) rename {doc => docs}/dev/logs/2011-10-04 (100%) rename {doc => docs}/dev/logs/2011-10-05 (100%) rename {doc => docs}/dev/logs/2011-10-06 (100%) rename {doc => docs}/dev/logs/2011-10-06.ssh_scp_sudo_chroot (100%) rename {doc => docs}/dev/logs/2011-10-11.emulator-output (100%) rename {doc => docs}/dev/logs/2011-10-12 (100%) rename {doc => docs}/dev/logs/2011-10-13.output (100%) rename {doc => docs}/dev/logs/2011-10-14.error-output (100%) rename {doc => docs}/dev/logs/2011-10-15.prefix-output-missing (100%) rename {doc => docs}/dev/logs/2011-10-15.ugly-output-on-breaking-explorer (100%) rename {doc => docs}/dev/logs/2011-10-16.keyboardirqoutputs (100%) rename {doc => docs}/dev/logs/2011-10-18.requirement-object (100%) rename {doc => docs}/dev/logs/2011-10-18.traceback-gencode (100%) rename {doc => docs}/dev/logs/2011-11-15.startup-yannick (100%) rename {doc => docs}/dev/logs/2012-01-06.python3-in-distros (100%) rename {doc => docs}/dev/logs/2012-01-07.urls (100%) rename {doc => docs}/dev/logs/2012-01-18.urls (100%) rename {doc => docs}/dev/logs/2012-02-08.explorer-depends-on-another-type (100%) rename {doc => docs}/dev/logs/2012-02-10.object_id-and-slashes (100%) rename {doc => docs}/dev/logs/2012-02-13.dependencies (100%) rename {doc => docs}/dev/logs/2012-02-15.steven (100%) rename {doc => docs}/dev/logs/2012-02-17.keyboardirq (100%) rename {doc => docs}/dev/logs/2012-02-20.debug-jake-deps (100%) rename {doc => docs}/dev/logs/2012-02-20.error-does-not-contain-host (100%) rename {doc => docs}/dev/logs/2012-05-24.makedirs.py-python3.1 (100%) rename {doc => docs}/dev/logs/2012-05-30.ifconfig-outputs (100%) rename {doc => docs}/dev/logs/2012-05-31.csh-compatibilty (100%) rename {doc => docs}/dev/logs/2012-06-06.wikipedia (100%) rename {doc => docs}/dev/logs/2012-06-15.explorer-dep-problem (100%) rename {doc => docs}/dev/logs/2012-10-17.conflicting-types-problem (100%) rename {doc => docs}/dev/logs/README (100%) rename {doc => docs}/dev/logs/linklist (100%) rename {doc => docs}/dev/logs/times (100%) rename {doc => docs}/dev/releasechecklist (100%) rename {doc => docs}/dev/show_all_exported_variables (100%) rename {doc => docs}/dev/sync-to-testhost (100%) rename {doc => docs}/dev/todo/3.0 (100%) rename {doc => docs}/dev/todo/TAKEME (100%) rename {doc => docs}/dev/todo/niconext (100%) rename {doc => docs}/dev/todo/performance-ideas (100%) rename {doc => docs}/dev/todo/steven (100%) rename {doc => docs}/dev/todo/tests (100%) rename {doc => docs}/gfx/cdist-automated-inverted.png (100%) rename {doc => docs}/gfx/cdist-automated.png (100%) rename {doc => docs}/gfx/cdist-automated.text (100%) rename {doc => docs}/gfx/cdist-logo-cm.png (100%) rename {doc => docs}/gfx/cdist-logo-inverted.png (100%) rename {doc => docs}/gfx/cdist-logo.png (100%) rename {doc => docs}/gfx/cdist-logo.text (100%) rename {doc => docs}/gfx/font-used (100%) rename {doc => docs}/man/cdist-reference.text.sh (100%) rename {doc => docs}/man/man1/cdist.text (100%) rename {doc => docs}/man/man7/cdist-best-practice.text (100%) rename {doc => docs}/man/man7/cdist-bootstrap.text (100%) rename {doc => docs}/man/man7/cdist-explorer.text (100%) rename {doc => docs}/man/man7/cdist-hacker.text (100%) rename {doc => docs}/man/man7/cdist-manifest.text (100%) rename {doc => docs}/man/man7/cdist-quickstart.text (100%) rename {doc => docs}/man/man7/cdist-remote-exec-copy.text (100%) rename {doc => docs}/man/man7/cdist-stages.text (100%) rename {doc => docs}/man/man7/cdist-tutorial.text (100%) rename {doc => docs}/man/man7/cdist-type.text (100%) rename {doc => docs}/speeches/.gitignore (100%) rename {doc => docs}/speeches/2011-03-18_hacker_erwachen.tex (100%) rename {doc => docs}/speeches/2011-04-27_sans.tex (100%) rename {doc => docs}/speeches/2011-05-20_cosin.tex (100%) rename {doc => docs}/video/cdist-installation-in-less-than-60-seconds.mp4 (100%) diff --git a/.gitignore b/.gitignore index 69a8ea98..fe52a82f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,14 +2,14 @@ .*.swp # Ignore generated manpages -doc/man/.marker -doc/man/man1/*.1 -doc/man/man7/*.7 -doc/man/man*/*.html -doc/man/man*/*.xml -doc/man/man7/cdist-type__*.text -doc/man/man7/cdist-reference.text -doc/man/man*/docbook-xsl.css +docs/man/.marker +docs/man/man1/*.1 +docs/man/man7/*.7 +docs/man/man*/*.html +docs/man/man*/*.xml +docs/man/man7/cdist-type__*.text +docs/man/man7/cdist-reference.text +docs/man/man*/docbook-xsl.css # Ignore cdist cache for version control /cache/ diff --git a/build b/build index bec7f5a9..d3f8ca3a 100755 --- a/build +++ b/build @@ -39,10 +39,10 @@ WEBMAN=$WEBBASE/man/$version WEBPAGE=${WEBBASE}.mdwn # Documentation -MANDIR=doc/man +MANDIR=docs/man MAN1DSTDIR=${MANDIR}/man1 MAN7DSTDIR=${MANDIR}/man7 -SPEECHESDIR=doc/speeches +SPEECHESDIR=docs/speeches case "$1" in man) @@ -75,7 +75,7 @@ case "$1" in mantype) for mansrc in conf/type/*/man.text; do - dst="$(echo $mansrc | sed -e 's;conf/;cdist-;' -e 's;/;;' -e 's;/man;;' -e 's;^;doc/man/man7/;')" + dst="$(echo $mansrc | sed -e 's;conf/;cdist-;' -e 's;/;;' -e 's;/man;;' -e 's;^;docs/man/man7/;')" ln -sf "../../../$mansrc" "$dst" done ;; @@ -85,7 +85,7 @@ case "$1" in ;; release) - ./doc/dev/releasechecklist + ./docs/dev/releasechecklist ;; speeches) diff --git a/doc/changelog b/docs/changelog similarity index 100% rename from doc/changelog rename to docs/changelog diff --git a/doc/changelog-2.1 b/docs/changelog-2.1 similarity index 100% rename from doc/changelog-2.1 rename to docs/changelog-2.1 diff --git a/doc/dev/benchmark-oprofile b/docs/dev/benchmark-oprofile similarity index 100% rename from doc/dev/benchmark-oprofile rename to docs/dev/benchmark-oprofile diff --git a/doc/dev/benchmark-parallel-deploy b/docs/dev/benchmark-parallel-deploy similarity index 100% rename from doc/dev/benchmark-parallel-deploy rename to docs/dev/benchmark-parallel-deploy diff --git a/doc/dev/debug/bach25-1.6.2-373-g6fd31f8 b/docs/dev/debug/bach25-1.6.2-373-g6fd31f8 similarity index 100% rename from doc/dev/debug/bach25-1.6.2-373-g6fd31f8 rename to docs/dev/debug/bach25-1.6.2-373-g6fd31f8 diff --git a/doc/dev/debug/ikq04-1.6.2-373-g6fd31f8-dbg b/docs/dev/debug/ikq04-1.6.2-373-g6fd31f8-dbg similarity index 100% rename from doc/dev/debug/ikq04-1.6.2-373-g6fd31f8-dbg rename to docs/dev/debug/ikq04-1.6.2-373-g6fd31f8-dbg diff --git a/doc/dev/fancy-ideas b/docs/dev/fancy-ideas similarity index 100% rename from doc/dev/fancy-ideas rename to docs/dev/fancy-ideas diff --git a/doc/dev/git-post-commit-hook b/docs/dev/git-post-commit-hook similarity index 100% rename from doc/dev/git-post-commit-hook rename to docs/dev/git-post-commit-hook diff --git a/doc/dev/header b/docs/dev/header similarity index 100% rename from doc/dev/header rename to docs/dev/header diff --git a/doc/dev/lastchanges b/docs/dev/lastchanges similarity index 100% rename from doc/dev/lastchanges rename to docs/dev/lastchanges diff --git a/doc/dev/logs/2010-09-25 b/docs/dev/logs/2010-09-25 similarity index 100% rename from doc/dev/logs/2010-09-25 rename to docs/dev/logs/2010-09-25 diff --git a/doc/dev/logs/2010-11-02.steven b/docs/dev/logs/2010-11-02.steven similarity index 100% rename from doc/dev/logs/2010-11-02.steven rename to docs/dev/logs/2010-11-02.steven diff --git a/doc/dev/logs/2010-11-09 b/docs/dev/logs/2010-11-09 similarity index 100% rename from doc/dev/logs/2010-11-09 rename to docs/dev/logs/2010-11-09 diff --git a/doc/dev/logs/2010-11-21 b/docs/dev/logs/2010-11-21 similarity index 100% rename from doc/dev/logs/2010-11-21 rename to docs/dev/logs/2010-11-21 diff --git a/doc/dev/logs/2010-11-29 b/docs/dev/logs/2010-11-29 similarity index 100% rename from doc/dev/logs/2010-11-29 rename to docs/dev/logs/2010-11-29 diff --git a/doc/dev/logs/2010-12-01 b/docs/dev/logs/2010-12-01 similarity index 100% rename from doc/dev/logs/2010-12-01 rename to docs/dev/logs/2010-12-01 diff --git a/doc/dev/logs/2010-12-01.handwritten/SCAN0000.PDF b/docs/dev/logs/2010-12-01.handwritten/SCAN0000.PDF similarity index 100% rename from doc/dev/logs/2010-12-01.handwritten/SCAN0000.PDF rename to docs/dev/logs/2010-12-01.handwritten/SCAN0000.PDF diff --git a/doc/dev/logs/2010-12-01.handwritten/SCAN0001.PDF b/docs/dev/logs/2010-12-01.handwritten/SCAN0001.PDF similarity index 100% rename from doc/dev/logs/2010-12-01.handwritten/SCAN0001.PDF rename to docs/dev/logs/2010-12-01.handwritten/SCAN0001.PDF diff --git a/doc/dev/logs/2010-12-01.handwritten/SCAN0002.PDF b/docs/dev/logs/2010-12-01.handwritten/SCAN0002.PDF similarity index 100% rename from doc/dev/logs/2010-12-01.handwritten/SCAN0002.PDF rename to docs/dev/logs/2010-12-01.handwritten/SCAN0002.PDF diff --git a/doc/dev/logs/2010-12-01.handwritten/SCAN0003.PDF b/docs/dev/logs/2010-12-01.handwritten/SCAN0003.PDF similarity index 100% rename from doc/dev/logs/2010-12-01.handwritten/SCAN0003.PDF rename to docs/dev/logs/2010-12-01.handwritten/SCAN0003.PDF diff --git a/doc/dev/logs/2010-12-01.handwritten/SCAN0004.PDF b/docs/dev/logs/2010-12-01.handwritten/SCAN0004.PDF similarity index 100% rename from doc/dev/logs/2010-12-01.handwritten/SCAN0004.PDF rename to docs/dev/logs/2010-12-01.handwritten/SCAN0004.PDF diff --git a/doc/dev/logs/2011-01-17 b/docs/dev/logs/2011-01-17 similarity index 100% rename from doc/dev/logs/2011-01-17 rename to docs/dev/logs/2011-01-17 diff --git a/doc/dev/logs/2011-01-18.type-creation b/docs/dev/logs/2011-01-18.type-creation similarity index 100% rename from doc/dev/logs/2011-01-18.type-creation rename to docs/dev/logs/2011-01-18.type-creation diff --git a/doc/dev/logs/2011-01-24 b/docs/dev/logs/2011-01-24 similarity index 100% rename from doc/dev/logs/2011-01-24 rename to docs/dev/logs/2011-01-24 diff --git a/doc/dev/logs/2011-02-03 b/docs/dev/logs/2011-02-03 similarity index 100% rename from doc/dev/logs/2011-02-03 rename to docs/dev/logs/2011-02-03 diff --git a/doc/dev/logs/2011-02-04.steven b/docs/dev/logs/2011-02-04.steven similarity index 100% rename from doc/dev/logs/2011-02-04.steven rename to docs/dev/logs/2011-02-04.steven diff --git a/doc/dev/logs/2011-02-22 b/docs/dev/logs/2011-02-22 similarity index 100% rename from doc/dev/logs/2011-02-22 rename to docs/dev/logs/2011-02-22 diff --git a/doc/dev/logs/2011-02-24 b/docs/dev/logs/2011-02-24 similarity index 100% rename from doc/dev/logs/2011-02-24 rename to docs/dev/logs/2011-02-24 diff --git a/doc/dev/logs/2011-02-27 b/docs/dev/logs/2011-02-27 similarity index 100% rename from doc/dev/logs/2011-02-27 rename to docs/dev/logs/2011-02-27 diff --git a/doc/dev/logs/2011-03-03 b/docs/dev/logs/2011-03-03 similarity index 100% rename from doc/dev/logs/2011-03-03 rename to docs/dev/logs/2011-03-03 diff --git a/doc/dev/logs/2011-03-07 b/docs/dev/logs/2011-03-07 similarity index 100% rename from doc/dev/logs/2011-03-07 rename to docs/dev/logs/2011-03-07 diff --git a/doc/dev/logs/2011-03-09 b/docs/dev/logs/2011-03-09 similarity index 100% rename from doc/dev/logs/2011-03-09 rename to docs/dev/logs/2011-03-09 diff --git a/doc/dev/logs/2011-03-15 b/docs/dev/logs/2011-03-15 similarity index 100% rename from doc/dev/logs/2011-03-15 rename to docs/dev/logs/2011-03-15 diff --git a/doc/dev/logs/2011-03-15.file_directory_link b/docs/dev/logs/2011-03-15.file_directory_link similarity index 100% rename from doc/dev/logs/2011-03-15.file_directory_link rename to docs/dev/logs/2011-03-15.file_directory_link diff --git a/doc/dev/logs/2011-03-23.autorequire b/docs/dev/logs/2011-03-23.autorequire similarity index 100% rename from doc/dev/logs/2011-03-23.autorequire rename to docs/dev/logs/2011-03-23.autorequire diff --git a/doc/dev/logs/2011-03-23.manifest_use_explorer b/docs/dev/logs/2011-03-23.manifest_use_explorer similarity index 100% rename from doc/dev/logs/2011-03-23.manifest_use_explorer rename to docs/dev/logs/2011-03-23.manifest_use_explorer diff --git a/doc/dev/logs/2011-03-27.pgrep b/docs/dev/logs/2011-03-27.pgrep similarity index 100% rename from doc/dev/logs/2011-03-27.pgrep rename to docs/dev/logs/2011-03-27.pgrep diff --git a/doc/dev/logs/2011-03-28.execution-order b/docs/dev/logs/2011-03-28.execution-order similarity index 100% rename from doc/dev/logs/2011-03-28.execution-order rename to docs/dev/logs/2011-03-28.execution-order diff --git a/doc/dev/logs/2011-04-02.yum b/docs/dev/logs/2011-04-02.yum similarity index 100% rename from doc/dev/logs/2011-04-02.yum rename to docs/dev/logs/2011-04-02.yum diff --git a/doc/dev/logs/2011-04-04.openbsd b/docs/dev/logs/2011-04-04.openbsd similarity index 100% rename from doc/dev/logs/2011-04-04.openbsd rename to docs/dev/logs/2011-04-04.openbsd diff --git a/doc/dev/logs/2011-04-19 b/docs/dev/logs/2011-04-19 similarity index 100% rename from doc/dev/logs/2011-04-19 rename to docs/dev/logs/2011-04-19 diff --git a/doc/dev/logs/2011-04-20.slashdot-articles b/docs/dev/logs/2011-04-20.slashdot-articles similarity index 100% rename from doc/dev/logs/2011-04-20.slashdot-articles rename to docs/dev/logs/2011-04-20.slashdot-articles diff --git a/doc/dev/logs/2011-04-21.benchmark-eth b/docs/dev/logs/2011-04-21.benchmark-eth similarity index 100% rename from doc/dev/logs/2011-04-21.benchmark-eth rename to docs/dev/logs/2011-04-21.benchmark-eth diff --git a/doc/dev/logs/2011-04-21.benchmark-from-home.with-stdout b/docs/dev/logs/2011-04-21.benchmark-from-home.with-stdout similarity index 100% rename from doc/dev/logs/2011-04-21.benchmark-from-home.with-stdout rename to docs/dev/logs/2011-04-21.benchmark-from-home.with-stdout diff --git a/doc/dev/logs/2011-04-27 b/docs/dev/logs/2011-04-27 similarity index 100% rename from doc/dev/logs/2011-04-27 rename to docs/dev/logs/2011-04-27 diff --git a/doc/dev/logs/2011-04-27.benchmark b/docs/dev/logs/2011-04-27.benchmark similarity index 100% rename from doc/dev/logs/2011-04-27.benchmark rename to docs/dev/logs/2011-04-27.benchmark diff --git a/doc/dev/logs/2011-04-27.benchmark.dash b/docs/dev/logs/2011-04-27.benchmark.dash similarity index 100% rename from doc/dev/logs/2011-04-27.benchmark.dash rename to docs/dev/logs/2011-04-27.benchmark.dash diff --git a/doc/dev/logs/2011-04-27.debug-timing b/docs/dev/logs/2011-04-27.debug-timing similarity index 100% rename from doc/dev/logs/2011-04-27.debug-timing rename to docs/dev/logs/2011-04-27.debug-timing diff --git a/doc/dev/logs/2011-05-09 b/docs/dev/logs/2011-05-09 similarity index 100% rename from doc/dev/logs/2011-05-09 rename to docs/dev/logs/2011-05-09 diff --git a/doc/dev/logs/2011-05-10 b/docs/dev/logs/2011-05-10 similarity index 100% rename from doc/dev/logs/2011-05-10 rename to docs/dev/logs/2011-05-10 diff --git a/doc/dev/logs/2011-05-10.benchmark b/docs/dev/logs/2011-05-10.benchmark similarity index 100% rename from doc/dev/logs/2011-05-10.benchmark rename to docs/dev/logs/2011-05-10.benchmark diff --git a/doc/dev/logs/2011-05-12 b/docs/dev/logs/2011-05-12 similarity index 100% rename from doc/dev/logs/2011-05-12 rename to docs/dev/logs/2011-05-12 diff --git a/doc/dev/logs/2011-06-13.installation-via-cdist b/docs/dev/logs/2011-06-13.installation-via-cdist similarity index 100% rename from doc/dev/logs/2011-06-13.installation-via-cdist rename to docs/dev/logs/2011-06-13.installation-via-cdist diff --git a/doc/dev/logs/2011-06-14.library_for_user b/docs/dev/logs/2011-06-14.library_for_user similarity index 100% rename from doc/dev/logs/2011-06-14.library_for_user rename to docs/dev/logs/2011-06-14.library_for_user diff --git a/doc/dev/logs/2011-06-24.cinst_preos b/docs/dev/logs/2011-06-24.cinst_preos similarity index 100% rename from doc/dev/logs/2011-06-24.cinst_preos rename to docs/dev/logs/2011-06-24.cinst_preos diff --git a/doc/dev/logs/2011-06-25.trigger-graphic b/docs/dev/logs/2011-06-25.trigger-graphic similarity index 100% rename from doc/dev/logs/2011-06-25.trigger-graphic rename to docs/dev/logs/2011-06-25.trigger-graphic diff --git a/doc/dev/logs/2011-07-01.type-gencode b/docs/dev/logs/2011-07-01.type-gencode similarity index 100% rename from doc/dev/logs/2011-07-01.type-gencode rename to docs/dev/logs/2011-07-01.type-gencode diff --git a/doc/dev/logs/2011-07-01.type-global-explorers b/docs/dev/logs/2011-07-01.type-global-explorers similarity index 100% rename from doc/dev/logs/2011-07-01.type-global-explorers rename to docs/dev/logs/2011-07-01.type-global-explorers diff --git a/doc/dev/logs/2011-09-08.obsolete_debugging b/docs/dev/logs/2011-09-08.obsolete_debugging similarity index 100% rename from doc/dev/logs/2011-09-08.obsolete_debugging rename to docs/dev/logs/2011-09-08.obsolete_debugging diff --git a/doc/dev/logs/2011-09-12 b/docs/dev/logs/2011-09-12 similarity index 100% rename from doc/dev/logs/2011-09-12 rename to docs/dev/logs/2011-09-12 diff --git a/doc/dev/logs/2011-09-12.benchmark-home b/docs/dev/logs/2011-09-12.benchmark-home similarity index 100% rename from doc/dev/logs/2011-09-12.benchmark-home rename to docs/dev/logs/2011-09-12.benchmark-home diff --git a/doc/dev/logs/2011-09-13 b/docs/dev/logs/2011-09-13 similarity index 100% rename from doc/dev/logs/2011-09-13 rename to docs/dev/logs/2011-09-13 diff --git a/doc/dev/logs/2011-09-16.benchmark-r815-no-control-socket b/docs/dev/logs/2011-09-16.benchmark-r815-no-control-socket similarity index 100% rename from doc/dev/logs/2011-09-16.benchmark-r815-no-control-socket rename to docs/dev/logs/2011-09-16.benchmark-r815-no-control-socket diff --git a/doc/dev/logs/2011-09-16.benchmark-r815-no-control-socket.dmidecode b/docs/dev/logs/2011-09-16.benchmark-r815-no-control-socket.dmidecode similarity index 100% rename from doc/dev/logs/2011-09-16.benchmark-r815-no-control-socket.dmidecode rename to docs/dev/logs/2011-09-16.benchmark-r815-no-control-socket.dmidecode diff --git a/doc/dev/logs/2011-10-04 b/docs/dev/logs/2011-10-04 similarity index 100% rename from doc/dev/logs/2011-10-04 rename to docs/dev/logs/2011-10-04 diff --git a/doc/dev/logs/2011-10-05 b/docs/dev/logs/2011-10-05 similarity index 100% rename from doc/dev/logs/2011-10-05 rename to docs/dev/logs/2011-10-05 diff --git a/doc/dev/logs/2011-10-06 b/docs/dev/logs/2011-10-06 similarity index 100% rename from doc/dev/logs/2011-10-06 rename to docs/dev/logs/2011-10-06 diff --git a/doc/dev/logs/2011-10-06.ssh_scp_sudo_chroot b/docs/dev/logs/2011-10-06.ssh_scp_sudo_chroot similarity index 100% rename from doc/dev/logs/2011-10-06.ssh_scp_sudo_chroot rename to docs/dev/logs/2011-10-06.ssh_scp_sudo_chroot diff --git a/doc/dev/logs/2011-10-11.emulator-output b/docs/dev/logs/2011-10-11.emulator-output similarity index 100% rename from doc/dev/logs/2011-10-11.emulator-output rename to docs/dev/logs/2011-10-11.emulator-output diff --git a/doc/dev/logs/2011-10-12 b/docs/dev/logs/2011-10-12 similarity index 100% rename from doc/dev/logs/2011-10-12 rename to docs/dev/logs/2011-10-12 diff --git a/doc/dev/logs/2011-10-13.output b/docs/dev/logs/2011-10-13.output similarity index 100% rename from doc/dev/logs/2011-10-13.output rename to docs/dev/logs/2011-10-13.output diff --git a/doc/dev/logs/2011-10-14.error-output b/docs/dev/logs/2011-10-14.error-output similarity index 100% rename from doc/dev/logs/2011-10-14.error-output rename to docs/dev/logs/2011-10-14.error-output diff --git a/doc/dev/logs/2011-10-15.prefix-output-missing b/docs/dev/logs/2011-10-15.prefix-output-missing similarity index 100% rename from doc/dev/logs/2011-10-15.prefix-output-missing rename to docs/dev/logs/2011-10-15.prefix-output-missing diff --git a/doc/dev/logs/2011-10-15.ugly-output-on-breaking-explorer b/docs/dev/logs/2011-10-15.ugly-output-on-breaking-explorer similarity index 100% rename from doc/dev/logs/2011-10-15.ugly-output-on-breaking-explorer rename to docs/dev/logs/2011-10-15.ugly-output-on-breaking-explorer diff --git a/doc/dev/logs/2011-10-16.keyboardirqoutputs b/docs/dev/logs/2011-10-16.keyboardirqoutputs similarity index 100% rename from doc/dev/logs/2011-10-16.keyboardirqoutputs rename to docs/dev/logs/2011-10-16.keyboardirqoutputs diff --git a/doc/dev/logs/2011-10-18.requirement-object b/docs/dev/logs/2011-10-18.requirement-object similarity index 100% rename from doc/dev/logs/2011-10-18.requirement-object rename to docs/dev/logs/2011-10-18.requirement-object diff --git a/doc/dev/logs/2011-10-18.traceback-gencode b/docs/dev/logs/2011-10-18.traceback-gencode similarity index 100% rename from doc/dev/logs/2011-10-18.traceback-gencode rename to docs/dev/logs/2011-10-18.traceback-gencode diff --git a/doc/dev/logs/2011-11-15.startup-yannick b/docs/dev/logs/2011-11-15.startup-yannick similarity index 100% rename from doc/dev/logs/2011-11-15.startup-yannick rename to docs/dev/logs/2011-11-15.startup-yannick diff --git a/doc/dev/logs/2012-01-06.python3-in-distros b/docs/dev/logs/2012-01-06.python3-in-distros similarity index 100% rename from doc/dev/logs/2012-01-06.python3-in-distros rename to docs/dev/logs/2012-01-06.python3-in-distros diff --git a/doc/dev/logs/2012-01-07.urls b/docs/dev/logs/2012-01-07.urls similarity index 100% rename from doc/dev/logs/2012-01-07.urls rename to docs/dev/logs/2012-01-07.urls diff --git a/doc/dev/logs/2012-01-18.urls b/docs/dev/logs/2012-01-18.urls similarity index 100% rename from doc/dev/logs/2012-01-18.urls rename to docs/dev/logs/2012-01-18.urls diff --git a/doc/dev/logs/2012-02-08.explorer-depends-on-another-type b/docs/dev/logs/2012-02-08.explorer-depends-on-another-type similarity index 100% rename from doc/dev/logs/2012-02-08.explorer-depends-on-another-type rename to docs/dev/logs/2012-02-08.explorer-depends-on-another-type diff --git a/doc/dev/logs/2012-02-10.object_id-and-slashes b/docs/dev/logs/2012-02-10.object_id-and-slashes similarity index 100% rename from doc/dev/logs/2012-02-10.object_id-and-slashes rename to docs/dev/logs/2012-02-10.object_id-and-slashes diff --git a/doc/dev/logs/2012-02-13.dependencies b/docs/dev/logs/2012-02-13.dependencies similarity index 100% rename from doc/dev/logs/2012-02-13.dependencies rename to docs/dev/logs/2012-02-13.dependencies diff --git a/doc/dev/logs/2012-02-15.steven b/docs/dev/logs/2012-02-15.steven similarity index 100% rename from doc/dev/logs/2012-02-15.steven rename to docs/dev/logs/2012-02-15.steven diff --git a/doc/dev/logs/2012-02-17.keyboardirq b/docs/dev/logs/2012-02-17.keyboardirq similarity index 100% rename from doc/dev/logs/2012-02-17.keyboardirq rename to docs/dev/logs/2012-02-17.keyboardirq diff --git a/doc/dev/logs/2012-02-20.debug-jake-deps b/docs/dev/logs/2012-02-20.debug-jake-deps similarity index 100% rename from doc/dev/logs/2012-02-20.debug-jake-deps rename to docs/dev/logs/2012-02-20.debug-jake-deps diff --git a/doc/dev/logs/2012-02-20.error-does-not-contain-host b/docs/dev/logs/2012-02-20.error-does-not-contain-host similarity index 100% rename from doc/dev/logs/2012-02-20.error-does-not-contain-host rename to docs/dev/logs/2012-02-20.error-does-not-contain-host diff --git a/doc/dev/logs/2012-05-24.makedirs.py-python3.1 b/docs/dev/logs/2012-05-24.makedirs.py-python3.1 similarity index 100% rename from doc/dev/logs/2012-05-24.makedirs.py-python3.1 rename to docs/dev/logs/2012-05-24.makedirs.py-python3.1 diff --git a/doc/dev/logs/2012-05-30.ifconfig-outputs b/docs/dev/logs/2012-05-30.ifconfig-outputs similarity index 100% rename from doc/dev/logs/2012-05-30.ifconfig-outputs rename to docs/dev/logs/2012-05-30.ifconfig-outputs diff --git a/doc/dev/logs/2012-05-31.csh-compatibilty b/docs/dev/logs/2012-05-31.csh-compatibilty similarity index 100% rename from doc/dev/logs/2012-05-31.csh-compatibilty rename to docs/dev/logs/2012-05-31.csh-compatibilty diff --git a/doc/dev/logs/2012-06-06.wikipedia b/docs/dev/logs/2012-06-06.wikipedia similarity index 100% rename from doc/dev/logs/2012-06-06.wikipedia rename to docs/dev/logs/2012-06-06.wikipedia diff --git a/doc/dev/logs/2012-06-15.explorer-dep-problem b/docs/dev/logs/2012-06-15.explorer-dep-problem similarity index 100% rename from doc/dev/logs/2012-06-15.explorer-dep-problem rename to docs/dev/logs/2012-06-15.explorer-dep-problem diff --git a/doc/dev/logs/2012-10-17.conflicting-types-problem b/docs/dev/logs/2012-10-17.conflicting-types-problem similarity index 100% rename from doc/dev/logs/2012-10-17.conflicting-types-problem rename to docs/dev/logs/2012-10-17.conflicting-types-problem diff --git a/doc/dev/logs/README b/docs/dev/logs/README similarity index 100% rename from doc/dev/logs/README rename to docs/dev/logs/README diff --git a/doc/dev/logs/linklist b/docs/dev/logs/linklist similarity index 100% rename from doc/dev/logs/linklist rename to docs/dev/logs/linklist diff --git a/doc/dev/logs/times b/docs/dev/logs/times similarity index 100% rename from doc/dev/logs/times rename to docs/dev/logs/times diff --git a/doc/dev/releasechecklist b/docs/dev/releasechecklist similarity index 100% rename from doc/dev/releasechecklist rename to docs/dev/releasechecklist diff --git a/doc/dev/show_all_exported_variables b/docs/dev/show_all_exported_variables similarity index 100% rename from doc/dev/show_all_exported_variables rename to docs/dev/show_all_exported_variables diff --git a/doc/dev/sync-to-testhost b/docs/dev/sync-to-testhost similarity index 100% rename from doc/dev/sync-to-testhost rename to docs/dev/sync-to-testhost diff --git a/doc/dev/todo/3.0 b/docs/dev/todo/3.0 similarity index 100% rename from doc/dev/todo/3.0 rename to docs/dev/todo/3.0 diff --git a/doc/dev/todo/TAKEME b/docs/dev/todo/TAKEME similarity index 100% rename from doc/dev/todo/TAKEME rename to docs/dev/todo/TAKEME diff --git a/doc/dev/todo/niconext b/docs/dev/todo/niconext similarity index 100% rename from doc/dev/todo/niconext rename to docs/dev/todo/niconext diff --git a/doc/dev/todo/performance-ideas b/docs/dev/todo/performance-ideas similarity index 100% rename from doc/dev/todo/performance-ideas rename to docs/dev/todo/performance-ideas diff --git a/doc/dev/todo/steven b/docs/dev/todo/steven similarity index 100% rename from doc/dev/todo/steven rename to docs/dev/todo/steven diff --git a/doc/dev/todo/tests b/docs/dev/todo/tests similarity index 100% rename from doc/dev/todo/tests rename to docs/dev/todo/tests diff --git a/doc/gfx/cdist-automated-inverted.png b/docs/gfx/cdist-automated-inverted.png similarity index 100% rename from doc/gfx/cdist-automated-inverted.png rename to docs/gfx/cdist-automated-inverted.png diff --git a/doc/gfx/cdist-automated.png b/docs/gfx/cdist-automated.png similarity index 100% rename from doc/gfx/cdist-automated.png rename to docs/gfx/cdist-automated.png diff --git a/doc/gfx/cdist-automated.text b/docs/gfx/cdist-automated.text similarity index 100% rename from doc/gfx/cdist-automated.text rename to docs/gfx/cdist-automated.text diff --git a/doc/gfx/cdist-logo-cm.png b/docs/gfx/cdist-logo-cm.png similarity index 100% rename from doc/gfx/cdist-logo-cm.png rename to docs/gfx/cdist-logo-cm.png diff --git a/doc/gfx/cdist-logo-inverted.png b/docs/gfx/cdist-logo-inverted.png similarity index 100% rename from doc/gfx/cdist-logo-inverted.png rename to docs/gfx/cdist-logo-inverted.png diff --git a/doc/gfx/cdist-logo.png b/docs/gfx/cdist-logo.png similarity index 100% rename from doc/gfx/cdist-logo.png rename to docs/gfx/cdist-logo.png diff --git a/doc/gfx/cdist-logo.text b/docs/gfx/cdist-logo.text similarity index 100% rename from doc/gfx/cdist-logo.text rename to docs/gfx/cdist-logo.text diff --git a/doc/gfx/font-used b/docs/gfx/font-used similarity index 100% rename from doc/gfx/font-used rename to docs/gfx/font-used diff --git a/doc/man/cdist-reference.text.sh b/docs/man/cdist-reference.text.sh similarity index 100% rename from doc/man/cdist-reference.text.sh rename to docs/man/cdist-reference.text.sh diff --git a/doc/man/man1/cdist.text b/docs/man/man1/cdist.text similarity index 100% rename from doc/man/man1/cdist.text rename to docs/man/man1/cdist.text diff --git a/doc/man/man7/cdist-best-practice.text b/docs/man/man7/cdist-best-practice.text similarity index 100% rename from doc/man/man7/cdist-best-practice.text rename to docs/man/man7/cdist-best-practice.text diff --git a/doc/man/man7/cdist-bootstrap.text b/docs/man/man7/cdist-bootstrap.text similarity index 100% rename from doc/man/man7/cdist-bootstrap.text rename to docs/man/man7/cdist-bootstrap.text diff --git a/doc/man/man7/cdist-explorer.text b/docs/man/man7/cdist-explorer.text similarity index 100% rename from doc/man/man7/cdist-explorer.text rename to docs/man/man7/cdist-explorer.text diff --git a/doc/man/man7/cdist-hacker.text b/docs/man/man7/cdist-hacker.text similarity index 100% rename from doc/man/man7/cdist-hacker.text rename to docs/man/man7/cdist-hacker.text diff --git a/doc/man/man7/cdist-manifest.text b/docs/man/man7/cdist-manifest.text similarity index 100% rename from doc/man/man7/cdist-manifest.text rename to docs/man/man7/cdist-manifest.text diff --git a/doc/man/man7/cdist-quickstart.text b/docs/man/man7/cdist-quickstart.text similarity index 100% rename from doc/man/man7/cdist-quickstart.text rename to docs/man/man7/cdist-quickstart.text diff --git a/doc/man/man7/cdist-remote-exec-copy.text b/docs/man/man7/cdist-remote-exec-copy.text similarity index 100% rename from doc/man/man7/cdist-remote-exec-copy.text rename to docs/man/man7/cdist-remote-exec-copy.text diff --git a/doc/man/man7/cdist-stages.text b/docs/man/man7/cdist-stages.text similarity index 100% rename from doc/man/man7/cdist-stages.text rename to docs/man/man7/cdist-stages.text diff --git a/doc/man/man7/cdist-tutorial.text b/docs/man/man7/cdist-tutorial.text similarity index 100% rename from doc/man/man7/cdist-tutorial.text rename to docs/man/man7/cdist-tutorial.text diff --git a/doc/man/man7/cdist-type.text b/docs/man/man7/cdist-type.text similarity index 100% rename from doc/man/man7/cdist-type.text rename to docs/man/man7/cdist-type.text diff --git a/doc/speeches/.gitignore b/docs/speeches/.gitignore similarity index 100% rename from doc/speeches/.gitignore rename to docs/speeches/.gitignore diff --git a/doc/speeches/2011-03-18_hacker_erwachen.tex b/docs/speeches/2011-03-18_hacker_erwachen.tex similarity index 100% rename from doc/speeches/2011-03-18_hacker_erwachen.tex rename to docs/speeches/2011-03-18_hacker_erwachen.tex diff --git a/doc/speeches/2011-04-27_sans.tex b/docs/speeches/2011-04-27_sans.tex similarity index 100% rename from doc/speeches/2011-04-27_sans.tex rename to docs/speeches/2011-04-27_sans.tex diff --git a/doc/speeches/2011-05-20_cosin.tex b/docs/speeches/2011-05-20_cosin.tex similarity index 100% rename from doc/speeches/2011-05-20_cosin.tex rename to docs/speeches/2011-05-20_cosin.tex diff --git a/doc/video/cdist-installation-in-less-than-60-seconds.mp4 b/docs/video/cdist-installation-in-less-than-60-seconds.mp4 similarity index 100% rename from doc/video/cdist-installation-in-less-than-60-seconds.mp4 rename to docs/video/cdist-installation-in-less-than-60-seconds.mp4 From c9f728e073975ce395ef17164a3e175738fdf451 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 25 Oct 2012 17:21:58 +0200 Subject: [PATCH 011/104] lib/cdist => cdist (pypi) Signed-off-by: Nico Schottelius --- {lib/cdist => cdist}/__init__.py | 0 {lib/cdist => cdist}/banner.py | 0 {lib/cdist => cdist}/config.py | 0 {lib/cdist => cdist}/config_install.py | 0 {lib/cdist => cdist}/context.py | 0 {lib/cdist => cdist}/core/__init__.py | 0 {lib/cdist => cdist}/core/cdist_object.py | 0 {lib/cdist => cdist}/core/cdist_type.py | 0 {lib/cdist => cdist}/core/code.py | 0 {lib/cdist => cdist}/core/explorer.py | 0 {lib/cdist => cdist}/core/manifest.py | 0 {lib/cdist => cdist}/emulator.py | 0 {lib/cdist => cdist}/exec/__init__.py | 0 {lib/cdist => cdist}/exec/local.py | 0 {lib/cdist => cdist}/exec/remote.py | 0 {lib/cdist => cdist}/install.py | 0 {lib/cdist => cdist}/resolver.py | 0 {lib/cdist => cdist}/test/__init__.py | 0 {lib/cdist => cdist}/test/__main__.py | 0 {lib/cdist => cdist}/test/autorequire/__init__.py | 0 .../cdist => cdist}/test/autorequire/fixtures/conf/explorer/.keep | 0 .../test/autorequire/fixtures/conf/manifest/circular_dependency | 0 .../test/autorequire/fixtures/conf/manifest/implicit_dependencies | 0 .../test/autorequire/fixtures/conf/type/__addifnosuchline/.keep | 0 .../test/autorequire/fixtures/conf/type/__directory/.keep | 0 .../test/autorequire/fixtures/conf/type/__nfsroot_client/manifest | 0 .../test/autorequire/fixtures/conf/type/__package/manifest | 0 .../test/autorequire/fixtures/conf/type/__package_special/.keep | 0 .../fixtures/conf/type/__root_ssh_authorized_key/manifest | 0 .../test/autorequire/fixtures/conf/type/__top/manifest | 0 .../test/autorequire/fixtures/conf/type/__user/.keep | 0 {lib/cdist => cdist}/test/banner/__init__.py | 0 {lib/cdist => cdist}/test/code/__init__.py | 0 .../test/code/fixtures/conf/type/__dump_environment/gencode-local | 0 .../code/fixtures/conf/type/__dump_environment/gencode-remote | 0 {lib/cdist => cdist}/test/emulator/__init__.py | 0 {lib/cdist => cdist}/test/emulator/fixtures/conf/explorer/.keep | 0 {lib/cdist => cdist}/test/emulator/fixtures/conf/manifest/init | 0 .../fixtures/conf/type/__arguments_boolean/parameter/boolean | 0 .../fixtures/conf/type/__arguments_optional/parameter/optional | 0 .../fixtures/conf/type/__arguments_required/parameter/required | 0 .../fixtures/conf/type/__arguments_with_dashes/parameter/required | 0 {lib/cdist => cdist}/test/emulator/fixtures/conf/type/__file | 0 .../test/emulator/fixtures/conf/type/__file_from_stdin/manifest | 0 .../fixtures/conf/type/__file_from_stdin/parameter/required | 0 .../test/emulator/fixtures/conf/type/__moon/manifest | 0 .../test/emulator/fixtures/conf/type/__moon/parameter/optional | 0 .../test/emulator/fixtures/conf/type/__moon/parameter/required | 0 .../test/emulator/fixtures/conf/type/__planet/manifest | 0 .../test/emulator/fixtures/conf/type/__planet/parameter/optional | 0 .../test/emulator/fixtures/conf/type/__saturn/manifest | 0 .../test/emulator/fixtures/conf/type/__saturn/singleton | 0 {lib/cdist => cdist}/test/exec/__init__.py | 0 {lib/cdist => cdist}/test/exec/local.py | 0 {lib/cdist => cdist}/test/exec/remote.py | 0 {lib/cdist => cdist}/test/explorer/__init__.py | 0 {lib/cdist => cdist}/test/explorer/fixtures/conf/explorer/foobar | 0 {lib/cdist => cdist}/test/explorer/fixtures/conf/explorer/global | 0 .../test/explorer/fixtures/conf/type/__test_type/explorer/world | 0 .../type/__test_type_object_parameter/explorer/test_parameter | 0 {lib/cdist => cdist}/test/manifest/__init__.py | 0 .../test/manifest/fixtures/conf/manifest/dump_environment | 0 {lib/cdist => cdist}/test/manifest/fixtures/conf/manifest/init | 0 .../test/manifest/fixtures/conf/type/__dump_environment/manifest | 0 .../cdist => cdist}/test/manifest/fixtures/conf/type/__moon/.keep | 0 .../test/manifest/fixtures/conf/type/__moon/manifest | 0 .../test/manifest/fixtures/conf/type/__moon/parameter/optional | 0 .../test/manifest/fixtures/conf/type/__moon/parameter/required | 0 .../test/manifest/fixtures/conf/type/__planet/.keep | 0 .../test/manifest/fixtures/conf/type/__planet/manifest | 0 .../test/manifest/fixtures/conf/type/__planet/parameter/optional | 0 {lib/cdist => cdist}/test/object/__init__.py | 0 {lib/cdist => cdist}/test/object/fixtures/object/__first/.keep | 0 .../test/object/fixtures/object/__first/man/.cdist/.keep | 0 {lib/cdist => cdist}/test/object/fixtures/object/__second/.keep | 0 .../test/object/fixtures/object/__second/on-the/.cdist/.keep | 0 {lib/cdist => cdist}/test/object/fixtures/object/__third/.keep | 0 .../test/object/fixtures/object/__third/moon/.cdist/.keep | 0 .../object/fixtures/object/__third/moon/.cdist/parameter/name | 0 .../object/fixtures/object/__third/moon/.cdist/parameter/planet | 0 {lib/cdist => cdist}/test/object/fixtures/type/__first/.keep | 0 {lib/cdist => cdist}/test/object/fixtures/type/__second/.keep | 0 {lib/cdist => cdist}/test/object/fixtures/type/__third/.keep | 0 {lib/cdist => cdist}/test/resolver/__init__.py | 0 {lib/cdist => cdist}/test/resolver/fixtures/object/__first/.keep | 0 .../test/resolver/fixtures/object/__first/child/.cdist/.keep | 0 .../test/resolver/fixtures/object/__first/dog/.cdist/.keep | 0 .../test/resolver/fixtures/object/__first/man/.cdist/.keep | 0 .../test/resolver/fixtures/object/__first/woman/.cdist/.keep | 0 {lib/cdist => cdist}/test/resolver/fixtures/object/__second/.keep | 0 .../test/resolver/fixtures/object/__second/on-the/.cdist/.keep | 0 .../test/resolver/fixtures/object/__second/under-the/.cdist/.keep | 0 {lib/cdist => cdist}/test/resolver/fixtures/object/__third/.keep | 0 .../test/resolver/fixtures/object/__third/moon/.cdist/.keep | 0 .../resolver/fixtures/object/__third/moon/.cdist/parameter/name | 0 .../resolver/fixtures/object/__third/moon/.cdist/parameter/planet | 0 {lib/cdist => cdist}/test/resolver/fixtures/type/__first/.keep | 0 {lib/cdist => cdist}/test/resolver/fixtures/type/__second/.keep | 0 {lib/cdist => cdist}/test/resolver/fixtures/type/__third/.keep | 0 {lib/cdist => cdist}/test/type/__init__.py | 0 {lib/cdist => cdist}/test/type/fixtures/__install/install | 0 {lib/cdist => cdist}/test/type/fixtures/__name_path/.keep | 0 {lib/cdist => cdist}/test/type/fixtures/__not_install/.keep | 0 {lib/cdist => cdist}/test/type/fixtures/__not_singleton/.keep | 0 {lib/cdist => cdist}/test/type/fixtures/__singleton/singleton | 0 .../type/fixtures/__with_boolean_parameters/parameter/boolean | 0 .../test/type/fixtures/__with_explorers/explorer/whatever | 0 .../type/fixtures/__with_optional_parameters/parameter/optional | 0 .../type/fixtures/__with_required_parameters/parameter/required | 0 .../test/type/fixtures/__without_boolean_parameters/.keep | 0 {lib/cdist => cdist}/test/type/fixtures/__without_explorers/.keep | 0 .../test/type/fixtures/__without_optional_parameters/.keep | 0 .../test/type/fixtures/__without_required_parameters/.keep | 0 {lib/cdist => cdist}/test/type/fixtures/list_types/__first/.keep | 0 {lib/cdist => cdist}/test/type/fixtures/list_types/__second/.keep | 0 {lib/cdist => cdist}/test/type/fixtures/list_types/__third/.keep | 0 {lib/cdist => cdist}/test/util/__init__.py | 0 {lib/cdist => cdist}/test/util/fsproperty.py | 0 {lib/cdist => cdist}/util/__init__.py | 0 {lib/cdist => cdist}/util/fsproperty.py | 0 120 files changed, 0 insertions(+), 0 deletions(-) rename {lib/cdist => cdist}/__init__.py (100%) rename {lib/cdist => cdist}/banner.py (100%) rename {lib/cdist => cdist}/config.py (100%) rename {lib/cdist => cdist}/config_install.py (100%) rename {lib/cdist => cdist}/context.py (100%) rename {lib/cdist => cdist}/core/__init__.py (100%) rename {lib/cdist => cdist}/core/cdist_object.py (100%) rename {lib/cdist => cdist}/core/cdist_type.py (100%) rename {lib/cdist => cdist}/core/code.py (100%) rename {lib/cdist => cdist}/core/explorer.py (100%) rename {lib/cdist => cdist}/core/manifest.py (100%) rename {lib/cdist => cdist}/emulator.py (100%) rename {lib/cdist => cdist}/exec/__init__.py (100%) rename {lib/cdist => cdist}/exec/local.py (100%) rename {lib/cdist => cdist}/exec/remote.py (100%) rename {lib/cdist => cdist}/install.py (100%) rename {lib/cdist => cdist}/resolver.py (100%) rename {lib/cdist => cdist}/test/__init__.py (100%) rename {lib/cdist => cdist}/test/__main__.py (100%) rename {lib/cdist => cdist}/test/autorequire/__init__.py (100%) rename {lib/cdist => cdist}/test/autorequire/fixtures/conf/explorer/.keep (100%) rename {lib/cdist => cdist}/test/autorequire/fixtures/conf/manifest/circular_dependency (100%) rename {lib/cdist => cdist}/test/autorequire/fixtures/conf/manifest/implicit_dependencies (100%) rename {lib/cdist => cdist}/test/autorequire/fixtures/conf/type/__addifnosuchline/.keep (100%) rename {lib/cdist => cdist}/test/autorequire/fixtures/conf/type/__directory/.keep (100%) rename {lib/cdist => cdist}/test/autorequire/fixtures/conf/type/__nfsroot_client/manifest (100%) rename {lib/cdist => cdist}/test/autorequire/fixtures/conf/type/__package/manifest (100%) rename {lib/cdist => cdist}/test/autorequire/fixtures/conf/type/__package_special/.keep (100%) rename {lib/cdist => cdist}/test/autorequire/fixtures/conf/type/__root_ssh_authorized_key/manifest (100%) rename {lib/cdist => cdist}/test/autorequire/fixtures/conf/type/__top/manifest (100%) rename {lib/cdist => cdist}/test/autorequire/fixtures/conf/type/__user/.keep (100%) rename {lib/cdist => cdist}/test/banner/__init__.py (100%) rename {lib/cdist => cdist}/test/code/__init__.py (100%) rename {lib/cdist => cdist}/test/code/fixtures/conf/type/__dump_environment/gencode-local (100%) rename {lib/cdist => cdist}/test/code/fixtures/conf/type/__dump_environment/gencode-remote (100%) rename {lib/cdist => cdist}/test/emulator/__init__.py (100%) rename {lib/cdist => cdist}/test/emulator/fixtures/conf/explorer/.keep (100%) rename {lib/cdist => cdist}/test/emulator/fixtures/conf/manifest/init (100%) rename {lib/cdist => cdist}/test/emulator/fixtures/conf/type/__arguments_boolean/parameter/boolean (100%) rename {lib/cdist => cdist}/test/emulator/fixtures/conf/type/__arguments_optional/parameter/optional (100%) rename {lib/cdist => cdist}/test/emulator/fixtures/conf/type/__arguments_required/parameter/required (100%) rename {lib/cdist => cdist}/test/emulator/fixtures/conf/type/__arguments_with_dashes/parameter/required (100%) rename {lib/cdist => cdist}/test/emulator/fixtures/conf/type/__file (100%) rename {lib/cdist => cdist}/test/emulator/fixtures/conf/type/__file_from_stdin/manifest (100%) rename {lib/cdist => cdist}/test/emulator/fixtures/conf/type/__file_from_stdin/parameter/required (100%) rename {lib/cdist => cdist}/test/emulator/fixtures/conf/type/__moon/manifest (100%) rename {lib/cdist => cdist}/test/emulator/fixtures/conf/type/__moon/parameter/optional (100%) rename {lib/cdist => cdist}/test/emulator/fixtures/conf/type/__moon/parameter/required (100%) rename {lib/cdist => cdist}/test/emulator/fixtures/conf/type/__planet/manifest (100%) rename {lib/cdist => cdist}/test/emulator/fixtures/conf/type/__planet/parameter/optional (100%) rename {lib/cdist => cdist}/test/emulator/fixtures/conf/type/__saturn/manifest (100%) rename {lib/cdist => cdist}/test/emulator/fixtures/conf/type/__saturn/singleton (100%) rename {lib/cdist => cdist}/test/exec/__init__.py (100%) rename {lib/cdist => cdist}/test/exec/local.py (100%) rename {lib/cdist => cdist}/test/exec/remote.py (100%) rename {lib/cdist => cdist}/test/explorer/__init__.py (100%) rename {lib/cdist => cdist}/test/explorer/fixtures/conf/explorer/foobar (100%) rename {lib/cdist => cdist}/test/explorer/fixtures/conf/explorer/global (100%) rename {lib/cdist => cdist}/test/explorer/fixtures/conf/type/__test_type/explorer/world (100%) rename {lib/cdist => cdist}/test/explorer/fixtures/conf/type/__test_type_object_parameter/explorer/test_parameter (100%) rename {lib/cdist => cdist}/test/manifest/__init__.py (100%) rename {lib/cdist => cdist}/test/manifest/fixtures/conf/manifest/dump_environment (100%) rename {lib/cdist => cdist}/test/manifest/fixtures/conf/manifest/init (100%) rename {lib/cdist => cdist}/test/manifest/fixtures/conf/type/__dump_environment/manifest (100%) rename {lib/cdist => cdist}/test/manifest/fixtures/conf/type/__moon/.keep (100%) rename {lib/cdist => cdist}/test/manifest/fixtures/conf/type/__moon/manifest (100%) rename {lib/cdist => cdist}/test/manifest/fixtures/conf/type/__moon/parameter/optional (100%) rename {lib/cdist => cdist}/test/manifest/fixtures/conf/type/__moon/parameter/required (100%) rename {lib/cdist => cdist}/test/manifest/fixtures/conf/type/__planet/.keep (100%) rename {lib/cdist => cdist}/test/manifest/fixtures/conf/type/__planet/manifest (100%) rename {lib/cdist => cdist}/test/manifest/fixtures/conf/type/__planet/parameter/optional (100%) rename {lib/cdist => cdist}/test/object/__init__.py (100%) rename {lib/cdist => cdist}/test/object/fixtures/object/__first/.keep (100%) rename {lib/cdist => cdist}/test/object/fixtures/object/__first/man/.cdist/.keep (100%) rename {lib/cdist => cdist}/test/object/fixtures/object/__second/.keep (100%) rename {lib/cdist => cdist}/test/object/fixtures/object/__second/on-the/.cdist/.keep (100%) rename {lib/cdist => cdist}/test/object/fixtures/object/__third/.keep (100%) rename {lib/cdist => cdist}/test/object/fixtures/object/__third/moon/.cdist/.keep (100%) rename {lib/cdist => cdist}/test/object/fixtures/object/__third/moon/.cdist/parameter/name (100%) rename {lib/cdist => cdist}/test/object/fixtures/object/__third/moon/.cdist/parameter/planet (100%) rename {lib/cdist => cdist}/test/object/fixtures/type/__first/.keep (100%) rename {lib/cdist => cdist}/test/object/fixtures/type/__second/.keep (100%) rename {lib/cdist => cdist}/test/object/fixtures/type/__third/.keep (100%) rename {lib/cdist => cdist}/test/resolver/__init__.py (100%) rename {lib/cdist => cdist}/test/resolver/fixtures/object/__first/.keep (100%) rename {lib/cdist => cdist}/test/resolver/fixtures/object/__first/child/.cdist/.keep (100%) rename {lib/cdist => cdist}/test/resolver/fixtures/object/__first/dog/.cdist/.keep (100%) rename {lib/cdist => cdist}/test/resolver/fixtures/object/__first/man/.cdist/.keep (100%) rename {lib/cdist => cdist}/test/resolver/fixtures/object/__first/woman/.cdist/.keep (100%) rename {lib/cdist => cdist}/test/resolver/fixtures/object/__second/.keep (100%) rename {lib/cdist => cdist}/test/resolver/fixtures/object/__second/on-the/.cdist/.keep (100%) rename {lib/cdist => cdist}/test/resolver/fixtures/object/__second/under-the/.cdist/.keep (100%) rename {lib/cdist => cdist}/test/resolver/fixtures/object/__third/.keep (100%) rename {lib/cdist => cdist}/test/resolver/fixtures/object/__third/moon/.cdist/.keep (100%) rename {lib/cdist => cdist}/test/resolver/fixtures/object/__third/moon/.cdist/parameter/name (100%) rename {lib/cdist => cdist}/test/resolver/fixtures/object/__third/moon/.cdist/parameter/planet (100%) rename {lib/cdist => cdist}/test/resolver/fixtures/type/__first/.keep (100%) rename {lib/cdist => cdist}/test/resolver/fixtures/type/__second/.keep (100%) rename {lib/cdist => cdist}/test/resolver/fixtures/type/__third/.keep (100%) rename {lib/cdist => cdist}/test/type/__init__.py (100%) rename {lib/cdist => cdist}/test/type/fixtures/__install/install (100%) rename {lib/cdist => cdist}/test/type/fixtures/__name_path/.keep (100%) rename {lib/cdist => cdist}/test/type/fixtures/__not_install/.keep (100%) rename {lib/cdist => cdist}/test/type/fixtures/__not_singleton/.keep (100%) rename {lib/cdist => cdist}/test/type/fixtures/__singleton/singleton (100%) rename {lib/cdist => cdist}/test/type/fixtures/__with_boolean_parameters/parameter/boolean (100%) rename {lib/cdist => cdist}/test/type/fixtures/__with_explorers/explorer/whatever (100%) rename {lib/cdist => cdist}/test/type/fixtures/__with_optional_parameters/parameter/optional (100%) rename {lib/cdist => cdist}/test/type/fixtures/__with_required_parameters/parameter/required (100%) rename {lib/cdist => cdist}/test/type/fixtures/__without_boolean_parameters/.keep (100%) rename {lib/cdist => cdist}/test/type/fixtures/__without_explorers/.keep (100%) rename {lib/cdist => cdist}/test/type/fixtures/__without_optional_parameters/.keep (100%) rename {lib/cdist => cdist}/test/type/fixtures/__without_required_parameters/.keep (100%) rename {lib/cdist => cdist}/test/type/fixtures/list_types/__first/.keep (100%) rename {lib/cdist => cdist}/test/type/fixtures/list_types/__second/.keep (100%) rename {lib/cdist => cdist}/test/type/fixtures/list_types/__third/.keep (100%) rename {lib/cdist => cdist}/test/util/__init__.py (100%) rename {lib/cdist => cdist}/test/util/fsproperty.py (100%) rename {lib/cdist => cdist}/util/__init__.py (100%) rename {lib/cdist => cdist}/util/fsproperty.py (100%) diff --git a/lib/cdist/__init__.py b/cdist/__init__.py similarity index 100% rename from lib/cdist/__init__.py rename to cdist/__init__.py diff --git a/lib/cdist/banner.py b/cdist/banner.py similarity index 100% rename from lib/cdist/banner.py rename to cdist/banner.py diff --git a/lib/cdist/config.py b/cdist/config.py similarity index 100% rename from lib/cdist/config.py rename to cdist/config.py diff --git a/lib/cdist/config_install.py b/cdist/config_install.py similarity index 100% rename from lib/cdist/config_install.py rename to cdist/config_install.py diff --git a/lib/cdist/context.py b/cdist/context.py similarity index 100% rename from lib/cdist/context.py rename to cdist/context.py diff --git a/lib/cdist/core/__init__.py b/cdist/core/__init__.py similarity index 100% rename from lib/cdist/core/__init__.py rename to cdist/core/__init__.py diff --git a/lib/cdist/core/cdist_object.py b/cdist/core/cdist_object.py similarity index 100% rename from lib/cdist/core/cdist_object.py rename to cdist/core/cdist_object.py diff --git a/lib/cdist/core/cdist_type.py b/cdist/core/cdist_type.py similarity index 100% rename from lib/cdist/core/cdist_type.py rename to cdist/core/cdist_type.py diff --git a/lib/cdist/core/code.py b/cdist/core/code.py similarity index 100% rename from lib/cdist/core/code.py rename to cdist/core/code.py diff --git a/lib/cdist/core/explorer.py b/cdist/core/explorer.py similarity index 100% rename from lib/cdist/core/explorer.py rename to cdist/core/explorer.py diff --git a/lib/cdist/core/manifest.py b/cdist/core/manifest.py similarity index 100% rename from lib/cdist/core/manifest.py rename to cdist/core/manifest.py diff --git a/lib/cdist/emulator.py b/cdist/emulator.py similarity index 100% rename from lib/cdist/emulator.py rename to cdist/emulator.py diff --git a/lib/cdist/exec/__init__.py b/cdist/exec/__init__.py similarity index 100% rename from lib/cdist/exec/__init__.py rename to cdist/exec/__init__.py diff --git a/lib/cdist/exec/local.py b/cdist/exec/local.py similarity index 100% rename from lib/cdist/exec/local.py rename to cdist/exec/local.py diff --git a/lib/cdist/exec/remote.py b/cdist/exec/remote.py similarity index 100% rename from lib/cdist/exec/remote.py rename to cdist/exec/remote.py diff --git a/lib/cdist/install.py b/cdist/install.py similarity index 100% rename from lib/cdist/install.py rename to cdist/install.py diff --git a/lib/cdist/resolver.py b/cdist/resolver.py similarity index 100% rename from lib/cdist/resolver.py rename to cdist/resolver.py diff --git a/lib/cdist/test/__init__.py b/cdist/test/__init__.py similarity index 100% rename from lib/cdist/test/__init__.py rename to cdist/test/__init__.py diff --git a/lib/cdist/test/__main__.py b/cdist/test/__main__.py similarity index 100% rename from lib/cdist/test/__main__.py rename to cdist/test/__main__.py diff --git a/lib/cdist/test/autorequire/__init__.py b/cdist/test/autorequire/__init__.py similarity index 100% rename from lib/cdist/test/autorequire/__init__.py rename to cdist/test/autorequire/__init__.py diff --git a/lib/cdist/test/autorequire/fixtures/conf/explorer/.keep b/cdist/test/autorequire/fixtures/conf/explorer/.keep similarity index 100% rename from lib/cdist/test/autorequire/fixtures/conf/explorer/.keep rename to cdist/test/autorequire/fixtures/conf/explorer/.keep diff --git a/lib/cdist/test/autorequire/fixtures/conf/manifest/circular_dependency b/cdist/test/autorequire/fixtures/conf/manifest/circular_dependency similarity index 100% rename from lib/cdist/test/autorequire/fixtures/conf/manifest/circular_dependency rename to cdist/test/autorequire/fixtures/conf/manifest/circular_dependency diff --git a/lib/cdist/test/autorequire/fixtures/conf/manifest/implicit_dependencies b/cdist/test/autorequire/fixtures/conf/manifest/implicit_dependencies similarity index 100% rename from lib/cdist/test/autorequire/fixtures/conf/manifest/implicit_dependencies rename to cdist/test/autorequire/fixtures/conf/manifest/implicit_dependencies diff --git a/lib/cdist/test/autorequire/fixtures/conf/type/__addifnosuchline/.keep b/cdist/test/autorequire/fixtures/conf/type/__addifnosuchline/.keep similarity index 100% rename from lib/cdist/test/autorequire/fixtures/conf/type/__addifnosuchline/.keep rename to cdist/test/autorequire/fixtures/conf/type/__addifnosuchline/.keep diff --git a/lib/cdist/test/autorequire/fixtures/conf/type/__directory/.keep b/cdist/test/autorequire/fixtures/conf/type/__directory/.keep similarity index 100% rename from lib/cdist/test/autorequire/fixtures/conf/type/__directory/.keep rename to cdist/test/autorequire/fixtures/conf/type/__directory/.keep diff --git a/lib/cdist/test/autorequire/fixtures/conf/type/__nfsroot_client/manifest b/cdist/test/autorequire/fixtures/conf/type/__nfsroot_client/manifest similarity index 100% rename from lib/cdist/test/autorequire/fixtures/conf/type/__nfsroot_client/manifest rename to cdist/test/autorequire/fixtures/conf/type/__nfsroot_client/manifest diff --git a/lib/cdist/test/autorequire/fixtures/conf/type/__package/manifest b/cdist/test/autorequire/fixtures/conf/type/__package/manifest similarity index 100% rename from lib/cdist/test/autorequire/fixtures/conf/type/__package/manifest rename to cdist/test/autorequire/fixtures/conf/type/__package/manifest diff --git a/lib/cdist/test/autorequire/fixtures/conf/type/__package_special/.keep b/cdist/test/autorequire/fixtures/conf/type/__package_special/.keep similarity index 100% rename from lib/cdist/test/autorequire/fixtures/conf/type/__package_special/.keep rename to cdist/test/autorequire/fixtures/conf/type/__package_special/.keep diff --git a/lib/cdist/test/autorequire/fixtures/conf/type/__root_ssh_authorized_key/manifest b/cdist/test/autorequire/fixtures/conf/type/__root_ssh_authorized_key/manifest similarity index 100% rename from lib/cdist/test/autorequire/fixtures/conf/type/__root_ssh_authorized_key/manifest rename to cdist/test/autorequire/fixtures/conf/type/__root_ssh_authorized_key/manifest diff --git a/lib/cdist/test/autorequire/fixtures/conf/type/__top/manifest b/cdist/test/autorequire/fixtures/conf/type/__top/manifest similarity index 100% rename from lib/cdist/test/autorequire/fixtures/conf/type/__top/manifest rename to cdist/test/autorequire/fixtures/conf/type/__top/manifest diff --git a/lib/cdist/test/autorequire/fixtures/conf/type/__user/.keep b/cdist/test/autorequire/fixtures/conf/type/__user/.keep similarity index 100% rename from lib/cdist/test/autorequire/fixtures/conf/type/__user/.keep rename to cdist/test/autorequire/fixtures/conf/type/__user/.keep diff --git a/lib/cdist/test/banner/__init__.py b/cdist/test/banner/__init__.py similarity index 100% rename from lib/cdist/test/banner/__init__.py rename to cdist/test/banner/__init__.py diff --git a/lib/cdist/test/code/__init__.py b/cdist/test/code/__init__.py similarity index 100% rename from lib/cdist/test/code/__init__.py rename to cdist/test/code/__init__.py diff --git a/lib/cdist/test/code/fixtures/conf/type/__dump_environment/gencode-local b/cdist/test/code/fixtures/conf/type/__dump_environment/gencode-local similarity index 100% rename from lib/cdist/test/code/fixtures/conf/type/__dump_environment/gencode-local rename to cdist/test/code/fixtures/conf/type/__dump_environment/gencode-local diff --git a/lib/cdist/test/code/fixtures/conf/type/__dump_environment/gencode-remote b/cdist/test/code/fixtures/conf/type/__dump_environment/gencode-remote similarity index 100% rename from lib/cdist/test/code/fixtures/conf/type/__dump_environment/gencode-remote rename to cdist/test/code/fixtures/conf/type/__dump_environment/gencode-remote diff --git a/lib/cdist/test/emulator/__init__.py b/cdist/test/emulator/__init__.py similarity index 100% rename from lib/cdist/test/emulator/__init__.py rename to cdist/test/emulator/__init__.py diff --git a/lib/cdist/test/emulator/fixtures/conf/explorer/.keep b/cdist/test/emulator/fixtures/conf/explorer/.keep similarity index 100% rename from lib/cdist/test/emulator/fixtures/conf/explorer/.keep rename to cdist/test/emulator/fixtures/conf/explorer/.keep diff --git a/lib/cdist/test/emulator/fixtures/conf/manifest/init b/cdist/test/emulator/fixtures/conf/manifest/init similarity index 100% rename from lib/cdist/test/emulator/fixtures/conf/manifest/init rename to cdist/test/emulator/fixtures/conf/manifest/init diff --git a/lib/cdist/test/emulator/fixtures/conf/type/__arguments_boolean/parameter/boolean b/cdist/test/emulator/fixtures/conf/type/__arguments_boolean/parameter/boolean similarity index 100% rename from lib/cdist/test/emulator/fixtures/conf/type/__arguments_boolean/parameter/boolean rename to cdist/test/emulator/fixtures/conf/type/__arguments_boolean/parameter/boolean diff --git a/lib/cdist/test/emulator/fixtures/conf/type/__arguments_optional/parameter/optional b/cdist/test/emulator/fixtures/conf/type/__arguments_optional/parameter/optional similarity index 100% rename from lib/cdist/test/emulator/fixtures/conf/type/__arguments_optional/parameter/optional rename to cdist/test/emulator/fixtures/conf/type/__arguments_optional/parameter/optional diff --git a/lib/cdist/test/emulator/fixtures/conf/type/__arguments_required/parameter/required b/cdist/test/emulator/fixtures/conf/type/__arguments_required/parameter/required similarity index 100% rename from lib/cdist/test/emulator/fixtures/conf/type/__arguments_required/parameter/required rename to cdist/test/emulator/fixtures/conf/type/__arguments_required/parameter/required diff --git a/lib/cdist/test/emulator/fixtures/conf/type/__arguments_with_dashes/parameter/required b/cdist/test/emulator/fixtures/conf/type/__arguments_with_dashes/parameter/required similarity index 100% rename from lib/cdist/test/emulator/fixtures/conf/type/__arguments_with_dashes/parameter/required rename to cdist/test/emulator/fixtures/conf/type/__arguments_with_dashes/parameter/required diff --git a/lib/cdist/test/emulator/fixtures/conf/type/__file b/cdist/test/emulator/fixtures/conf/type/__file similarity index 100% rename from lib/cdist/test/emulator/fixtures/conf/type/__file rename to cdist/test/emulator/fixtures/conf/type/__file diff --git a/lib/cdist/test/emulator/fixtures/conf/type/__file_from_stdin/manifest b/cdist/test/emulator/fixtures/conf/type/__file_from_stdin/manifest similarity index 100% rename from lib/cdist/test/emulator/fixtures/conf/type/__file_from_stdin/manifest rename to cdist/test/emulator/fixtures/conf/type/__file_from_stdin/manifest diff --git a/lib/cdist/test/emulator/fixtures/conf/type/__file_from_stdin/parameter/required b/cdist/test/emulator/fixtures/conf/type/__file_from_stdin/parameter/required similarity index 100% rename from lib/cdist/test/emulator/fixtures/conf/type/__file_from_stdin/parameter/required rename to cdist/test/emulator/fixtures/conf/type/__file_from_stdin/parameter/required diff --git a/lib/cdist/test/emulator/fixtures/conf/type/__moon/manifest b/cdist/test/emulator/fixtures/conf/type/__moon/manifest similarity index 100% rename from lib/cdist/test/emulator/fixtures/conf/type/__moon/manifest rename to cdist/test/emulator/fixtures/conf/type/__moon/manifest diff --git a/lib/cdist/test/emulator/fixtures/conf/type/__moon/parameter/optional b/cdist/test/emulator/fixtures/conf/type/__moon/parameter/optional similarity index 100% rename from lib/cdist/test/emulator/fixtures/conf/type/__moon/parameter/optional rename to cdist/test/emulator/fixtures/conf/type/__moon/parameter/optional diff --git a/lib/cdist/test/emulator/fixtures/conf/type/__moon/parameter/required b/cdist/test/emulator/fixtures/conf/type/__moon/parameter/required similarity index 100% rename from lib/cdist/test/emulator/fixtures/conf/type/__moon/parameter/required rename to cdist/test/emulator/fixtures/conf/type/__moon/parameter/required diff --git a/lib/cdist/test/emulator/fixtures/conf/type/__planet/manifest b/cdist/test/emulator/fixtures/conf/type/__planet/manifest similarity index 100% rename from lib/cdist/test/emulator/fixtures/conf/type/__planet/manifest rename to cdist/test/emulator/fixtures/conf/type/__planet/manifest diff --git a/lib/cdist/test/emulator/fixtures/conf/type/__planet/parameter/optional b/cdist/test/emulator/fixtures/conf/type/__planet/parameter/optional similarity index 100% rename from lib/cdist/test/emulator/fixtures/conf/type/__planet/parameter/optional rename to cdist/test/emulator/fixtures/conf/type/__planet/parameter/optional diff --git a/lib/cdist/test/emulator/fixtures/conf/type/__saturn/manifest b/cdist/test/emulator/fixtures/conf/type/__saturn/manifest similarity index 100% rename from lib/cdist/test/emulator/fixtures/conf/type/__saturn/manifest rename to cdist/test/emulator/fixtures/conf/type/__saturn/manifest diff --git a/lib/cdist/test/emulator/fixtures/conf/type/__saturn/singleton b/cdist/test/emulator/fixtures/conf/type/__saturn/singleton similarity index 100% rename from lib/cdist/test/emulator/fixtures/conf/type/__saturn/singleton rename to cdist/test/emulator/fixtures/conf/type/__saturn/singleton diff --git a/lib/cdist/test/exec/__init__.py b/cdist/test/exec/__init__.py similarity index 100% rename from lib/cdist/test/exec/__init__.py rename to cdist/test/exec/__init__.py diff --git a/lib/cdist/test/exec/local.py b/cdist/test/exec/local.py similarity index 100% rename from lib/cdist/test/exec/local.py rename to cdist/test/exec/local.py diff --git a/lib/cdist/test/exec/remote.py b/cdist/test/exec/remote.py similarity index 100% rename from lib/cdist/test/exec/remote.py rename to cdist/test/exec/remote.py diff --git a/lib/cdist/test/explorer/__init__.py b/cdist/test/explorer/__init__.py similarity index 100% rename from lib/cdist/test/explorer/__init__.py rename to cdist/test/explorer/__init__.py diff --git a/lib/cdist/test/explorer/fixtures/conf/explorer/foobar b/cdist/test/explorer/fixtures/conf/explorer/foobar similarity index 100% rename from lib/cdist/test/explorer/fixtures/conf/explorer/foobar rename to cdist/test/explorer/fixtures/conf/explorer/foobar diff --git a/lib/cdist/test/explorer/fixtures/conf/explorer/global b/cdist/test/explorer/fixtures/conf/explorer/global similarity index 100% rename from lib/cdist/test/explorer/fixtures/conf/explorer/global rename to cdist/test/explorer/fixtures/conf/explorer/global diff --git a/lib/cdist/test/explorer/fixtures/conf/type/__test_type/explorer/world b/cdist/test/explorer/fixtures/conf/type/__test_type/explorer/world similarity index 100% rename from lib/cdist/test/explorer/fixtures/conf/type/__test_type/explorer/world rename to cdist/test/explorer/fixtures/conf/type/__test_type/explorer/world diff --git a/lib/cdist/test/explorer/fixtures/conf/type/__test_type_object_parameter/explorer/test_parameter b/cdist/test/explorer/fixtures/conf/type/__test_type_object_parameter/explorer/test_parameter similarity index 100% rename from lib/cdist/test/explorer/fixtures/conf/type/__test_type_object_parameter/explorer/test_parameter rename to cdist/test/explorer/fixtures/conf/type/__test_type_object_parameter/explorer/test_parameter diff --git a/lib/cdist/test/manifest/__init__.py b/cdist/test/manifest/__init__.py similarity index 100% rename from lib/cdist/test/manifest/__init__.py rename to cdist/test/manifest/__init__.py diff --git a/lib/cdist/test/manifest/fixtures/conf/manifest/dump_environment b/cdist/test/manifest/fixtures/conf/manifest/dump_environment similarity index 100% rename from lib/cdist/test/manifest/fixtures/conf/manifest/dump_environment rename to cdist/test/manifest/fixtures/conf/manifest/dump_environment diff --git a/lib/cdist/test/manifest/fixtures/conf/manifest/init b/cdist/test/manifest/fixtures/conf/manifest/init similarity index 100% rename from lib/cdist/test/manifest/fixtures/conf/manifest/init rename to cdist/test/manifest/fixtures/conf/manifest/init diff --git a/lib/cdist/test/manifest/fixtures/conf/type/__dump_environment/manifest b/cdist/test/manifest/fixtures/conf/type/__dump_environment/manifest similarity index 100% rename from lib/cdist/test/manifest/fixtures/conf/type/__dump_environment/manifest rename to cdist/test/manifest/fixtures/conf/type/__dump_environment/manifest diff --git a/lib/cdist/test/manifest/fixtures/conf/type/__moon/.keep b/cdist/test/manifest/fixtures/conf/type/__moon/.keep similarity index 100% rename from lib/cdist/test/manifest/fixtures/conf/type/__moon/.keep rename to cdist/test/manifest/fixtures/conf/type/__moon/.keep diff --git a/lib/cdist/test/manifest/fixtures/conf/type/__moon/manifest b/cdist/test/manifest/fixtures/conf/type/__moon/manifest similarity index 100% rename from lib/cdist/test/manifest/fixtures/conf/type/__moon/manifest rename to cdist/test/manifest/fixtures/conf/type/__moon/manifest diff --git a/lib/cdist/test/manifest/fixtures/conf/type/__moon/parameter/optional b/cdist/test/manifest/fixtures/conf/type/__moon/parameter/optional similarity index 100% rename from lib/cdist/test/manifest/fixtures/conf/type/__moon/parameter/optional rename to cdist/test/manifest/fixtures/conf/type/__moon/parameter/optional diff --git a/lib/cdist/test/manifest/fixtures/conf/type/__moon/parameter/required b/cdist/test/manifest/fixtures/conf/type/__moon/parameter/required similarity index 100% rename from lib/cdist/test/manifest/fixtures/conf/type/__moon/parameter/required rename to cdist/test/manifest/fixtures/conf/type/__moon/parameter/required diff --git a/lib/cdist/test/manifest/fixtures/conf/type/__planet/.keep b/cdist/test/manifest/fixtures/conf/type/__planet/.keep similarity index 100% rename from lib/cdist/test/manifest/fixtures/conf/type/__planet/.keep rename to cdist/test/manifest/fixtures/conf/type/__planet/.keep diff --git a/lib/cdist/test/manifest/fixtures/conf/type/__planet/manifest b/cdist/test/manifest/fixtures/conf/type/__planet/manifest similarity index 100% rename from lib/cdist/test/manifest/fixtures/conf/type/__planet/manifest rename to cdist/test/manifest/fixtures/conf/type/__planet/manifest diff --git a/lib/cdist/test/manifest/fixtures/conf/type/__planet/parameter/optional b/cdist/test/manifest/fixtures/conf/type/__planet/parameter/optional similarity index 100% rename from lib/cdist/test/manifest/fixtures/conf/type/__planet/parameter/optional rename to cdist/test/manifest/fixtures/conf/type/__planet/parameter/optional diff --git a/lib/cdist/test/object/__init__.py b/cdist/test/object/__init__.py similarity index 100% rename from lib/cdist/test/object/__init__.py rename to cdist/test/object/__init__.py diff --git a/lib/cdist/test/object/fixtures/object/__first/.keep b/cdist/test/object/fixtures/object/__first/.keep similarity index 100% rename from lib/cdist/test/object/fixtures/object/__first/.keep rename to cdist/test/object/fixtures/object/__first/.keep diff --git a/lib/cdist/test/object/fixtures/object/__first/man/.cdist/.keep b/cdist/test/object/fixtures/object/__first/man/.cdist/.keep similarity index 100% rename from lib/cdist/test/object/fixtures/object/__first/man/.cdist/.keep rename to cdist/test/object/fixtures/object/__first/man/.cdist/.keep diff --git a/lib/cdist/test/object/fixtures/object/__second/.keep b/cdist/test/object/fixtures/object/__second/.keep similarity index 100% rename from lib/cdist/test/object/fixtures/object/__second/.keep rename to cdist/test/object/fixtures/object/__second/.keep diff --git a/lib/cdist/test/object/fixtures/object/__second/on-the/.cdist/.keep b/cdist/test/object/fixtures/object/__second/on-the/.cdist/.keep similarity index 100% rename from lib/cdist/test/object/fixtures/object/__second/on-the/.cdist/.keep rename to cdist/test/object/fixtures/object/__second/on-the/.cdist/.keep diff --git a/lib/cdist/test/object/fixtures/object/__third/.keep b/cdist/test/object/fixtures/object/__third/.keep similarity index 100% rename from lib/cdist/test/object/fixtures/object/__third/.keep rename to cdist/test/object/fixtures/object/__third/.keep diff --git a/lib/cdist/test/object/fixtures/object/__third/moon/.cdist/.keep b/cdist/test/object/fixtures/object/__third/moon/.cdist/.keep similarity index 100% rename from lib/cdist/test/object/fixtures/object/__third/moon/.cdist/.keep rename to cdist/test/object/fixtures/object/__third/moon/.cdist/.keep diff --git a/lib/cdist/test/object/fixtures/object/__third/moon/.cdist/parameter/name b/cdist/test/object/fixtures/object/__third/moon/.cdist/parameter/name similarity index 100% rename from lib/cdist/test/object/fixtures/object/__third/moon/.cdist/parameter/name rename to cdist/test/object/fixtures/object/__third/moon/.cdist/parameter/name diff --git a/lib/cdist/test/object/fixtures/object/__third/moon/.cdist/parameter/planet b/cdist/test/object/fixtures/object/__third/moon/.cdist/parameter/planet similarity index 100% rename from lib/cdist/test/object/fixtures/object/__third/moon/.cdist/parameter/planet rename to cdist/test/object/fixtures/object/__third/moon/.cdist/parameter/planet diff --git a/lib/cdist/test/object/fixtures/type/__first/.keep b/cdist/test/object/fixtures/type/__first/.keep similarity index 100% rename from lib/cdist/test/object/fixtures/type/__first/.keep rename to cdist/test/object/fixtures/type/__first/.keep diff --git a/lib/cdist/test/object/fixtures/type/__second/.keep b/cdist/test/object/fixtures/type/__second/.keep similarity index 100% rename from lib/cdist/test/object/fixtures/type/__second/.keep rename to cdist/test/object/fixtures/type/__second/.keep diff --git a/lib/cdist/test/object/fixtures/type/__third/.keep b/cdist/test/object/fixtures/type/__third/.keep similarity index 100% rename from lib/cdist/test/object/fixtures/type/__third/.keep rename to cdist/test/object/fixtures/type/__third/.keep diff --git a/lib/cdist/test/resolver/__init__.py b/cdist/test/resolver/__init__.py similarity index 100% rename from lib/cdist/test/resolver/__init__.py rename to cdist/test/resolver/__init__.py diff --git a/lib/cdist/test/resolver/fixtures/object/__first/.keep b/cdist/test/resolver/fixtures/object/__first/.keep similarity index 100% rename from lib/cdist/test/resolver/fixtures/object/__first/.keep rename to cdist/test/resolver/fixtures/object/__first/.keep diff --git a/lib/cdist/test/resolver/fixtures/object/__first/child/.cdist/.keep b/cdist/test/resolver/fixtures/object/__first/child/.cdist/.keep similarity index 100% rename from lib/cdist/test/resolver/fixtures/object/__first/child/.cdist/.keep rename to cdist/test/resolver/fixtures/object/__first/child/.cdist/.keep diff --git a/lib/cdist/test/resolver/fixtures/object/__first/dog/.cdist/.keep b/cdist/test/resolver/fixtures/object/__first/dog/.cdist/.keep similarity index 100% rename from lib/cdist/test/resolver/fixtures/object/__first/dog/.cdist/.keep rename to cdist/test/resolver/fixtures/object/__first/dog/.cdist/.keep diff --git a/lib/cdist/test/resolver/fixtures/object/__first/man/.cdist/.keep b/cdist/test/resolver/fixtures/object/__first/man/.cdist/.keep similarity index 100% rename from lib/cdist/test/resolver/fixtures/object/__first/man/.cdist/.keep rename to cdist/test/resolver/fixtures/object/__first/man/.cdist/.keep diff --git a/lib/cdist/test/resolver/fixtures/object/__first/woman/.cdist/.keep b/cdist/test/resolver/fixtures/object/__first/woman/.cdist/.keep similarity index 100% rename from lib/cdist/test/resolver/fixtures/object/__first/woman/.cdist/.keep rename to cdist/test/resolver/fixtures/object/__first/woman/.cdist/.keep diff --git a/lib/cdist/test/resolver/fixtures/object/__second/.keep b/cdist/test/resolver/fixtures/object/__second/.keep similarity index 100% rename from lib/cdist/test/resolver/fixtures/object/__second/.keep rename to cdist/test/resolver/fixtures/object/__second/.keep diff --git a/lib/cdist/test/resolver/fixtures/object/__second/on-the/.cdist/.keep b/cdist/test/resolver/fixtures/object/__second/on-the/.cdist/.keep similarity index 100% rename from lib/cdist/test/resolver/fixtures/object/__second/on-the/.cdist/.keep rename to cdist/test/resolver/fixtures/object/__second/on-the/.cdist/.keep diff --git a/lib/cdist/test/resolver/fixtures/object/__second/under-the/.cdist/.keep b/cdist/test/resolver/fixtures/object/__second/under-the/.cdist/.keep similarity index 100% rename from lib/cdist/test/resolver/fixtures/object/__second/under-the/.cdist/.keep rename to cdist/test/resolver/fixtures/object/__second/under-the/.cdist/.keep diff --git a/lib/cdist/test/resolver/fixtures/object/__third/.keep b/cdist/test/resolver/fixtures/object/__third/.keep similarity index 100% rename from lib/cdist/test/resolver/fixtures/object/__third/.keep rename to cdist/test/resolver/fixtures/object/__third/.keep diff --git a/lib/cdist/test/resolver/fixtures/object/__third/moon/.cdist/.keep b/cdist/test/resolver/fixtures/object/__third/moon/.cdist/.keep similarity index 100% rename from lib/cdist/test/resolver/fixtures/object/__third/moon/.cdist/.keep rename to cdist/test/resolver/fixtures/object/__third/moon/.cdist/.keep diff --git a/lib/cdist/test/resolver/fixtures/object/__third/moon/.cdist/parameter/name b/cdist/test/resolver/fixtures/object/__third/moon/.cdist/parameter/name similarity index 100% rename from lib/cdist/test/resolver/fixtures/object/__third/moon/.cdist/parameter/name rename to cdist/test/resolver/fixtures/object/__third/moon/.cdist/parameter/name diff --git a/lib/cdist/test/resolver/fixtures/object/__third/moon/.cdist/parameter/planet b/cdist/test/resolver/fixtures/object/__third/moon/.cdist/parameter/planet similarity index 100% rename from lib/cdist/test/resolver/fixtures/object/__third/moon/.cdist/parameter/planet rename to cdist/test/resolver/fixtures/object/__third/moon/.cdist/parameter/planet diff --git a/lib/cdist/test/resolver/fixtures/type/__first/.keep b/cdist/test/resolver/fixtures/type/__first/.keep similarity index 100% rename from lib/cdist/test/resolver/fixtures/type/__first/.keep rename to cdist/test/resolver/fixtures/type/__first/.keep diff --git a/lib/cdist/test/resolver/fixtures/type/__second/.keep b/cdist/test/resolver/fixtures/type/__second/.keep similarity index 100% rename from lib/cdist/test/resolver/fixtures/type/__second/.keep rename to cdist/test/resolver/fixtures/type/__second/.keep diff --git a/lib/cdist/test/resolver/fixtures/type/__third/.keep b/cdist/test/resolver/fixtures/type/__third/.keep similarity index 100% rename from lib/cdist/test/resolver/fixtures/type/__third/.keep rename to cdist/test/resolver/fixtures/type/__third/.keep diff --git a/lib/cdist/test/type/__init__.py b/cdist/test/type/__init__.py similarity index 100% rename from lib/cdist/test/type/__init__.py rename to cdist/test/type/__init__.py diff --git a/lib/cdist/test/type/fixtures/__install/install b/cdist/test/type/fixtures/__install/install similarity index 100% rename from lib/cdist/test/type/fixtures/__install/install rename to cdist/test/type/fixtures/__install/install diff --git a/lib/cdist/test/type/fixtures/__name_path/.keep b/cdist/test/type/fixtures/__name_path/.keep similarity index 100% rename from lib/cdist/test/type/fixtures/__name_path/.keep rename to cdist/test/type/fixtures/__name_path/.keep diff --git a/lib/cdist/test/type/fixtures/__not_install/.keep b/cdist/test/type/fixtures/__not_install/.keep similarity index 100% rename from lib/cdist/test/type/fixtures/__not_install/.keep rename to cdist/test/type/fixtures/__not_install/.keep diff --git a/lib/cdist/test/type/fixtures/__not_singleton/.keep b/cdist/test/type/fixtures/__not_singleton/.keep similarity index 100% rename from lib/cdist/test/type/fixtures/__not_singleton/.keep rename to cdist/test/type/fixtures/__not_singleton/.keep diff --git a/lib/cdist/test/type/fixtures/__singleton/singleton b/cdist/test/type/fixtures/__singleton/singleton similarity index 100% rename from lib/cdist/test/type/fixtures/__singleton/singleton rename to cdist/test/type/fixtures/__singleton/singleton diff --git a/lib/cdist/test/type/fixtures/__with_boolean_parameters/parameter/boolean b/cdist/test/type/fixtures/__with_boolean_parameters/parameter/boolean similarity index 100% rename from lib/cdist/test/type/fixtures/__with_boolean_parameters/parameter/boolean rename to cdist/test/type/fixtures/__with_boolean_parameters/parameter/boolean diff --git a/lib/cdist/test/type/fixtures/__with_explorers/explorer/whatever b/cdist/test/type/fixtures/__with_explorers/explorer/whatever similarity index 100% rename from lib/cdist/test/type/fixtures/__with_explorers/explorer/whatever rename to cdist/test/type/fixtures/__with_explorers/explorer/whatever diff --git a/lib/cdist/test/type/fixtures/__with_optional_parameters/parameter/optional b/cdist/test/type/fixtures/__with_optional_parameters/parameter/optional similarity index 100% rename from lib/cdist/test/type/fixtures/__with_optional_parameters/parameter/optional rename to cdist/test/type/fixtures/__with_optional_parameters/parameter/optional diff --git a/lib/cdist/test/type/fixtures/__with_required_parameters/parameter/required b/cdist/test/type/fixtures/__with_required_parameters/parameter/required similarity index 100% rename from lib/cdist/test/type/fixtures/__with_required_parameters/parameter/required rename to cdist/test/type/fixtures/__with_required_parameters/parameter/required diff --git a/lib/cdist/test/type/fixtures/__without_boolean_parameters/.keep b/cdist/test/type/fixtures/__without_boolean_parameters/.keep similarity index 100% rename from lib/cdist/test/type/fixtures/__without_boolean_parameters/.keep rename to cdist/test/type/fixtures/__without_boolean_parameters/.keep diff --git a/lib/cdist/test/type/fixtures/__without_explorers/.keep b/cdist/test/type/fixtures/__without_explorers/.keep similarity index 100% rename from lib/cdist/test/type/fixtures/__without_explorers/.keep rename to cdist/test/type/fixtures/__without_explorers/.keep diff --git a/lib/cdist/test/type/fixtures/__without_optional_parameters/.keep b/cdist/test/type/fixtures/__without_optional_parameters/.keep similarity index 100% rename from lib/cdist/test/type/fixtures/__without_optional_parameters/.keep rename to cdist/test/type/fixtures/__without_optional_parameters/.keep diff --git a/lib/cdist/test/type/fixtures/__without_required_parameters/.keep b/cdist/test/type/fixtures/__without_required_parameters/.keep similarity index 100% rename from lib/cdist/test/type/fixtures/__without_required_parameters/.keep rename to cdist/test/type/fixtures/__without_required_parameters/.keep diff --git a/lib/cdist/test/type/fixtures/list_types/__first/.keep b/cdist/test/type/fixtures/list_types/__first/.keep similarity index 100% rename from lib/cdist/test/type/fixtures/list_types/__first/.keep rename to cdist/test/type/fixtures/list_types/__first/.keep diff --git a/lib/cdist/test/type/fixtures/list_types/__second/.keep b/cdist/test/type/fixtures/list_types/__second/.keep similarity index 100% rename from lib/cdist/test/type/fixtures/list_types/__second/.keep rename to cdist/test/type/fixtures/list_types/__second/.keep diff --git a/lib/cdist/test/type/fixtures/list_types/__third/.keep b/cdist/test/type/fixtures/list_types/__third/.keep similarity index 100% rename from lib/cdist/test/type/fixtures/list_types/__third/.keep rename to cdist/test/type/fixtures/list_types/__third/.keep diff --git a/lib/cdist/test/util/__init__.py b/cdist/test/util/__init__.py similarity index 100% rename from lib/cdist/test/util/__init__.py rename to cdist/test/util/__init__.py diff --git a/lib/cdist/test/util/fsproperty.py b/cdist/test/util/fsproperty.py similarity index 100% rename from lib/cdist/test/util/fsproperty.py rename to cdist/test/util/fsproperty.py diff --git a/lib/cdist/util/__init__.py b/cdist/util/__init__.py similarity index 100% rename from lib/cdist/util/__init__.py rename to cdist/util/__init__.py diff --git a/lib/cdist/util/fsproperty.py b/cdist/util/fsproperty.py similarity index 100% rename from lib/cdist/util/fsproperty.py rename to cdist/util/fsproperty.py From 814c5e04d9db3193b935f768f1f56fbc0d8fe244 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 25 Oct 2012 17:42:38 +0200 Subject: [PATCH 012/104] add initial setup.py Signed-off-by: Nico Schottelius --- setup.py | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 setup.py diff --git a/setup.py b/setup.py new file mode 100644 index 00000000..92194071 --- /dev/null +++ b/setup.py @@ -0,0 +1,34 @@ +from distutils.core import setup + +setup( + name = "cdist", + packages = ["cdist"], + version = "2.1.0", + description = "Usable configuration management system", + author = "Nico Schottelius", + author_email = "nico-cdist-pypi@schottelius.org", + url = "http://www.nico.schottelius.org/software/cdist/", + classifiers = [ + "Development Status :: 6 - Mature", + "Environment :: Console", + "Intended Audience :: System Administrators", + "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)", + "Operating System :: MacOS :: MacOS X", + "Operating System :: POSIX", + "Operating System :: POSIX :: BSD", + "Operating System :: POSIX :: Linux", + "Operating System :: Unix", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Topic :: System :: Boot", + "Topic :: System :: Installation/Setup", + "Topic :: System :: Operating System", + "Topic :: System :: Software Distribution", + "Topic :: Utilities" + ], + long_description = ''' + cdist is a usable configuration management system. + It adheres to the KISS principle and is being used in small up to enterprise grade environments. + cdist is an alternative to other configuration management systems like cfengine, bcfg2, chef and puppet. + ''' +) From abb384c2708224ba20a535c63c22e5969aaa08b2 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 25 Oct 2012 17:43:20 +0200 Subject: [PATCH 013/104] add manifest for distutils Signed-off-by: Nico Schottelius --- MANIFEST.in | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 MANIFEST.in diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 00000000..ae20db47 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,3 @@ +include docs/changelog docs/changelog-2.1 +recursive-include docs/gfx +recursive-include docs *.mdwn From 392ec3c5edbea53179325fabfbce47493ade48d5 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 25 Oct 2012 17:46:19 +0200 Subject: [PATCH 014/104] correct link to __file Signed-off-by: Nico Schottelius --- cdist/test/emulator/fixtures/conf/type/__file | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cdist/test/emulator/fixtures/conf/type/__file b/cdist/test/emulator/fixtures/conf/type/__file index c57c4134..8458361c 120000 --- a/cdist/test/emulator/fixtures/conf/type/__file +++ b/cdist/test/emulator/fixtures/conf/type/__file @@ -1 +1 @@ -../../../../../../../conf/type/__file \ No newline at end of file +../../../../../../conf/type/__file \ No newline at end of file From f25989d779f9926a89ad4f7d1b3d39a03e8071e9 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 25 Oct 2012 18:28:19 +0200 Subject: [PATCH 015/104] build MANIFEST ourselves Signed-off-by: Nico Schottelius --- .gitignore | 3 ++- MANIFEST.in | 3 --- build | 57 +++++++++++++++++++++++++++++++++++++++-------------- 3 files changed, 44 insertions(+), 19 deletions(-) delete mode 100644 MANIFEST.in diff --git a/.gitignore b/.gitignore index fe52a82f..5fc6b0ad 100644 --- a/.gitignore +++ b/.gitignore @@ -14,5 +14,6 @@ docs/man/man*/docbook-xsl.css # Ignore cdist cache for version control /cache/ -# Python / cache +# Python: cache, distutils __pycache__/ +MANIFEST diff --git a/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index ae20db47..00000000 --- a/MANIFEST.in +++ /dev/null @@ -1,3 +0,0 @@ -include docs/changelog docs/changelog-2.1 -recursive-include docs/gfx -recursive-include docs *.mdwn diff --git a/build b/build index d3f8ca3a..59bc0b65 100755 --- a/build +++ b/build @@ -45,12 +45,37 @@ MAN7DSTDIR=${MANDIR}/man7 SPEECHESDIR=docs/speeches case "$1" in - man) - set -e - "$0" mangen - "$0" mantype - "$0" manbuild - ;; + man) + set -e + "$0" mangen + "$0" mantype + "$0" manbuild + ;; + + pypi-manifest) + : > MANIFEST + # bin + echo bin/cdist >> MANIFEST + + # conf + find conf >> MANIFEST + + # docs + ls docs/changelog* >> MANIFEST + find docs/gfx >> MANIFEST + find docs/man/ -name \*.text >> MANIFEST + find docs/man/ -name \*.text.sh >> MANIFEST + + # other + find other/ >> MANIFEST + + + ;; + + pypi) + $0 pypi-manifest + python3 setup.py sdist + ;; manbuild) trap abort INT @@ -133,15 +158,17 @@ case "$1" in done ;; - clean) - rm -f ${MAN7DSTDIR}/cdist-reference.text - find "${MANDIR}" -mindepth 2 -type l \ - -o -name "*.1" \ - -o -name "*.7" \ - -o -name "*.html" \ - -o -name "*.xml" \ - | xargs rm -f - ;; + clean) + rm -f ${MAN7DSTDIR}/cdist-reference.text + find "${MANDIR}" -mindepth 2 -type l \ + -o -name "*.1" \ + -o -name "*.7" \ + -o -name "*.html" \ + -o -name "*.xml" \ + | xargs rm -f + + find * -name __pycache__ | xargs rm -rf + ;; test) shift # skip t From 45a4719fb0c08dcc7ab00076881a07b578a68586 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 25 Oct 2012 18:29:49 +0200 Subject: [PATCH 016/104] clean before running pypi Signed-off-by: Nico Schottelius --- build | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build b/build index 59bc0b65..fa0e78a2 100755 --- a/build +++ b/build @@ -73,6 +73,7 @@ case "$1" in ;; pypi) + $0 clean $0 pypi-manifest python3 setup.py sdist ;; @@ -168,6 +169,8 @@ case "$1" in | xargs rm -f find * -name __pycache__ | xargs rm -rf + + rm -f MANIFEST ;; test) From 65128e4bcfa7d73e25abc459914488a9b832df13 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 25 Oct 2012 18:44:05 +0200 Subject: [PATCH 017/104] re-indent Signed-off-by: Nico Schottelius --- build | 287 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 146 insertions(+), 141 deletions(-) diff --git a/build b/build index fa0e78a2..bb8d60f5 100755 --- a/build +++ b/build @@ -45,157 +45,162 @@ MAN7DSTDIR=${MANDIR}/man7 SPEECHESDIR=docs/speeches case "$1" in - man) - set -e - "$0" mangen - "$0" mantype - "$0" manbuild - ;; + man) + set -e + "$0" mangen + "$0" mantype + "$0" manbuild + ;; - pypi-manifest) - : > MANIFEST - # bin - echo bin/cdist >> MANIFEST - - # conf - find conf >> MANIFEST + pypi-manifest) + # init MANIFEST + echo README > MANIFEST - # docs - ls docs/changelog* >> MANIFEST - find docs/gfx >> MANIFEST - find docs/man/ -name \*.text >> MANIFEST - find docs/man/ -name \*.text.sh >> MANIFEST + # bin + echo bin/cdist >> MANIFEST + + # main source + find cdist -type f >> MANIFEST - # other - find other/ >> MANIFEST + # conf + find conf -type f >> MANIFEST + + # docs + ls docs/changelog* >> MANIFEST + find docs/gfx -type f >> MANIFEST + find docs/man/ -type f -name \*.text >> MANIFEST + find docs/man/ -type f -name \*.text.sh >> MANIFEST + + # other + find other/ -type f >> MANIFEST - ;; + ;; - pypi) - $0 clean - $0 pypi-manifest - python3 setup.py sdist - ;; + pypi) + $0 clean + $0 pypi-manifest + python3 setup.py sdist + ;; - manbuild) - trap abort INT - abort() { - kill 0 - } - for section in 1 7; do - for src in ${MANDIR}/man${section}/*.text; do - manpage="${src%.text}.$section" - if [ ! -f "$manpage" -o "$manpage" -ot "$src" ]; then - echo "Compiling man page for $src" - $A2XM "$src" - fi - htmlpage="${src%.text}.html" - if [ ! -f "$htmlpage" -o "$htmlpage" -ot "$src" ]; then - echo "Compiling html page for $src" - $A2XH "$src" - fi - done - done - ;; - - mantype) - for mansrc in conf/type/*/man.text; do - dst="$(echo $mansrc | sed -e 's;conf/;cdist-;' -e 's;/;;' -e 's;/man;;' -e 's;^;docs/man/man7/;')" - ln -sf "../../../$mansrc" "$dst" - done - ;; - - mangen) - ${MANDIR}/cdist-reference.text.sh - ;; - - release) - ./docs/dev/releasechecklist - ;; - - speeches) - cd "$SPEECHESDIR" - for speech in *tex; do - pdflatex "$speech" - pdflatex "$speech" - pdflatex "$speech" - done - ;; - - webmain) - cp README ${WEBPAGE} - cd ${WEBDIR} && git commit -m "cdist main update" ${WEBPAGE} - cd ${WEBDIR} && make pub - ;; - - web) - cp README ${WEBPAGE} - rm -rf ${WEBMAN} - mkdir -p ${WEBMAN}/man1 ${WEBMAN}/man7 - - # old stuff - # rm -rf ${WEBDIR}/${WEBBASE}/speeches && mkdir ${WEBDIR}/${WEBBASE}/speeches - # cp ${SPEECHESDIR}/*.pdf ${WEBDIR}/${WEBBASE}/speeches - # git describe > ${WEBDIR}/${WEBBASE}/man/VERSION - - cp ${MAN1DSTDIR}/*.html ${MAN1DSTDIR}/*.css ${WEBMAN}/man1 - cp ${MAN7DSTDIR}/*.html ${MAN7DSTDIR}/*.css ${WEBMAN}/man7 - - cd ${WEBDIR} && git add ${WEBBASE} - cd ${WEBDIR} && git commit -m "cdist update" ${WEBBASE} ${WEBPAGE} - cd ${WEBDIR} && make pub - - # Fix ikiwiki, which does not like symlinks for pseudo security - ssh tee.schottelius.org \ - "cd /home/services/www/nico/www.nico.schottelius.org/www/software/cdist/man && - rm -f latest && ln -sf "$version" latest" - ;; - - p|pu|pub) - for remote in "" github sf ethz; do - echo "Pushing to $remote" - git push --mirror $remote + manbuild) + trap abort INT + abort() { + kill 0 + } + for section in 1 7; do + for src in ${MANDIR}/man${section}/*.text; do + manpage="${src%.text}.$section" + if [ ! -f "$manpage" -o "$manpage" -ot "$src" ]; then + echo "Compiling man page for $src" + $A2XM "$src" + fi + htmlpage="${src%.text}.html" + if [ ! -f "$htmlpage" -o "$htmlpage" -ot "$src" ]; then + echo "Compiling html page for $src" + $A2XH "$src" + fi + done done - ;; - - clean) - rm -f ${MAN7DSTDIR}/cdist-reference.text - find "${MANDIR}" -mindepth 2 -type l \ - -o -name "*.1" \ - -o -name "*.7" \ - -o -name "*.html" \ - -o -name "*.xml" \ - | xargs rm -f - - find * -name __pycache__ | xargs rm -rf - - rm -f MANIFEST ;; - test) - shift # skip t - export PYTHONPATH=$PYTHONPATH:$(pwd -P)/lib + mantype) + for mansrc in conf/type/*/man.text; do + dst="$(echo $mansrc | sed -e 's;conf/;cdist-;' -e 's;/;;' -e 's;/man;;' -e 's;^;docs/man/man7/;')" + ln -sf "../../../$mansrc" "$dst" + done + ;; - if [ $# -lt 1 ]; then - python3 -m cdist.test - else - python3 -m unittest "$@" - fi - ;; + mangen) + ${MANDIR}/cdist-reference.text.sh + ;; - *) - echo '' - echo 'Welcome to cdist!' - echo '' - echo 'Here are the possible targets:' - echo '' - echo ' clean: Remove build stuff' - echo ' man: Build manpages (requires Asciidoc)' - echo ' test: Run tests' - echo '' - echo '' - echo "Unknown target, \"$1\"" >&2 - exit 1 - ;; + release) + ./docs/dev/releasechecklist + ;; + + speeches) + cd "$SPEECHESDIR" + for speech in *tex; do + pdflatex "$speech" + pdflatex "$speech" + pdflatex "$speech" + done + ;; + + webmain) + cp README ${WEBPAGE} + cd ${WEBDIR} && git commit -m "cdist main update" ${WEBPAGE} + cd ${WEBDIR} && make pub + ;; + + web) + cp README ${WEBPAGE} + rm -rf ${WEBMAN} + mkdir -p ${WEBMAN}/man1 ${WEBMAN}/man7 + + # old stuff + # rm -rf ${WEBDIR}/${WEBBASE}/speeches && mkdir ${WEBDIR}/${WEBBASE}/speeches + # cp ${SPEECHESDIR}/*.pdf ${WEBDIR}/${WEBBASE}/speeches + # git describe > ${WEBDIR}/${WEBBASE}/man/VERSION + + cp ${MAN1DSTDIR}/*.html ${MAN1DSTDIR}/*.css ${WEBMAN}/man1 + cp ${MAN7DSTDIR}/*.html ${MAN7DSTDIR}/*.css ${WEBMAN}/man7 + + cd ${WEBDIR} && git add ${WEBBASE} + cd ${WEBDIR} && git commit -m "cdist update" ${WEBBASE} ${WEBPAGE} + cd ${WEBDIR} && make pub + + # Fix ikiwiki, which does not like symlinks for pseudo security + ssh tee.schottelius.org \ + "cd /home/services/www/nico/www.nico.schottelius.org/www/software/cdist/man && + rm -f latest && ln -sf "$version" latest" + ;; + + p|pu|pub) + for remote in "" github sf ethz; do + echo "Pushing to $remote" + git push --mirror $remote + done + ;; + + clean) + rm -f ${MAN7DSTDIR}/cdist-reference.text + find "${MANDIR}" -mindepth 2 -type l \ + -o -name "*.1" \ + -o -name "*.7" \ + -o -name "*.html" \ + -o -name "*.xml" \ + | xargs rm -f + + find * -name __pycache__ | xargs rm -rf + + rm -f MANIFEST + ;; + + test) + shift # skip t + export PYTHONPATH=$PYTHONPATH:$(pwd -P)/lib + + if [ $# -lt 1 ]; then + python3 -m cdist.test + else + python3 -m unittest "$@" + fi + ;; + + *) + echo '' + echo 'Welcome to cdist!' + echo '' + echo 'Here are the possible targets:' + echo '' + echo ' clean: Remove build stuff' + echo ' man: Build manpages (requires Asciidoc)' + echo ' test: Run tests' + echo '' + echo '' + echo "Unknown target, \"$1\"" >&2 + exit 1 + ;; esac From 37db1e8c2fe2ed469260769a8f78e0104ec2598e Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 25 Oct 2012 18:47:48 +0200 Subject: [PATCH 018/104] retry MANIFEST.in, when deleting cache before Signed-off-by: Nico Schottelius --- MANIFEST.in | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 MANIFEST.in diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 00000000..6b86bbd0 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,3 @@ +include docs/changelog docs/changelog-2.1 +recursive-include docs/gfx *.png *.text +recursive-include docs *.text From d20ae0596d484c928df39b00f98c2ae4d223f7ce Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 25 Oct 2012 19:07:50 +0200 Subject: [PATCH 019/104] pypi cleanups Signed-off-by: Nico Schottelius --- .gitignore | 1 + MANIFEST.in | 2 +- build | 77 +++++++++++++++++++---------------------------------- 3 files changed, 30 insertions(+), 50 deletions(-) diff --git a/.gitignore b/.gitignore index 5fc6b0ad..71b70251 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ docs/man/man*/docbook-xsl.css # Python: cache, distutils __pycache__/ MANIFEST +dist/ diff --git a/MANIFEST.in b/MANIFEST.in index 6b86bbd0..b4935a92 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,3 @@ include docs/changelog docs/changelog-2.1 recursive-include docs/gfx *.png *.text -recursive-include docs *.text +recursive-include docs *.text *.html *.1 *.7 diff --git a/build b/build index bb8d60f5..4b5690ef 100755 --- a/build +++ b/build @@ -45,43 +45,12 @@ MAN7DSTDIR=${MANDIR}/man7 SPEECHESDIR=docs/speeches case "$1" in - man) - set -e - "$0" mangen - "$0" mantype - "$0" manbuild - ;; - - pypi-manifest) - # init MANIFEST - echo README > MANIFEST - - # bin - echo bin/cdist >> MANIFEST - - # main source - find cdist -type f >> MANIFEST - - # conf - find conf -type f >> MANIFEST - - # docs - ls docs/changelog* >> MANIFEST - find docs/gfx -type f >> MANIFEST - find docs/man/ -type f -name \*.text >> MANIFEST - find docs/man/ -type f -name \*.text.sh >> MANIFEST - - # other - find other/ -type f >> MANIFEST - - - ;; - - pypi) - $0 clean - $0 pypi-manifest - python3 setup.py sdist - ;; + man) + set -e + "$0" mangen + "$0" mantype + "$0" manbuild + ;; manbuild) trap abort INT @@ -119,6 +88,12 @@ case "$1" in ./docs/dev/releasechecklist ;; + pypi) + $0 very-clean + $0 man + python3 setup.py sdist + ;; + speeches) cd "$SPEECHESDIR" for speech in *tex; do @@ -164,19 +139,23 @@ case "$1" in done ;; - clean) - rm -f ${MAN7DSTDIR}/cdist-reference.text - find "${MANDIR}" -mindepth 2 -type l \ - -o -name "*.1" \ - -o -name "*.7" \ - -o -name "*.html" \ - -o -name "*.xml" \ - | xargs rm -f - - find * -name __pycache__ | xargs rm -rf + clean) + rm -f ${MAN7DSTDIR}/cdist-reference.text + find "${MANDIR}" -mindepth 2 -type l \ + -o -name "*.1" \ + -o -name "*.7" \ + -o -name "*.html" \ + -o -name "*.xml" \ + | xargs rm -f - rm -f MANIFEST - ;; + find * -name __pycache__ | xargs rm -rf + + rm -f MANIFEST + ;; + very-clean) + $0 clean + rm -rf cache/ + ;; test) shift # skip t From 91c1374657e9122e4527d1f08f8ad8d08c6990f4 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 25 Oct 2012 23:37:15 +0200 Subject: [PATCH 020/104] begin restructering for python package Signed-off-by: Nico Schottelius --- .gitignore | 2 +- .version | 2 +- bin/cdist | 233 +--------------- cdist.py | 248 ++++++++++++++++++ cdist/test/emulator/fixtures/conf/type/__file | 2 +- {lib/cdist => cdist}/version.py | 0 {lib/cdist => cdist}/version_dynamic.py | 0 7 files changed, 256 insertions(+), 231 deletions(-) create mode 100755 cdist.py rename {lib/cdist => cdist}/version.py (100%) rename {lib/cdist => cdist}/version_dynamic.py (100%) diff --git a/.gitignore b/.gitignore index 786c706d..707b5f66 100644 --- a/.gitignore +++ b/.gitignore @@ -18,4 +18,4 @@ docs/man/man7/cdist-reference.text __pycache__/ MANIFEST dist/ -lib/cdist/version_static.py +cdist/version_static.py diff --git a/.version b/.version index 3d45b5c6..71f08595 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -2.0.14 +2.1.0-pre1 diff --git a/bin/cdist b/bin/cdist index 75047acb..15127d2b 100755 --- a/bin/cdist +++ b/bin/cdist @@ -1,7 +1,7 @@ -#!/usr/bin/env python3 +#!/bin/sh # -*- coding: utf-8 -*- # -# 2010-2012 Nico Schottelius (nico-cdist at schottelius.org) +# 2012 Nico Schottelius (nico-cdist at schottelius.org) # # This file is part of cdist. # @@ -20,229 +20,6 @@ # # -def commandline(): - """Parse command line""" - import argparse - - import cdist.banner - import cdist.config - import cdist.install - - # Construct parser others can reuse - parser = {} - # Options _all_ parsers have in common - parser['loglevel'] = argparse.ArgumentParser(add_help=False) - parser['loglevel'].add_argument('-d', '--debug', - help='Set log level to debug', action='store_true', - default=False) - parser['loglevel'].add_argument('-v', '--verbose', - help='Set log level to info, be more verbose', - action='store_true', default=False) - - # Main subcommand parser - parser['main'] = argparse.ArgumentParser(description='cdist ' + cdist.VERSION, - parents=[parser['loglevel']]) - parser['main'].add_argument('-V', '--version', - help='Show version', action='version', - version='%(prog)s ' + cdist.VERSION) - parser['sub'] = parser['main'].add_subparsers(title="Commands") - - # Banner - parser['banner'] = parser['sub'].add_parser('banner', - parents=[parser['loglevel']]) - parser['banner'].set_defaults(func=cdist.banner.banner) - - # Config and install (common stuff) - parser['configinstall'] = argparse.ArgumentParser(add_help=False) - parser['configinstall'].add_argument('host', nargs='+', - help='one or more hosts to operate on') - parser['configinstall'].add_argument('-c', '--cdist-home', - help='Change cdist home (default: .. from bin directory)', - action='store') - parser['configinstall'].add_argument('-i', '--initial-manifest', - help='Path to a cdist manifest or \'-\' to read from stdin.', - dest='manifest', required=False) - parser['configinstall'].add_argument('-p', '--parallel', - help='Operate on multiple hosts in parallel', - action='store_true', dest='parallel') - parser['configinstall'].add_argument('-s', '--sequential', - help='Operate on multiple hosts sequentially (default)', - action='store_false', dest='parallel') - - parser['configinstall'].add_argument('--remote-copy', - help='Command to use for remote copy (should behave like scp)', - action='store', dest='remote_copy', - default="scp -o User=root -q") - parser['configinstall'].add_argument('--remote-exec', - help='Command to use for remote execution (should behave like ssh)', - action='store', dest='remote_exec', - default="ssh -o User=root -q") - - # Config - parser['config'] = parser['sub'].add_parser('config', - parents=[parser['loglevel'], parser['configinstall']]) - parser['config'].set_defaults(func=config) - - # Install - # 20120525/sar: commented until it actually does something - #parser['install'] = parser['sub'].add_parser('install', - # parents=[parser['loglevel'], parser['configinstall']]) - #parser['install'].set_defaults(func=install) - - for p in parser: - parser[p].epilog = "Get cdist at http://www.nico.schottelius.org/software/cdist/" - - args = parser['main'].parse_args(sys.argv[1:]) - - # Loglevels are handled globally in here and debug wins over verbose - if args.verbose: - logging.root.setLevel(logging.INFO) - if args.debug: - logging.root.setLevel(logging.DEBUG) - - log.debug(args) - args.func(args) - -def config(args): - configinstall(args, mode=cdist.config.Config) - -def install(args): - configinstall(args, mode=cdist.install.Install) - -def configinstall(args, mode): - """Configure or install remote system""" - import multiprocessing - import time - - initial_manifest_tempfile = None - if args.manifest == '-': - # read initial manifest from stdin - import tempfile - try: - handle, initial_manifest_temp_path = tempfile.mkstemp(prefix='cdist.stdin.') - with os.fdopen(handle, 'w') as fd: - fd.write(sys.stdin.read()) - except (IOError, OSError) as e: - raise cdist.Error("Creating tempfile for stdin data failed: %s" % e) - - args.manifest = initial_manifest_temp_path - import atexit - atexit.register(lambda: os.remove(initial_manifest_temp_path)) - - process = {} - failed_hosts = [] - time_start = time.time() - - for host in args.host: - if args.parallel: - log.debug("Creating child process for %s", host) - process[host] = multiprocessing.Process(target=configinstall_onehost, args=(host, args, mode, True)) - process[host].start() - else: - try: - configinstall_onehost(host, args, mode, parallel=False) - except cdist.Error as e: - failed_hosts.append(host) - - # Catch errors in parallel mode when joining - if args.parallel: - for host in process.keys(): - log.debug("Joining process %s", host) - process[host].join() - - if not process[host].exitcode == 0: - failed_hosts.append(host) - - time_end = time.time() - log.info("Total processing time for %s host(s): %s", len(args.host), - (time_end - time_start)) - - if len(failed_hosts) > 0: - raise cdist.Error("Failed to deploy to the following hosts: " + - " ".join(failed_hosts)) - -def configinstall_onehost(host, args, mode, parallel): - """Configure or install ONE remote system""" - - try: - import cdist.context - - context = cdist.context.Context( - target_host=host, - remote_copy=args.remote_copy, - remote_exec=args.remote_exec, - initial_manifest=args.manifest, - base_path=args.cdist_home, - exec_path=sys.argv[0], - debug=args.debug) - - c = mode(context) - c.deploy_and_cleanup() - context.cleanup() - - except cdist.Error as e: - # We are running in our own process here, need to sys.exit! - if parallel: - log.error(e) - sys.exit(1) - else: - raise - - except KeyboardInterrupt: - # Ignore in parallel mode, we are existing anyway - if parallel: - sys.exit(0) - # Pass back to controlling code in sequential mode - else: - raise - -def emulator(): - """Prepare and run emulator""" - import cdist.emulator - emulator = cdist.emulator.Emulator(sys.argv) - return emulator.run() - -if __name__ == "__main__": - # Sys is needed for sys.exit() - import sys - - cdistpythonversion = '3.2' - if sys.version < cdistpythonversion: - print('Cdist requires Python >= ' + cdistpythonversion + - ' on the source host.', file=sys.stderr) - sys.exit(1) - - - exit_code = 0 - - try: - import logging - import os - import re - - # Ensure our /lib/ is included into PYTHON_PATH - sys.path.insert(0, os.path.abspath( - os.path.join(os.path.dirname(os.path.realpath(__file__)), '../lib'))) - - # And now import our stuff - import cdist - - log = logging.getLogger("cdist") - - logging.basicConfig(format='%(levelname)s: %(message)s') - - if re.match("__", os.path.basename(sys.argv[0])): - emulator() - else: - commandline() - - except KeyboardInterrupt: - pass - - except cdist.Error as e: - log.error(e) - exit_code = 1 - - # Determine exit code by return value of function - - sys.exit(exit_code) +# Wrapper for real script to allow execution from checkout +dir=${0%/*} +"$dir/../cdist.py" "$@" diff --git a/cdist.py b/cdist.py new file mode 100755 index 00000000..75047acb --- /dev/null +++ b/cdist.py @@ -0,0 +1,248 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# +# 2010-2012 Nico Schottelius (nico-cdist at schottelius.org) +# +# This file is part of cdist. +# +# cdist is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# cdist is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with cdist. If not, see . +# +# + +def commandline(): + """Parse command line""" + import argparse + + import cdist.banner + import cdist.config + import cdist.install + + # Construct parser others can reuse + parser = {} + # Options _all_ parsers have in common + parser['loglevel'] = argparse.ArgumentParser(add_help=False) + parser['loglevel'].add_argument('-d', '--debug', + help='Set log level to debug', action='store_true', + default=False) + parser['loglevel'].add_argument('-v', '--verbose', + help='Set log level to info, be more verbose', + action='store_true', default=False) + + # Main subcommand parser + parser['main'] = argparse.ArgumentParser(description='cdist ' + cdist.VERSION, + parents=[parser['loglevel']]) + parser['main'].add_argument('-V', '--version', + help='Show version', action='version', + version='%(prog)s ' + cdist.VERSION) + parser['sub'] = parser['main'].add_subparsers(title="Commands") + + # Banner + parser['banner'] = parser['sub'].add_parser('banner', + parents=[parser['loglevel']]) + parser['banner'].set_defaults(func=cdist.banner.banner) + + # Config and install (common stuff) + parser['configinstall'] = argparse.ArgumentParser(add_help=False) + parser['configinstall'].add_argument('host', nargs='+', + help='one or more hosts to operate on') + parser['configinstall'].add_argument('-c', '--cdist-home', + help='Change cdist home (default: .. from bin directory)', + action='store') + parser['configinstall'].add_argument('-i', '--initial-manifest', + help='Path to a cdist manifest or \'-\' to read from stdin.', + dest='manifest', required=False) + parser['configinstall'].add_argument('-p', '--parallel', + help='Operate on multiple hosts in parallel', + action='store_true', dest='parallel') + parser['configinstall'].add_argument('-s', '--sequential', + help='Operate on multiple hosts sequentially (default)', + action='store_false', dest='parallel') + + parser['configinstall'].add_argument('--remote-copy', + help='Command to use for remote copy (should behave like scp)', + action='store', dest='remote_copy', + default="scp -o User=root -q") + parser['configinstall'].add_argument('--remote-exec', + help='Command to use for remote execution (should behave like ssh)', + action='store', dest='remote_exec', + default="ssh -o User=root -q") + + # Config + parser['config'] = parser['sub'].add_parser('config', + parents=[parser['loglevel'], parser['configinstall']]) + parser['config'].set_defaults(func=config) + + # Install + # 20120525/sar: commented until it actually does something + #parser['install'] = parser['sub'].add_parser('install', + # parents=[parser['loglevel'], parser['configinstall']]) + #parser['install'].set_defaults(func=install) + + for p in parser: + parser[p].epilog = "Get cdist at http://www.nico.schottelius.org/software/cdist/" + + args = parser['main'].parse_args(sys.argv[1:]) + + # Loglevels are handled globally in here and debug wins over verbose + if args.verbose: + logging.root.setLevel(logging.INFO) + if args.debug: + logging.root.setLevel(logging.DEBUG) + + log.debug(args) + args.func(args) + +def config(args): + configinstall(args, mode=cdist.config.Config) + +def install(args): + configinstall(args, mode=cdist.install.Install) + +def configinstall(args, mode): + """Configure or install remote system""" + import multiprocessing + import time + + initial_manifest_tempfile = None + if args.manifest == '-': + # read initial manifest from stdin + import tempfile + try: + handle, initial_manifest_temp_path = tempfile.mkstemp(prefix='cdist.stdin.') + with os.fdopen(handle, 'w') as fd: + fd.write(sys.stdin.read()) + except (IOError, OSError) as e: + raise cdist.Error("Creating tempfile for stdin data failed: %s" % e) + + args.manifest = initial_manifest_temp_path + import atexit + atexit.register(lambda: os.remove(initial_manifest_temp_path)) + + process = {} + failed_hosts = [] + time_start = time.time() + + for host in args.host: + if args.parallel: + log.debug("Creating child process for %s", host) + process[host] = multiprocessing.Process(target=configinstall_onehost, args=(host, args, mode, True)) + process[host].start() + else: + try: + configinstall_onehost(host, args, mode, parallel=False) + except cdist.Error as e: + failed_hosts.append(host) + + # Catch errors in parallel mode when joining + if args.parallel: + for host in process.keys(): + log.debug("Joining process %s", host) + process[host].join() + + if not process[host].exitcode == 0: + failed_hosts.append(host) + + time_end = time.time() + log.info("Total processing time for %s host(s): %s", len(args.host), + (time_end - time_start)) + + if len(failed_hosts) > 0: + raise cdist.Error("Failed to deploy to the following hosts: " + + " ".join(failed_hosts)) + +def configinstall_onehost(host, args, mode, parallel): + """Configure or install ONE remote system""" + + try: + import cdist.context + + context = cdist.context.Context( + target_host=host, + remote_copy=args.remote_copy, + remote_exec=args.remote_exec, + initial_manifest=args.manifest, + base_path=args.cdist_home, + exec_path=sys.argv[0], + debug=args.debug) + + c = mode(context) + c.deploy_and_cleanup() + context.cleanup() + + except cdist.Error as e: + # We are running in our own process here, need to sys.exit! + if parallel: + log.error(e) + sys.exit(1) + else: + raise + + except KeyboardInterrupt: + # Ignore in parallel mode, we are existing anyway + if parallel: + sys.exit(0) + # Pass back to controlling code in sequential mode + else: + raise + +def emulator(): + """Prepare and run emulator""" + import cdist.emulator + emulator = cdist.emulator.Emulator(sys.argv) + return emulator.run() + +if __name__ == "__main__": + # Sys is needed for sys.exit() + import sys + + cdistpythonversion = '3.2' + if sys.version < cdistpythonversion: + print('Cdist requires Python >= ' + cdistpythonversion + + ' on the source host.', file=sys.stderr) + sys.exit(1) + + + exit_code = 0 + + try: + import logging + import os + import re + + # Ensure our /lib/ is included into PYTHON_PATH + sys.path.insert(0, os.path.abspath( + os.path.join(os.path.dirname(os.path.realpath(__file__)), '../lib'))) + + # And now import our stuff + import cdist + + log = logging.getLogger("cdist") + + logging.basicConfig(format='%(levelname)s: %(message)s') + + if re.match("__", os.path.basename(sys.argv[0])): + emulator() + else: + commandline() + + except KeyboardInterrupt: + pass + + except cdist.Error as e: + log.error(e) + exit_code = 1 + + # Determine exit code by return value of function + + sys.exit(exit_code) diff --git a/cdist/test/emulator/fixtures/conf/type/__file b/cdist/test/emulator/fixtures/conf/type/__file index 8458361c..c57c4134 120000 --- a/cdist/test/emulator/fixtures/conf/type/__file +++ b/cdist/test/emulator/fixtures/conf/type/__file @@ -1 +1 @@ -../../../../../../conf/type/__file \ No newline at end of file +../../../../../../../conf/type/__file \ No newline at end of file diff --git a/lib/cdist/version.py b/cdist/version.py similarity index 100% rename from lib/cdist/version.py rename to cdist/version.py diff --git a/lib/cdist/version_dynamic.py b/cdist/version_dynamic.py similarity index 100% rename from lib/cdist/version_dynamic.py rename to cdist/version_dynamic.py From 136bb01a67fed7c55426b62cbe84b1dc8818a55f Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 25 Oct 2012 23:43:12 +0200 Subject: [PATCH 021/104] correct placement in build script Signed-off-by: Nico Schottelius --- build | 33 +++++++++++++++++++-------------- setup.py | 9 +++++++-- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/build b/build index 1dedabba..7d73224d 100755 --- a/build +++ b/build @@ -89,8 +89,13 @@ case "$1" in ;; pypi) - $0 very-clean - $0 man + #$0 very-clean + #$0 man + $0 version-dist + $0 sdist + $0 version-dynamic + ;; + sdist) python3 setup.py sdist ;; @@ -159,7 +164,6 @@ case "$1" in test) shift # skip t - export PYTHONPATH=$PYTHONPATH:$(pwd -P)/lib if [ $# -lt 1 ]; then python3 -m cdist.test @@ -168,6 +172,18 @@ case "$1" in fi ;; + version-dynamic) + cd cdist/ + ln -sf version_dynamic.py version.py + ;; + + version-dist) + version=$(cat .version) + cd cdist/ + echo "VERSION=\"$version\"" > version_static.py + ln -sf version_static.py version.py + ;; + *) echo '' echo 'Welcome to cdist!' @@ -183,15 +199,4 @@ case "$1" in exit 1 ;; - version-dynamic) - cd lib/cdist/ - ln -sf version_dynamic.py version.py - ;; - - version-dist) - version=$(cat .version) - cd lib/cdist/ - echo "VERSION=\"$version\"" > version_static.py - ln -sf version_static.py version.py - ;; esac diff --git a/setup.py b/setup.py index 92194071..62ee480c 100644 --- a/setup.py +++ b/setup.py @@ -1,9 +1,14 @@ from distutils.core import setup +package_dir = {'': 'lib'} + +import cdist + setup( name = "cdist", - packages = ["cdist"], - version = "2.1.0", + packages = ["cdist", "cdist.core", "cdist.exec", "cdist.util" ], + scripts = ["cdist.py"], + version = cdist.version.VERSION, description = "Usable configuration management system", author = "Nico Schottelius", author_email = "nico-cdist-pypi@schottelius.org", From 3cf59fdf9a1ebdde176835dd2f986dd6465d6dd4 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 25 Oct 2012 23:45:56 +0200 Subject: [PATCH 022/104] always use dynamic version - on shipping included generated version Signed-off-by: Nico Schottelius --- bin/cdist | 1 + build | 12 ++---------- cdist/version.py | 1 - cdist/version_dynamic.py | 27 --------------------------- 4 files changed, 3 insertions(+), 38 deletions(-) delete mode 120000 cdist/version.py delete mode 100644 cdist/version_dynamic.py diff --git a/bin/cdist b/bin/cdist index 15127d2b..5c1239fb 100755 --- a/bin/cdist +++ b/bin/cdist @@ -22,4 +22,5 @@ # Wrapper for real script to allow execution from checkout dir=${0%/*} +"$dir/../build" version "$dir/../cdist.py" "$@" diff --git a/build b/build index 7d73224d..f8d6c74a 100755 --- a/build +++ b/build @@ -172,16 +172,8 @@ case "$1" in fi ;; - version-dynamic) - cd cdist/ - ln -sf version_dynamic.py version.py - ;; - - version-dist) - version=$(cat .version) - cd cdist/ - echo "VERSION=\"$version\"" > version_static.py - ln -sf version_static.py version.py + version) + echo "VERSION=\"$version\"" > cdist/version.py ;; *) diff --git a/cdist/version.py b/cdist/version.py deleted file mode 120000 index 153cf043..00000000 --- a/cdist/version.py +++ /dev/null @@ -1 +0,0 @@ -version_dynamic.py \ No newline at end of file diff --git a/cdist/version_dynamic.py b/cdist/version_dynamic.py deleted file mode 100644 index 5f69f374..00000000 --- a/cdist/version_dynamic.py +++ /dev/null @@ -1,27 +0,0 @@ -# -*- coding: utf-8 -*- -# -# 2010-2012 Nico Schottelius (nico-cdist at schottelius.org) -# -# This file is part of cdist. -# -# cdist is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# cdist is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with cdist. If not, see . -# -# - -import os -import subprocess - -here = os.path.dirname(os.path.realpath(__file__)) -VERSION = subprocess.check_output('cd "%s" && git describe' % here, - shell=True).decode('utf-8') From af8f944aaf8d72bd6c9f9287cee40d8ac7ff7f08 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 25 Oct 2012 23:47:32 +0200 Subject: [PATCH 023/104] package_dir not needed anymore Signed-off-by: Nico Schottelius --- setup.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/setup.py b/setup.py index 62ee480c..be907786 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,5 @@ from distutils.core import setup -package_dir = {'': 'lib'} - import cdist setup( From 85fcfb1744030f8f4f806abc745edbcb1745bf5d Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 25 Oct 2012 23:48:56 +0200 Subject: [PATCH 024/104] correct __file link again Signed-off-by: Nico Schottelius --- cdist/test/emulator/fixtures/conf/type/__file | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cdist/test/emulator/fixtures/conf/type/__file b/cdist/test/emulator/fixtures/conf/type/__file index c57c4134..8458361c 120000 --- a/cdist/test/emulator/fixtures/conf/type/__file +++ b/cdist/test/emulator/fixtures/conf/type/__file @@ -1 +1 @@ -../../../../../../../conf/type/__file \ No newline at end of file +../../../../../../conf/type/__file \ No newline at end of file From 3826b6ce36b99dba101e821ec129c58e8da19e50 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 25 Oct 2012 23:49:10 +0200 Subject: [PATCH 025/104] not needed to import our path anymore Signed-off-by: Nico Schottelius --- cdist.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/cdist.py b/cdist.py index 75047acb..2066db55 100755 --- a/cdist.py +++ b/cdist.py @@ -219,16 +219,9 @@ if __name__ == "__main__": import logging import os import re - - # Ensure our /lib/ is included into PYTHON_PATH - sys.path.insert(0, os.path.abspath( - os.path.join(os.path.dirname(os.path.realpath(__file__)), '../lib'))) - - # And now import our stuff import cdist log = logging.getLogger("cdist") - logging.basicConfig(format='%(levelname)s: %(message)s') if re.match("__", os.path.basename(sys.argv[0])): From c613f868a2564de8e814d15866a5ed37721862b6 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 25 Oct 2012 23:49:22 +0200 Subject: [PATCH 026/104] cleanups Signed-off-by: Nico Schottelius --- .gitignore | 2 +- build | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 707b5f66..0269a9fc 100644 --- a/.gitignore +++ b/.gitignore @@ -18,4 +18,4 @@ docs/man/man7/cdist-reference.text __pycache__/ MANIFEST dist/ -cdist/version_static.py +cdist/version.py diff --git a/build b/build index f8d6c74a..75496c8d 100755 --- a/build +++ b/build @@ -146,6 +146,9 @@ case "$1" in clean) rm -f ${MAN7DSTDIR}/cdist-reference.text + rm -f cdist/version.py + rm -f MANIFEST + find "${MANDIR}" -mindepth 2 -type l \ -o -name "*.1" \ -o -name "*.7" \ @@ -154,8 +157,6 @@ case "$1" in | xargs rm -f find * -name __pycache__ | xargs rm -rf - - rm -f MANIFEST ;; very-clean) $0 clean From a21f5f787db135202b917f8e6e50ceb315076af6 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 25 Oct 2012 23:51:18 +0200 Subject: [PATCH 027/104] begin with pre first --- docs/changelog-2.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/changelog-2.1 b/docs/changelog-2.1 index 6398e7dc..a5f7ca98 100644 --- a/docs/changelog-2.1 +++ b/docs/changelog-2.1 @@ -4,7 +4,7 @@ Changelog (v2.1 specific) * Changes are always commented with their author in (braces) * Exception: No braces means author == Nico Schottelius -2.1.0: +2.1.0pre1: * Core: Removed obsolete variable __self * Removed type __addifnosuchline (replaced by __line) * Removed type __removeline (replaced by __line) From eb6687bd32a895f2adb8c41374d0824ee05e948f Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 26 Oct 2012 06:55:01 +0200 Subject: [PATCH 028/104] allow build to be called outside of the project directory Signed-off-by: Nico Schottelius --- build | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build b/build index 75496c8d..8e30c8d4 100755 --- a/build +++ b/build @@ -26,6 +26,7 @@ # exit on any error #set -e +basedir=${0%/*} version=$(git describe) # Manpage and HTML @@ -44,6 +45,9 @@ MAN1DSTDIR=${MANDIR}/man1 MAN7DSTDIR=${MANDIR}/man7 SPEECHESDIR=docs/speeches +# Change to checkout directory +cd "$basedir" + case "$1" in man) set -e From 27a832676bd39251d895a4208fb99918e18a27ef Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 26 Oct 2012 07:09:05 +0200 Subject: [PATCH 029/104] move logfile into new destination Signed-off-by: Nico Schottelius --- {doc => docs}/dev/logs/2012-10-25.version-split | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {doc => docs}/dev/logs/2012-10-25.version-split (100%) diff --git a/doc/dev/logs/2012-10-25.version-split b/docs/dev/logs/2012-10-25.version-split similarity index 100% rename from doc/dev/logs/2012-10-25.version-split rename to docs/dev/logs/2012-10-25.version-split From 0db38038a90ecc2b5fc56e813a4762e84485bb30 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 26 Oct 2012 07:20:03 +0200 Subject: [PATCH 030/104] merge changelog-2.1 back into main changelog Signed-off-by: Nico Schottelius --- docs/changelog | 12 ++++++++++++ docs/changelog-2.1 | 15 --------------- 2 files changed, 12 insertions(+), 15 deletions(-) delete mode 100644 docs/changelog-2.1 diff --git a/docs/changelog b/docs/changelog index 05d6d96b..7475a566 100644 --- a/docs/changelog +++ b/docs/changelog @@ -4,6 +4,18 @@ Changelog * Changes are always commented with their author in (braces) * Exception: No braces means author == Nico Schottelius + +2.1.0pre1: + * Core: Removed obsolete variable __self + * Removed type __addifnosuchline (replaced by __line) + * Removed type __removeline (replaced by __line) + * Type __directory: Parameter --parents and --recursive are now boolean + * Type __package_apt, __package_luarocks, __package_opkg, + __package_pacman, __package_pkg_freebsd, __package_pkg_openbsd, + __package_rubygem, __package_yum, __process: + Parameter state accepts only "present" and "absent" + * Initial support for pypi packaging + 2.0.15: * Core: Make variable __object_name available in type explorers (Steven Armtrong) * New Type: __qemu_img diff --git a/docs/changelog-2.1 b/docs/changelog-2.1 deleted file mode 100644 index a5f7ca98..00000000 --- a/docs/changelog-2.1 +++ /dev/null @@ -1,15 +0,0 @@ -Changelog (v2.1 specific) -------------------------- - - * Changes are always commented with their author in (braces) - * Exception: No braces means author == Nico Schottelius - -2.1.0pre1: - * Core: Removed obsolete variable __self - * Removed type __addifnosuchline (replaced by __line) - * Removed type __removeline (replaced by __line) - * Type __directory: Parameter --parents and --recursive are now boolean - * Type __package_apt, __package_luarocks, __package_opkg, - __package_pacman, __package_pkg_freebsd, __package_pkg_openbsd, - __package_rubygem, __package_yum, __process: - Parameter state accepts only "present" and "absent" From 80db8a01cf82a2f92d454c54aa7956d3e2dee7a3 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 26 Oct 2012 07:36:07 +0200 Subject: [PATCH 031/104] +linebreak Signed-off-by: Nico Schottelius --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index be907786..2de4a3c0 100644 --- a/setup.py +++ b/setup.py @@ -32,6 +32,7 @@ setup( long_description = ''' cdist is a usable configuration management system. It adheres to the KISS principle and is being used in small up to enterprise grade environments. - cdist is an alternative to other configuration management systems like cfengine, bcfg2, chef and puppet. + cdist is an alternative to other configuration management systems like + cfengine, bcfg2, chef and puppet. ''' ) From ca275133d3eab812703565895a2c6dbd70ac3627 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 26 Oct 2012 07:36:56 +0200 Subject: [PATCH 032/104] add releasedate for 2.1.0pre1 Signed-off-by: Nico Schottelius --- docs/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/changelog b/docs/changelog index 7475a566..e691c09d 100644 --- a/docs/changelog +++ b/docs/changelog @@ -5,7 +5,7 @@ Changelog * Exception: No braces means author == Nico Schottelius -2.1.0pre1: +2.1.0pre1: 2012-10-26 * Core: Removed obsolete variable __self * Removed type __addifnosuchline (replaced by __line) * Removed type __removeline (replaced by __line) From 9eb7503713820a28aee7532b968123c19b875ba9 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 26 Oct 2012 07:37:18 +0200 Subject: [PATCH 033/104] split clean-dist into its own section Signed-off-by: Nico Schottelius --- build | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/build b/build index 8e30c8d4..d7426feb 100755 --- a/build +++ b/build @@ -95,9 +95,8 @@ case "$1" in pypi) #$0 very-clean #$0 man - $0 version-dist + $0 version $0 sdist - $0 version-dynamic ;; sdist) python3 setup.py sdist @@ -150,8 +149,6 @@ case "$1" in clean) rm -f ${MAN7DSTDIR}/cdist-reference.text - rm -f cdist/version.py - rm -f MANIFEST find "${MANDIR}" -mindepth 2 -type l \ -o -name "*.1" \ @@ -162,9 +159,14 @@ case "$1" in find * -name __pycache__ | xargs rm -rf ;; + clean-dist) + rm -f cdist/version.py MANIFEST + rm -rf cache/ dist/ + ;; + very-clean) $0 clean - rm -rf cache/ + $0 clean-dist ;; test) From 3b04f5749e94a155bcc4a89b565374bcc7b3f36c Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 26 Oct 2012 08:31:54 +0200 Subject: [PATCH 034/104] change release script to setup version from changelog Signed-off-by: Nico Schottelius --- docs/dev/releasechecklist | 44 ++++++++++++++++----------------------- 1 file changed, 18 insertions(+), 26 deletions(-) diff --git a/docs/dev/releasechecklist b/docs/dev/releasechecklist index 71f2979e..197ab2d3 100755 --- a/docs/dev/releasechecklist +++ b/docs/dev/releasechecklist @@ -1,48 +1,40 @@ #!/bin/sh # Nico Schottelius -files="doc/changelog lib/cdist/__init__.py" - -# Stuff to take care of when doing a release -echo "Preparing next release" - # Ensure documentation builds cleanly -echo "Testing documentation..." -./build clean && ./build man || exit 1 +echo "Verifying documentation building works ..." +## ./build clean && ./build man || exit 1 -# get version -changelog_version=$(grep '^[[:digit:]]' doc/changelog | head -n1 | sed 's/:.*//') -#git_version=$(git describe) -lib_version=$(grep "^ VERSION" lib/cdist/__init__.py | sed -e 's/.*= //' -e 's/"//g') +# get version from changelog and ensure it's not already present +changelog_version=$(grep '^[[:digit:]]' docs/changelog | head -n1 | sed 's/:.*//') -# get date +if git show --quiet $changelog_version >/dev/null 2>&1; then + echo "Version $changelog_version already exists, aborting." + exit 1 +fi + +echo "Target version from changelog: $changelog_version" + +# verify date in changelog date_today="$(date +%Y-%m-%d)" -date_changelog=$(grep '^[[:digit:]]' doc/changelog | head -n1 | sed 's/.*: //') - -echo "Ensure you fixed/prepared version files: $files" -echo "changelog: $changelog_version" -#echo "git: $git_version" -echo "lib: $lib_version" +date_changelog=$(grep '^[[:digit:]]' docs/changelog | head -n1 | sed 's/.*: //') if [ "$date_today" != "$date_changelog" ]; then - echo "Messed up date, not releasing:" + echo "Date in changelog is not today" echo "Changelog: $date_changelog" exit 1 fi -if [ "$lib_version" != "$changelog_version" ]; then - echo "Messed up versions, not releasing" - exit 1 -else - echo "Versions are sane, continuing" -fi echo "Press enter to continue" read wait -version=$lib_version +version=$changelog_version # get target branch branch=${version%\.*} +echo "Selecting branch $branch for merging" +exit 0 + # add tag printf "Enter tag description for %s> " "$version" read tagmessage From c29b7f68141a48657b3ef1dd267e74270179e630 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 26 Oct 2012 11:59:43 +0200 Subject: [PATCH 035/104] checklist is now a helper Signed-off-by: Nico Schottelius --- docs/dev/{releasechecklist => releasehelper} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename docs/dev/{releasechecklist => releasehelper} (100%) diff --git a/docs/dev/releasechecklist b/docs/dev/releasehelper similarity index 100% rename from docs/dev/releasechecklist rename to docs/dev/releasehelper From 1064d8edd50752f661c621b0c3aa4301c4bef5e6 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 26 Oct 2012 12:17:43 +0200 Subject: [PATCH 036/104] cleanup release and build script Signed-off-by: Nico Schottelius --- build | 5 ----- docs/dev/releasehelper | 16 ++++++++-------- 2 files changed, 8 insertions(+), 13 deletions(-) mode change 100755 => 100644 docs/dev/releasehelper diff --git a/build b/build index d7426feb..76057530 100755 --- a/build +++ b/build @@ -122,11 +122,6 @@ case "$1" in rm -rf ${WEBMAN} mkdir -p ${WEBMAN}/man1 ${WEBMAN}/man7 - # old stuff - # rm -rf ${WEBDIR}/${WEBBASE}/speeches && mkdir ${WEBDIR}/${WEBBASE}/speeches - # cp ${SPEECHESDIR}/*.pdf ${WEBDIR}/${WEBBASE}/speeches - # git describe > ${WEBDIR}/${WEBBASE}/man/VERSION - cp ${MAN1DSTDIR}/*.html ${MAN1DSTDIR}/*.css ${WEBMAN}/man1 cp ${MAN7DSTDIR}/*.html ${MAN7DSTDIR}/*.css ${WEBMAN}/man7 diff --git a/docs/dev/releasehelper b/docs/dev/releasehelper old mode 100755 new mode 100644 index 197ab2d3..4a570f89 --- a/docs/dev/releasehelper +++ b/docs/dev/releasehelper @@ -30,10 +30,10 @@ read wait version=$changelog_version # get target branch -branch=${version%\.*} +target_branch=${version%\.*} +current_branch=$(git rev-parse --abbrev-ref HEAD) -echo "Selecting branch $branch for merging" -exit 0 +echo "Selected branch $target_branch for merging $current_branch" # add tag printf "Enter tag description for %s> " "$version" @@ -41,14 +41,14 @@ read tagmessage git tag "$version" -m "$tagmessage" # Import into current version branch -printf "Press enter to git merge into branch \"$branch\" > " +printf "Press enter to git merge into branch \"$target_branch\" > " read prompt -git checkout $branch -git merge master -git checkout master +git checkout "$target_branch" +git merge "$current_branch" +git checkout "$current_branch" # Publish manpages and sourcecode -printf "Press enter to publish doc/ and code/ > " +printf "Press enter to publish doc/ code/ pypi for $version > " read prompt ./build web ./build pub From 281852ff27ee1a2d3803324da565da68cd825c8b Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 26 Oct 2012 12:19:41 +0200 Subject: [PATCH 037/104] use new helper Signed-off-by: Nico Schottelius --- build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build b/build index 76057530..16479304 100755 --- a/build +++ b/build @@ -89,7 +89,7 @@ case "$1" in ;; release) - ./docs/dev/releasechecklist + ./docs/dev/releasehelper ;; pypi) From aef91d972efc9acbb92a53097aece31bd7169894 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 26 Oct 2012 12:23:47 +0200 Subject: [PATCH 038/104] more cleanups Signed-off-by: Nico Schottelius --- build | 1 - docs/dev/releasehelper | 0 2 files changed, 1 deletion(-) mode change 100644 => 100755 docs/dev/releasehelper diff --git a/build b/build index 16479304..2e6e7813 100755 --- a/build +++ b/build @@ -93,7 +93,6 @@ case "$1" in ;; pypi) - #$0 very-clean #$0 man $0 version $0 sdist diff --git a/docs/dev/releasehelper b/docs/dev/releasehelper old mode 100644 new mode 100755 From 7a34c6cd28697618a8b323c19d9fa27051e0a7fc Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 26 Oct 2012 17:40:38 +0200 Subject: [PATCH 039/104] add types to pypi distribution Signed-off-by: Nico Schottelius --- MANIFEST.in | 1 + docs/changelog | 3 +++ 2 files changed, 4 insertions(+) diff --git a/MANIFEST.in b/MANIFEST.in index b4935a92..319dad56 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,4 @@ include docs/changelog docs/changelog-2.1 recursive-include docs/gfx *.png *.text recursive-include docs *.text *.html *.1 *.7 +recursive-include conf * diff --git a/docs/changelog b/docs/changelog index e691c09d..3f170057 100644 --- a/docs/changelog +++ b/docs/changelog @@ -5,6 +5,9 @@ Changelog * Exception: No braces means author == Nico Schottelius +2.1.0pre2: + * PyPi: Add conf/ directory to distribution + 2.1.0pre1: 2012-10-26 * Core: Removed obsolete variable __self * Removed type __addifnosuchline (replaced by __line) From 6627325b454ef36354204787eb8dd8a9f0752d21 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 26 Oct 2012 17:42:26 +0200 Subject: [PATCH 040/104] build manpages before doing a pypi package Signed-off-by: Nico Schottelius --- build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build b/build index 2e6e7813..18dcfdab 100755 --- a/build +++ b/build @@ -93,7 +93,7 @@ case "$1" in ;; pypi) - #$0 man + $0 man $0 version $0 sdist ;; From cbd44a883780d7ec541b07eea9fde7305d941cff Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 26 Oct 2012 17:53:35 +0200 Subject: [PATCH 041/104] begin initial PKGBUILD for archlinux Signed-off-by: Nico Schottelius --- PKGBUILD.in | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100755 PKGBUILD.in diff --git a/PKGBUILD.in b/PKGBUILD.in new file mode 100755 index 00000000..8e55946f --- /dev/null +++ b/PKGBUILD.in @@ -0,0 +1,26 @@ +#!/bin/sh + +version=$(git describe) +version=2.1.0pre1 + +outfile=${0%.in} + +cat << eof > "${outfile}" +pkgname=cdist +pkgver=$version +pkgrel=1 +pkgdesc='A Usable Configuration Management System"' +arch=('any') +url='http://www.nico.schottelius.org/software/cdist/' +license=('GPL3') +depends=('python3>=3.2.0') +source=("http://pypi.python.org/packages/source/c/cdist/cdist-\${pkgver}.tar.gz") + +package() { + python3 setup.py build install --root="${pkgdir}" + + #install -Dm644 offlineimap.1 "${pkgdir}"/usr/share/man/man1/offlineimap.1 + #install -Dm644 offlineimap.conf "${pkgdir}"/usr/share/offlineimap/offlineimap.conf + #install -Dm644 offlineimap.conf.minimal "${pkgdir}"/usr/share/offlineimap/offlineimap.conf.minimal +} +eof From 4c4b234feb401d26b52d004611fdc1366df4e1eb Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 26 Oct 2012 17:53:57 +0200 Subject: [PATCH 042/104] ignore generated PKGBUILD Signed-off-by: Nico Schottelius --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 0269a9fc..5d39eae1 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,6 @@ __pycache__/ MANIFEST dist/ cdist/version.py + +# Packaging: Archlinux +/PKGBUILD From 195036b7101db05002d85f478ba4151d0576e0c1 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 26 Oct 2012 18:13:17 +0200 Subject: [PATCH 043/104] creating basic cdist archlinux package works Signed-off-by: Nico Schottelius --- .gitignore | 4 ++++ PKGBUILD.in | 14 +++++++------- build | 13 +++++++++++-- setup.py | 2 +- 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 5d39eae1..6e2d4437 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,7 @@ cdist/version.py # Packaging: Archlinux /PKGBUILD +/cdist-*.pkg.tar.xz +/cdist-*.tar.gz +/pkg +/src diff --git a/PKGBUILD.in b/PKGBUILD.in index 8e55946f..a4e744ae 100755 --- a/PKGBUILD.in +++ b/PKGBUILD.in @@ -1,8 +1,6 @@ #!/bin/sh version=$(git describe) -version=2.1.0pre1 - outfile=${0%.in} cat << eof > "${outfile}" @@ -13,14 +11,16 @@ pkgdesc='A Usable Configuration Management System"' arch=('any') url='http://www.nico.schottelius.org/software/cdist/' license=('GPL3') -depends=('python3>=3.2.0') +depends=('python>=3.2.0') source=("http://pypi.python.org/packages/source/c/cdist/cdist-\${pkgver}.tar.gz") package() { - python3 setup.py build install --root="${pkgdir}" + cd cdist-\${pkgver} + python3 setup.py build install --root="\${pkgdir}" + mv "\${pkgdir}"/usr/bin/cdist.py "\${pkgdir}"/usr/bin/cdist - #install -Dm644 offlineimap.1 "${pkgdir}"/usr/share/man/man1/offlineimap.1 - #install -Dm644 offlineimap.conf "${pkgdir}"/usr/share/offlineimap/offlineimap.conf - #install -Dm644 offlineimap.conf.minimal "${pkgdir}"/usr/share/offlineimap/offlineimap.conf.minimal + #install -Dm644 offlineimap.1 "\${pkgdir}"/usr/share/man/man1/offlineimap.1 } eof + +makepkg -g >> "${outfile}" diff --git a/build b/build index 18dcfdab..bb31ccc0 100755 --- a/build +++ b/build @@ -92,7 +92,12 @@ case "$1" in ./docs/dev/releasehelper ;; - pypi) + dist-archlinux) + ./PKGBUILD.in + makepkg + ;; + + dist-pypi) $0 man $0 version $0 sdist @@ -154,8 +159,12 @@ case "$1" in find * -name __pycache__ | xargs rm -rf ;; clean-dist) - rm -f cdist/version.py MANIFEST + rm -f cdist/version.py MANIFEST PKGBUILD rm -rf cache/ dist/ + + # Archlinux + rm -f cdist-*.pkg.tar.xz cdist-*.tar.gz + rm -rf pkg/ src/ ;; very-clean) diff --git a/setup.py b/setup.py index 2de4a3c0..900dac0f 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ setup( packages = ["cdist", "cdist.core", "cdist.exec", "cdist.util" ], scripts = ["cdist.py"], version = cdist.version.VERSION, - description = "Usable configuration management system", + description = "A Usable Configuration Management System", author = "Nico Schottelius", author_email = "nico-cdist-pypi@schottelius.org", url = "http://www.nico.schottelius.org/software/cdist/", From 992be4959a0aa660de8ea44abd2a36e2f7a9e119 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 26 Oct 2012 18:14:04 +0200 Subject: [PATCH 044/104] ++changes(2.1.0pre2) Signed-off-by: Nico Schottelius --- docs/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/changelog b/docs/changelog index 3f170057..295aa677 100644 --- a/docs/changelog +++ b/docs/changelog @@ -6,7 +6,8 @@ Changelog 2.1.0pre2: - * PyPi: Add conf/ directory to distribution + * Dist: PyPi: Add conf/ directory to distribution + * Dist: Initial support for archlinux packaging 2.1.0pre1: 2012-10-26 * Core: Removed obsolete variable __self @@ -17,7 +18,7 @@ Changelog __package_pacman, __package_pkg_freebsd, __package_pkg_openbsd, __package_rubygem, __package_yum, __process: Parameter state accepts only "present" and "absent" - * Initial support for pypi packaging + * Dist: Initial support for pypi packaging 2.0.15: * Core: Make variable __object_name available in type explorers (Steven Armtrong) From 3e573fa21e36f6e25884b3c94d13342340f0f08c Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 26 Oct 2012 18:20:09 +0200 Subject: [PATCH 045/104] begin to merge releasehelper into build Signed-off-by: Nico Schottelius --- build | 83 +++++++++++++++++++++++++++++++++++++++++- docs/dev/releasehelper | 64 -------------------------------- 2 files changed, 81 insertions(+), 66 deletions(-) delete mode 100755 docs/dev/releasehelper diff --git a/build b/build index bb31ccc0..7fb3c2ec 100755 --- a/build +++ b/build @@ -88,13 +88,26 @@ case "$1" in ${MANDIR}/cdist-reference.text.sh ;; - release) + dist) + $0 dist-pypi + + # Archlinux depends on successful pypi ;-) + $0 dist-archlinux + + $0 dist-post + ;; + + dist-prepare) ./docs/dev/releasehelper ;; + dist-post) + + ;; + dist-archlinux) ./PKGBUILD.in - makepkg + makepkg -c ;; dist-pypi) @@ -202,3 +215,69 @@ case "$1" in ;; esac + + +#!/bin/sh +# Nico Schottelius + +# Ensure documentation builds cleanly +echo "Verifying documentation building works ..." +## ./build clean && ./build man || exit 1 + +# get version from changelog and ensure it's not already present +changelog_version=$(grep '^[[:digit:]]' docs/changelog | head -n1 | sed 's/:.*//') + +if git show --quiet $changelog_version >/dev/null 2>&1; then + echo "Version $changelog_version already exists, aborting." + exit 1 +fi + +echo "Target version from changelog: $changelog_version" + +# verify date in changelog +date_today="$(date +%Y-%m-%d)" +date_changelog=$(grep '^[[:digit:]]' docs/changelog | head -n1 | sed 's/.*: //') + +if [ "$date_today" != "$date_changelog" ]; then + echo "Date in changelog is not today" + echo "Changelog: $date_changelog" + exit 1 +fi + +echo "Press enter to continue" +read wait +version=$changelog_version + +# get target branch +target_branch=${version%\.*} +current_branch=$(git rev-parse --abbrev-ref HEAD) + +echo "Selected branch $target_branch for merging $current_branch" + +# add tag +printf "Enter tag description for %s> " "$version" +read tagmessage +git tag "$version" -m "$tagmessage" + +# Import into current version branch +printf "Press enter to git merge into branch \"$target_branch\" > " +read prompt +git checkout "$target_branch" +git merge "$current_branch" +git checkout "$current_branch" + +# Publish manpages and sourcecode +printf "Press enter to publish doc/ code/ pypi for $version > " +read prompt +./build web +./build pub + +cat << notes +To be done manually... + + - freecode release + - blog entry + - linkedin entry + - mailinglist update + +notes diff --git a/docs/dev/releasehelper b/docs/dev/releasehelper deleted file mode 100755 index 4a570f89..00000000 --- a/docs/dev/releasehelper +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh -# Nico Schottelius - -# Ensure documentation builds cleanly -echo "Verifying documentation building works ..." -## ./build clean && ./build man || exit 1 - -# get version from changelog and ensure it's not already present -changelog_version=$(grep '^[[:digit:]]' docs/changelog | head -n1 | sed 's/:.*//') - -if git show --quiet $changelog_version >/dev/null 2>&1; then - echo "Version $changelog_version already exists, aborting." - exit 1 -fi - -echo "Target version from changelog: $changelog_version" - -# verify date in changelog -date_today="$(date +%Y-%m-%d)" -date_changelog=$(grep '^[[:digit:]]' docs/changelog | head -n1 | sed 's/.*: //') - -if [ "$date_today" != "$date_changelog" ]; then - echo "Date in changelog is not today" - echo "Changelog: $date_changelog" - exit 1 -fi - -echo "Press enter to continue" -read wait -version=$changelog_version - -# get target branch -target_branch=${version%\.*} -current_branch=$(git rev-parse --abbrev-ref HEAD) - -echo "Selected branch $target_branch for merging $current_branch" - -# add tag -printf "Enter tag description for %s> " "$version" -read tagmessage -git tag "$version" -m "$tagmessage" - -# Import into current version branch -printf "Press enter to git merge into branch \"$target_branch\" > " -read prompt -git checkout "$target_branch" -git merge "$current_branch" -git checkout "$current_branch" - -# Publish manpages and sourcecode -printf "Press enter to publish doc/ code/ pypi for $version > " -read prompt -./build web -./build pub - -cat << notes -To be done manually... - - - freecode release - - blog entry - - linkedin entry - - mailinglist update - -notes From e397f2a74cce0a1ae0a832415a06e238c7135d45 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 26 Oct 2012 18:35:47 +0200 Subject: [PATCH 046/104] cleanup distribution process in build file Signed-off-by: Nico Schottelius --- build | 144 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 71 insertions(+), 73 deletions(-) diff --git a/build b/build index 7fb3c2ec..1aa76f3b 100755 --- a/build +++ b/build @@ -89,34 +89,98 @@ case "$1" in ;; dist) + set -e + # Do the checks + $0 dist-check + + # Git changes - everything depends on this + $0 dist-tag + $0 dist-branch-merge + $0 dist-pypi # Archlinux depends on successful pypi ;-) $0 dist-archlinux + # Update website (includes documentation) + $0 web + + $0 pub + $0 dist-post ;; - dist-prepare) - ./docs/dev/releasehelper + changelog-version) + # get version from changelog and ensure it's not already present + grep '^[[:digit:]]' "$basedir/docs/changelog" | head -n1 | sed 's/:.*//' + ;; + + dist-check) + echo "Verifying documentation building works ..." + $0 clean && $0 man + + changelog_version=$($0 changelog-version) + + if git show --quiet $changelog_version >/dev/null 2>&1; then + echo "Version $changelog_version already exists, aborting." + exit 1 + fi + + echo "Target version from changelog: $changelog_version" + + # verify date in changelog + date_today="$(date +%Y-%m-%d)" + date_changelog=$(grep '^[[:digit:]]' "$basedir/docs/changelog" | head -n1 | sed 's/.*: //') + + if [ "$date_today" != "$date_changelog" ]; then + echo "Date in changelog is not today" + echo "Changelog: $date_changelog" + exit 1 + fi + ;; dist-post) + cat << notes + To be done manually... + + - freecode release + - blog entry + - linkedin entry + - mailinglist update +notes + + ;; + + dist-tag) + version=$($0 changelog-version) + # add tag + printf "Enter tag description for %s> " "$version" + read tagmessage + git tag "$version" -m "$tagmessage" + ;; + + dist-branch-merge) + version=$($0 changelog-version) + target_branch=${version%\.*} + current_branch=$(git rev-parse --abbrev-ref HEAD) + + printf "Press enter to git merge $current_branch into \"$target_branch\" > " + read prompt + git checkout "$target_branch" + git merge "$current_branch" + git checkout "$current_branch" ;; dist-archlinux) ./PKGBUILD.in makepkg -c ;; - dist-pypi) $0 man $0 version - $0 sdist - ;; - sdist) - python3 setup.py sdist + python3 setup.py sdist update ;; speeches) @@ -215,69 +279,3 @@ case "$1" in ;; esac - - -#!/bin/sh -# Nico Schottelius - -# Ensure documentation builds cleanly -echo "Verifying documentation building works ..." -## ./build clean && ./build man || exit 1 - -# get version from changelog and ensure it's not already present -changelog_version=$(grep '^[[:digit:]]' docs/changelog | head -n1 | sed 's/:.*//') - -if git show --quiet $changelog_version >/dev/null 2>&1; then - echo "Version $changelog_version already exists, aborting." - exit 1 -fi - -echo "Target version from changelog: $changelog_version" - -# verify date in changelog -date_today="$(date +%Y-%m-%d)" -date_changelog=$(grep '^[[:digit:]]' docs/changelog | head -n1 | sed 's/.*: //') - -if [ "$date_today" != "$date_changelog" ]; then - echo "Date in changelog is not today" - echo "Changelog: $date_changelog" - exit 1 -fi - -echo "Press enter to continue" -read wait -version=$changelog_version - -# get target branch -target_branch=${version%\.*} -current_branch=$(git rev-parse --abbrev-ref HEAD) - -echo "Selected branch $target_branch for merging $current_branch" - -# add tag -printf "Enter tag description for %s> " "$version" -read tagmessage -git tag "$version" -m "$tagmessage" - -# Import into current version branch -printf "Press enter to git merge into branch \"$target_branch\" > " -read prompt -git checkout "$target_branch" -git merge "$current_branch" -git checkout "$current_branch" - -# Publish manpages and sourcecode -printf "Press enter to publish doc/ code/ pypi for $version > " -read prompt -./build web -./build pub - -cat << notes -To be done manually... - - - freecode release - - blog entry - - linkedin entry - - mailinglist update - -notes From 2307cdebfa1dd1759a1e37a52241919fa7b12f03 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 26 Oct 2012 18:38:00 +0200 Subject: [PATCH 047/104] abort dist on any error Signed-off-by: Nico Schottelius --- build | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build b/build index 1aa76f3b..5ecf481a 100755 --- a/build +++ b/build @@ -116,18 +116,19 @@ case "$1" in ;; dist-check) + set -e echo "Verifying documentation building works ..." - $0 clean && $0 man + $0 clean + $0 man changelog_version=$($0 changelog-version) + echo "Target version from changelog: $changelog_version" if git show --quiet $changelog_version >/dev/null 2>&1; then echo "Version $changelog_version already exists, aborting." exit 1 fi - echo "Target version from changelog: $changelog_version" - # verify date in changelog date_today="$(date +%Y-%m-%d)" date_changelog=$(grep '^[[:digit:]]' "$basedir/docs/changelog" | head -n1 | sed 's/.*: //') From 0d46dc336766be528b8030da2fe21db466d8ca0d Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 26 Oct 2012 18:38:14 +0200 Subject: [PATCH 048/104] fix manpages of __pf_ruleset and __pf_apply Signed-off-by: Nico Schottelius --- conf/type/__pf_apply/man.text | 2 +- conf/type/__pf_ruleset/man.text | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/type/__pf_apply/man.text b/conf/type/__pf_apply/man.text index 55bf5745..2e0d7802 100644 --- a/conf/type/__pf_apply/man.text +++ b/conf/type/__pf_apply/man.text @@ -1,5 +1,5 @@ cdist-type__pf_apply(7) -================================== +======================= Jake Guffey diff --git a/conf/type/__pf_ruleset/man.text b/conf/type/__pf_ruleset/man.text index 68601fad..5c368e77 100644 --- a/conf/type/__pf_ruleset/man.text +++ b/conf/type/__pf_ruleset/man.text @@ -1,5 +1,5 @@ cdist-type__pf_ruleset(7) -================================== +========================= Jake Guffey From fd9aca7b3c1648edb5c489c1ca4669f00b72f86d Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 26 Oct 2012 18:39:22 +0200 Subject: [PATCH 049/104] release 2.1.0pre2 today Signed-off-by: Nico Schottelius --- docs/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/changelog b/docs/changelog index 295aa677..dba70701 100644 --- a/docs/changelog +++ b/docs/changelog @@ -5,7 +5,7 @@ Changelog * Exception: No braces means author == Nico Schottelius -2.1.0pre2: +2.1.0pre2: 2012-10-26 * Dist: PyPi: Add conf/ directory to distribution * Dist: Initial support for archlinux packaging From 24481781f94b13e6f8b92bbdba2a33969d0d29a9 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 26 Oct 2012 18:42:06 +0200 Subject: [PATCH 050/104] +comment Signed-off-by: Nico Schottelius --- build | 1 + 1 file changed, 1 insertion(+) diff --git a/build b/build index 5ecf481a..16029581 100755 --- a/build +++ b/build @@ -97,6 +97,7 @@ case "$1" in $0 dist-tag $0 dist-branch-merge + # Pypi first - is the base for others $0 dist-pypi # Archlinux depends on successful pypi ;-) From 8324c9dee4ba03aaf5aac066aa277aca2f9bd2dc Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 26 Oct 2012 18:47:49 +0200 Subject: [PATCH 051/104] build source for archlinux as well as upload to pypi Signed-off-by: Nico Schottelius --- build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build b/build index 16029581..d295da14 100755 --- a/build +++ b/build @@ -178,11 +178,12 @@ notes dist-archlinux) ./PKGBUILD.in makepkg -c + makepkg -c --source ;; dist-pypi) $0 man $0 version - python3 setup.py sdist update + python3 setup.py sdist upload ;; speeches) From e2ba9ab1d2096072ef764e98d1ae400248d11f0e Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Mon, 29 Oct 2012 22:18:32 +0100 Subject: [PATCH 052/104] add package data info Signed-off-by: Nico Schottelius --- MANIFEST.in | 3 +-- setup.py | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 319dad56..a675f446 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,3 @@ -include docs/changelog docs/changelog-2.1 +include docs/changelog recursive-include docs/gfx *.png *.text recursive-include docs *.text *.html *.1 *.7 -recursive-include conf * diff --git a/setup.py b/setup.py index 900dac0f..19fb28e6 100644 --- a/setup.py +++ b/setup.py @@ -1,10 +1,31 @@ from distutils.core import setup +#data_files=[('/usr/share/cdist', 'conf')], + # data_files=[('/tmp/cdist', ['conf'])], import cdist +import os + +def data_finder(data_dir): + entries = [] + for name in os.listdir(data_dir): + entry = os.path.join(data_dir, name) + if os.path.isdir(entry): + entries.extend(data_finder(entry)) + else: + entries.append(entry) + + return entries + +package_data = data_finder("conf") + + +print(package_data) + setup( name = "cdist", packages = ["cdist", "cdist.core", "cdist.exec", "cdist.util" ], + package_data={'cdist': package_data}, scripts = ["cdist.py"], version = cdist.version.VERSION, description = "A Usable Configuration Management System", From 63573a9797651ba90233e5f59a1a4360a3a15189 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Mon, 29 Oct 2012 22:50:27 +0100 Subject: [PATCH 053/104] make package_data work Signed-off-by: Nico Schottelius --- {conf => cdist/conf}/.gitignore | 0 {conf => cdist/conf}/README | 0 {conf => cdist/conf}/explorer/hostname | 0 {conf => cdist/conf}/explorer/interfaces | 0 {conf => cdist/conf}/explorer/lsb_codename | 0 {conf => cdist/conf}/explorer/lsb_description | 0 {conf => cdist/conf}/explorer/lsb_id | 0 {conf => cdist/conf}/explorer/lsb_release | 0 {conf => cdist/conf}/explorer/machine | 0 {conf => cdist/conf}/explorer/os | 0 {conf => cdist/conf}/explorer/os_version | 0 {conf => cdist/conf}/explorer/runlevel | 0 {conf => cdist/conf}/manifest/init.sample | 0 {conf => cdist/conf}/type/__apt_ppa/explorer/state | 0 .../conf}/type/__apt_ppa/files/remove-apt-repository | 0 {conf => cdist/conf}/type/__apt_ppa/gencode-remote | 0 {conf => cdist/conf}/type/__apt_ppa/man.text | 0 {conf => cdist/conf}/type/__apt_ppa/manifest | 0 {conf => cdist/conf}/type/__apt_ppa/parameter/required | 0 {conf => cdist/conf}/type/__apt_update_index/gencode-remote | 0 {conf => cdist/conf}/type/__apt_update_index/man.text | 0 {conf => cdist/conf}/type/__apt_update_index/singleton | 0 {conf => cdist/conf}/type/__autofs_map/man.text | 0 {conf => cdist/conf}/type/__autofs_map/manifest | 0 {conf => cdist/conf}/type/__autofs_map/parameter/optional | 0 {conf => cdist/conf}/type/__autofs_map/parameter/required | 0 .../conf}/type/__autofs_master/files/auto.master.header | 0 {conf => cdist/conf}/type/__autofs_master/gencode-local | 0 {conf => cdist/conf}/type/__autofs_master/man.text | 0 {conf => cdist/conf}/type/__autofs_master/manifest | 0 .../conf}/type/__autofs_master/parameter/optional | 0 {conf => cdist/conf}/type/__autofs_master/singleton | 0 {conf => cdist/conf}/type/__cdistmarker/gencode-remote | 0 {conf => cdist/conf}/type/__cdistmarker/man.text | 0 {conf => cdist/conf}/type/__cdistmarker/parameter/optional | 0 {conf => cdist/conf}/type/__cdistmarker/singleton | 0 {conf => cdist/conf}/type/__cron/explorer/entry | 0 {conf => cdist/conf}/type/__cron/gencode-remote | 0 {conf => cdist/conf}/type/__cron/man.text | 0 {conf => cdist/conf}/type/__cron/manifest | 0 {conf => cdist/conf}/type/__cron/parameter/optional | 0 {conf => cdist/conf}/type/__cron/parameter/required | 0 .../conf}/type/__debconf_set_selections/gencode-remote | 0 {conf => cdist/conf}/type/__debconf_set_selections/man.text | 0 .../conf}/type/__debconf_set_selections/parameter/required | 0 {conf => cdist/conf}/type/__directory/explorer/state | 0 {conf => cdist/conf}/type/__directory/gencode-remote | 0 {conf => cdist/conf}/type/__directory/man.text | 0 {conf => cdist/conf}/type/__directory/parameter/boolean | 0 {conf => cdist/conf}/type/__directory/parameter/optional | 0 {conf => cdist/conf}/type/__file/explorer/cksum | 0 {conf => cdist/conf}/type/__file/explorer/exists | 0 {conf => cdist/conf}/type/__file/gencode-local | 0 {conf => cdist/conf}/type/__file/gencode-remote | 0 {conf => cdist/conf}/type/__file/man.text | 0 {conf => cdist/conf}/type/__file/manifest | 0 {conf => cdist/conf}/type/__file/parameter/optional | 0 {conf => cdist/conf}/type/__group/TODO | 0 {conf => cdist/conf}/type/__group/explorer/group | 0 {conf => cdist/conf}/type/__group/explorer/gshadow | 0 {conf => cdist/conf}/type/__group/gencode-remote | 0 {conf => cdist/conf}/type/__group/man.text | 0 {conf => cdist/conf}/type/__group/parameter/optional | 0 {conf => cdist/conf}/type/__issue/files/archlinux | 0 {conf => cdist/conf}/type/__issue/files/default | 0 {conf => cdist/conf}/type/__issue/files/redhat | 0 {conf => cdist/conf}/type/__issue/man.text | 0 {conf => cdist/conf}/type/__issue/manifest | 0 {conf => cdist/conf}/type/__issue/parameter/optional | 0 {conf => cdist/conf}/type/__issue/singleton | 0 {conf => cdist/conf}/type/__jail/.gitignore | 0 {conf => cdist/conf}/type/__jail/explorer/basepresent | 0 {conf => cdist/conf}/type/__jail/explorer/present | 0 {conf => cdist/conf}/type/__jail/explorer/status | 0 {conf => cdist/conf}/type/__jail/gencode-local | 0 {conf => cdist/conf}/type/__jail/gencode-remote | 0 {conf => cdist/conf}/type/__jail/man.text | 0 {conf => cdist/conf}/type/__jail/manifest | 0 {conf => cdist/conf}/type/__jail/parameter/optional | 0 {conf => cdist/conf}/type/__jail/parameter/required | 0 {conf => cdist/conf}/type/__key_value/explorer/state | 0 {conf => cdist/conf}/type/__key_value/gencode-remote | 0 {conf => cdist/conf}/type/__key_value/man.text | 0 {conf => cdist/conf}/type/__key_value/manifest | 0 {conf => cdist/conf}/type/__key_value/parameter/optional | 0 {conf => cdist/conf}/type/__key_value/parameter/required | 0 {conf => cdist/conf}/type/__line/explorer/state | 0 {conf => cdist/conf}/type/__line/gencode-remote | 0 {conf => cdist/conf}/type/__line/man.text | 0 {conf => cdist/conf}/type/__line/parameter/optional | 0 {conf => cdist/conf}/type/__link/explorer/state | 0 {conf => cdist/conf}/type/__link/gencode-remote | 0 {conf => cdist/conf}/type/__link/man.text | 0 {conf => cdist/conf}/type/__link/manifest | 0 {conf => cdist/conf}/type/__link/parameter/optional | 0 {conf => cdist/conf}/type/__link/parameter/required | 0 {conf => cdist/conf}/type/__mkfs/gencode-remote | 0 {conf => cdist/conf}/type/__mkfs/install | 0 {conf => cdist/conf}/type/__mkfs/man.text | 0 {conf => cdist/conf}/type/__mkfs/manifest | 0 {conf => cdist/conf}/type/__mkfs/parameter/optional | 0 {conf => cdist/conf}/type/__mkfs/parameter/required | 0 {conf => cdist/conf}/type/__motd/files/motd | 0 {conf => cdist/conf}/type/__motd/man.text | 0 {conf => cdist/conf}/type/__motd/manifest | 0 {conf => cdist/conf}/type/__motd/parameter/optional | 0 {conf => cdist/conf}/type/__motd/singleton | 0 {conf => cdist/conf}/type/__mysql_database/gencode-remote | 0 {conf => cdist/conf}/type/__mysql_database/man.text | 0 .../conf}/type/__mysql_database/parameter/optional | 0 {conf => cdist/conf}/type/__package/man.text | 0 {conf => cdist/conf}/type/__package/manifest | 0 {conf => cdist/conf}/type/__package/parameter/optional | 0 {conf => cdist/conf}/type/__package_apt/explorer/state | 0 {conf => cdist/conf}/type/__package_apt/gencode-remote | 0 {conf => cdist/conf}/type/__package_apt/man.text | 0 {conf => cdist/conf}/type/__package_apt/notes.txt | 0 {conf => cdist/conf}/type/__package_apt/parameter/optional | 0 .../conf}/type/__package_luarocks/explorer/pkg_status | 0 {conf => cdist/conf}/type/__package_luarocks/gencode-remote | 0 {conf => cdist/conf}/type/__package_luarocks/man.text | 0 {conf => cdist/conf}/type/__package_luarocks/manifest | 0 .../conf}/type/__package_luarocks/parameter/optional | 0 .../conf}/type/__package_opkg/explorer/pkg_status | 0 {conf => cdist/conf}/type/__package_opkg/gencode-remote | 0 {conf => cdist/conf}/type/__package_opkg/man.text | 0 {conf => cdist/conf}/type/__package_opkg/parameter/optional | 0 .../conf}/type/__package_pacman/explorer/pkg_version | 0 {conf => cdist/conf}/type/__package_pacman/gencode-remote | 0 {conf => cdist/conf}/type/__package_pacman/man.text | 0 .../conf}/type/__package_pacman/parameter/optional | 0 {conf => cdist/conf}/type/__package_pip/explorer/state | 0 {conf => cdist/conf}/type/__package_pip/gencode-remote | 0 {conf => cdist/conf}/type/__package_pip/man.text | 0 {conf => cdist/conf}/type/__package_pip/parameter/optional | 0 .../conf}/type/__package_pkg_freebsd/explorer/pkg_version | 0 .../conf}/type/__package_pkg_freebsd/gencode-remote | 0 {conf => cdist/conf}/type/__package_pkg_freebsd/man.text | 0 .../conf}/type/__package_pkg_freebsd/parameter/optional | 0 .../conf}/type/__package_pkg_openbsd/explorer/pkg_version | 0 .../conf}/type/__package_pkg_openbsd/gencode-remote | 0 {conf => cdist/conf}/type/__package_pkg_openbsd/man.text | 0 .../conf}/type/__package_pkg_openbsd/parameter/optional | 0 .../conf}/type/__package_rubygem/explorer/pkg_status | 0 {conf => cdist/conf}/type/__package_rubygem/gencode-remote | 0 {conf => cdist/conf}/type/__package_rubygem/man.text | 0 .../conf}/type/__package_rubygem/parameter/optional | 0 .../conf}/type/__package_yum/explorer/pkg_version | 0 {conf => cdist/conf}/type/__package_yum/gencode-remote | 0 {conf => cdist/conf}/type/__package_yum/man.text | 0 {conf => cdist/conf}/type/__package_yum/parameter/optional | 0 .../conf}/type/__package_zypper/explorer/pkg_version | 0 {conf => cdist/conf}/type/__package_zypper/gencode-remote | 0 {conf => cdist/conf}/type/__package_zypper/man.text | 0 .../conf}/type/__package_zypper/parameter/optional | 0 {conf => cdist/conf}/type/__partition_msdos/install | 0 {conf => cdist/conf}/type/__partition_msdos/man.text | 0 {conf => cdist/conf}/type/__partition_msdos/manifest | 0 .../conf}/type/__partition_msdos/parameter/optional | 0 .../conf}/type/__partition_msdos/parameter/required | 0 .../conf}/type/__partition_msdos_apply/explorer/partitions | 0 .../conf}/type/__partition_msdos_apply/files/lib.sh | 0 .../conf}/type/__partition_msdos_apply/gencode-remote | 0 {conf => cdist/conf}/type/__partition_msdos_apply/install | 0 {conf => cdist/conf}/type/__partition_msdos_apply/man.text | 0 {conf => cdist/conf}/type/__partition_msdos_apply/singleton | 0 {conf => cdist/conf}/type/__pf_apply/explorer/rcvar | 0 {conf => cdist/conf}/type/__pf_apply/gencode-remote | 0 {conf => cdist/conf}/type/__pf_apply/man.text | 0 {conf => cdist/conf}/type/__pf_apply/singleton | 0 {conf => cdist/conf}/type/__pf_ruleset/explorer/cksum | 0 {conf => cdist/conf}/type/__pf_ruleset/explorer/rcvar | 0 {conf => cdist/conf}/type/__pf_ruleset/gencode-local | 0 {conf => cdist/conf}/type/__pf_ruleset/gencode-remote | 0 {conf => cdist/conf}/type/__pf_ruleset/man.text | 0 {conf => cdist/conf}/type/__pf_ruleset/parameter/optional | 0 {conf => cdist/conf}/type/__pf_ruleset/parameter/required | 0 {conf => cdist/conf}/type/__pf_ruleset/singleton | 0 .../conf}/type/__postgres_database/explorer/state | 0 .../conf}/type/__postgres_database/gencode-remote | 0 {conf => cdist/conf}/type/__postgres_database/man.text | 0 .../conf}/type/__postgres_database/parameter/optional | 0 .../conf}/type/__postgres_database/parameter/required | 0 {conf => cdist/conf}/type/__postgres_role/explorer/state | 0 {conf => cdist/conf}/type/__postgres_role/gencode-remote | 0 {conf => cdist/conf}/type/__postgres_role/man.text | 0 .../conf}/type/__postgres_role/parameter/optional | 0 .../conf}/type/__postgres_role/parameter/required | 0 {conf => cdist/conf}/type/__process/explorer/runs | 0 {conf => cdist/conf}/type/__process/gencode-remote | 0 {conf => cdist/conf}/type/__process/man.text | 0 {conf => cdist/conf}/type/__process/parameter/optional | 0 {conf => cdist/conf}/type/__process/parameter/required | 0 {conf => cdist/conf}/type/__qemu_img/explorer/exists | 0 {conf => cdist/conf}/type/__qemu_img/gencode-remote | 0 {conf => cdist/conf}/type/__qemu_img/man.text | 0 {conf => cdist/conf}/type/__qemu_img/manifest | 0 {conf => cdist/conf}/type/__qemu_img/parameter/optional | 0 {conf => cdist/conf}/type/__qemu_img/parameter/required | 0 {conf => cdist/conf}/type/__rvm/explorer/state | 0 {conf => cdist/conf}/type/__rvm/gencode-remote | 0 {conf => cdist/conf}/type/__rvm/man.text | 0 {conf => cdist/conf}/type/__rvm/manifest | 0 {conf => cdist/conf}/type/__rvm/parameter/required | 0 {conf => cdist/conf}/type/__rvm_gem/explorer/state | 0 {conf => cdist/conf}/type/__rvm_gem/gencode-remote | 0 {conf => cdist/conf}/type/__rvm_gem/man.text | 0 {conf => cdist/conf}/type/__rvm_gem/manifest | 0 {conf => cdist/conf}/type/__rvm_gem/parameter/optional | 0 {conf => cdist/conf}/type/__rvm_gem/parameter/required | 0 {conf => cdist/conf}/type/__rvm_gemset/explorer/state | 0 {conf => cdist/conf}/type/__rvm_gemset/gencode-remote | 0 {conf => cdist/conf}/type/__rvm_gemset/man.text | 0 {conf => cdist/conf}/type/__rvm_gemset/manifest | 0 {conf => cdist/conf}/type/__rvm_gemset/parameter/optional | 0 {conf => cdist/conf}/type/__rvm_gemset/parameter/required | 0 {conf => cdist/conf}/type/__rvm_ruby/explorer/state | 0 {conf => cdist/conf}/type/__rvm_ruby/gencode-remote | 0 {conf => cdist/conf}/type/__rvm_ruby/man.text | 0 {conf => cdist/conf}/type/__rvm_ruby/manifest | 0 {conf => cdist/conf}/type/__rvm_ruby/parameter/optional | 0 {conf => cdist/conf}/type/__rvm_ruby/parameter/required | 0 .../conf}/type/__ssh_authorized_key/explorer/dstuser_group | 0 {conf => cdist/conf}/type/__ssh_authorized_key/man.text | 0 {conf => cdist/conf}/type/__ssh_authorized_key/manifest | 0 .../conf}/type/__ssh_authorized_key/parameter/optional | 0 {conf => cdist/conf}/type/__start_on_boot/explorer/state | 0 {conf => cdist/conf}/type/__start_on_boot/gencode-remote | 0 {conf => cdist/conf}/type/__start_on_boot/man.text | 0 .../conf}/type/__start_on_boot/parameter/optional | 0 {conf => cdist/conf}/type/__timezone/man.text | 0 {conf => cdist/conf}/type/__timezone/manifest | 0 {conf => cdist/conf}/type/__user/TODO | 0 {conf => cdist/conf}/type/__user/explorer/group | 0 {conf => cdist/conf}/type/__user/explorer/passwd | 0 {conf => cdist/conf}/type/__user/explorer/shadow | 0 {conf => cdist/conf}/type/__user/gencode-remote | 0 {conf => cdist/conf}/type/__user/man.text | 0 {conf => cdist/conf}/type/__user/parameter/optional | 0 cdist/test/emulator/fixtures/conf/type/__file | 2 +- setup.py | 6 +++++- 241 files changed, 6 insertions(+), 2 deletions(-) rename {conf => cdist/conf}/.gitignore (100%) rename {conf => cdist/conf}/README (100%) rename {conf => cdist/conf}/explorer/hostname (100%) rename {conf => cdist/conf}/explorer/interfaces (100%) rename {conf => cdist/conf}/explorer/lsb_codename (100%) rename {conf => cdist/conf}/explorer/lsb_description (100%) rename {conf => cdist/conf}/explorer/lsb_id (100%) rename {conf => cdist/conf}/explorer/lsb_release (100%) rename {conf => cdist/conf}/explorer/machine (100%) rename {conf => cdist/conf}/explorer/os (100%) rename {conf => cdist/conf}/explorer/os_version (100%) rename {conf => cdist/conf}/explorer/runlevel (100%) rename {conf => cdist/conf}/manifest/init.sample (100%) rename {conf => cdist/conf}/type/__apt_ppa/explorer/state (100%) rename {conf => cdist/conf}/type/__apt_ppa/files/remove-apt-repository (100%) rename {conf => cdist/conf}/type/__apt_ppa/gencode-remote (100%) rename {conf => cdist/conf}/type/__apt_ppa/man.text (100%) rename {conf => cdist/conf}/type/__apt_ppa/manifest (100%) rename {conf => cdist/conf}/type/__apt_ppa/parameter/required (100%) rename {conf => cdist/conf}/type/__apt_update_index/gencode-remote (100%) rename {conf => cdist/conf}/type/__apt_update_index/man.text (100%) rename {conf => cdist/conf}/type/__apt_update_index/singleton (100%) rename {conf => cdist/conf}/type/__autofs_map/man.text (100%) rename {conf => cdist/conf}/type/__autofs_map/manifest (100%) rename {conf => cdist/conf}/type/__autofs_map/parameter/optional (100%) rename {conf => cdist/conf}/type/__autofs_map/parameter/required (100%) rename {conf => cdist/conf}/type/__autofs_master/files/auto.master.header (100%) rename {conf => cdist/conf}/type/__autofs_master/gencode-local (100%) rename {conf => cdist/conf}/type/__autofs_master/man.text (100%) rename {conf => cdist/conf}/type/__autofs_master/manifest (100%) rename {conf => cdist/conf}/type/__autofs_master/parameter/optional (100%) rename {conf => cdist/conf}/type/__autofs_master/singleton (100%) rename {conf => cdist/conf}/type/__cdistmarker/gencode-remote (100%) rename {conf => cdist/conf}/type/__cdistmarker/man.text (100%) rename {conf => cdist/conf}/type/__cdistmarker/parameter/optional (100%) rename {conf => cdist/conf}/type/__cdistmarker/singleton (100%) rename {conf => cdist/conf}/type/__cron/explorer/entry (100%) rename {conf => cdist/conf}/type/__cron/gencode-remote (100%) rename {conf => cdist/conf}/type/__cron/man.text (100%) rename {conf => cdist/conf}/type/__cron/manifest (100%) rename {conf => cdist/conf}/type/__cron/parameter/optional (100%) rename {conf => cdist/conf}/type/__cron/parameter/required (100%) rename {conf => cdist/conf}/type/__debconf_set_selections/gencode-remote (100%) rename {conf => cdist/conf}/type/__debconf_set_selections/man.text (100%) rename {conf => cdist/conf}/type/__debconf_set_selections/parameter/required (100%) rename {conf => cdist/conf}/type/__directory/explorer/state (100%) rename {conf => cdist/conf}/type/__directory/gencode-remote (100%) rename {conf => cdist/conf}/type/__directory/man.text (100%) rename {conf => cdist/conf}/type/__directory/parameter/boolean (100%) rename {conf => cdist/conf}/type/__directory/parameter/optional (100%) rename {conf => cdist/conf}/type/__file/explorer/cksum (100%) rename {conf => cdist/conf}/type/__file/explorer/exists (100%) rename {conf => cdist/conf}/type/__file/gencode-local (100%) rename {conf => cdist/conf}/type/__file/gencode-remote (100%) rename {conf => cdist/conf}/type/__file/man.text (100%) rename {conf => cdist/conf}/type/__file/manifest (100%) rename {conf => cdist/conf}/type/__file/parameter/optional (100%) rename {conf => cdist/conf}/type/__group/TODO (100%) rename {conf => cdist/conf}/type/__group/explorer/group (100%) rename {conf => cdist/conf}/type/__group/explorer/gshadow (100%) rename {conf => cdist/conf}/type/__group/gencode-remote (100%) rename {conf => cdist/conf}/type/__group/man.text (100%) rename {conf => cdist/conf}/type/__group/parameter/optional (100%) rename {conf => cdist/conf}/type/__issue/files/archlinux (100%) rename {conf => cdist/conf}/type/__issue/files/default (100%) rename {conf => cdist/conf}/type/__issue/files/redhat (100%) rename {conf => cdist/conf}/type/__issue/man.text (100%) rename {conf => cdist/conf}/type/__issue/manifest (100%) rename {conf => cdist/conf}/type/__issue/parameter/optional (100%) rename {conf => cdist/conf}/type/__issue/singleton (100%) rename {conf => cdist/conf}/type/__jail/.gitignore (100%) rename {conf => cdist/conf}/type/__jail/explorer/basepresent (100%) rename {conf => cdist/conf}/type/__jail/explorer/present (100%) rename {conf => cdist/conf}/type/__jail/explorer/status (100%) rename {conf => cdist/conf}/type/__jail/gencode-local (100%) rename {conf => cdist/conf}/type/__jail/gencode-remote (100%) rename {conf => cdist/conf}/type/__jail/man.text (100%) rename {conf => cdist/conf}/type/__jail/manifest (100%) rename {conf => cdist/conf}/type/__jail/parameter/optional (100%) rename {conf => cdist/conf}/type/__jail/parameter/required (100%) rename {conf => cdist/conf}/type/__key_value/explorer/state (100%) rename {conf => cdist/conf}/type/__key_value/gencode-remote (100%) rename {conf => cdist/conf}/type/__key_value/man.text (100%) rename {conf => cdist/conf}/type/__key_value/manifest (100%) rename {conf => cdist/conf}/type/__key_value/parameter/optional (100%) rename {conf => cdist/conf}/type/__key_value/parameter/required (100%) rename {conf => cdist/conf}/type/__line/explorer/state (100%) rename {conf => cdist/conf}/type/__line/gencode-remote (100%) rename {conf => cdist/conf}/type/__line/man.text (100%) rename {conf => cdist/conf}/type/__line/parameter/optional (100%) rename {conf => cdist/conf}/type/__link/explorer/state (100%) rename {conf => cdist/conf}/type/__link/gencode-remote (100%) rename {conf => cdist/conf}/type/__link/man.text (100%) rename {conf => cdist/conf}/type/__link/manifest (100%) rename {conf => cdist/conf}/type/__link/parameter/optional (100%) rename {conf => cdist/conf}/type/__link/parameter/required (100%) rename {conf => cdist/conf}/type/__mkfs/gencode-remote (100%) rename {conf => cdist/conf}/type/__mkfs/install (100%) rename {conf => cdist/conf}/type/__mkfs/man.text (100%) rename {conf => cdist/conf}/type/__mkfs/manifest (100%) rename {conf => cdist/conf}/type/__mkfs/parameter/optional (100%) rename {conf => cdist/conf}/type/__mkfs/parameter/required (100%) rename {conf => cdist/conf}/type/__motd/files/motd (100%) rename {conf => cdist/conf}/type/__motd/man.text (100%) rename {conf => cdist/conf}/type/__motd/manifest (100%) rename {conf => cdist/conf}/type/__motd/parameter/optional (100%) rename {conf => cdist/conf}/type/__motd/singleton (100%) rename {conf => cdist/conf}/type/__mysql_database/gencode-remote (100%) rename {conf => cdist/conf}/type/__mysql_database/man.text (100%) rename {conf => cdist/conf}/type/__mysql_database/parameter/optional (100%) rename {conf => cdist/conf}/type/__package/man.text (100%) rename {conf => cdist/conf}/type/__package/manifest (100%) rename {conf => cdist/conf}/type/__package/parameter/optional (100%) rename {conf => cdist/conf}/type/__package_apt/explorer/state (100%) rename {conf => cdist/conf}/type/__package_apt/gencode-remote (100%) rename {conf => cdist/conf}/type/__package_apt/man.text (100%) rename {conf => cdist/conf}/type/__package_apt/notes.txt (100%) rename {conf => cdist/conf}/type/__package_apt/parameter/optional (100%) rename {conf => cdist/conf}/type/__package_luarocks/explorer/pkg_status (100%) rename {conf => cdist/conf}/type/__package_luarocks/gencode-remote (100%) rename {conf => cdist/conf}/type/__package_luarocks/man.text (100%) rename {conf => cdist/conf}/type/__package_luarocks/manifest (100%) rename {conf => cdist/conf}/type/__package_luarocks/parameter/optional (100%) rename {conf => cdist/conf}/type/__package_opkg/explorer/pkg_status (100%) rename {conf => cdist/conf}/type/__package_opkg/gencode-remote (100%) rename {conf => cdist/conf}/type/__package_opkg/man.text (100%) rename {conf => cdist/conf}/type/__package_opkg/parameter/optional (100%) rename {conf => cdist/conf}/type/__package_pacman/explorer/pkg_version (100%) rename {conf => cdist/conf}/type/__package_pacman/gencode-remote (100%) rename {conf => cdist/conf}/type/__package_pacman/man.text (100%) rename {conf => cdist/conf}/type/__package_pacman/parameter/optional (100%) rename {conf => cdist/conf}/type/__package_pip/explorer/state (100%) rename {conf => cdist/conf}/type/__package_pip/gencode-remote (100%) rename {conf => cdist/conf}/type/__package_pip/man.text (100%) rename {conf => cdist/conf}/type/__package_pip/parameter/optional (100%) rename {conf => cdist/conf}/type/__package_pkg_freebsd/explorer/pkg_version (100%) rename {conf => cdist/conf}/type/__package_pkg_freebsd/gencode-remote (100%) rename {conf => cdist/conf}/type/__package_pkg_freebsd/man.text (100%) rename {conf => cdist/conf}/type/__package_pkg_freebsd/parameter/optional (100%) rename {conf => cdist/conf}/type/__package_pkg_openbsd/explorer/pkg_version (100%) rename {conf => cdist/conf}/type/__package_pkg_openbsd/gencode-remote (100%) rename {conf => cdist/conf}/type/__package_pkg_openbsd/man.text (100%) rename {conf => cdist/conf}/type/__package_pkg_openbsd/parameter/optional (100%) rename {conf => cdist/conf}/type/__package_rubygem/explorer/pkg_status (100%) rename {conf => cdist/conf}/type/__package_rubygem/gencode-remote (100%) rename {conf => cdist/conf}/type/__package_rubygem/man.text (100%) rename {conf => cdist/conf}/type/__package_rubygem/parameter/optional (100%) rename {conf => cdist/conf}/type/__package_yum/explorer/pkg_version (100%) rename {conf => cdist/conf}/type/__package_yum/gencode-remote (100%) rename {conf => cdist/conf}/type/__package_yum/man.text (100%) rename {conf => cdist/conf}/type/__package_yum/parameter/optional (100%) rename {conf => cdist/conf}/type/__package_zypper/explorer/pkg_version (100%) rename {conf => cdist/conf}/type/__package_zypper/gencode-remote (100%) rename {conf => cdist/conf}/type/__package_zypper/man.text (100%) rename {conf => cdist/conf}/type/__package_zypper/parameter/optional (100%) rename {conf => cdist/conf}/type/__partition_msdos/install (100%) rename {conf => cdist/conf}/type/__partition_msdos/man.text (100%) rename {conf => cdist/conf}/type/__partition_msdos/manifest (100%) rename {conf => cdist/conf}/type/__partition_msdos/parameter/optional (100%) rename {conf => cdist/conf}/type/__partition_msdos/parameter/required (100%) rename {conf => cdist/conf}/type/__partition_msdos_apply/explorer/partitions (100%) rename {conf => cdist/conf}/type/__partition_msdos_apply/files/lib.sh (100%) rename {conf => cdist/conf}/type/__partition_msdos_apply/gencode-remote (100%) rename {conf => cdist/conf}/type/__partition_msdos_apply/install (100%) rename {conf => cdist/conf}/type/__partition_msdos_apply/man.text (100%) rename {conf => cdist/conf}/type/__partition_msdos_apply/singleton (100%) rename {conf => cdist/conf}/type/__pf_apply/explorer/rcvar (100%) rename {conf => cdist/conf}/type/__pf_apply/gencode-remote (100%) rename {conf => cdist/conf}/type/__pf_apply/man.text (100%) rename {conf => cdist/conf}/type/__pf_apply/singleton (100%) rename {conf => cdist/conf}/type/__pf_ruleset/explorer/cksum (100%) rename {conf => cdist/conf}/type/__pf_ruleset/explorer/rcvar (100%) rename {conf => cdist/conf}/type/__pf_ruleset/gencode-local (100%) rename {conf => cdist/conf}/type/__pf_ruleset/gencode-remote (100%) rename {conf => cdist/conf}/type/__pf_ruleset/man.text (100%) rename {conf => cdist/conf}/type/__pf_ruleset/parameter/optional (100%) rename {conf => cdist/conf}/type/__pf_ruleset/parameter/required (100%) rename {conf => cdist/conf}/type/__pf_ruleset/singleton (100%) rename {conf => cdist/conf}/type/__postgres_database/explorer/state (100%) rename {conf => cdist/conf}/type/__postgres_database/gencode-remote (100%) rename {conf => cdist/conf}/type/__postgres_database/man.text (100%) rename {conf => cdist/conf}/type/__postgres_database/parameter/optional (100%) rename {conf => cdist/conf}/type/__postgres_database/parameter/required (100%) rename {conf => cdist/conf}/type/__postgres_role/explorer/state (100%) rename {conf => cdist/conf}/type/__postgres_role/gencode-remote (100%) rename {conf => cdist/conf}/type/__postgres_role/man.text (100%) rename {conf => cdist/conf}/type/__postgres_role/parameter/optional (100%) rename {conf => cdist/conf}/type/__postgres_role/parameter/required (100%) rename {conf => cdist/conf}/type/__process/explorer/runs (100%) rename {conf => cdist/conf}/type/__process/gencode-remote (100%) rename {conf => cdist/conf}/type/__process/man.text (100%) rename {conf => cdist/conf}/type/__process/parameter/optional (100%) rename {conf => cdist/conf}/type/__process/parameter/required (100%) rename {conf => cdist/conf}/type/__qemu_img/explorer/exists (100%) rename {conf => cdist/conf}/type/__qemu_img/gencode-remote (100%) rename {conf => cdist/conf}/type/__qemu_img/man.text (100%) rename {conf => cdist/conf}/type/__qemu_img/manifest (100%) rename {conf => cdist/conf}/type/__qemu_img/parameter/optional (100%) rename {conf => cdist/conf}/type/__qemu_img/parameter/required (100%) rename {conf => cdist/conf}/type/__rvm/explorer/state (100%) rename {conf => cdist/conf}/type/__rvm/gencode-remote (100%) rename {conf => cdist/conf}/type/__rvm/man.text (100%) rename {conf => cdist/conf}/type/__rvm/manifest (100%) rename {conf => cdist/conf}/type/__rvm/parameter/required (100%) rename {conf => cdist/conf}/type/__rvm_gem/explorer/state (100%) rename {conf => cdist/conf}/type/__rvm_gem/gencode-remote (100%) rename {conf => cdist/conf}/type/__rvm_gem/man.text (100%) rename {conf => cdist/conf}/type/__rvm_gem/manifest (100%) rename {conf => cdist/conf}/type/__rvm_gem/parameter/optional (100%) rename {conf => cdist/conf}/type/__rvm_gem/parameter/required (100%) rename {conf => cdist/conf}/type/__rvm_gemset/explorer/state (100%) rename {conf => cdist/conf}/type/__rvm_gemset/gencode-remote (100%) rename {conf => cdist/conf}/type/__rvm_gemset/man.text (100%) rename {conf => cdist/conf}/type/__rvm_gemset/manifest (100%) rename {conf => cdist/conf}/type/__rvm_gemset/parameter/optional (100%) rename {conf => cdist/conf}/type/__rvm_gemset/parameter/required (100%) rename {conf => cdist/conf}/type/__rvm_ruby/explorer/state (100%) rename {conf => cdist/conf}/type/__rvm_ruby/gencode-remote (100%) rename {conf => cdist/conf}/type/__rvm_ruby/man.text (100%) rename {conf => cdist/conf}/type/__rvm_ruby/manifest (100%) rename {conf => cdist/conf}/type/__rvm_ruby/parameter/optional (100%) rename {conf => cdist/conf}/type/__rvm_ruby/parameter/required (100%) rename {conf => cdist/conf}/type/__ssh_authorized_key/explorer/dstuser_group (100%) rename {conf => cdist/conf}/type/__ssh_authorized_key/man.text (100%) rename {conf => cdist/conf}/type/__ssh_authorized_key/manifest (100%) rename {conf => cdist/conf}/type/__ssh_authorized_key/parameter/optional (100%) rename {conf => cdist/conf}/type/__start_on_boot/explorer/state (100%) rename {conf => cdist/conf}/type/__start_on_boot/gencode-remote (100%) rename {conf => cdist/conf}/type/__start_on_boot/man.text (100%) rename {conf => cdist/conf}/type/__start_on_boot/parameter/optional (100%) rename {conf => cdist/conf}/type/__timezone/man.text (100%) rename {conf => cdist/conf}/type/__timezone/manifest (100%) rename {conf => cdist/conf}/type/__user/TODO (100%) rename {conf => cdist/conf}/type/__user/explorer/group (100%) rename {conf => cdist/conf}/type/__user/explorer/passwd (100%) rename {conf => cdist/conf}/type/__user/explorer/shadow (100%) rename {conf => cdist/conf}/type/__user/gencode-remote (100%) rename {conf => cdist/conf}/type/__user/man.text (100%) rename {conf => cdist/conf}/type/__user/parameter/optional (100%) diff --git a/conf/.gitignore b/cdist/conf/.gitignore similarity index 100% rename from conf/.gitignore rename to cdist/conf/.gitignore diff --git a/conf/README b/cdist/conf/README similarity index 100% rename from conf/README rename to cdist/conf/README diff --git a/conf/explorer/hostname b/cdist/conf/explorer/hostname similarity index 100% rename from conf/explorer/hostname rename to cdist/conf/explorer/hostname diff --git a/conf/explorer/interfaces b/cdist/conf/explorer/interfaces similarity index 100% rename from conf/explorer/interfaces rename to cdist/conf/explorer/interfaces diff --git a/conf/explorer/lsb_codename b/cdist/conf/explorer/lsb_codename similarity index 100% rename from conf/explorer/lsb_codename rename to cdist/conf/explorer/lsb_codename diff --git a/conf/explorer/lsb_description b/cdist/conf/explorer/lsb_description similarity index 100% rename from conf/explorer/lsb_description rename to cdist/conf/explorer/lsb_description diff --git a/conf/explorer/lsb_id b/cdist/conf/explorer/lsb_id similarity index 100% rename from conf/explorer/lsb_id rename to cdist/conf/explorer/lsb_id diff --git a/conf/explorer/lsb_release b/cdist/conf/explorer/lsb_release similarity index 100% rename from conf/explorer/lsb_release rename to cdist/conf/explorer/lsb_release diff --git a/conf/explorer/machine b/cdist/conf/explorer/machine similarity index 100% rename from conf/explorer/machine rename to cdist/conf/explorer/machine diff --git a/conf/explorer/os b/cdist/conf/explorer/os similarity index 100% rename from conf/explorer/os rename to cdist/conf/explorer/os diff --git a/conf/explorer/os_version b/cdist/conf/explorer/os_version similarity index 100% rename from conf/explorer/os_version rename to cdist/conf/explorer/os_version diff --git a/conf/explorer/runlevel b/cdist/conf/explorer/runlevel similarity index 100% rename from conf/explorer/runlevel rename to cdist/conf/explorer/runlevel diff --git a/conf/manifest/init.sample b/cdist/conf/manifest/init.sample similarity index 100% rename from conf/manifest/init.sample rename to cdist/conf/manifest/init.sample diff --git a/conf/type/__apt_ppa/explorer/state b/cdist/conf/type/__apt_ppa/explorer/state similarity index 100% rename from conf/type/__apt_ppa/explorer/state rename to cdist/conf/type/__apt_ppa/explorer/state diff --git a/conf/type/__apt_ppa/files/remove-apt-repository b/cdist/conf/type/__apt_ppa/files/remove-apt-repository similarity index 100% rename from conf/type/__apt_ppa/files/remove-apt-repository rename to cdist/conf/type/__apt_ppa/files/remove-apt-repository diff --git a/conf/type/__apt_ppa/gencode-remote b/cdist/conf/type/__apt_ppa/gencode-remote similarity index 100% rename from conf/type/__apt_ppa/gencode-remote rename to cdist/conf/type/__apt_ppa/gencode-remote diff --git a/conf/type/__apt_ppa/man.text b/cdist/conf/type/__apt_ppa/man.text similarity index 100% rename from conf/type/__apt_ppa/man.text rename to cdist/conf/type/__apt_ppa/man.text diff --git a/conf/type/__apt_ppa/manifest b/cdist/conf/type/__apt_ppa/manifest similarity index 100% rename from conf/type/__apt_ppa/manifest rename to cdist/conf/type/__apt_ppa/manifest diff --git a/conf/type/__apt_ppa/parameter/required b/cdist/conf/type/__apt_ppa/parameter/required similarity index 100% rename from conf/type/__apt_ppa/parameter/required rename to cdist/conf/type/__apt_ppa/parameter/required diff --git a/conf/type/__apt_update_index/gencode-remote b/cdist/conf/type/__apt_update_index/gencode-remote similarity index 100% rename from conf/type/__apt_update_index/gencode-remote rename to cdist/conf/type/__apt_update_index/gencode-remote diff --git a/conf/type/__apt_update_index/man.text b/cdist/conf/type/__apt_update_index/man.text similarity index 100% rename from conf/type/__apt_update_index/man.text rename to cdist/conf/type/__apt_update_index/man.text diff --git a/conf/type/__apt_update_index/singleton b/cdist/conf/type/__apt_update_index/singleton similarity index 100% rename from conf/type/__apt_update_index/singleton rename to cdist/conf/type/__apt_update_index/singleton diff --git a/conf/type/__autofs_map/man.text b/cdist/conf/type/__autofs_map/man.text similarity index 100% rename from conf/type/__autofs_map/man.text rename to cdist/conf/type/__autofs_map/man.text diff --git a/conf/type/__autofs_map/manifest b/cdist/conf/type/__autofs_map/manifest similarity index 100% rename from conf/type/__autofs_map/manifest rename to cdist/conf/type/__autofs_map/manifest diff --git a/conf/type/__autofs_map/parameter/optional b/cdist/conf/type/__autofs_map/parameter/optional similarity index 100% rename from conf/type/__autofs_map/parameter/optional rename to cdist/conf/type/__autofs_map/parameter/optional diff --git a/conf/type/__autofs_map/parameter/required b/cdist/conf/type/__autofs_map/parameter/required similarity index 100% rename from conf/type/__autofs_map/parameter/required rename to cdist/conf/type/__autofs_map/parameter/required diff --git a/conf/type/__autofs_master/files/auto.master.header b/cdist/conf/type/__autofs_master/files/auto.master.header similarity index 100% rename from conf/type/__autofs_master/files/auto.master.header rename to cdist/conf/type/__autofs_master/files/auto.master.header diff --git a/conf/type/__autofs_master/gencode-local b/cdist/conf/type/__autofs_master/gencode-local similarity index 100% rename from conf/type/__autofs_master/gencode-local rename to cdist/conf/type/__autofs_master/gencode-local diff --git a/conf/type/__autofs_master/man.text b/cdist/conf/type/__autofs_master/man.text similarity index 100% rename from conf/type/__autofs_master/man.text rename to cdist/conf/type/__autofs_master/man.text diff --git a/conf/type/__autofs_master/manifest b/cdist/conf/type/__autofs_master/manifest similarity index 100% rename from conf/type/__autofs_master/manifest rename to cdist/conf/type/__autofs_master/manifest diff --git a/conf/type/__autofs_master/parameter/optional b/cdist/conf/type/__autofs_master/parameter/optional similarity index 100% rename from conf/type/__autofs_master/parameter/optional rename to cdist/conf/type/__autofs_master/parameter/optional diff --git a/conf/type/__autofs_master/singleton b/cdist/conf/type/__autofs_master/singleton similarity index 100% rename from conf/type/__autofs_master/singleton rename to cdist/conf/type/__autofs_master/singleton diff --git a/conf/type/__cdistmarker/gencode-remote b/cdist/conf/type/__cdistmarker/gencode-remote similarity index 100% rename from conf/type/__cdistmarker/gencode-remote rename to cdist/conf/type/__cdistmarker/gencode-remote diff --git a/conf/type/__cdistmarker/man.text b/cdist/conf/type/__cdistmarker/man.text similarity index 100% rename from conf/type/__cdistmarker/man.text rename to cdist/conf/type/__cdistmarker/man.text diff --git a/conf/type/__cdistmarker/parameter/optional b/cdist/conf/type/__cdistmarker/parameter/optional similarity index 100% rename from conf/type/__cdistmarker/parameter/optional rename to cdist/conf/type/__cdistmarker/parameter/optional diff --git a/conf/type/__cdistmarker/singleton b/cdist/conf/type/__cdistmarker/singleton similarity index 100% rename from conf/type/__cdistmarker/singleton rename to cdist/conf/type/__cdistmarker/singleton diff --git a/conf/type/__cron/explorer/entry b/cdist/conf/type/__cron/explorer/entry similarity index 100% rename from conf/type/__cron/explorer/entry rename to cdist/conf/type/__cron/explorer/entry diff --git a/conf/type/__cron/gencode-remote b/cdist/conf/type/__cron/gencode-remote similarity index 100% rename from conf/type/__cron/gencode-remote rename to cdist/conf/type/__cron/gencode-remote diff --git a/conf/type/__cron/man.text b/cdist/conf/type/__cron/man.text similarity index 100% rename from conf/type/__cron/man.text rename to cdist/conf/type/__cron/man.text diff --git a/conf/type/__cron/manifest b/cdist/conf/type/__cron/manifest similarity index 100% rename from conf/type/__cron/manifest rename to cdist/conf/type/__cron/manifest diff --git a/conf/type/__cron/parameter/optional b/cdist/conf/type/__cron/parameter/optional similarity index 100% rename from conf/type/__cron/parameter/optional rename to cdist/conf/type/__cron/parameter/optional diff --git a/conf/type/__cron/parameter/required b/cdist/conf/type/__cron/parameter/required similarity index 100% rename from conf/type/__cron/parameter/required rename to cdist/conf/type/__cron/parameter/required diff --git a/conf/type/__debconf_set_selections/gencode-remote b/cdist/conf/type/__debconf_set_selections/gencode-remote similarity index 100% rename from conf/type/__debconf_set_selections/gencode-remote rename to cdist/conf/type/__debconf_set_selections/gencode-remote diff --git a/conf/type/__debconf_set_selections/man.text b/cdist/conf/type/__debconf_set_selections/man.text similarity index 100% rename from conf/type/__debconf_set_selections/man.text rename to cdist/conf/type/__debconf_set_selections/man.text diff --git a/conf/type/__debconf_set_selections/parameter/required b/cdist/conf/type/__debconf_set_selections/parameter/required similarity index 100% rename from conf/type/__debconf_set_selections/parameter/required rename to cdist/conf/type/__debconf_set_selections/parameter/required diff --git a/conf/type/__directory/explorer/state b/cdist/conf/type/__directory/explorer/state similarity index 100% rename from conf/type/__directory/explorer/state rename to cdist/conf/type/__directory/explorer/state diff --git a/conf/type/__directory/gencode-remote b/cdist/conf/type/__directory/gencode-remote similarity index 100% rename from conf/type/__directory/gencode-remote rename to cdist/conf/type/__directory/gencode-remote diff --git a/conf/type/__directory/man.text b/cdist/conf/type/__directory/man.text similarity index 100% rename from conf/type/__directory/man.text rename to cdist/conf/type/__directory/man.text diff --git a/conf/type/__directory/parameter/boolean b/cdist/conf/type/__directory/parameter/boolean similarity index 100% rename from conf/type/__directory/parameter/boolean rename to cdist/conf/type/__directory/parameter/boolean diff --git a/conf/type/__directory/parameter/optional b/cdist/conf/type/__directory/parameter/optional similarity index 100% rename from conf/type/__directory/parameter/optional rename to cdist/conf/type/__directory/parameter/optional diff --git a/conf/type/__file/explorer/cksum b/cdist/conf/type/__file/explorer/cksum similarity index 100% rename from conf/type/__file/explorer/cksum rename to cdist/conf/type/__file/explorer/cksum diff --git a/conf/type/__file/explorer/exists b/cdist/conf/type/__file/explorer/exists similarity index 100% rename from conf/type/__file/explorer/exists rename to cdist/conf/type/__file/explorer/exists diff --git a/conf/type/__file/gencode-local b/cdist/conf/type/__file/gencode-local similarity index 100% rename from conf/type/__file/gencode-local rename to cdist/conf/type/__file/gencode-local diff --git a/conf/type/__file/gencode-remote b/cdist/conf/type/__file/gencode-remote similarity index 100% rename from conf/type/__file/gencode-remote rename to cdist/conf/type/__file/gencode-remote diff --git a/conf/type/__file/man.text b/cdist/conf/type/__file/man.text similarity index 100% rename from conf/type/__file/man.text rename to cdist/conf/type/__file/man.text diff --git a/conf/type/__file/manifest b/cdist/conf/type/__file/manifest similarity index 100% rename from conf/type/__file/manifest rename to cdist/conf/type/__file/manifest diff --git a/conf/type/__file/parameter/optional b/cdist/conf/type/__file/parameter/optional similarity index 100% rename from conf/type/__file/parameter/optional rename to cdist/conf/type/__file/parameter/optional diff --git a/conf/type/__group/TODO b/cdist/conf/type/__group/TODO similarity index 100% rename from conf/type/__group/TODO rename to cdist/conf/type/__group/TODO diff --git a/conf/type/__group/explorer/group b/cdist/conf/type/__group/explorer/group similarity index 100% rename from conf/type/__group/explorer/group rename to cdist/conf/type/__group/explorer/group diff --git a/conf/type/__group/explorer/gshadow b/cdist/conf/type/__group/explorer/gshadow similarity index 100% rename from conf/type/__group/explorer/gshadow rename to cdist/conf/type/__group/explorer/gshadow diff --git a/conf/type/__group/gencode-remote b/cdist/conf/type/__group/gencode-remote similarity index 100% rename from conf/type/__group/gencode-remote rename to cdist/conf/type/__group/gencode-remote diff --git a/conf/type/__group/man.text b/cdist/conf/type/__group/man.text similarity index 100% rename from conf/type/__group/man.text rename to cdist/conf/type/__group/man.text diff --git a/conf/type/__group/parameter/optional b/cdist/conf/type/__group/parameter/optional similarity index 100% rename from conf/type/__group/parameter/optional rename to cdist/conf/type/__group/parameter/optional diff --git a/conf/type/__issue/files/archlinux b/cdist/conf/type/__issue/files/archlinux similarity index 100% rename from conf/type/__issue/files/archlinux rename to cdist/conf/type/__issue/files/archlinux diff --git a/conf/type/__issue/files/default b/cdist/conf/type/__issue/files/default similarity index 100% rename from conf/type/__issue/files/default rename to cdist/conf/type/__issue/files/default diff --git a/conf/type/__issue/files/redhat b/cdist/conf/type/__issue/files/redhat similarity index 100% rename from conf/type/__issue/files/redhat rename to cdist/conf/type/__issue/files/redhat diff --git a/conf/type/__issue/man.text b/cdist/conf/type/__issue/man.text similarity index 100% rename from conf/type/__issue/man.text rename to cdist/conf/type/__issue/man.text diff --git a/conf/type/__issue/manifest b/cdist/conf/type/__issue/manifest similarity index 100% rename from conf/type/__issue/manifest rename to cdist/conf/type/__issue/manifest diff --git a/conf/type/__issue/parameter/optional b/cdist/conf/type/__issue/parameter/optional similarity index 100% rename from conf/type/__issue/parameter/optional rename to cdist/conf/type/__issue/parameter/optional diff --git a/conf/type/__issue/singleton b/cdist/conf/type/__issue/singleton similarity index 100% rename from conf/type/__issue/singleton rename to cdist/conf/type/__issue/singleton diff --git a/conf/type/__jail/.gitignore b/cdist/conf/type/__jail/.gitignore similarity index 100% rename from conf/type/__jail/.gitignore rename to cdist/conf/type/__jail/.gitignore diff --git a/conf/type/__jail/explorer/basepresent b/cdist/conf/type/__jail/explorer/basepresent similarity index 100% rename from conf/type/__jail/explorer/basepresent rename to cdist/conf/type/__jail/explorer/basepresent diff --git a/conf/type/__jail/explorer/present b/cdist/conf/type/__jail/explorer/present similarity index 100% rename from conf/type/__jail/explorer/present rename to cdist/conf/type/__jail/explorer/present diff --git a/conf/type/__jail/explorer/status b/cdist/conf/type/__jail/explorer/status similarity index 100% rename from conf/type/__jail/explorer/status rename to cdist/conf/type/__jail/explorer/status diff --git a/conf/type/__jail/gencode-local b/cdist/conf/type/__jail/gencode-local similarity index 100% rename from conf/type/__jail/gencode-local rename to cdist/conf/type/__jail/gencode-local diff --git a/conf/type/__jail/gencode-remote b/cdist/conf/type/__jail/gencode-remote similarity index 100% rename from conf/type/__jail/gencode-remote rename to cdist/conf/type/__jail/gencode-remote diff --git a/conf/type/__jail/man.text b/cdist/conf/type/__jail/man.text similarity index 100% rename from conf/type/__jail/man.text rename to cdist/conf/type/__jail/man.text diff --git a/conf/type/__jail/manifest b/cdist/conf/type/__jail/manifest similarity index 100% rename from conf/type/__jail/manifest rename to cdist/conf/type/__jail/manifest diff --git a/conf/type/__jail/parameter/optional b/cdist/conf/type/__jail/parameter/optional similarity index 100% rename from conf/type/__jail/parameter/optional rename to cdist/conf/type/__jail/parameter/optional diff --git a/conf/type/__jail/parameter/required b/cdist/conf/type/__jail/parameter/required similarity index 100% rename from conf/type/__jail/parameter/required rename to cdist/conf/type/__jail/parameter/required diff --git a/conf/type/__key_value/explorer/state b/cdist/conf/type/__key_value/explorer/state similarity index 100% rename from conf/type/__key_value/explorer/state rename to cdist/conf/type/__key_value/explorer/state diff --git a/conf/type/__key_value/gencode-remote b/cdist/conf/type/__key_value/gencode-remote similarity index 100% rename from conf/type/__key_value/gencode-remote rename to cdist/conf/type/__key_value/gencode-remote diff --git a/conf/type/__key_value/man.text b/cdist/conf/type/__key_value/man.text similarity index 100% rename from conf/type/__key_value/man.text rename to cdist/conf/type/__key_value/man.text diff --git a/conf/type/__key_value/manifest b/cdist/conf/type/__key_value/manifest similarity index 100% rename from conf/type/__key_value/manifest rename to cdist/conf/type/__key_value/manifest diff --git a/conf/type/__key_value/parameter/optional b/cdist/conf/type/__key_value/parameter/optional similarity index 100% rename from conf/type/__key_value/parameter/optional rename to cdist/conf/type/__key_value/parameter/optional diff --git a/conf/type/__key_value/parameter/required b/cdist/conf/type/__key_value/parameter/required similarity index 100% rename from conf/type/__key_value/parameter/required rename to cdist/conf/type/__key_value/parameter/required diff --git a/conf/type/__line/explorer/state b/cdist/conf/type/__line/explorer/state similarity index 100% rename from conf/type/__line/explorer/state rename to cdist/conf/type/__line/explorer/state diff --git a/conf/type/__line/gencode-remote b/cdist/conf/type/__line/gencode-remote similarity index 100% rename from conf/type/__line/gencode-remote rename to cdist/conf/type/__line/gencode-remote diff --git a/conf/type/__line/man.text b/cdist/conf/type/__line/man.text similarity index 100% rename from conf/type/__line/man.text rename to cdist/conf/type/__line/man.text diff --git a/conf/type/__line/parameter/optional b/cdist/conf/type/__line/parameter/optional similarity index 100% rename from conf/type/__line/parameter/optional rename to cdist/conf/type/__line/parameter/optional diff --git a/conf/type/__link/explorer/state b/cdist/conf/type/__link/explorer/state similarity index 100% rename from conf/type/__link/explorer/state rename to cdist/conf/type/__link/explorer/state diff --git a/conf/type/__link/gencode-remote b/cdist/conf/type/__link/gencode-remote similarity index 100% rename from conf/type/__link/gencode-remote rename to cdist/conf/type/__link/gencode-remote diff --git a/conf/type/__link/man.text b/cdist/conf/type/__link/man.text similarity index 100% rename from conf/type/__link/man.text rename to cdist/conf/type/__link/man.text diff --git a/conf/type/__link/manifest b/cdist/conf/type/__link/manifest similarity index 100% rename from conf/type/__link/manifest rename to cdist/conf/type/__link/manifest diff --git a/conf/type/__link/parameter/optional b/cdist/conf/type/__link/parameter/optional similarity index 100% rename from conf/type/__link/parameter/optional rename to cdist/conf/type/__link/parameter/optional diff --git a/conf/type/__link/parameter/required b/cdist/conf/type/__link/parameter/required similarity index 100% rename from conf/type/__link/parameter/required rename to cdist/conf/type/__link/parameter/required diff --git a/conf/type/__mkfs/gencode-remote b/cdist/conf/type/__mkfs/gencode-remote similarity index 100% rename from conf/type/__mkfs/gencode-remote rename to cdist/conf/type/__mkfs/gencode-remote diff --git a/conf/type/__mkfs/install b/cdist/conf/type/__mkfs/install similarity index 100% rename from conf/type/__mkfs/install rename to cdist/conf/type/__mkfs/install diff --git a/conf/type/__mkfs/man.text b/cdist/conf/type/__mkfs/man.text similarity index 100% rename from conf/type/__mkfs/man.text rename to cdist/conf/type/__mkfs/man.text diff --git a/conf/type/__mkfs/manifest b/cdist/conf/type/__mkfs/manifest similarity index 100% rename from conf/type/__mkfs/manifest rename to cdist/conf/type/__mkfs/manifest diff --git a/conf/type/__mkfs/parameter/optional b/cdist/conf/type/__mkfs/parameter/optional similarity index 100% rename from conf/type/__mkfs/parameter/optional rename to cdist/conf/type/__mkfs/parameter/optional diff --git a/conf/type/__mkfs/parameter/required b/cdist/conf/type/__mkfs/parameter/required similarity index 100% rename from conf/type/__mkfs/parameter/required rename to cdist/conf/type/__mkfs/parameter/required diff --git a/conf/type/__motd/files/motd b/cdist/conf/type/__motd/files/motd similarity index 100% rename from conf/type/__motd/files/motd rename to cdist/conf/type/__motd/files/motd diff --git a/conf/type/__motd/man.text b/cdist/conf/type/__motd/man.text similarity index 100% rename from conf/type/__motd/man.text rename to cdist/conf/type/__motd/man.text diff --git a/conf/type/__motd/manifest b/cdist/conf/type/__motd/manifest similarity index 100% rename from conf/type/__motd/manifest rename to cdist/conf/type/__motd/manifest diff --git a/conf/type/__motd/parameter/optional b/cdist/conf/type/__motd/parameter/optional similarity index 100% rename from conf/type/__motd/parameter/optional rename to cdist/conf/type/__motd/parameter/optional diff --git a/conf/type/__motd/singleton b/cdist/conf/type/__motd/singleton similarity index 100% rename from conf/type/__motd/singleton rename to cdist/conf/type/__motd/singleton diff --git a/conf/type/__mysql_database/gencode-remote b/cdist/conf/type/__mysql_database/gencode-remote similarity index 100% rename from conf/type/__mysql_database/gencode-remote rename to cdist/conf/type/__mysql_database/gencode-remote diff --git a/conf/type/__mysql_database/man.text b/cdist/conf/type/__mysql_database/man.text similarity index 100% rename from conf/type/__mysql_database/man.text rename to cdist/conf/type/__mysql_database/man.text diff --git a/conf/type/__mysql_database/parameter/optional b/cdist/conf/type/__mysql_database/parameter/optional similarity index 100% rename from conf/type/__mysql_database/parameter/optional rename to cdist/conf/type/__mysql_database/parameter/optional diff --git a/conf/type/__package/man.text b/cdist/conf/type/__package/man.text similarity index 100% rename from conf/type/__package/man.text rename to cdist/conf/type/__package/man.text diff --git a/conf/type/__package/manifest b/cdist/conf/type/__package/manifest similarity index 100% rename from conf/type/__package/manifest rename to cdist/conf/type/__package/manifest diff --git a/conf/type/__package/parameter/optional b/cdist/conf/type/__package/parameter/optional similarity index 100% rename from conf/type/__package/parameter/optional rename to cdist/conf/type/__package/parameter/optional diff --git a/conf/type/__package_apt/explorer/state b/cdist/conf/type/__package_apt/explorer/state similarity index 100% rename from conf/type/__package_apt/explorer/state rename to cdist/conf/type/__package_apt/explorer/state diff --git a/conf/type/__package_apt/gencode-remote b/cdist/conf/type/__package_apt/gencode-remote similarity index 100% rename from conf/type/__package_apt/gencode-remote rename to cdist/conf/type/__package_apt/gencode-remote diff --git a/conf/type/__package_apt/man.text b/cdist/conf/type/__package_apt/man.text similarity index 100% rename from conf/type/__package_apt/man.text rename to cdist/conf/type/__package_apt/man.text diff --git a/conf/type/__package_apt/notes.txt b/cdist/conf/type/__package_apt/notes.txt similarity index 100% rename from conf/type/__package_apt/notes.txt rename to cdist/conf/type/__package_apt/notes.txt diff --git a/conf/type/__package_apt/parameter/optional b/cdist/conf/type/__package_apt/parameter/optional similarity index 100% rename from conf/type/__package_apt/parameter/optional rename to cdist/conf/type/__package_apt/parameter/optional diff --git a/conf/type/__package_luarocks/explorer/pkg_status b/cdist/conf/type/__package_luarocks/explorer/pkg_status similarity index 100% rename from conf/type/__package_luarocks/explorer/pkg_status rename to cdist/conf/type/__package_luarocks/explorer/pkg_status diff --git a/conf/type/__package_luarocks/gencode-remote b/cdist/conf/type/__package_luarocks/gencode-remote similarity index 100% rename from conf/type/__package_luarocks/gencode-remote rename to cdist/conf/type/__package_luarocks/gencode-remote diff --git a/conf/type/__package_luarocks/man.text b/cdist/conf/type/__package_luarocks/man.text similarity index 100% rename from conf/type/__package_luarocks/man.text rename to cdist/conf/type/__package_luarocks/man.text diff --git a/conf/type/__package_luarocks/manifest b/cdist/conf/type/__package_luarocks/manifest similarity index 100% rename from conf/type/__package_luarocks/manifest rename to cdist/conf/type/__package_luarocks/manifest diff --git a/conf/type/__package_luarocks/parameter/optional b/cdist/conf/type/__package_luarocks/parameter/optional similarity index 100% rename from conf/type/__package_luarocks/parameter/optional rename to cdist/conf/type/__package_luarocks/parameter/optional diff --git a/conf/type/__package_opkg/explorer/pkg_status b/cdist/conf/type/__package_opkg/explorer/pkg_status similarity index 100% rename from conf/type/__package_opkg/explorer/pkg_status rename to cdist/conf/type/__package_opkg/explorer/pkg_status diff --git a/conf/type/__package_opkg/gencode-remote b/cdist/conf/type/__package_opkg/gencode-remote similarity index 100% rename from conf/type/__package_opkg/gencode-remote rename to cdist/conf/type/__package_opkg/gencode-remote diff --git a/conf/type/__package_opkg/man.text b/cdist/conf/type/__package_opkg/man.text similarity index 100% rename from conf/type/__package_opkg/man.text rename to cdist/conf/type/__package_opkg/man.text diff --git a/conf/type/__package_opkg/parameter/optional b/cdist/conf/type/__package_opkg/parameter/optional similarity index 100% rename from conf/type/__package_opkg/parameter/optional rename to cdist/conf/type/__package_opkg/parameter/optional diff --git a/conf/type/__package_pacman/explorer/pkg_version b/cdist/conf/type/__package_pacman/explorer/pkg_version similarity index 100% rename from conf/type/__package_pacman/explorer/pkg_version rename to cdist/conf/type/__package_pacman/explorer/pkg_version diff --git a/conf/type/__package_pacman/gencode-remote b/cdist/conf/type/__package_pacman/gencode-remote similarity index 100% rename from conf/type/__package_pacman/gencode-remote rename to cdist/conf/type/__package_pacman/gencode-remote diff --git a/conf/type/__package_pacman/man.text b/cdist/conf/type/__package_pacman/man.text similarity index 100% rename from conf/type/__package_pacman/man.text rename to cdist/conf/type/__package_pacman/man.text diff --git a/conf/type/__package_pacman/parameter/optional b/cdist/conf/type/__package_pacman/parameter/optional similarity index 100% rename from conf/type/__package_pacman/parameter/optional rename to cdist/conf/type/__package_pacman/parameter/optional diff --git a/conf/type/__package_pip/explorer/state b/cdist/conf/type/__package_pip/explorer/state similarity index 100% rename from conf/type/__package_pip/explorer/state rename to cdist/conf/type/__package_pip/explorer/state diff --git a/conf/type/__package_pip/gencode-remote b/cdist/conf/type/__package_pip/gencode-remote similarity index 100% rename from conf/type/__package_pip/gencode-remote rename to cdist/conf/type/__package_pip/gencode-remote diff --git a/conf/type/__package_pip/man.text b/cdist/conf/type/__package_pip/man.text similarity index 100% rename from conf/type/__package_pip/man.text rename to cdist/conf/type/__package_pip/man.text diff --git a/conf/type/__package_pip/parameter/optional b/cdist/conf/type/__package_pip/parameter/optional similarity index 100% rename from conf/type/__package_pip/parameter/optional rename to cdist/conf/type/__package_pip/parameter/optional diff --git a/conf/type/__package_pkg_freebsd/explorer/pkg_version b/cdist/conf/type/__package_pkg_freebsd/explorer/pkg_version similarity index 100% rename from conf/type/__package_pkg_freebsd/explorer/pkg_version rename to cdist/conf/type/__package_pkg_freebsd/explorer/pkg_version diff --git a/conf/type/__package_pkg_freebsd/gencode-remote b/cdist/conf/type/__package_pkg_freebsd/gencode-remote similarity index 100% rename from conf/type/__package_pkg_freebsd/gencode-remote rename to cdist/conf/type/__package_pkg_freebsd/gencode-remote diff --git a/conf/type/__package_pkg_freebsd/man.text b/cdist/conf/type/__package_pkg_freebsd/man.text similarity index 100% rename from conf/type/__package_pkg_freebsd/man.text rename to cdist/conf/type/__package_pkg_freebsd/man.text diff --git a/conf/type/__package_pkg_freebsd/parameter/optional b/cdist/conf/type/__package_pkg_freebsd/parameter/optional similarity index 100% rename from conf/type/__package_pkg_freebsd/parameter/optional rename to cdist/conf/type/__package_pkg_freebsd/parameter/optional diff --git a/conf/type/__package_pkg_openbsd/explorer/pkg_version b/cdist/conf/type/__package_pkg_openbsd/explorer/pkg_version similarity index 100% rename from conf/type/__package_pkg_openbsd/explorer/pkg_version rename to cdist/conf/type/__package_pkg_openbsd/explorer/pkg_version diff --git a/conf/type/__package_pkg_openbsd/gencode-remote b/cdist/conf/type/__package_pkg_openbsd/gencode-remote similarity index 100% rename from conf/type/__package_pkg_openbsd/gencode-remote rename to cdist/conf/type/__package_pkg_openbsd/gencode-remote diff --git a/conf/type/__package_pkg_openbsd/man.text b/cdist/conf/type/__package_pkg_openbsd/man.text similarity index 100% rename from conf/type/__package_pkg_openbsd/man.text rename to cdist/conf/type/__package_pkg_openbsd/man.text diff --git a/conf/type/__package_pkg_openbsd/parameter/optional b/cdist/conf/type/__package_pkg_openbsd/parameter/optional similarity index 100% rename from conf/type/__package_pkg_openbsd/parameter/optional rename to cdist/conf/type/__package_pkg_openbsd/parameter/optional diff --git a/conf/type/__package_rubygem/explorer/pkg_status b/cdist/conf/type/__package_rubygem/explorer/pkg_status similarity index 100% rename from conf/type/__package_rubygem/explorer/pkg_status rename to cdist/conf/type/__package_rubygem/explorer/pkg_status diff --git a/conf/type/__package_rubygem/gencode-remote b/cdist/conf/type/__package_rubygem/gencode-remote similarity index 100% rename from conf/type/__package_rubygem/gencode-remote rename to cdist/conf/type/__package_rubygem/gencode-remote diff --git a/conf/type/__package_rubygem/man.text b/cdist/conf/type/__package_rubygem/man.text similarity index 100% rename from conf/type/__package_rubygem/man.text rename to cdist/conf/type/__package_rubygem/man.text diff --git a/conf/type/__package_rubygem/parameter/optional b/cdist/conf/type/__package_rubygem/parameter/optional similarity index 100% rename from conf/type/__package_rubygem/parameter/optional rename to cdist/conf/type/__package_rubygem/parameter/optional diff --git a/conf/type/__package_yum/explorer/pkg_version b/cdist/conf/type/__package_yum/explorer/pkg_version similarity index 100% rename from conf/type/__package_yum/explorer/pkg_version rename to cdist/conf/type/__package_yum/explorer/pkg_version diff --git a/conf/type/__package_yum/gencode-remote b/cdist/conf/type/__package_yum/gencode-remote similarity index 100% rename from conf/type/__package_yum/gencode-remote rename to cdist/conf/type/__package_yum/gencode-remote diff --git a/conf/type/__package_yum/man.text b/cdist/conf/type/__package_yum/man.text similarity index 100% rename from conf/type/__package_yum/man.text rename to cdist/conf/type/__package_yum/man.text diff --git a/conf/type/__package_yum/parameter/optional b/cdist/conf/type/__package_yum/parameter/optional similarity index 100% rename from conf/type/__package_yum/parameter/optional rename to cdist/conf/type/__package_yum/parameter/optional diff --git a/conf/type/__package_zypper/explorer/pkg_version b/cdist/conf/type/__package_zypper/explorer/pkg_version similarity index 100% rename from conf/type/__package_zypper/explorer/pkg_version rename to cdist/conf/type/__package_zypper/explorer/pkg_version diff --git a/conf/type/__package_zypper/gencode-remote b/cdist/conf/type/__package_zypper/gencode-remote similarity index 100% rename from conf/type/__package_zypper/gencode-remote rename to cdist/conf/type/__package_zypper/gencode-remote diff --git a/conf/type/__package_zypper/man.text b/cdist/conf/type/__package_zypper/man.text similarity index 100% rename from conf/type/__package_zypper/man.text rename to cdist/conf/type/__package_zypper/man.text diff --git a/conf/type/__package_zypper/parameter/optional b/cdist/conf/type/__package_zypper/parameter/optional similarity index 100% rename from conf/type/__package_zypper/parameter/optional rename to cdist/conf/type/__package_zypper/parameter/optional diff --git a/conf/type/__partition_msdos/install b/cdist/conf/type/__partition_msdos/install similarity index 100% rename from conf/type/__partition_msdos/install rename to cdist/conf/type/__partition_msdos/install diff --git a/conf/type/__partition_msdos/man.text b/cdist/conf/type/__partition_msdos/man.text similarity index 100% rename from conf/type/__partition_msdos/man.text rename to cdist/conf/type/__partition_msdos/man.text diff --git a/conf/type/__partition_msdos/manifest b/cdist/conf/type/__partition_msdos/manifest similarity index 100% rename from conf/type/__partition_msdos/manifest rename to cdist/conf/type/__partition_msdos/manifest diff --git a/conf/type/__partition_msdos/parameter/optional b/cdist/conf/type/__partition_msdos/parameter/optional similarity index 100% rename from conf/type/__partition_msdos/parameter/optional rename to cdist/conf/type/__partition_msdos/parameter/optional diff --git a/conf/type/__partition_msdos/parameter/required b/cdist/conf/type/__partition_msdos/parameter/required similarity index 100% rename from conf/type/__partition_msdos/parameter/required rename to cdist/conf/type/__partition_msdos/parameter/required diff --git a/conf/type/__partition_msdos_apply/explorer/partitions b/cdist/conf/type/__partition_msdos_apply/explorer/partitions similarity index 100% rename from conf/type/__partition_msdos_apply/explorer/partitions rename to cdist/conf/type/__partition_msdos_apply/explorer/partitions diff --git a/conf/type/__partition_msdos_apply/files/lib.sh b/cdist/conf/type/__partition_msdos_apply/files/lib.sh similarity index 100% rename from conf/type/__partition_msdos_apply/files/lib.sh rename to cdist/conf/type/__partition_msdos_apply/files/lib.sh diff --git a/conf/type/__partition_msdos_apply/gencode-remote b/cdist/conf/type/__partition_msdos_apply/gencode-remote similarity index 100% rename from conf/type/__partition_msdos_apply/gencode-remote rename to cdist/conf/type/__partition_msdos_apply/gencode-remote diff --git a/conf/type/__partition_msdos_apply/install b/cdist/conf/type/__partition_msdos_apply/install similarity index 100% rename from conf/type/__partition_msdos_apply/install rename to cdist/conf/type/__partition_msdos_apply/install diff --git a/conf/type/__partition_msdos_apply/man.text b/cdist/conf/type/__partition_msdos_apply/man.text similarity index 100% rename from conf/type/__partition_msdos_apply/man.text rename to cdist/conf/type/__partition_msdos_apply/man.text diff --git a/conf/type/__partition_msdos_apply/singleton b/cdist/conf/type/__partition_msdos_apply/singleton similarity index 100% rename from conf/type/__partition_msdos_apply/singleton rename to cdist/conf/type/__partition_msdos_apply/singleton diff --git a/conf/type/__pf_apply/explorer/rcvar b/cdist/conf/type/__pf_apply/explorer/rcvar similarity index 100% rename from conf/type/__pf_apply/explorer/rcvar rename to cdist/conf/type/__pf_apply/explorer/rcvar diff --git a/conf/type/__pf_apply/gencode-remote b/cdist/conf/type/__pf_apply/gencode-remote similarity index 100% rename from conf/type/__pf_apply/gencode-remote rename to cdist/conf/type/__pf_apply/gencode-remote diff --git a/conf/type/__pf_apply/man.text b/cdist/conf/type/__pf_apply/man.text similarity index 100% rename from conf/type/__pf_apply/man.text rename to cdist/conf/type/__pf_apply/man.text diff --git a/conf/type/__pf_apply/singleton b/cdist/conf/type/__pf_apply/singleton similarity index 100% rename from conf/type/__pf_apply/singleton rename to cdist/conf/type/__pf_apply/singleton diff --git a/conf/type/__pf_ruleset/explorer/cksum b/cdist/conf/type/__pf_ruleset/explorer/cksum similarity index 100% rename from conf/type/__pf_ruleset/explorer/cksum rename to cdist/conf/type/__pf_ruleset/explorer/cksum diff --git a/conf/type/__pf_ruleset/explorer/rcvar b/cdist/conf/type/__pf_ruleset/explorer/rcvar similarity index 100% rename from conf/type/__pf_ruleset/explorer/rcvar rename to cdist/conf/type/__pf_ruleset/explorer/rcvar diff --git a/conf/type/__pf_ruleset/gencode-local b/cdist/conf/type/__pf_ruleset/gencode-local similarity index 100% rename from conf/type/__pf_ruleset/gencode-local rename to cdist/conf/type/__pf_ruleset/gencode-local diff --git a/conf/type/__pf_ruleset/gencode-remote b/cdist/conf/type/__pf_ruleset/gencode-remote similarity index 100% rename from conf/type/__pf_ruleset/gencode-remote rename to cdist/conf/type/__pf_ruleset/gencode-remote diff --git a/conf/type/__pf_ruleset/man.text b/cdist/conf/type/__pf_ruleset/man.text similarity index 100% rename from conf/type/__pf_ruleset/man.text rename to cdist/conf/type/__pf_ruleset/man.text diff --git a/conf/type/__pf_ruleset/parameter/optional b/cdist/conf/type/__pf_ruleset/parameter/optional similarity index 100% rename from conf/type/__pf_ruleset/parameter/optional rename to cdist/conf/type/__pf_ruleset/parameter/optional diff --git a/conf/type/__pf_ruleset/parameter/required b/cdist/conf/type/__pf_ruleset/parameter/required similarity index 100% rename from conf/type/__pf_ruleset/parameter/required rename to cdist/conf/type/__pf_ruleset/parameter/required diff --git a/conf/type/__pf_ruleset/singleton b/cdist/conf/type/__pf_ruleset/singleton similarity index 100% rename from conf/type/__pf_ruleset/singleton rename to cdist/conf/type/__pf_ruleset/singleton diff --git a/conf/type/__postgres_database/explorer/state b/cdist/conf/type/__postgres_database/explorer/state similarity index 100% rename from conf/type/__postgres_database/explorer/state rename to cdist/conf/type/__postgres_database/explorer/state diff --git a/conf/type/__postgres_database/gencode-remote b/cdist/conf/type/__postgres_database/gencode-remote similarity index 100% rename from conf/type/__postgres_database/gencode-remote rename to cdist/conf/type/__postgres_database/gencode-remote diff --git a/conf/type/__postgres_database/man.text b/cdist/conf/type/__postgres_database/man.text similarity index 100% rename from conf/type/__postgres_database/man.text rename to cdist/conf/type/__postgres_database/man.text diff --git a/conf/type/__postgres_database/parameter/optional b/cdist/conf/type/__postgres_database/parameter/optional similarity index 100% rename from conf/type/__postgres_database/parameter/optional rename to cdist/conf/type/__postgres_database/parameter/optional diff --git a/conf/type/__postgres_database/parameter/required b/cdist/conf/type/__postgres_database/parameter/required similarity index 100% rename from conf/type/__postgres_database/parameter/required rename to cdist/conf/type/__postgres_database/parameter/required diff --git a/conf/type/__postgres_role/explorer/state b/cdist/conf/type/__postgres_role/explorer/state similarity index 100% rename from conf/type/__postgres_role/explorer/state rename to cdist/conf/type/__postgres_role/explorer/state diff --git a/conf/type/__postgres_role/gencode-remote b/cdist/conf/type/__postgres_role/gencode-remote similarity index 100% rename from conf/type/__postgres_role/gencode-remote rename to cdist/conf/type/__postgres_role/gencode-remote diff --git a/conf/type/__postgres_role/man.text b/cdist/conf/type/__postgres_role/man.text similarity index 100% rename from conf/type/__postgres_role/man.text rename to cdist/conf/type/__postgres_role/man.text diff --git a/conf/type/__postgres_role/parameter/optional b/cdist/conf/type/__postgres_role/parameter/optional similarity index 100% rename from conf/type/__postgres_role/parameter/optional rename to cdist/conf/type/__postgres_role/parameter/optional diff --git a/conf/type/__postgres_role/parameter/required b/cdist/conf/type/__postgres_role/parameter/required similarity index 100% rename from conf/type/__postgres_role/parameter/required rename to cdist/conf/type/__postgres_role/parameter/required diff --git a/conf/type/__process/explorer/runs b/cdist/conf/type/__process/explorer/runs similarity index 100% rename from conf/type/__process/explorer/runs rename to cdist/conf/type/__process/explorer/runs diff --git a/conf/type/__process/gencode-remote b/cdist/conf/type/__process/gencode-remote similarity index 100% rename from conf/type/__process/gencode-remote rename to cdist/conf/type/__process/gencode-remote diff --git a/conf/type/__process/man.text b/cdist/conf/type/__process/man.text similarity index 100% rename from conf/type/__process/man.text rename to cdist/conf/type/__process/man.text diff --git a/conf/type/__process/parameter/optional b/cdist/conf/type/__process/parameter/optional similarity index 100% rename from conf/type/__process/parameter/optional rename to cdist/conf/type/__process/parameter/optional diff --git a/conf/type/__process/parameter/required b/cdist/conf/type/__process/parameter/required similarity index 100% rename from conf/type/__process/parameter/required rename to cdist/conf/type/__process/parameter/required diff --git a/conf/type/__qemu_img/explorer/exists b/cdist/conf/type/__qemu_img/explorer/exists similarity index 100% rename from conf/type/__qemu_img/explorer/exists rename to cdist/conf/type/__qemu_img/explorer/exists diff --git a/conf/type/__qemu_img/gencode-remote b/cdist/conf/type/__qemu_img/gencode-remote similarity index 100% rename from conf/type/__qemu_img/gencode-remote rename to cdist/conf/type/__qemu_img/gencode-remote diff --git a/conf/type/__qemu_img/man.text b/cdist/conf/type/__qemu_img/man.text similarity index 100% rename from conf/type/__qemu_img/man.text rename to cdist/conf/type/__qemu_img/man.text diff --git a/conf/type/__qemu_img/manifest b/cdist/conf/type/__qemu_img/manifest similarity index 100% rename from conf/type/__qemu_img/manifest rename to cdist/conf/type/__qemu_img/manifest diff --git a/conf/type/__qemu_img/parameter/optional b/cdist/conf/type/__qemu_img/parameter/optional similarity index 100% rename from conf/type/__qemu_img/parameter/optional rename to cdist/conf/type/__qemu_img/parameter/optional diff --git a/conf/type/__qemu_img/parameter/required b/cdist/conf/type/__qemu_img/parameter/required similarity index 100% rename from conf/type/__qemu_img/parameter/required rename to cdist/conf/type/__qemu_img/parameter/required diff --git a/conf/type/__rvm/explorer/state b/cdist/conf/type/__rvm/explorer/state similarity index 100% rename from conf/type/__rvm/explorer/state rename to cdist/conf/type/__rvm/explorer/state diff --git a/conf/type/__rvm/gencode-remote b/cdist/conf/type/__rvm/gencode-remote similarity index 100% rename from conf/type/__rvm/gencode-remote rename to cdist/conf/type/__rvm/gencode-remote diff --git a/conf/type/__rvm/man.text b/cdist/conf/type/__rvm/man.text similarity index 100% rename from conf/type/__rvm/man.text rename to cdist/conf/type/__rvm/man.text diff --git a/conf/type/__rvm/manifest b/cdist/conf/type/__rvm/manifest similarity index 100% rename from conf/type/__rvm/manifest rename to cdist/conf/type/__rvm/manifest diff --git a/conf/type/__rvm/parameter/required b/cdist/conf/type/__rvm/parameter/required similarity index 100% rename from conf/type/__rvm/parameter/required rename to cdist/conf/type/__rvm/parameter/required diff --git a/conf/type/__rvm_gem/explorer/state b/cdist/conf/type/__rvm_gem/explorer/state similarity index 100% rename from conf/type/__rvm_gem/explorer/state rename to cdist/conf/type/__rvm_gem/explorer/state diff --git a/conf/type/__rvm_gem/gencode-remote b/cdist/conf/type/__rvm_gem/gencode-remote similarity index 100% rename from conf/type/__rvm_gem/gencode-remote rename to cdist/conf/type/__rvm_gem/gencode-remote diff --git a/conf/type/__rvm_gem/man.text b/cdist/conf/type/__rvm_gem/man.text similarity index 100% rename from conf/type/__rvm_gem/man.text rename to cdist/conf/type/__rvm_gem/man.text diff --git a/conf/type/__rvm_gem/manifest b/cdist/conf/type/__rvm_gem/manifest similarity index 100% rename from conf/type/__rvm_gem/manifest rename to cdist/conf/type/__rvm_gem/manifest diff --git a/conf/type/__rvm_gem/parameter/optional b/cdist/conf/type/__rvm_gem/parameter/optional similarity index 100% rename from conf/type/__rvm_gem/parameter/optional rename to cdist/conf/type/__rvm_gem/parameter/optional diff --git a/conf/type/__rvm_gem/parameter/required b/cdist/conf/type/__rvm_gem/parameter/required similarity index 100% rename from conf/type/__rvm_gem/parameter/required rename to cdist/conf/type/__rvm_gem/parameter/required diff --git a/conf/type/__rvm_gemset/explorer/state b/cdist/conf/type/__rvm_gemset/explorer/state similarity index 100% rename from conf/type/__rvm_gemset/explorer/state rename to cdist/conf/type/__rvm_gemset/explorer/state diff --git a/conf/type/__rvm_gemset/gencode-remote b/cdist/conf/type/__rvm_gemset/gencode-remote similarity index 100% rename from conf/type/__rvm_gemset/gencode-remote rename to cdist/conf/type/__rvm_gemset/gencode-remote diff --git a/conf/type/__rvm_gemset/man.text b/cdist/conf/type/__rvm_gemset/man.text similarity index 100% rename from conf/type/__rvm_gemset/man.text rename to cdist/conf/type/__rvm_gemset/man.text diff --git a/conf/type/__rvm_gemset/manifest b/cdist/conf/type/__rvm_gemset/manifest similarity index 100% rename from conf/type/__rvm_gemset/manifest rename to cdist/conf/type/__rvm_gemset/manifest diff --git a/conf/type/__rvm_gemset/parameter/optional b/cdist/conf/type/__rvm_gemset/parameter/optional similarity index 100% rename from conf/type/__rvm_gemset/parameter/optional rename to cdist/conf/type/__rvm_gemset/parameter/optional diff --git a/conf/type/__rvm_gemset/parameter/required b/cdist/conf/type/__rvm_gemset/parameter/required similarity index 100% rename from conf/type/__rvm_gemset/parameter/required rename to cdist/conf/type/__rvm_gemset/parameter/required diff --git a/conf/type/__rvm_ruby/explorer/state b/cdist/conf/type/__rvm_ruby/explorer/state similarity index 100% rename from conf/type/__rvm_ruby/explorer/state rename to cdist/conf/type/__rvm_ruby/explorer/state diff --git a/conf/type/__rvm_ruby/gencode-remote b/cdist/conf/type/__rvm_ruby/gencode-remote similarity index 100% rename from conf/type/__rvm_ruby/gencode-remote rename to cdist/conf/type/__rvm_ruby/gencode-remote diff --git a/conf/type/__rvm_ruby/man.text b/cdist/conf/type/__rvm_ruby/man.text similarity index 100% rename from conf/type/__rvm_ruby/man.text rename to cdist/conf/type/__rvm_ruby/man.text diff --git a/conf/type/__rvm_ruby/manifest b/cdist/conf/type/__rvm_ruby/manifest similarity index 100% rename from conf/type/__rvm_ruby/manifest rename to cdist/conf/type/__rvm_ruby/manifest diff --git a/conf/type/__rvm_ruby/parameter/optional b/cdist/conf/type/__rvm_ruby/parameter/optional similarity index 100% rename from conf/type/__rvm_ruby/parameter/optional rename to cdist/conf/type/__rvm_ruby/parameter/optional diff --git a/conf/type/__rvm_ruby/parameter/required b/cdist/conf/type/__rvm_ruby/parameter/required similarity index 100% rename from conf/type/__rvm_ruby/parameter/required rename to cdist/conf/type/__rvm_ruby/parameter/required diff --git a/conf/type/__ssh_authorized_key/explorer/dstuser_group b/cdist/conf/type/__ssh_authorized_key/explorer/dstuser_group similarity index 100% rename from conf/type/__ssh_authorized_key/explorer/dstuser_group rename to cdist/conf/type/__ssh_authorized_key/explorer/dstuser_group diff --git a/conf/type/__ssh_authorized_key/man.text b/cdist/conf/type/__ssh_authorized_key/man.text similarity index 100% rename from conf/type/__ssh_authorized_key/man.text rename to cdist/conf/type/__ssh_authorized_key/man.text diff --git a/conf/type/__ssh_authorized_key/manifest b/cdist/conf/type/__ssh_authorized_key/manifest similarity index 100% rename from conf/type/__ssh_authorized_key/manifest rename to cdist/conf/type/__ssh_authorized_key/manifest diff --git a/conf/type/__ssh_authorized_key/parameter/optional b/cdist/conf/type/__ssh_authorized_key/parameter/optional similarity index 100% rename from conf/type/__ssh_authorized_key/parameter/optional rename to cdist/conf/type/__ssh_authorized_key/parameter/optional diff --git a/conf/type/__start_on_boot/explorer/state b/cdist/conf/type/__start_on_boot/explorer/state similarity index 100% rename from conf/type/__start_on_boot/explorer/state rename to cdist/conf/type/__start_on_boot/explorer/state diff --git a/conf/type/__start_on_boot/gencode-remote b/cdist/conf/type/__start_on_boot/gencode-remote similarity index 100% rename from conf/type/__start_on_boot/gencode-remote rename to cdist/conf/type/__start_on_boot/gencode-remote diff --git a/conf/type/__start_on_boot/man.text b/cdist/conf/type/__start_on_boot/man.text similarity index 100% rename from conf/type/__start_on_boot/man.text rename to cdist/conf/type/__start_on_boot/man.text diff --git a/conf/type/__start_on_boot/parameter/optional b/cdist/conf/type/__start_on_boot/parameter/optional similarity index 100% rename from conf/type/__start_on_boot/parameter/optional rename to cdist/conf/type/__start_on_boot/parameter/optional diff --git a/conf/type/__timezone/man.text b/cdist/conf/type/__timezone/man.text similarity index 100% rename from conf/type/__timezone/man.text rename to cdist/conf/type/__timezone/man.text diff --git a/conf/type/__timezone/manifest b/cdist/conf/type/__timezone/manifest similarity index 100% rename from conf/type/__timezone/manifest rename to cdist/conf/type/__timezone/manifest diff --git a/conf/type/__user/TODO b/cdist/conf/type/__user/TODO similarity index 100% rename from conf/type/__user/TODO rename to cdist/conf/type/__user/TODO diff --git a/conf/type/__user/explorer/group b/cdist/conf/type/__user/explorer/group similarity index 100% rename from conf/type/__user/explorer/group rename to cdist/conf/type/__user/explorer/group diff --git a/conf/type/__user/explorer/passwd b/cdist/conf/type/__user/explorer/passwd similarity index 100% rename from conf/type/__user/explorer/passwd rename to cdist/conf/type/__user/explorer/passwd diff --git a/conf/type/__user/explorer/shadow b/cdist/conf/type/__user/explorer/shadow similarity index 100% rename from conf/type/__user/explorer/shadow rename to cdist/conf/type/__user/explorer/shadow diff --git a/conf/type/__user/gencode-remote b/cdist/conf/type/__user/gencode-remote similarity index 100% rename from conf/type/__user/gencode-remote rename to cdist/conf/type/__user/gencode-remote diff --git a/conf/type/__user/man.text b/cdist/conf/type/__user/man.text similarity index 100% rename from conf/type/__user/man.text rename to cdist/conf/type/__user/man.text diff --git a/conf/type/__user/parameter/optional b/cdist/conf/type/__user/parameter/optional similarity index 100% rename from conf/type/__user/parameter/optional rename to cdist/conf/type/__user/parameter/optional diff --git a/cdist/test/emulator/fixtures/conf/type/__file b/cdist/test/emulator/fixtures/conf/type/__file index 8458361c..1ed684b9 120000 --- a/cdist/test/emulator/fixtures/conf/type/__file +++ b/cdist/test/emulator/fixtures/conf/type/__file @@ -1 +1 @@ -../../../../../../conf/type/__file \ No newline at end of file +../../../../../conf/type/__file \ No newline at end of file diff --git a/setup.py b/setup.py index 19fb28e6..d5dac616 100644 --- a/setup.py +++ b/setup.py @@ -11,14 +11,18 @@ def data_finder(data_dir): for name in os.listdir(data_dir): entry = os.path.join(data_dir, name) if os.path.isdir(entry): + entries.append(entry) entries.extend(data_finder(entry)) else: entries.append(entry) return entries +cur = os.getcwd() +os.chdir("cdist") package_data = data_finder("conf") - + # package_dir={'cdist': 'src/mypkg'}, +os.chdir(cur) print(package_data) From 8202cd0e7ad78c2df4969635932752d9752e0896 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Mon, 29 Oct 2012 22:56:29 +0100 Subject: [PATCH 054/104] remove some debug, remove adding dirs Signed-off-by: Nico Schottelius --- setup.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/setup.py b/setup.py index d5dac616..5b5e2a47 100644 --- a/setup.py +++ b/setup.py @@ -1,9 +1,5 @@ from distutils.core import setup - -#data_files=[('/usr/share/cdist', 'conf')], - # data_files=[('/tmp/cdist', ['conf'])], import cdist - import os def data_finder(data_dir): @@ -11,7 +7,6 @@ def data_finder(data_dir): for name in os.listdir(data_dir): entry = os.path.join(data_dir, name) if os.path.isdir(entry): - entries.append(entry) entries.extend(data_finder(entry)) else: entries.append(entry) @@ -21,11 +16,8 @@ def data_finder(data_dir): cur = os.getcwd() os.chdir("cdist") package_data = data_finder("conf") - # package_dir={'cdist': 'src/mypkg'}, os.chdir(cur) -print(package_data) - setup( name = "cdist", packages = ["cdist", "cdist.core", "cdist.exec", "cdist.util" ], From 6c4480abfa138bbc99d59da6a3e3838c1a9c98cf Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Mon, 29 Oct 2012 23:25:28 +0100 Subject: [PATCH 055/104] ++changes(2.1.0pre3) Signed-off-by: Nico Schottelius --- docs/changelog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/changelog b/docs/changelog index dba70701..93d71ba2 100644 --- a/docs/changelog +++ b/docs/changelog @@ -5,6 +5,9 @@ Changelog * Exception: No braces means author == Nico Schottelius +2.1.0pre3: 2012-10-29 + * Dist: PyPi: Types and explorer included as package data + 2.1.0pre2: 2012-10-26 * Dist: PyPi: Add conf/ directory to distribution * Dist: Initial support for archlinux packaging From cbb34de1b2bd1ebb0b7f11cac3933f40d00effc3 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Mon, 29 Oct 2012 23:28:27 +0100 Subject: [PATCH 056/104] explorers are now below cdist/ Signed-off-by: Nico Schottelius --- docs/man/cdist-reference.text.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/man/cdist-reference.text.sh b/docs/man/cdist-reference.text.sh index cf1b852f..8e3f49a2 100755 --- a/docs/man/cdist-reference.text.sh +++ b/docs/man/cdist-reference.text.sh @@ -49,7 +49,7 @@ The following global explorers are available: eof ( - cd ../../conf/explorer + cd ../../cdist/conf/explorer for explorer in *; do echo "- $explorer" done From e0bdcea78b1a59424e22de1ccf7ea8ec24b22f8b Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 30 Oct 2012 07:33:07 +0100 Subject: [PATCH 057/104] adjust type linking script Signed-off-by: Nico Schottelius --- build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build b/build index d295da14..a4550f67 100755 --- a/build +++ b/build @@ -78,8 +78,8 @@ case "$1" in ;; mantype) - for mansrc in conf/type/*/man.text; do - dst="$(echo $mansrc | sed -e 's;conf/;cdist-;' -e 's;/;;' -e 's;/man;;' -e 's;^;docs/man/man7/;')" + for mansrc in cdist/conf/type/*/man.text; do + dst="$(echo $mansrc | sed -e 's;cdist/conf/;cdist-;' -e 's;/;;' -e 's;/man;;' -e 's;^;docs/man/man7/;')" ln -sf "../../../$mansrc" "$dst" done ;; From 80e42c133ddb93edae8f6da303294a960f9d7b3a Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 30 Oct 2012 07:37:19 +0100 Subject: [PATCH 058/104] this is pre3, not pre2 Signed-off-by: Nico Schottelius --- docs/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/changelog b/docs/changelog index 93d71ba2..118d9bfe 100644 --- a/docs/changelog +++ b/docs/changelog @@ -5,7 +5,7 @@ Changelog * Exception: No braces means author == Nico Schottelius -2.1.0pre3: 2012-10-29 +2.1.0pre3: 2012-10-30 * Dist: PyPi: Types and explorer included as package data 2.1.0pre2: 2012-10-26 From a81525b101929bc334bb1414c431bd5c1cb92bed Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 30 Oct 2012 07:41:42 +0100 Subject: [PATCH 059/104] add some thoughts on changes for multiple directory search for types and explorers Signed-off-by: Nico Schottelius --- docs/dev/logs/2012-10-29.installed_paths | 32 ++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 docs/dev/logs/2012-10-29.installed_paths diff --git a/docs/dev/logs/2012-10-29.installed_paths b/docs/dev/logs/2012-10-29.installed_paths new file mode 100644 index 00000000..f6824274 --- /dev/null +++ b/docs/dev/logs/2012-10-29.installed_paths @@ -0,0 +1,32 @@ + +Installed paths: (read first) + os.path.dirname(cdist.__file__) + + /conf/explorer + /conf/type + +User paths: (read after, overwrite)? + + $HOME/.cdist + + /explorer + /type + + /manifest + +Additional paths: + + CDIST_EXPLORER_EXTRA_PATH=... + CDIST_TYPE_EXTRA_PATH=... + + or + + -c dir -c dir2 -c ... => + add types and explorer from those directories + last one wins? + because they can only be appended to existing "$PATH" + +Open questions: + + - How to tell types to use global explorer? + - How to tell types to find other types? From 10b6c31ac8d14cec11e615827981ac0f49de8258 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 30 Oct 2012 11:47:16 +0100 Subject: [PATCH 060/104] Rename cdist.py to scripts/cdist to avoid self import naming cdist cdist.py and running import cdist, imports itself and thus raises an interesting error: (virtualenv)[7:47] brief:virtualenv% cdist.py Traceback (most recent call last): File "", line 1512, in _find_and_load_unlocked AttributeError: 'module' object has no attribute '__path__' During handling of the above exception, another exception occurred: Traceback (most recent call last): File "/home/users/nico/oeffentlich/rechner/projekte/cdist/virtualenv/bin/cdist.py", line 230, in commandline() File "/home/users/nico/oeffentlich/rechner/projekte/cdist/virtualenv/bin/cdist.py", line 27, in commandline import cdist.banner ImportError: No module named 'cdist.banner'; cdist is not a package During handling of the above exception, another exception occurred: Traceback (most recent call last): File "/home/users/nico/oeffentlich/rechner/projekte/cdist/virtualenv/bin/cdist.py", line 235, in except cdist.Error as e: AttributeError: 'module' object has no attribute 'Error' Also described on http://www.velocityreviews.com/forums/t953596-error-executing-import-html-parser-from-a-script.html Signed-off-by: Nico Schottelius --- bin/cdist | 5 ++++- cdist.py => scripts/cdist | 0 2 files changed, 4 insertions(+), 1 deletion(-) rename cdist.py => scripts/cdist (100%) diff --git a/bin/cdist b/bin/cdist index 5c1239fb..5a6ce92f 100755 --- a/bin/cdist +++ b/bin/cdist @@ -22,5 +22,8 @@ # Wrapper for real script to allow execution from checkout dir=${0%/*} + +# Ensure version is present - the bundled/shipped version contains a static version, +# the git version contains a dynamic version "$dir/../build" version -"$dir/../cdist.py" "$@" +PYTHONPATH="${dir}/../" "$dir/../scripts/cdist" "$@" diff --git a/cdist.py b/scripts/cdist similarity index 100% rename from cdist.py rename to scripts/cdist From c4274e789fe0d7349acf6307d15c0a15c01b5e2e Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 30 Oct 2012 11:51:27 +0100 Subject: [PATCH 061/104] include cdist from the scripts/ directory for shipping Signed-off-by: Nico Schottelius --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 5b5e2a47..25fc4820 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ setup( name = "cdist", packages = ["cdist", "cdist.core", "cdist.exec", "cdist.util" ], package_data={'cdist': package_data}, - scripts = ["cdist.py"], + scripts = ["scripts/cdist"], version = cdist.version.VERSION, description = "A Usable Configuration Management System", author = "Nico Schottelius", From 01eef6b242cd87a608855fdd975bbd40e5ae220c Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 30 Oct 2012 14:53:53 +0100 Subject: [PATCH 062/104] ++changes(2.1.0pre4) Signed-off-by: Nico Schottelius --- docs/changelog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/changelog b/docs/changelog index 118d9bfe..242e0c2f 100644 --- a/docs/changelog +++ b/docs/changelog @@ -5,6 +5,9 @@ Changelog * Exception: No braces means author == Nico Schottelius +2.1.0pre4: + * Dist: PyPi: Move cdist.py to script/cdist to avoid double import + 2.1.0pre3: 2012-10-30 * Dist: PyPi: Types and explorer included as package data From 6ece8a97c71c5c0a946e515603015837562c68ac Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 30 Oct 2012 14:54:05 +0100 Subject: [PATCH 063/104] use obsolete lib path Signed-off-by: Nico Schottelius --- cdist/exec/local.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/cdist/exec/local.py b/cdist/exec/local.py index e510a8fb..9947ac64 100644 --- a/cdist/exec/local.py +++ b/cdist/exec/local.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # # 2011 Steven Armstrong (steven-cdist at armstrong.cc) -# 2011 Nico Schottelius (nico-cdist at schottelius.org) +# 2011-2012 Nico Schottelius (nico-cdist at schottelius.org) # # This file is part of cdist. # @@ -20,8 +20,6 @@ # # -# FIXME: common base class with Remote? - import io import os import sys @@ -49,8 +47,6 @@ class Local(object): self.global_explorer_path = os.path.join(self.conf_path, "explorer") self.manifest_path = os.path.join(self.conf_path, "manifest") self.type_path = os.path.join(self.conf_path, "type") - # FIXME: should not be needed anywhere - self.lib_path = os.path.join(self.base_path, "lib") # Local output self.out_path = out_path From f09378eed05cd4b4c15b424dbdb751baa652ee8d Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 30 Oct 2012 14:57:49 +0100 Subject: [PATCH 064/104] path implementation done (in theory) Signed-off-by: Nico Schottelius --- ...0-30.path-for-types-and-global-explorer-implementation | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 docs/dev/logs/2012-10-30.path-for-types-and-global-explorer-implementation diff --git a/docs/dev/logs/2012-10-30.path-for-types-and-global-explorer-implementation b/docs/dev/logs/2012-10-30.path-for-types-and-global-explorer-implementation new file mode 100644 index 00000000..8a683a40 --- /dev/null +++ b/docs/dev/logs/2012-10-30.path-for-types-and-global-explorer-implementation @@ -0,0 +1,8 @@ +- Allow list of base directories, which may contain explorer/ or type/ subdirectories + - can use the existing -c parameter, only allow it to be specified multiple times +- for each directory, link the given explorer and types to a temporary conf/ directory + similar to bin/ +- last one wins strategy + - what is expected by the user + + From 18c0c937dd417900ae48c4e43df1e6ee4010e836 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 30 Oct 2012 14:58:03 +0100 Subject: [PATCH 065/104] also add cache to user dir Signed-off-by: Nico Schottelius --- docs/dev/logs/2012-10-29.installed_paths | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/dev/logs/2012-10-29.installed_paths b/docs/dev/logs/2012-10-29.installed_paths index f6824274..3587390e 100644 --- a/docs/dev/logs/2012-10-29.installed_paths +++ b/docs/dev/logs/2012-10-29.installed_paths @@ -14,6 +14,8 @@ User paths: (read after, overwrite)? /manifest + /cache + Additional paths: CDIST_EXPLORER_EXTRA_PATH=... From 813651c14b87d30b5f2c028ac7d21d43efb67bb2 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 30 Oct 2012 15:59:02 +0100 Subject: [PATCH 066/104] allow passing conf_dir instead of cdist-home Signed-off-by: Nico Schottelius --- scripts/cdist | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/cdist b/scripts/cdist index 2066db55..d5ea06d0 100755 --- a/scripts/cdist +++ b/scripts/cdist @@ -56,9 +56,9 @@ def commandline(): parser['configinstall'] = argparse.ArgumentParser(add_help=False) parser['configinstall'].add_argument('host', nargs='+', help='one or more hosts to operate on') - parser['configinstall'].add_argument('-c', '--cdist-home', - help='Change cdist home (default: .. from bin directory)', - action='store') + parser['configinstall'].add_argument('-c', '--conf-dir', + help='Add configuration directory (can be repeated, last one wins)', + action='append') parser['configinstall'].add_argument('-i', '--initial-manifest', help='Path to a cdist manifest or \'-\' to read from stdin.', dest='manifest', required=False) @@ -172,7 +172,7 @@ def configinstall_onehost(host, args, mode, parallel): remote_copy=args.remote_copy, remote_exec=args.remote_exec, initial_manifest=args.manifest, - base_path=args.cdist_home, + conf_dirs=args.conf_dir, exec_path=sys.argv[0], debug=args.debug) From b0e8c23078acd1f8ba73e3aa23c0bb24a5ec843a Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 30 Oct 2012 15:59:21 +0100 Subject: [PATCH 067/104] initial change to support multiple conf_dirs Signed-off-by: Nico Schottelius --- cdist/context.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/cdist/context.py b/cdist/context.py index 8b468739..64a8086e 100644 --- a/cdist/context.py +++ b/cdist/context.py @@ -38,26 +38,18 @@ class Context(object): remote_copy, remote_exec, initial_manifest=False, - base_path=False, + conf_dirs=[], exec_path=sys.argv[0], debug=False): - self.debug = debug - + self.debug = debug self.target_host = target_host - - # Only required for testing self.exec_path = exec_path # Context logging self.log = logging.getLogger(self.target_host) self.log.addFilter(self) - # Local base directory - self.base_path = (base_path or - os.path.abspath(os.path.join(os.path.dirname(__file__), - os.pardir, os.pardir))) - # Local temp directory # FIXME: if __cdist_out_dir can be given from the outside, the same directory will be used for all hosts if '__cdist_out_dir' in os.environ: @@ -67,7 +59,7 @@ class Context(object): self.temp_dir = tempfile.mkdtemp() self.out_path = os.path.join(self.temp_dir, "out") - self.local = local.Local(self.target_host, self.base_path, self.out_path) + self.local = local.Local(self.target_host, self.conf_dirs, self.out_path) self.initial_manifest = (initial_manifest or os.path.join(self.local.manifest_path, "init")) From 1e264afa6343ffbab5c61d7d4b379d1454f8aee8 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 30 Oct 2012 16:05:37 +0100 Subject: [PATCH 068/104] refactor code to allow multiple directories to be passed in Signed-off-by: Nico Schottelius --- cdist/exec/local.py | 107 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 89 insertions(+), 18 deletions(-) diff --git a/cdist/exec/local.py b/cdist/exec/local.py index 9947ac64..4d94789b 100644 --- a/cdist/exec/local.py +++ b/cdist/exec/local.py @@ -37,32 +37,67 @@ class Local(object): Directly accessing the local side from python code is a bug. """ - def __init__(self, target_host, local_base_path, out_path): - self.target_host = target_host - self.base_path = local_base_path + def __init__(self, target_host, conf_dirs, out_path, cache_dir): - # Local input - self.cache_path = os.path.join(self.base_path, "cache") - self.conf_path = os.path.join(self.base_path, "conf") + self.target_host = target_host + self.add_conf_dirs = conf_dirs + self.out_path = out_path + + self._init_log() + self._init_permissions() + self._init_home_dir() + self._init_paths() + self._init_cache_dir() + self._init_conf_dirs() + + def _init_home_dir(self): + if 'HOME' in os.environ: + self.home_dir = os.environ['HOME'] + else: + self.home_dir = None + + def _init_log(self): + self.log = logging.getLogger(self.target_host) + + def _init_permissions(self): + # Setup file permissions using umask + os.umask(0o077) + + def _init_paths(self): + # Depending on out_path + self.bin_path = os.path.join(self.out_path, "bin") + self.conf_path = os.path.join(self.out_path, "conf") + self.global_explorer_out_path = os.path.join(self.out_path, "explorer") + self.object_path = os.path.join(self.out_path, "object") + + # Depending on conf_path self.global_explorer_path = os.path.join(self.conf_path, "explorer") self.manifest_path = os.path.join(self.conf_path, "manifest") self.type_path = os.path.join(self.conf_path, "type") - # Local output - self.out_path = out_path - self.bin_path = os.path.join(self.out_path, "bin") - self.global_explorer_out_path = os.path.join(self.out_path, "explorer") - self.object_path = os.path.join(self.out_path, "object") + def _init_conf_dirs(self): + self.conf_dirs = [] - self.log = logging.getLogger(self.target_host) + # Comes with the distribution + system_conf_dir = os.path.join(os.path.dirname(cdist.__file__), "conf") + self.conf_dirs.append(system_conf_dir) - # Setup file permissions using umask - os.umask(0o077) + # Is the default place for user created explorer, type and manifest + if self.home_dir: + user_conf_dir = os.path.join(self.home_dir, ".cdist") + self.conf_dirs.append(user_conf_dir) - def create_directories(self): - self.mkdir(self.out_path) - self.mkdir(self.global_explorer_out_path) - self.mkdir(self.bin_path) + # Add user supplied directories + self.conf_dirs.extend(self.add_conf_dirs) + + def _init_cache_dir(self, cache_dir): + if cache_dir: + self.cache_path = cache_dir + else: + if self.home_dir: + self.cache_path = os.path.join(self.home_dir, "cache") + else: + raise cdist.Error("No homedir setup and no cache dir location given") def rmdir(self, path): """Remove directory on the local side.""" @@ -107,6 +142,42 @@ class Local(object): return self.run(command, env, return_output) + def create_context_files_dirs(self): + self._create_context_dirs() + self._create_conf_path_and_link_conf_dirs() + + def _create_context_dirs(self): + self.mkdir(self.out_path) + self.mkdir(self.conf_path) + self.mkdir(self.global_explorer_out_path) + self.mkdir(self.bin_path) + + def _create_conf_path_and_link_conf_dirs(self): + self.mkdir(self.conf_path) + + # Link destination directories + for sub_dir in [ "explorer", "manifest", "type" ]: + self.mkdir(os.path.join(self.conf_path, sub_dir)) + + # Iterate over all directories and link the to the output dir + for conf_dir in self.conf_dirs: + for sub_dir in [ "explorer", "manifest", "type" ]: + current_dir = os.path.join(conf_dir, sub_dir) + + for entry in os.listdir(current_dir): + rel_entry_path = os.path.join(sub_dir, entry) + src = os.path.join(self.conf_path, entry) + dst = os.path.join(conf_dir, sub_dir, entry) + + # Already exists? remove and link + if os.path.exists(dst): + os.ulink(dst) + + try: + os.symlink(src, dst) + except OSError as e: + raise cdist.Error("Linking %s %s to %s failed: %s" % (sub_dir, src, dst, e.__str__())) + def link_emulator(self, exec_path): """Link emulator to types""" src = os.path.abspath(exec_path) From cbe95b18e650b1fc1b6fe28059590ae94a437d6e Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 30 Oct 2012 16:06:27 +0100 Subject: [PATCH 069/104] rename function to reveal new task: create_files_dirs Signed-off-by: Nico Schottelius --- cdist/config_install.py | 4 ++-- cdist/exec/local.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cdist/config_install.py b/cdist/config_install.py index 3aadca86..280f186c 100644 --- a/cdist/config_install.py +++ b/cdist/config_install.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- # -# 2010-2011 Nico Schottelius (nico-cdist at schottelius.org) +# 2010-2012 Nico Schottelius (nico-cdist at schottelius.org) # # This file is part of cdist. # @@ -48,7 +48,7 @@ class ConfigInstall(object): self.remote = context.remote # Initialise local directory structure - self.local.create_directories() + self.local.create_files_dirs() # Initialise remote directory structure self.remote.create_directories() diff --git a/cdist/exec/local.py b/cdist/exec/local.py index 4d94789b..bb90ab6c 100644 --- a/cdist/exec/local.py +++ b/cdist/exec/local.py @@ -142,7 +142,7 @@ class Local(object): return self.run(command, env, return_output) - def create_context_files_dirs(self): + def create_files_dirs(self): self._create_context_dirs() self._create_conf_path_and_link_conf_dirs() From dcaa70e6be1487942adc687e54473bca8119d4a1 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 30 Oct 2012 16:07:00 +0100 Subject: [PATCH 070/104] be consistent in remote Signed-off-by: Nico Schottelius --- cdist/config_install.py | 2 +- cdist/exec/remote.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cdist/config_install.py b/cdist/config_install.py index 280f186c..b7804a10 100644 --- a/cdist/config_install.py +++ b/cdist/config_install.py @@ -50,7 +50,7 @@ class ConfigInstall(object): # Initialise local directory structure self.local.create_files_dirs() # Initialise remote directory structure - self.remote.create_directories() + self.remote.create_files_dirs() self.explorer = core.Explorer(self.context.target_host, self.local, self.remote) self.manifest = core.Manifest(self.context.target_host, self.local) diff --git a/cdist/exec/remote.py b/cdist/exec/remote.py index 487beea3..07c6614b 100644 --- a/cdist/exec/remote.py +++ b/cdist/exec/remote.py @@ -57,7 +57,7 @@ class Remote(object): self.log = logging.getLogger(self.target_host) - def create_directories(self): + def create_files_dirs(self): self.rmdir(self.base_path) self.mkdir(self.base_path) self.mkdir(self.conf_path) From e41aae041a64d378be522a97456a1df93e9d3782 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 30 Oct 2012 16:11:03 +0100 Subject: [PATCH 071/104] fix cache_dir syntax error Signed-off-by: Nico Schottelius --- cdist/context.py | 2 +- cdist/exec/local.py | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/cdist/context.py b/cdist/context.py index 64a8086e..5fec530f 100644 --- a/cdist/context.py +++ b/cdist/context.py @@ -59,7 +59,7 @@ class Context(object): self.temp_dir = tempfile.mkdtemp() self.out_path = os.path.join(self.temp_dir, "out") - self.local = local.Local(self.target_host, self.conf_dirs, self.out_path) + self.local = local.Local(self.target_host, conf_dirs, self.out_path) self.initial_manifest = (initial_manifest or os.path.join(self.local.manifest_path, "init")) diff --git a/cdist/exec/local.py b/cdist/exec/local.py index bb90ab6c..a5e838cb 100644 --- a/cdist/exec/local.py +++ b/cdist/exec/local.py @@ -37,7 +37,7 @@ class Local(object): Directly accessing the local side from python code is a bug. """ - def __init__(self, target_host, conf_dirs, out_path, cache_dir): + def __init__(self, target_host, conf_dirs, out_path, cache_dir=None): self.target_host = target_host self.add_conf_dirs = conf_dirs @@ -47,7 +47,7 @@ class Local(object): self._init_permissions() self._init_home_dir() self._init_paths() - self._init_cache_dir() + self._init_cache_dir(cache_dir) self._init_conf_dirs() def _init_home_dir(self): @@ -88,7 +88,8 @@ class Local(object): self.conf_dirs.append(user_conf_dir) # Add user supplied directories - self.conf_dirs.extend(self.add_conf_dirs) + if self.add_conf_dirs: + self.conf_dirs.extend(self.add_conf_dirs) def _init_cache_dir(self, cache_dir): if cache_dir: @@ -166,12 +167,12 @@ class Local(object): for entry in os.listdir(current_dir): rel_entry_path = os.path.join(sub_dir, entry) - src = os.path.join(self.conf_path, entry) - dst = os.path.join(conf_dir, sub_dir, entry) + src = os.path.join(conf_dir, sub_dir, entry) + dst = os.path.join(self.conf_path, entry) # Already exists? remove and link if os.path.exists(dst): - os.ulink(dst) + os.unlink(dst) try: os.symlink(src, dst) From 92d21a46251f00f37cc6855f4f8efa05c154c0b1 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 30 Oct 2012 16:14:02 +0100 Subject: [PATCH 072/104] remove init.sample from this place in the distribution Signed-off-by: Nico Schottelius --- cdist/conf/manifest/init.sample | 69 --------------------------------- 1 file changed, 69 deletions(-) delete mode 100755 cdist/conf/manifest/init.sample diff --git a/cdist/conf/manifest/init.sample b/cdist/conf/manifest/init.sample deleted file mode 100755 index fca959e2..00000000 --- a/cdist/conf/manifest/init.sample +++ /dev/null @@ -1,69 +0,0 @@ -# -# This is a sample manifest, but used in real world -# - -# This is debug and should not be in a production environment -# echo "We could access other manifests in $__manifest" - -# Every machine becomes a marker, so sysadmins know that automatic -# configurations are happening -__file /etc/cdist-configured - -case "$__target_host" in - # Everybody has this - localhost) - require="__file/etc/cdist-configured" __link /tmp/cdist-testfile \ - --source /etc/cdist-configured --type symbolic - require="__directory/tmp/cdist-test-dir" __file /tmp/cdist-test-dir/test-file \ - --mode 0750 --owner nobody --group root - __directory /tmp/cdist-test-dir --mode 4777 - - require="__file/etc/cdist-configured __link/tmp/cdist-testfile" \ - __file /tmp/cdist-another-testfile - - ;; - - # - # Examples using different types - # - - # - # Use an alias in /etc/hosts for localhost to use these hosts: - # - # 127.0.0.1 localhost.localdomain localhost cdist-archlinux - # - cdist-archlinux) - # This is the specific package type for pacman - __package_pacman zsh --state installed - - # The __package type autoselect the right type based on the os - __package vim --state installed - - # If the type is a singleton, it does not take an object id - __issue - ;; - # This is how it would look like on gentoo - cdist-gentoo) - # Same stuff for gentoo - __package tree --state installed - ;; - - cdist-debian) - __package_apt atop --state installed - __package apache2 --state removed - ;; - - cdist-redhat) - __issue - __motd - ;; - - # Real machines may be used with their hostname or fqdn, - # depending on how you call cdist-deploy-to - # machine) - # ... - # ;; - # machine.example.org) - # ... - # ;; -esac From e7be0cceab502fb77628230af0d3131b17edbc06 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 30 Oct 2012 16:16:59 +0100 Subject: [PATCH 073/104] big change for pre4 Signed-off-by: Nico Schottelius --- cdist/exec/local.py | 9 +++++++-- docs/changelog | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cdist/exec/local.py b/cdist/exec/local.py index a5e838cb..785d5ff2 100644 --- a/cdist/exec/local.py +++ b/cdist/exec/local.py @@ -165,15 +165,20 @@ class Local(object): for sub_dir in [ "explorer", "manifest", "type" ]: current_dir = os.path.join(conf_dir, sub_dir) + # Allow conf dirs to contain only partial content + if not os.path.exists(current_dir): + continue + for entry in os.listdir(current_dir): rel_entry_path = os.path.join(sub_dir, entry) src = os.path.join(conf_dir, sub_dir, entry) - dst = os.path.join(self.conf_path, entry) + dst = os.path.join(self.conf_path, sub_dir, entry) # Already exists? remove and link if os.path.exists(dst): os.unlink(dst) - + + self.log.debug("Linking %s to %s ..." % (src, dst)) try: os.symlink(src, dst) except OSError as e: diff --git a/docs/changelog b/docs/changelog index 242e0c2f..4b77af7a 100644 --- a/docs/changelog +++ b/docs/changelog @@ -7,6 +7,7 @@ Changelog 2.1.0pre4: * Dist: PyPi: Move cdist.py to script/cdist to avoid double import + * Added internal support for multiple configuration directories 2.1.0pre3: 2012-10-30 * Dist: PyPi: Types and explorer included as package data From c25c986992338e0b32de91098619cc8fc74954ec Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 30 Oct 2012 16:33:18 +0100 Subject: [PATCH 074/104] re-add sample, but longer name Signed-off-by: Nico Schottelius --- cdist/conf/manifest/sample-from-distribution | 62 ++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100755 cdist/conf/manifest/sample-from-distribution diff --git a/cdist/conf/manifest/sample-from-distribution b/cdist/conf/manifest/sample-from-distribution new file mode 100755 index 00000000..56d52cf5 --- /dev/null +++ b/cdist/conf/manifest/sample-from-distribution @@ -0,0 +1,62 @@ +## # +## # Sample manifest from cdist distribution +## # +## +## # Every machine becomes a marker, so sysadmins know that automatic +## # configurations are happening +## __file /etc/cdist-configured +## __cdistmarker +## +## case "$__target_host" in +## # Everybody has this +## localhost) +## require="__file/etc/cdist-configured" __link /tmp/cdist-testfile \ +## --source /etc/cdist-configured --type symbolic +## require="__directory/tmp/cdist-test-dir" __file /tmp/cdist-test-dir/test-file \ +## --mode 0750 --owner nobody --group root +## __directory /tmp/cdist-test-dir --mode 4777 +## +## require="__file/etc/cdist-configured __link/tmp/cdist-testfile" \ +## __file /tmp/cdist-another-testfile +## +## ;; +## +## # +## # Use an alias in /etc/hosts for localhost to use these hosts: +## # +## # 127.0.0.1 localhost.localdomain localhost cdist-archlinux +## # +## cdist-archlinux) +## # This is the specific package type for pacman +## __package_pacman zsh --state installed +## +## # The __package type autoselect the right type based on the os +## __package vim --state installed +## +## # If the type is a singleton, it does not take an object id +## __issue +## ;; +## # This is how it would look like on gentoo +## cdist-gentoo) +## # Same stuff for gentoo +## __package tree --state installed +## ;; +## +## cdist-debian) +## __package_apt atop --state installed +## __package apache2 --state removed +## ;; +## +## cdist-redhat) +## __issue +## __motd +## ;; +## +## # Real machines may be used with their hostname or fqdn, +## # depending on how you call cdist +## # ... +## # ;; +## # machine.example.org) +## # ... +## # ;; +## esac From 1d1149deab6a48be34a49384b9afc79e42106af8 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 30 Oct 2012 16:36:32 +0100 Subject: [PATCH 075/104] +debug Signed-off-by: Nico Schottelius --- cdist/exec/local.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cdist/exec/local.py b/cdist/exec/local.py index 785d5ff2..d0ff1765 100644 --- a/cdist/exec/local.py +++ b/cdist/exec/local.py @@ -162,6 +162,7 @@ class Local(object): # Iterate over all directories and link the to the output dir for conf_dir in self.conf_dirs: + self.log.debug("Checking conf_dir %s ..." % (conf_dir)) for sub_dir in [ "explorer", "manifest", "type" ]: current_dir = os.path.join(conf_dir, sub_dir) From 9ca0d4efe73bfe01b20585f5444ab18d38921f6d Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 30 Oct 2012 16:37:02 +0100 Subject: [PATCH 076/104] clarify changes for 2.1.0pre4 Signed-off-by: Nico Schottelius --- docs/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/changelog b/docs/changelog index 4b77af7a..bc330818 100644 --- a/docs/changelog +++ b/docs/changelog @@ -7,7 +7,7 @@ Changelog 2.1.0pre4: * Dist: PyPi: Move cdist.py to script/cdist to avoid double import - * Added internal support for multiple configuration directories + * Added support for multiple configuration directories (no documentation) 2.1.0pre3: 2012-10-30 * Dist: PyPi: Types and explorer included as package data From 6af14263e3f1ddefc45cd0ea64e50617910f5c32 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Wed, 31 Oct 2012 08:12:01 +0100 Subject: [PATCH 077/104] past Signed-off-by: Nico Schottelius --- docs/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/changelog b/docs/changelog index bc330818..7eecab93 100644 --- a/docs/changelog +++ b/docs/changelog @@ -6,7 +6,7 @@ Changelog 2.1.0pre4: - * Dist: PyPi: Move cdist.py to script/cdist to avoid double import + * Dist: PyPi: Moved cdist.py to script/cdist to avoid double import * Added support for multiple configuration directories (no documentation) 2.1.0pre3: 2012-10-30 From dafc6c601757b8f2a4d7aa1211bddfb5e0f7cdd6 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Wed, 31 Oct 2012 08:15:09 +0100 Subject: [PATCH 078/104] update changelog date Signed-off-by: Nico Schottelius --- docs/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/changelog b/docs/changelog index 7eecab93..d76f65bb 100644 --- a/docs/changelog +++ b/docs/changelog @@ -5,9 +5,9 @@ Changelog * Exception: No braces means author == Nico Schottelius -2.1.0pre4: +2.1.0pre4: 2012-10-31 * Dist: PyPi: Moved cdist.py to script/cdist to avoid double import - * Added support for multiple configuration directories (no documentation) + * Core: Added support for multiple configuration directories (no documentation) 2.1.0pre3: 2012-10-30 * Dist: PyPi: Types and explorer included as package data From 2b22bfc0db25f262a4a369c82a4987c469443c87 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Wed, 31 Oct 2012 08:15:23 +0100 Subject: [PATCH 079/104] ignore freecode tempory script used to submit a release Signed-off-by: Nico Schottelius --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 6e2d4437..b5f69ec7 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ cdist/version.py /cdist-*.tar.gz /pkg /src +freecode-release From f8b20d58546efddf77d1e4b78a46000958ab9fdb Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Wed, 31 Oct 2012 08:18:02 +0100 Subject: [PATCH 080/104] skip unecessary merge in dist process Signed-off-by: Nico Schottelius --- build | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/build b/build index a4550f67..0af286f8 100755 --- a/build +++ b/build @@ -168,12 +168,16 @@ notes target_branch=${version%\.*} current_branch=$(git rev-parse --abbrev-ref HEAD) - printf "Press enter to git merge $current_branch into \"$target_branch\" > " - read prompt - git checkout "$target_branch" - git merge "$current_branch" - git checkout "$current_branch" - ;; + if [ "$target_branch" = "$current_branch" ]; then + echo "Skipping merge, already on destination branch" + else + printf "Press enter to git merge $current_branch into \"$target_branch\" > " + read prompt + git checkout "$target_branch" + git merge "$current_branch" + git checkout "$current_branch" + fi + ;; dist-archlinux) ./PKGBUILD.in From 59dd52d55528659956c074d308209d1ffbc83a9d Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Wed, 31 Oct 2012 08:42:24 +0100 Subject: [PATCH 081/104] include uploading to aur in dist process Signed-off-by: Nico Schottelius --- build | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/build b/build index 0af286f8..158e3ef8 100755 --- a/build +++ b/build @@ -180,10 +180,21 @@ notes ;; dist-archlinux) + $0 dist-archlinux-makepkg + $0 dist-archlinux-aur-upload + ;; + + dist-archlinux-makepkg) ./PKGBUILD.in - makepkg -c makepkg -c --source ;; + + dist-archlinux-aur-upload) + version=$($0 changelog-version) + tar=cdist-${version}-1.src.tar.gz + burp -c system "$tar" + ;; + dist-pypi) $0 man $0 version From 876eebe1c7d620f467674c66d69b499bcbe6bdec Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Wed, 31 Oct 2012 08:52:40 +0100 Subject: [PATCH 082/104] begin to include automatic freecode submissions using cfreecode-api Signed-off-by: Nico Schottelius --- build | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/build b/build index 158e3ef8..e5f252e7 100755 --- a/build +++ b/build @@ -195,6 +195,39 @@ notes burp -c system "$tar" ;; + dist-freecode) + version=$($0 changelog-version) + api_token=$(awk '/machine freecode login/ { print $8 }' ~/.netrc) + + printf "Enter tag list for freecode release %s> " "$version" + read taglist + + printf "Enter changelog for freecode release %s> " "$version" + read changelog + + echo "Submit preview" + cat << eof +tag_list = $taglist +changelog = $changelog +version = $version +eof + printf "Press enter to submit to freecode> " + read dummy + + cat << eof | cfreecode-api cdist + { + "auth_code": "$api_token", + "release": { + "tag_list": "REPLACEME", + "version": "$version", + "changelog": "REPLACEMETOO", + "hidden_from_frontpage": false + } + } +eof + + ;; + dist-pypi) $0 man $0 version From 440c209248026fe3fc1a9078cd15de79c9a70816 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Wed, 31 Oct 2012 08:53:17 +0100 Subject: [PATCH 083/104] no need to ignore the file anymore as being piped now Signed-off-by: Nico Schottelius --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index b5f69ec7..6e2d4437 100644 --- a/.gitignore +++ b/.gitignore @@ -26,4 +26,3 @@ cdist/version.py /cdist-*.tar.gz /pkg /src -freecode-release From 8f5d1f910f5fb08c79a8b174fcb19755f76408fc Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Wed, 31 Oct 2012 09:35:08 +0100 Subject: [PATCH 084/104] fix asciidoc title issues (made box out of it) Signed-off-by: Nico Schottelius --- docs/man/man7/cdist-remote-exec-copy.text | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/man/man7/cdist-remote-exec-copy.text b/docs/man/man7/cdist-remote-exec-copy.text index d789b12d..298891d6 100644 --- a/docs/man/man7/cdist-remote-exec-copy.text +++ b/docs/man/man7/cdist-remote-exec-copy.text @@ -31,7 +31,7 @@ remains as simple as possible. EXAMPLES --------------- +-------- See cdist/other/examples/remote/ for some example implementations. From c836a60a7e6697dfa587b71abcd19ad646b905f3 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Wed, 31 Oct 2012 09:40:28 +0100 Subject: [PATCH 085/104] correct call to cfreecode-api Signed-off-by: Nico Schottelius --- build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build b/build index e5f252e7..9d7284d7 100755 --- a/build +++ b/build @@ -214,7 +214,7 @@ eof printf "Press enter to submit to freecode> " read dummy - cat << eof | cfreecode-api cdist + cat << eof | cfreecode-api release cdist { "auth_code": "$api_token", "release": { From 081d3aea37ab23fad42bc64d83e9ac23cb64ae60 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 1 Nov 2012 11:09:45 +0100 Subject: [PATCH 086/104] remove manifests, which are not needed anymore (in production without them for some months) Signed-off-by: Nico Schottelius --- cdist/conf/type/__rvm_gem/manifest | 38 ------------ cdist/conf/type/__rvm_gemset/manifest | 36 ------------ cdist/conf/type/__rvm_ruby/manifest | 83 --------------------------- 3 files changed, 157 deletions(-) delete mode 100755 cdist/conf/type/__rvm_gem/manifest delete mode 100755 cdist/conf/type/__rvm_gemset/manifest delete mode 100755 cdist/conf/type/__rvm_ruby/manifest diff --git a/cdist/conf/type/__rvm_gem/manifest b/cdist/conf/type/__rvm_gem/manifest deleted file mode 100755 index a551472d..00000000 --- a/cdist/conf/type/__rvm_gem/manifest +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -# -# 2012 Evax Software -# -# This file is part of cdist. -# -# cdist is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# cdist is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with cdist. If not, see . -# - -gem="$__object_id" -gemset="$(cat "$__object/parameter/gemset")" -ruby="$(echo "$gemset" | cut -d '@' -f 1)" -gemsetname="$(echo "$gemset" | cut -d '@' -f 2)" -user="$(cat "$__object/parameter/user")" -state="$(cat "$__object/explorer/state")" -if [ -f "$__object/parameter/default" ]; then - default="$(cat "$__object/parameter/default")" -else - default="no" - echo $default > "$__object/parameter/default" -fi - -__rvm "$user" --state present -require="__rvm/$user" \ - __rvm_ruby $ruby --user "$user" --state present --default $default -require="__rvm_ruby/$ruby" \ - __rvm_gemset $gemset --user "$user" --state present --default $default diff --git a/cdist/conf/type/__rvm_gemset/manifest b/cdist/conf/type/__rvm_gemset/manifest deleted file mode 100755 index b69395ea..00000000 --- a/cdist/conf/type/__rvm_gemset/manifest +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# -# 2012 Evax Software -# -# This file is part of cdist. -# -# cdist is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# cdist is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with cdist. If not, see . -# - -gemset="$__object_id" -ruby="$(echo "$gemset" | cut -d '@' -f 1)" -gemsetname="$(echo "$gemset" | cut -d '@' -f 2)" -user="$(cat "$__object/parameter/user")" -state="$(cat "$__object/explorer/state")" -if [ -f "$__object/parameter/default" ]; then - default="$(cat "$__object/parameter/default")" -else - default="no" - echo $default > "$__object/parameter/default" -fi - -__rvm "$user" --state present -require="__rvm/$user" \ - __rvm_ruby $ruby --user "$user" --state present --default $default - diff --git a/cdist/conf/type/__rvm_ruby/manifest b/cdist/conf/type/__rvm_ruby/manifest deleted file mode 100755 index 581e98a8..00000000 --- a/cdist/conf/type/__rvm_ruby/manifest +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/sh -# -# 2012 Evax Software -# -# This file is part of cdist. -# -# cdist is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# cdist is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with cdist. If not, see . -# - -if [ -f "$__object/parameter/default" ]; then - default="$(cat "$__object/parameter/default")" -else - default="no" - echo "$default" > "$__object/parameter/default" -fi - -ruby="$__object_id" -user="$(cat "$__object/parameter/user")" -state="$(cat "$__object/explorer/state")" - -apt_ruby="build-essential openssl libreadline6 libreadline6-dev curl git-core -zlib1g zlib1g-dev libssl-dev libyaml-dev libsqlite3-0 libsqlite3-dev sqlite3 -libxml2-dev libxslt-dev autoconf libc6-dev ncurses-dev automake libtool bison -subversion" -apt_jruby="curl g++ openjdk-6-jre-headless" -apt_jruby_head="ant openjdk-6-jdk" -apt_ironruby="curl mono-2.0-devel" - -emerge_ruby="libiconv readline zlib openssl curl git libyaml sqlite libxslt -libtool gcc autoconf automake bison m4" -emerge_jruby="dev-java/sun-jdk dev-java/sun-jre-bin" -emerge_ironruby="dev-lang/mono" - -pacman_ruby="gcc patch curl zlib readline libxml2 libxslt git autoconf -diffutils make libtool bison subversion" -pacman_jruby="jdk jre curl" -pacman_ironruby="mono" - -yum_ruby="gcc-c++ patch readline readline-devel zlib zlib-devel libyaml-devel -libffi-devel openssl-devel make bzip2 autoconf automake libtool bison -iconv-devel" -yum_jruby="java" - -os="$(cat "$__global/explorer/os")" -case "$os" in - archlinux) type="pacman" ;; - debian|ubuntu) type="apt" ;; - gentoo) type="emerge" ;; - fedora|redhat|centos) type="yum" ;; - *);; -esac -case "$ruby" in - ruby-head*) - deps_list="${type}_ruby_head" - ;; - ruby*) - deps_list="${type}_ruby" - ;; - jruby-head*) - deps_list="${type}_jruby_head" - ;; - jruby*) - deps_list="${type}_jruby" - ;; - ironruby*) - deps_list="${type}_ironruby" - ;; -esac -deps=$(eval echo \$$deps_list) -for p in $deps; do __package_${type} $p --state present; done - -__rvm "$user" --state present From 6771a13758820813af402e47f5c4ace4be854d65 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 1 Nov 2012 13:30:45 +0100 Subject: [PATCH 087/104] pass exec_path from context to local, making it obsolete to manually add the argument to the _link_types_for_emulator Signed-off-by: Nico Schottelius --- cdist/config_install.py | 1 - cdist/context.py | 2 +- cdist/exec/local.py | 15 +++++++++------ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/cdist/config_install.py b/cdist/config_install.py index b7804a10..2c1edc44 100644 --- a/cdist/config_install.py +++ b/cdist/config_install.py @@ -79,7 +79,6 @@ class ConfigInstall(object): def stage_prepare(self): """Do everything for a deploy, minus the actual code stage""" - self.local.link_emulator(self.context.exec_path) self.explorer.run_global_explorers(self.local.global_explorer_out_path) self.manifest.run_initial_manifest(self.context.initial_manifest) diff --git a/cdist/context.py b/cdist/context.py index 5fec530f..d3e30dec 100644 --- a/cdist/context.py +++ b/cdist/context.py @@ -59,7 +59,7 @@ class Context(object): self.temp_dir = tempfile.mkdtemp() self.out_path = os.path.join(self.temp_dir, "out") - self.local = local.Local(self.target_host, conf_dirs, self.out_path) + self.local = local.Local(self.target_host, conf_dirs, self.out_path, self.exec_path) self.initial_manifest = (initial_manifest or os.path.join(self.local.manifest_path, "init")) diff --git a/cdist/exec/local.py b/cdist/exec/local.py index d0ff1765..d75917f5 100644 --- a/cdist/exec/local.py +++ b/cdist/exec/local.py @@ -37,11 +37,13 @@ class Local(object): Directly accessing the local side from python code is a bug. """ - def __init__(self, target_host, conf_dirs, out_path, cache_dir=None): + def __init__(self, target_host, conf_dirs, out_path, exec_path, cache_dir=None): self.target_host = target_host - self.add_conf_dirs = conf_dirs self.out_path = out_path + self.exec_path = exec_path + + self._add_conf_dirs = conf_dirs self._init_log() self._init_permissions() @@ -88,8 +90,8 @@ class Local(object): self.conf_dirs.append(user_conf_dir) # Add user supplied directories - if self.add_conf_dirs: - self.conf_dirs.extend(self.add_conf_dirs) + if self._add_conf_dirs: + self.conf_dirs.extend(self._add_conf_dirs) def _init_cache_dir(self, cache_dir): if cache_dir: @@ -146,6 +148,7 @@ class Local(object): def create_files_dirs(self): self._create_context_dirs() self._create_conf_path_and_link_conf_dirs() + self._link_types_for_emulator() def _create_context_dirs(self): self.mkdir(self.out_path) @@ -185,9 +188,9 @@ class Local(object): except OSError as e: raise cdist.Error("Linking %s %s to %s failed: %s" % (sub_dir, src, dst, e.__str__())) - def link_emulator(self, exec_path): + def _link_types_for_emulator(self): """Link emulator to types""" - src = os.path.abspath(exec_path) + src = os.path.abspath(self.exec_path) for cdist_type in core.CdistType.list_types(self.type_path): dst = os.path.join(self.bin_path, cdist_type.name) self.log.debug("Linking emulator: %s to %s", src, dst) From 4946fe26541a91b815bc553344adf82b970d0786 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 1 Nov 2012 13:34:48 +0100 Subject: [PATCH 088/104] adjust paths in test --- cdist/test/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cdist/test/__init__.py b/cdist/test/__init__.py index faa9dc2d..f8e71287 100644 --- a/cdist/test/__init__.py +++ b/cdist/test/__init__.py @@ -24,9 +24,9 @@ import unittest import tempfile cdist_base_path = os.path.abspath( - os.path.join(os.path.dirname(os.path.realpath(__file__)), "../../../")) + os.path.join(os.path.dirname(os.path.realpath(__file__)), "../../../../")) -cdist_exec_path = os.path.join(cdist_base_path, "bin/cdist") +cdist_exec_path = os.path.join(cdist_base_path, "scripts/cdist") class CdistTestCase(unittest.TestCase): From 32a94a0f89e0ba8002ff0135e66e425d4fd93c96 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 1 Nov 2012 13:35:52 +0100 Subject: [PATCH 089/104] adjust emulator test to pass exec_path to local Signed-off-by: Nico Schottelius --- cdist/test/emulator/__init__.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/cdist/test/emulator/__init__.py b/cdist/test/emulator/__init__.py index ff18fe87..679fd149 100644 --- a/cdist/test/emulator/__init__.py +++ b/cdist/test/emulator/__init__.py @@ -45,8 +45,8 @@ class EmulatorTestCase(test.CdistTestCase): os.close(handle) self.target_host = 'localhost' out_path = self.temp_dir - self.local = local.Local(self.target_host, local_base_path, out_path) - self.local.create_directories() + self.local = local.Local(self.target_host, local_base_path, out_path, test.cdist_exec_path) + self.local.create_files_dirs() self.env = { 'PATH': "%s:%s" % (self.local.bin_path, os.environ['PATH']), '__target_host': self.target_host, @@ -113,9 +113,8 @@ class AutoRequireEmulatorTestCase(test.CdistTestCase): self.target_host = 'localhost' out_path = self.temp_dir _local_base_path = fixtures - self.local = local.Local(self.target_host, _local_base_path, out_path) - self.local.create_directories() - self.local.link_emulator(cdist.test.cdist_exec_path) + self.local = local.Local(self.target_host, _local_base_path, out_path, test.cdist_exec_path) + self.local.create_files_dirs() self.manifest = core.Manifest(self.target_host, self.local) def tearDown(self): @@ -140,9 +139,8 @@ class ArgumentsTestCase(test.CdistTestCase): handle, self.script = self.mkstemp(dir=self.temp_dir) os.close(handle) _local_base_path = fixtures - self.local = local.Local(self.target_host, _local_base_path, out_path) - self.local.create_directories() - self.local.link_emulator(test.cdist_exec_path) + self.local = local.Local(self.target_host, _local_base_path, out_path, test.cdist_exec_path) + self.local.create_files_dirs() self.env = { 'PATH': "%s:%s" % (self.local.bin_path, os.environ['PATH']), '__target_host': self.target_host, From 6eddaaf09057b26157c27fe3ef3f1606b89d7ef5 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 1 Nov 2012 13:46:01 +0100 Subject: [PATCH 090/104] rename parameter correctly to add_conf_dirs Signed-off-by: Nico Schottelius --- cdist/exec/local.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cdist/exec/local.py b/cdist/exec/local.py index d75917f5..2406c8d5 100644 --- a/cdist/exec/local.py +++ b/cdist/exec/local.py @@ -37,13 +37,13 @@ class Local(object): Directly accessing the local side from python code is a bug. """ - def __init__(self, target_host, conf_dirs, out_path, exec_path, cache_dir=None): + def __init__(self, target_host, out_path, exec_path, add_conf_dirs=[], cache_dir=None): self.target_host = target_host self.out_path = out_path self.exec_path = exec_path - self._add_conf_dirs = conf_dirs + self._add_conf_dirs = add_conf_dirs self._init_log() self._init_permissions() From d944f2ac19985dd76c8bdca0b3be34536a5db51a Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 1 Nov 2012 14:13:52 +0100 Subject: [PATCH 091/104] add pythonpath for testing --- build | 1 + 1 file changed, 1 insertion(+) diff --git a/build b/build index 9d7284d7..57dc275b 100755 --- a/build +++ b/build @@ -302,6 +302,7 @@ eof test) shift # skip t + export PYTHONPATH="$(pwd -P)" if [ $# -lt 1 ]; then python3 -m cdist.test From 6ecfb28d9346830c8c643b0b36aac3597cfacb7a Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 1 Nov 2012 14:14:52 +0100 Subject: [PATCH 092/104] name parameter correctly add_conf_dirs Signed-off-by: Nico Schottelius --- cdist/context.py | 4 ++-- scripts/cdist | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cdist/context.py b/cdist/context.py index d3e30dec..92e683a3 100644 --- a/cdist/context.py +++ b/cdist/context.py @@ -38,7 +38,7 @@ class Context(object): remote_copy, remote_exec, initial_manifest=False, - conf_dirs=[], + add_conf_dirs=[], exec_path=sys.argv[0], debug=False): @@ -59,7 +59,7 @@ class Context(object): self.temp_dir = tempfile.mkdtemp() self.out_path = os.path.join(self.temp_dir, "out") - self.local = local.Local(self.target_host, conf_dirs, self.out_path, self.exec_path) + self.local = local.Local(self.target_host, self.out_path, self.exec_path, add_conf_dirs=add_conf_dirs) self.initial_manifest = (initial_manifest or os.path.join(self.local.manifest_path, "init")) diff --git a/scripts/cdist b/scripts/cdist index d5ea06d0..00ebbf18 100755 --- a/scripts/cdist +++ b/scripts/cdist @@ -172,7 +172,7 @@ def configinstall_onehost(host, args, mode, parallel): remote_copy=args.remote_copy, remote_exec=args.remote_exec, initial_manifest=args.manifest, - conf_dirs=args.conf_dir, + add_conf_dirs=args.conf_dir, exec_path=sys.argv[0], debug=args.debug) From 1177286d4e678547bc1df228e4e97008fe12551f Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 1 Nov 2012 14:42:55 +0100 Subject: [PATCH 093/104] cleanups of tests (especially exec.local) Signed-off-by: Nico Schottelius --- cdist/test/exec/local.py | 29 +++++++++++++++-------------- cdist/test/manifest/__init__.py | 3 +-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/cdist/test/exec/local.py b/cdist/test/exec/local.py index e6f2c2b0..ebfc64af 100644 --- a/cdist/test/exec/local.py +++ b/cdist/test/exec/local.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- # # 2010-2011 Steven Armstrong (steven-cdist at armstrong.cc) +# 2012 Nico Schottelius (nico-cdist at schottelius.org) # # This file is part of cdist. # @@ -25,9 +26,6 @@ import shutil import string import random -#import logging -#logging.basicConfig(level=logging.DEBUG, format='%(levelname)s: %(message)s') - import cdist from cdist import test from cdist.exec import local @@ -35,17 +33,22 @@ from cdist.exec import local import os.path as op my_dir = op.abspath(op.dirname(__file__)) fixtures = op.join(my_dir, 'fixtures') -local_base_path = fixtures - class LocalTestCase(test.CdistTestCase): def setUp(self): - self.temp_dir = self.mkdtemp() + target_host = 'localhost' + self.temp_dir = self.mkdtemp() self.out_path = self.temp_dir - self.base_path = local_base_path - self.local = local.Local(target_host, self.base_path, self.out_path) + + self.local = local.Local( + target_host=target_host, + out_path=self.out_path, + exec_path=test.cdist_exec_path + ) + + self.home_dir = os.path.join(os.environ['HOME'], ".cdist") def tearDown(self): shutil.rmtree(self.temp_dir) @@ -53,10 +56,7 @@ class LocalTestCase(test.CdistTestCase): ### test api def test_cache_path(self): - self.assertEqual(self.local.cache_path, os.path.join(self.base_path, "cache")) - - def test_conf_path(self): - self.assertEqual(self.local.conf_path, os.path.join(self.base_path, "conf")) + self.assertEqual(self.local.cache_path, os.path.join(self.home_dir, "cache")) def test_global_explorer_path(self): self.assertEqual(self.local.global_explorer_path, os.path.join(self.base_path, "conf", "explorer")) @@ -117,7 +117,8 @@ class LocalTestCase(test.CdistTestCase): self.local.rmdir(temp_dir) self.assertFalse(os.path.isdir(temp_dir)) - def test_create_directories(self): - self.local.create_directories() + def test_create_files_dirs(self): + self.local.create_files_dirs() self.assertTrue(os.path.isdir(self.local.out_path)) self.assertTrue(os.path.isdir(self.local.bin_path)) + self.assertTrue(os.path.isdir(self.local.conf_path)) diff --git a/cdist/test/manifest/__init__.py b/cdist/test/manifest/__init__.py index a9846b1d..61a815a9 100644 --- a/cdist/test/manifest/__init__.py +++ b/cdist/test/manifest/__init__.py @@ -49,8 +49,7 @@ class ManifestTestCase(test.CdistTestCase): self.target_host = 'localhost' out_path = self.temp_dir self.local = local.Local(self.target_host, local_base_path, out_path) - self.local.create_directories() - self.local.link_emulator(cdist.test.cdist_exec_path) + self.local.create_files_dirs() self.manifest = manifest.Manifest(self.target_host, self.local) self.log = logging.getLogger(self.target_host) From 69a38443328c93d6ae30ed8f50433f9b3694f35a Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 1 Nov 2012 14:48:51 +0100 Subject: [PATCH 094/104] fix some tests and fix home_dir lookup Signed-off-by: Nico Schottelius --- cdist/exec/local.py | 2 +- cdist/test/exec/local.py | 24 +++++++++++++++--------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/cdist/exec/local.py b/cdist/exec/local.py index 2406c8d5..4a9660ef 100644 --- a/cdist/exec/local.py +++ b/cdist/exec/local.py @@ -54,7 +54,7 @@ class Local(object): def _init_home_dir(self): if 'HOME' in os.environ: - self.home_dir = os.environ['HOME'] + self.home_dir = os.path.join(os.environ['HOME'], ".cdist") else: self.home_dir = None diff --git a/cdist/test/exec/local.py b/cdist/test/exec/local.py index ebfc64af..f74302df 100644 --- a/cdist/test/exec/local.py +++ b/cdist/test/exec/local.py @@ -58,14 +58,8 @@ class LocalTestCase(test.CdistTestCase): def test_cache_path(self): self.assertEqual(self.local.cache_path, os.path.join(self.home_dir, "cache")) - def test_global_explorer_path(self): - self.assertEqual(self.local.global_explorer_path, os.path.join(self.base_path, "conf", "explorer")) - - def test_manifest_path(self): - self.assertEqual(self.local.manifest_path, os.path.join(self.base_path, "conf", "manifest")) - - def test_type_path(self): - self.assertEqual(self.local.type_path, os.path.join(self.base_path, "conf", "type")) + def test_conf_path(self): + self.assertEqual(self.local.conf_path, os.path.join(self.out_path, "conf")) def test_out_path(self): self.assertEqual(self.local.out_path, self.out_path) @@ -81,6 +75,18 @@ class LocalTestCase(test.CdistTestCase): ### /test api + ### test internal implementation + + def test_global_explorer_path(self): + self.assertEqual(self.local.global_explorer_path, os.path.join(self.out_path, "conf", "explorer")) + + def test_manifest_path(self): + self.assertEqual(self.local.manifest_path, os.path.join(self.out_path, "conf", "manifest")) + + def test_type_path(self): + self.assertEqual(self.local.type_path, os.path.join(self.out_path, "conf", "type")) + + ### other tests def test_run_success(self): self.local.run(['/bin/true']) @@ -98,7 +104,7 @@ class LocalTestCase(test.CdistTestCase): handle, script = self.mkstemp(dir=self.temp_dir) with os.fdopen(handle, "w") as fd: fd.writelines(["#!/bin/sh\n", "/bin/false"]) - self.assertRaises(local.LocalScriptError, self.local.run_script, script) + self.assertRaises(cdist.Error, self.local.run_script, script) def test_run_script_get_output(self): handle, script = self.mkstemp(dir=self.temp_dir) From af241653670318d514212d903b995ec9202a64f8 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 1 Nov 2012 15:17:46 +0100 Subject: [PATCH 095/104] introduce home_dir as a property Signed-off-by: Nico Schottelius --- cdist/exec/local.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/cdist/exec/local.py b/cdist/exec/local.py index 4a9660ef..2f870033 100644 --- a/cdist/exec/local.py +++ b/cdist/exec/local.py @@ -47,16 +47,20 @@ class Local(object): self._init_log() self._init_permissions() - self._init_home_dir() self._init_paths() self._init_cache_dir(cache_dir) self._init_conf_dirs() - def _init_home_dir(self): + @property + def dist_conf_dir(self): + return os.path.abspath(os.path.join(os.path.dirname(cdist.__file__), "conf")) + + @property + def home_dir(self): if 'HOME' in os.environ: - self.home_dir = os.path.join(os.environ['HOME'], ".cdist") + return os.path.join(os.environ['HOME'], ".cdist") else: - self.home_dir = None + return = None def _init_log(self): self.log = logging.getLogger(self.target_host) @@ -81,13 +85,12 @@ class Local(object): self.conf_dirs = [] # Comes with the distribution - system_conf_dir = os.path.join(os.path.dirname(cdist.__file__), "conf") + system_conf_dir = os.path.abspath(os.path.join(os.path.dirname(cdist.__file__), "conf")) self.conf_dirs.append(system_conf_dir) # Is the default place for user created explorer, type and manifest if self.home_dir: - user_conf_dir = os.path.join(self.home_dir, ".cdist") - self.conf_dirs.append(user_conf_dir) + self.conf_dirs.append(self.home_dir) # Add user supplied directories if self._add_conf_dirs: @@ -152,13 +155,12 @@ class Local(object): def _create_context_dirs(self): self.mkdir(self.out_path) + self.mkdir(self.conf_path) self.mkdir(self.global_explorer_out_path) self.mkdir(self.bin_path) def _create_conf_path_and_link_conf_dirs(self): - self.mkdir(self.conf_path) - # Link destination directories for sub_dir in [ "explorer", "manifest", "type" ]: self.mkdir(os.path.join(self.conf_path, sub_dir)) From 528901bdeee3f963d42e30e0408edeb459b56732 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 1 Nov 2012 15:20:10 +0100 Subject: [PATCH 096/104] update a lot of tests for new exec.local Signed-off-by: Nico Schottelius --- cdist/core/cdist_type.py | 1 - cdist/exec/local.py | 2 +- cdist/test/autorequire/__init__.py | 6 +++-- cdist/test/code/__init__.py | 2 +- cdist/test/emulator/__init__.py | 23 +++++++++++-------- cdist/test/exec/local.py | 36 ++++++++++++++++++++++++++++++ cdist/test/explorer/__init__.py | 2 +- 7 files changed, 57 insertions(+), 15 deletions(-) diff --git a/cdist/core/cdist_type.py b/cdist/core/cdist_type.py index 86f3ced1..44e192fc 100644 --- a/cdist/core/cdist_type.py +++ b/cdist/core/cdist_type.py @@ -24,7 +24,6 @@ import os import cdist - class NoSuchTypeError(cdist.Error): def __init__(self, type_path, type_absolute_path): self.type_path = type_path diff --git a/cdist/exec/local.py b/cdist/exec/local.py index 2f870033..7ef11458 100644 --- a/cdist/exec/local.py +++ b/cdist/exec/local.py @@ -60,7 +60,7 @@ class Local(object): if 'HOME' in os.environ: return os.path.join(os.environ['HOME'], ".cdist") else: - return = None + return None def _init_log(self): self.log = logging.getLogger(self.target_host) diff --git a/cdist/test/autorequire/__init__.py b/cdist/test/autorequire/__init__.py index 2263cbf9..bd763fd3 100644 --- a/cdist/test/autorequire/__init__.py +++ b/cdist/test/autorequire/__init__.py @@ -34,7 +34,7 @@ import cdist.context import os.path as op my_dir = op.abspath(op.dirname(__file__)) fixtures = op.join(my_dir, 'fixtures') -local_base_path = fixtures +add_conf_dir = op.join(fixtures, 'conf') class AutorequireTestCase(test.CdistTestCase): @@ -48,7 +48,9 @@ class AutorequireTestCase(test.CdistTestCase): self.context = cdist.context.Context( target_host=self.target_host, - base_path=local_base_path, + remote_copy='/bin/true', + remote_exec='/bin/true', + add_conf_dirs=add_conf_dir, exec_path=test.cdist_exec_path, debug=False) self.config = config.Config(self.context) diff --git a/cdist/test/code/__init__.py b/cdist/test/code/__init__.py index 8a8583d7..8bc937b0 100644 --- a/cdist/test/code/__init__.py +++ b/cdist/test/code/__init__.py @@ -44,7 +44,7 @@ class CodeTestCase(test.CdistTestCase): self.local_base_path = local_base_path self.out_path = self.mkdtemp() self.local = local.Local(self.target_host, self.local_base_path, self.out_path) - self.local.create_directories() + self.local.create_files_dirs() self.remote_base_path = self.mkdtemp() self.user = getpass.getuser() diff --git a/cdist/test/emulator/__init__.py b/cdist/test/emulator/__init__.py index 679fd149..1b77bdb6 100644 --- a/cdist/test/emulator/__init__.py +++ b/cdist/test/emulator/__init__.py @@ -33,8 +33,6 @@ from cdist import core from cdist import config import cdist.context -local_base_path = test.cdist_base_path - class EmulatorTestCase(test.CdistTestCase): def setUp(self): @@ -45,7 +43,10 @@ class EmulatorTestCase(test.CdistTestCase): os.close(handle) self.target_host = 'localhost' out_path = self.temp_dir - self.local = local.Local(self.target_host, local_base_path, out_path, test.cdist_exec_path) + self.local = local.Local( + target_host=self.target_host, + out_path=out_path, + exec_path=test.cdist_exec_path) self.local.create_files_dirs() self.env = { 'PATH': "%s:%s" % (self.local.bin_path, os.environ['PATH']), @@ -112,8 +113,10 @@ class AutoRequireEmulatorTestCase(test.CdistTestCase): self.temp_dir = self.mkdtemp() self.target_host = 'localhost' out_path = self.temp_dir - _local_base_path = fixtures - self.local = local.Local(self.target_host, _local_base_path, out_path, test.cdist_exec_path) + self.local = local.Local( + target_host=self.target_host, + out_path=out_path, + exec_path=test.cdist_exec_path) self.local.create_files_dirs() self.manifest = core.Manifest(self.target_host, self.local) @@ -138,9 +141,13 @@ class ArgumentsTestCase(test.CdistTestCase): out_path = self.temp_dir handle, self.script = self.mkstemp(dir=self.temp_dir) os.close(handle) - _local_base_path = fixtures - self.local = local.Local(self.target_host, _local_base_path, out_path, test.cdist_exec_path) + + self.local = local.Local( + target_host=self.target_host, + out_path=out_path, + exec_path=test.cdist_exec_path) self.local.create_files_dirs() + self.env = { 'PATH': "%s:%s" % (self.local.bin_path, os.environ['PATH']), '__target_host': self.target_host, @@ -228,13 +235,11 @@ class StdinTestCase(test.CdistTestCase): self.target_host = 'localhost' self.temp_dir = self.mkdtemp() os.environ['__cdist_out_dir'] = self.temp_dir - local_base_path = fixtures self.context = cdist.context.Context( target_host=self.target_host, remote_copy='scp -o User=root -q', remote_exec='ssh -o User=root -q', - base_path=local_base_path, exec_path=test.cdist_exec_path, debug=False) self.config = config.Config(self.context) diff --git a/cdist/test/exec/local.py b/cdist/test/exec/local.py index f74302df..687c13a5 100644 --- a/cdist/test/exec/local.py +++ b/cdist/test/exec/local.py @@ -33,6 +33,7 @@ from cdist.exec import local import os.path as op my_dir = op.abspath(op.dirname(__file__)) fixtures = op.join(my_dir, 'fixtures') +conf_dir = op.join(fixtures, "conf") class LocalTestCase(test.CdistTestCase): @@ -86,6 +87,41 @@ class LocalTestCase(test.CdistTestCase): def test_type_path(self): self.assertEqual(self.local.type_path, os.path.join(self.out_path, "conf", "type")) + def test_dist_conf_dir_linking(self): + """Ensure that links are correctly created for types included in distribution""" + + test_type="__file" + + link_test_local = local.Local( + target_host='localhost', + out_path=self.out_path, + exec_path=test.cdist_exec_path, + ) + + link_test_local._create_conf_path_and_link_conf_dirs() + + our_type_dir = os.path.join(link_test_local.type_path, test_type) + + self.assertTrue(os.path.isdir(our_type_dir)) + + def test_added_conf_dir_linking(self): + """Ensure that links are correctly created for types in added conf directories""" + + test_type="__cdist_test_type" + + link_test_local = local.Local( + target_host='localhost', + out_path=self.out_path, + exec_path=test.cdist_exec_path, + add_conf_dirs=[conf_dir] + ) + + link_test_local._create_conf_path_and_link_conf_dirs() + + our_type_dir = os.path.join(link_test_local.type_path, test_type) + + self.assertTrue(os.path.isdir(our_type_dir)) + ### other tests def test_run_success(self): diff --git a/cdist/test/explorer/__init__.py b/cdist/test/explorer/__init__.py index 257ad8a9..528cb786 100644 --- a/cdist/test/explorer/__init__.py +++ b/cdist/test/explorer/__init__.py @@ -45,7 +45,7 @@ class ExplorerClassTestCase(test.CdistTestCase): self.local_base_path = local_base_path self.out_path = self.mkdtemp() self.local = local.Local(self.target_host, self.local_base_path, self.out_path) - self.local.create_directories() + self.local.create_files_dirs() self.remote_base_path = self.mkdtemp() self.user = getpass.getuser() From 0dd4942d96e6636bdfd05f3d70c78d960dbdc169 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 1 Nov 2012 15:25:57 +0100 Subject: [PATCH 097/104] pre5 updates Signed-off-by: Nico Schottelius --- docs/changelog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/changelog b/docs/changelog index d76f65bb..db6dbe59 100644 --- a/docs/changelog +++ b/docs/changelog @@ -5,6 +5,9 @@ Changelog * Exception: No braces means author == Nico Schottelius +2.1.0pre5: 2012-11-01 + * Core: First round of tests updated to work with multiple configuration directories + 2.1.0pre4: 2012-10-31 * Dist: PyPi: Moved cdist.py to script/cdist to avoid double import * Core: Added support for multiple configuration directories (no documentation) From 8a40ba789a13ee55b8879aa18a1c5f7a66af3996 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 1 Nov 2012 15:39:36 +0100 Subject: [PATCH 098/104] include freecode dist into dist process Signed-off-by: Nico Schottelius --- build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build b/build index 57dc275b..0dca69c9 100755 --- a/build +++ b/build @@ -108,6 +108,8 @@ case "$1" in $0 pub + $0 dist-freecode + $0 dist-post ;; @@ -214,7 +216,7 @@ eof printf "Press enter to submit to freecode> " read dummy - cat << eof | cfreecode-api release cdist + cat << eof | cfreecode-api release-add cdist { "auth_code": "$api_token", "release": { From f264cf9f6cfb1678377c57d7ee7d9e5ce464a1fe Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 1 Nov 2012 17:45:34 +0100 Subject: [PATCH 099/104] insert the actual data into the release process for freecode Signed-off-by: Nico Schottelius --- build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build b/build index 0dca69c9..def72470 100755 --- a/build +++ b/build @@ -220,9 +220,9 @@ eof { "auth_code": "$api_token", "release": { - "tag_list": "REPLACEME", + "tag_list": "$taglist", "version": "$version", - "changelog": "REPLACEMETOO", + "changelog": "$changelog", "hidden_from_frontpage": false } } From 5ec586f7641f22a0d4fa565e48dd3eb3a9519a25 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 1 Nov 2012 18:21:56 +0100 Subject: [PATCH 100/104] begin to cleanup explorer test case Signed-off-by: Nico Schottelius --- cdist/test/__init__.py | 4 ++++ cdist/test/explorer/__init__.py | 40 ++++++++++++++++++++------------- 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/cdist/test/__init__.py b/cdist/test/__init__.py index f8e71287..3d9b1a2e 100644 --- a/cdist/test/__init__.py +++ b/cdist/test/__init__.py @@ -28,9 +28,13 @@ cdist_base_path = os.path.abspath( cdist_exec_path = os.path.join(cdist_base_path, "scripts/cdist") +global_fixtures_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), "fixtures")) class CdistTestCase(unittest.TestCase): + remote_exec = os.path.join(global_fixtures_dir, "remote", "exec") + remote_copy = os.path.join(global_fixtures_dir, "remote", "copy") + def mkdtemp(self, **kwargs): return tempfile.mkdtemp(prefix='tmp.cdist.test.', **kwargs) diff --git a/cdist/test/explorer/__init__.py b/cdist/test/explorer/__init__.py index 528cb786..7801df5d 100644 --- a/cdist/test/explorer/__init__.py +++ b/cdist/test/explorer/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # # 2010-2011 Steven Armstrong (steven-cdist at armstrong.cc) -# 2011 Nico Schottelius (nico-cdist at schottelius.org) +# 2011-2012 Nico Schottelius (nico-cdist at schottelius.org) # # This file is part of cdist. # @@ -35,35 +35,45 @@ from cdist.core import explorer import os.path as op my_dir = op.abspath(op.dirname(__file__)) fixtures = op.join(my_dir, 'fixtures') -local_base_path = fixtures +conf_dir = op.join(fixtures, "conf") class ExplorerClassTestCase(test.CdistTestCase): def setUp(self): self.target_host = 'localhost' - self.local_base_path = local_base_path - self.out_path = self.mkdtemp() - self.local = local.Local(self.target_host, self.local_base_path, self.out_path) + self.temp_dir = self.mkdtemp() + self.out_path = os.path.join(self.temp_dir, "out") + self.remote_base_path = os.path.join(self.temp_dir, "remote") + + self.local = local.Local( + target_host=self.target_host, + out_path=self.out_path, + exec_path=test.cdist_exec_path, + add_conf_dirs=[conf_dir]) + self.local.create_files_dirs() - self.remote_base_path = self.mkdtemp() - self.user = getpass.getuser() - remote_exec = "ssh -o User=%s -q" % self.user - remote_copy = "scp -o User=%s -q" % self.user - self.remote = remote.Remote(self.target_host, self.remote_base_path, remote_exec, remote_copy) + self.remote = remote.Remote( + self.target_host, + self.remote_base_path, + self.remote_exec, + self.remote_copy) - self.explorer = explorer.Explorer(self.target_host, self.local, self.remote) + self.explorer = explorer.Explorer( + self.target_host, + self.local, + self.remote) self.log = logging.getLogger(self.target_host) def tearDown(self): - shutil.rmtree(self.out_path) - shutil.rmtree(self.remote_base_path) + shutil.rmtree(self.temp_dir) def test_list_global_explorer_names(self): - expected = ['foobar', 'global'] - self.assertEqual(self.explorer.list_global_explorer_names(), expected) + names = self.explorer.list_global_explorer_names() + self.assertIn("foobar", names) + self.assertIn("global", names) def test_transfer_global_explorers(self): self.explorer.transfer_global_explorers() From 09fd8090324f0e706a11fb2ae9c091ec977dd42d Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 1 Nov 2012 18:22:52 +0100 Subject: [PATCH 101/104] add new remote handler which turns remote into local ;-) Signed-off-by: Nico Schottelius --- cdist/test/fixtures/remote/copy | 28 ++++++++++++++++++++++++++++ cdist/test/fixtures/remote/exec | 29 +++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100755 cdist/test/fixtures/remote/copy create mode 100755 cdist/test/fixtures/remote/exec diff --git a/cdist/test/fixtures/remote/copy b/cdist/test/fixtures/remote/copy new file mode 100755 index 00000000..475155da --- /dev/null +++ b/cdist/test/fixtures/remote/copy @@ -0,0 +1,28 @@ +#!/bin/sh +# +# 2012 Nico Schottelius (nico-cdist schottelius.org) +# +# This file is part of cdist. +# +# cdist is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# cdist is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with cdist. If not, see . +# +# + +recursive=$1; shift +src=$1; shift +dst=$1; shift + +dst=$(echo $dst | sed "s/^${__target_host}://") + +cp "$recursive" "$src" "$dst" diff --git a/cdist/test/fixtures/remote/exec b/cdist/test/fixtures/remote/exec new file mode 100755 index 00000000..ac658313 --- /dev/null +++ b/cdist/test/fixtures/remote/exec @@ -0,0 +1,29 @@ +#!/bin/sh +# +# 2012 Nico Schottelius (nico-cdist schottelius.org) +# +# This file is part of cdist. +# +# cdist is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# cdist is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with cdist. If not, see . +# +# +# same as cdist default +# +# Usage: +# cdist config --remote-exec "/path/to/this/script" target_host +# + +target_host=$1; shift +# echo "Executing $@ (for $target_host)" +/bin/sh -c "$@" From 184e2bd9c56a751bfc6fa6ed300618fac36f6719 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 1 Nov 2012 18:25:29 +0100 Subject: [PATCH 102/104] add new remote that does local calls Signed-off-by: Nico Schottelius --- cdist/test/fixtures/remote | 1 + docs/changelog | 3 +++ other/examples/remote/local/README | 3 +++ .../test/fixtures/remote => other/examples/remote/local}/copy | 0 .../test/fixtures/remote => other/examples/remote/local}/exec | 0 5 files changed, 7 insertions(+) create mode 120000 cdist/test/fixtures/remote create mode 100644 other/examples/remote/local/README rename {cdist/test/fixtures/remote => other/examples/remote/local}/copy (100%) rename {cdist/test/fixtures/remote => other/examples/remote/local}/exec (100%) diff --git a/cdist/test/fixtures/remote b/cdist/test/fixtures/remote new file mode 120000 index 00000000..c5db6358 --- /dev/null +++ b/cdist/test/fixtures/remote @@ -0,0 +1 @@ +../../../other/examples/remote/local \ No newline at end of file diff --git a/docs/changelog b/docs/changelog index db6dbe59..2cdf6cbf 100644 --- a/docs/changelog +++ b/docs/changelog @@ -5,6 +5,9 @@ Changelog * Exception: No braces means author == Nico Schottelius +2.1.0pre6: + * New Example: Turn remote calls into local calls (used for unittesting) + 2.1.0pre5: 2012-11-01 * Core: First round of tests updated to work with multiple configuration directories diff --git a/other/examples/remote/local/README b/other/examples/remote/local/README new file mode 100644 index 00000000..cfd350f9 --- /dev/null +++ b/other/examples/remote/local/README @@ -0,0 +1,3 @@ +This effectively turns remote calling into local calling. + +Probably most useful for the unittesting. diff --git a/cdist/test/fixtures/remote/copy b/other/examples/remote/local/copy similarity index 100% rename from cdist/test/fixtures/remote/copy rename to other/examples/remote/local/copy diff --git a/cdist/test/fixtures/remote/exec b/other/examples/remote/local/exec similarity index 100% rename from cdist/test/fixtures/remote/exec rename to other/examples/remote/local/exec From 90fad0fe83176dd5a07fc690f527c97dba34c32b Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 2 Nov 2012 14:15:14 +0100 Subject: [PATCH 103/104] create remote base in test - needed? Signed-off-by: Nico Schottelius --- cdist/test/explorer/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cdist/test/explorer/__init__.py b/cdist/test/explorer/__init__.py index 7801df5d..bb39d006 100644 --- a/cdist/test/explorer/__init__.py +++ b/cdist/test/explorer/__init__.py @@ -45,6 +45,7 @@ class ExplorerClassTestCase(test.CdistTestCase): self.temp_dir = self.mkdtemp() self.out_path = os.path.join(self.temp_dir, "out") self.remote_base_path = os.path.join(self.temp_dir, "remote") + os.makedirs(self.remote_base_path) self.local = local.Local( target_host=self.target_host, From afa5f884c5bd73ec3c07b5920145fe50c67f6fe7 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 2 Nov 2012 14:25:55 +0100 Subject: [PATCH 104/104] rought migration document Signed-off-by: Nico Schottelius --- docs/dev/logs/2012-11-02.migration_to_2.1 | 40 +++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 docs/dev/logs/2012-11-02.migration_to_2.1 diff --git a/docs/dev/logs/2012-11-02.migration_to_2.1 b/docs/dev/logs/2012-11-02.migration_to_2.1 new file mode 100644 index 00000000..2ef8df22 --- /dev/null +++ b/docs/dev/logs/2012-11-02.migration_to_2.1 @@ -0,0 +1,40 @@ +create a new branch to ensure nothing breaks + + % git checkout -b 2.1_merge + +fetch latest upstream changes (change origin if you use another +remote name for upstream cdist) + + % git fetch -v origin + +Now try to merge upstream into the new branch. + + + % git merge origin/2.1 + +fix any conflicts that may have been occurred due to local changes +and then **git add** and *git commit** those changes. + +As the types have a new location, **cdist/conf/** now, you have to move +your own types there as well: + + % git mv conf/type/* cdist/conf/ + +The manifest location also changed, so move this one as well: + + % git mv conf/manifest/* cdist/conf/manifest/ + +Use **git status** to review the changes and ensure they +are in the git database: + + % git commit -m "Move types and manifests for 2.1 migration" + +This should be everything necessary for a 2.1 migration. Test the result +by running cdist on one of your staging hosts: + + % ./bin/cdist config -v staging-host + + +You can now cleanup the empty conf/ directory: + + % rmdir conf/* && rmdir conf