Merge branch 'master' into install

conf/manifest/init.sample

@@ -50,7 +50,7 @@ case "$__target_host" in
 
    cdist-debian)
       __package_apt atop --state installed
-      __package apache2 --state deinstalled
+      __package apache2 --state removed
    ;;
 
    cdist-redhat)

conf/type/__package_rubygem/explorer/pkg_status

@@ -0,0 +1,30 @@
+#!/bin/sh
+#
+# 2011 Chase Allen James (nx-cdist@nu-ex.com)
+#
+# 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 <http://www.gnu.org/licenses/>.
+#
+# Retrieve the status of a rubygem
+#
+
+if [ -f "$__object/parameter/name" ]; then
+   name="$(cat "$__object/parameter/name")"
+else
+   name="$__object_id"
+fi
+
+# Except gem failing, if package is not known / installed
+gem list -i "$name" 2>/dev/null || exit 0

conf/type/__package_rubygem/gencode-remote

@@ -0,0 +1,51 @@
+#!/bin/sh
+#
+# 2011 Chase Allen James <nx-cdist@nu-ex.com>
+#
+# 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 <http://www.gnu.org/licenses/>.
+#
+#
+# Manage Rubygem packages
+#
+
+
+if [ -f "$__object/parameter/name" ]; then
+   name="$(cat "$__object/parameter/name")"
+else
+   name="$__object_id"
+fi
+
+state="$(cat "$__object/parameter/state")"
+is_installed="$(grep "true" "$__object/explorer/pkg_status" || true)"
+
+case "$state" in
+   installed)
+      # Install only if non-existent
+      if [ -z "$is_installed" ]; then
+         echo gem install \"$name\" --no-ri --no-rdoc
+      fi
+   ;;
+   removed)
+      # Remove only if existent
+      if [ -n "$is_installed" ]; then
+         echo gem uninstall \"$name\"
+      fi
+   ;;
+   *)
+      echo "Unknown state: $state" >&2
+      exit 1
+   ;;
+esac

conf/type/__package_rubygem/man.text

@@ -0,0 +1,49 @@
+cdist-type__package_rubygem(7)
+==============================
+Chase Allen James <nx-cdist@nu-ex.com>
+
+
+NAME
+----
+cdist-type__package_rubygem - Manage rubygem packages
+
+
+DESCRIPTION
+-----------
+Rubygems is the default package management system for the Ruby programming language.
+
+
+REQUIRED PARAMETERS
+-------------------
+state::
+   Either "installed" or "removed".
+
+
+OPTIONAL PARAMETERS
+-------------------
+name::
+   If supplied, use the name and not the object id as the package name.
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+# Ensure sinatra is installed
+__package_rubygem sinatra --state installed
+
+# Remove package
+__package_rubygem rails --state removed
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+- cdist-type__package(7)
+
+
+COPYING
+-------
+Copyright \(C) 2011 Chase Allen James. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).

conf/type/__package_rubygem/parameter/optional

@@ -0,0 +1 @@
+name

conf/type/__package_rubygem/parameter/required

@@ -0,0 +1 @@
+state

conf/type/__process/man.text

@@ -35,16 +35,16 @@ EXAMPLES
 --------
 
 --------------------------------------------------------------------------------
-# Start /usr/sbin/sshd if not running
-__process /usr/sbin/sshd --state running
+# Start if not running
+__process /usr/sbin/syslog-ng --state running
 
-# Start /usr/sbin/sshd if not running with a different binary
-__process /usr/sbin/sshd --state running --start "/etc/rc.d/sshd start"
+# Start if not running with a different binary
+__process /usr/sbin/nginx --state running --start "/etc/rc.d/nginx start"
 
-# Stop the process using kill (the type default)
+# Stop the process using kill (the type default) - DO NOT USE THIS
 __process /usr/sbin/sshd --state stopped
 
-# Stop the process using /etc/rc.d/sshd stop
+# Stop the process using /etc/rc.d/sshd stop - THIS ONE NOT AS WELL
 __process /usr/sbin/sshd --state stopped --stop "/etc/rc.d/sshd stop"
 
 # Ensure cups is running, which runs with -C ...: