shadoi · GunioRobot · Oct 27, 8000 2011
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,20 @@
+# Compiled source #
+###################
+*.com
+*.class
+*.dll
+*.exe
+*.o
+*.so
+*.pyc
+
+# Logs and databases #
+######################
+*.log
+
+# OS generated files #
+######################
+.DS_Store*
+ehthumbs.db
+Icon?
+Thumbs.db
diff --git a/CHANGELOG b/CHANGELOG
@@ -10,14 +10,14 @@
 0.24.?
     Removed support for the 'node_name' setting in LDAP and external node lookups.
 
-    Removed support for the 'node_name' setting in LDAP and external node 
+    Removed support for the 'node_name' setting in LDAP and external node
     lookups.
 
     Also removed support for 'default' nodes in external nodes.
     LDAP nodes now use the certificate name, the short name, and 'default',
     but external nodes just use the certificate name and any custom terminus
     types will use just the certificate name.
-    
+
     Fixed #1201 - all external node attributes are converted to strings.
 
     Fixing #1168 (for 0.24.x) -- automatically downcasing the fqdn.
@@ -37,7 +37,7 @@
     The Master handler previously provided the support for the :node_name
     setting, and that functionality has now been moved into the Node
     class.  At the same time, the names to search through have been
-    changed somewhat:  Previously, the certificate name and the 
+    changed somewhat:  Previously, the certificate name and the
     hostname were both used for searching, but now, the cert name
     is always searched first (unless node_name == facter), but only
     the Facter hostname, domain, and fqdn are used otherwise.  We no
@@ -47,28 +47,28 @@
 
     Adding support for settings within the existing Facter provider confines.
 
-    Moving all confine code out of the Provider class, and fixing #1197. 
-    Created a Confiner module for the Provider class methods, enhanced 
-    the interface between it and the Confine class to make sure binary 
+    Moving all confine code out of the Provider class, and fixing #1197.
+    Created a Confiner module for the Provider class methods, enhanced
+    the interface between it and the Confine class to make sure binary
     paths are searched for fresh each time.
 
     Modified the 'factpath' setting to automatically configure
     Facter to load facts there if a new enough version of
     Facter is used.
 
-    Crontab provider: fix a parse error when a line begins with a space 
+    Crontab provider: fix a parse error when a line begins with a space
     character (fixes #1216)
 
-    Instead of deleting the init scripts (with --del) we should simply 
-    disable it with chkconfig service off, and respectfully do the same 
+    Instead of deleting the init scripts (with --del) we should simply
+    disable it with chkconfig service off, and respectfully do the same
     for enable => true;
- 
+
     Added ldap providers for users and groups.
 
     Added support for the --all option to puppetca --clean.  If
     puppetca --clean --all is issued then all client certificates
     are removed.
- 
+
     Resources now return the 'should' value for properties from
     the [] accessor method (they previously threw an exception when
     this method was used with properties).  This shouldn't have any
@@ -134,7 +134,7 @@
     that it can cause corruption, especially in file serving (but
     it's client-side corruption).
 
-    Applying patch by Ryan McBride to fix OpenBSD package 
+    Applying patch by Ryan McBride to fix OpenBSD package
     matching.  The actual problem was caused by the fix to #1001.
 
     Found all instances of methods where split() is used without
@@ -384,7 +384,7 @@
     the bootproto (#762).
 
     You now must specify an environment and you are required to specify
-    the valid environments for your site. (#911) 
+    the valid environments for your site. (#911)
 
     Certificates now always specify a subjectAltName, but it defaults
     to '*', meaning that it doesn't require DNS names to match.  You
@@ -515,7 +515,7 @@
     exactly the feature asked for, but I could not find a
     way to directly copy ActiveRecord's concept of an environment.
 
-    External node sources can now return undefined classes (#687). 
+    External node sources can now return undefined classes (#687).
 
     Puppet clients now have http proxy support (#701).
 
@@ -568,7 +568,7 @@
 
         Only ONE node source can be used -- you can use LDAP, code, or
         an external node program, but not more than one.
-    
+
         LDAP node support has two changes:  First, the "ldapattrs" attribute is
         now used for setting the attributes to retrieve from the server (in
         addition to required attriutes), and second, all retrieved attributes
@@ -583,8 +583,8 @@
         handle that on its own.
 
     Reworked the database schema used to store configurations with the
-    storeconfigs option.  
-    
+    storeconfigs option.
+
     Replaced the obsolete RRD ruby library with the maintained
     RubyRRDtool library (which requires rrdtool2) (#659).
 
@@ -657,7 +657,7 @@
     fail on cycles.
 
     Added a 'dynamicfacts' configuration option; any facts in that
-    comma-separated list will be ignored when comparing facts to 
+    comma-separated list will be ignored when comparing facts to
     see if they have changed and thus whether a recompile is necessary.
 
     Renamed some poorly named internal variables:
@@ -829,7 +829,7 @@
     Fixing a bug related to link recursion that caused link directories
     to always be considered out of sync.
 
-    The bind address for puppetmasterd can now be specified with 
+    The bind address for puppetmasterd can now be specified with
     --bindaddress.
 
     Added (probably experimental) mongrel support.  At this point you're
@@ -1009,7 +1009,7 @@
     Correctly handling spaces in file sources.
 
     Moved documentation into svn tree.
-    
+
 0.18.0
     Added support for a "default" node.
 
@@ -1207,7 +1207,7 @@
 
 0.9.4
     Small fix to wrap the StatusServer class in the checks for required classes.
-    
+
 0.9.3
     Fixed some significant bugs in cron job management.
 

diff --git a/LICENSE b/LICENSE
@@ -3,8 +3,8 @@ Puppet - Automating Configuration Management. Copyright (C) 2005 Reductive Labs
 Reductive Labs can be contacted at: info@reductivelabs.com
 
 This program and entire repository 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 
+redistribute it and/or modify it under the terms of the GNU
+General Public License as published by the Free Software
 Foundation; either version 2 of the License, or any later version.
 
 This program is distributed in the hope that it will be useful,

diff --git a/README b/README
@@ -1,4 +1,4 @@
-Documentation (and detailed install instructions) can be found 
+Documentation (and detailed install instructions) can be found
 online at http://reductivelabs.com/trac/puppet/wiki/DocumentationStart .
 
 Generally, you need the following things installed:

diff --git a/Rakefile b/Rakefile
@@ -77,7 +77,7 @@ rule(/_is_runnable$/) do |t|
     ENV['PATH'].split(':').each do |elem|
         available = true if File.executable? File.join(elem, executable)
     end
-    
+
     unless available
         puts "You do not have #{executable} available in your path"
         exit 1
@@ -139,7 +139,7 @@ end
 task :tracdocs do
     require 'puppet'
     require 'puppet/util/reference'
-    Puppet::Util::Reference.references.each do |ref| 
+    Puppet::Util::Reference.references.each do |ref|
         sh "puppetdoc -m trac -r #{ref.to_s}"
     end
 end
diff --git a/autotest/rspec.rb b/autotest/rspec.rb
@@ -4,13 +4,13 @@
   at.clear_mappings
   # watch out: Ruby bug (1.8.6):
   # %r(/) != /\//
-  at.add_mapping(%r%^spec/.*\.rb$%) { |filename, _| 
-    filename 
+  at.add_mapping(%r%^spec/.*\.rb$%) { |filename, _|
+    filename
   }
-  at.add_mapping(%r%^lib/(.*)\.rb$%) { |_, m| 
+  at.add_mapping(%r%^lib/(.*)\.rb$%) { |_, m|
     ["spec/#{m[1]}_spec.rb"]
   }
-  at.add_mapping(%r%^spec/(spec_helper|shared/.*)\.rb$%) { 
+  at.add_mapping(%r%^spec/(spec_helper|shared/.*)\.rb$%) {
     at.files_matching %r{^spec/.*_spec\.rb$}
   }
 end
@@ -40,7 +40,7 @@ def consolidate_failures(failed)
   def make_test_cmd(files_to_test)
     return "#{ruby} -S #{spec_command} #{add_options_if_present} #{files_to_test.keys.flatten.join(' ')}"
   end
-  
+
   def add_options_if_present
     File.exist?("spec/spec.opts") ? "-O spec/spec.opts " : ""
   end

diff --git a/conf/redhat/client.init b/conf/redhat/client.init
@@ -66,7 +66,7 @@ case "$1" in
   start)
 	start
 	;;
-  stop) 
+  stop)
 	stop
 	;;
   restart)

diff --git a/conf/redhat/puppet.spec b/conf/redhat/puppet.spec
@@ -27,9 +27,9 @@ BuildArchitectures: noarch
 BuildRequires: ruby >= 1.8.1
 
 %description
-Puppet lets you centrally manage every important aspect of your system using a 
-cross-platform specification language that manages all the separate elements 
-normally aggregated in different files, like users, cron jobs, and hosts, 
+Puppet lets you centrally manage every important aspect of your system using a
+cross-platform specification language that manages all the separate elements
+normally aggregated in different files, like users, cron jobs, and hosts,
 along with obviously discrete elements like packages, services, and files.
 
 %package server
@@ -45,7 +45,7 @@ The server can also function as a certificate authority and file server.
 %setup -q
 
 %build
-for f in bin/* ; do 
+for f in bin/* ; do
   sed -i -e '1c#!/usr/bin/ruby' $f
 done
 # Fix some rpmlint complaints
@@ -174,7 +174,7 @@ rm -rf %{buildroot}
 - Remove old config files
 
 * Wed Jun 20 2007 David Lutterkort <dlutter@redhat.com> - 0.23.0-1
-- Install one puppet.conf instead of old config files, keep old configs 
+- Install one puppet.conf instead of old config files, keep old configs
   around to ease update
 - Use plain shell commands in install instead of macros
 
@@ -235,7 +235,7 @@ rm -rf %{buildroot}
 
 * Mon Jun 19 2006 David Lutterkort <dlutter@redhat.com> - 0.18.0-1
 - Patch config for LSB compliance (lsb-config.patch)
-- Changed config moves /var/puppet to /var/lib/puppet, /etc/puppet/ssl 
+- Changed config moves /var/puppet to /var/lib/puppet, /etc/puppet/ssl
   to /var/lib/puppet, /etc/puppet/clases.txt to /var/lib/puppet/classes.txt,
   /etc/puppet/localconfig.yaml to /var/lib/puppet/localconfig.yaml
 
@@ -258,7 +258,7 @@ rm -rf %{buildroot}
 - Rebuilt for new version
 
 * Wed Mar 22 2006 David Lutterkort <dlutter@redhat.com> - 0.15.1-1
-- Patch0: Run puppetmaster as root; running as puppet is not ready 
+- Patch0: Run puppetmaster as root; running as puppet is not ready
   for primetime
 
 * Mon Mar 13 2006 David Lutterkort <dlutter@redhat.com> - 0.15.0-1
@@ -273,7 +273,7 @@ rm -rf %{buildroot}
   allocate the puppet uid/gid dynamically
 
 * Sun Feb 19 2006 David Lutterkort <dlutter@redhat.com> - 0.13.0-4
-- Use fedora-usermgmt to create puppet user/group. Use uid/gid 24. Fixed 
+- Use fedora-usermgmt to create puppet user/group. Use uid/gid 24. Fixed
 problem with listing fileserver.conf and puppetmaster.conf twice
 
 * Wed Feb  8 2006 David Lutterkort <dlutter@redhat.com> - 0.13.0-3
@@ -298,7 +298,7 @@ problem with listing fileserver.conf and puppetmaster.conf twice
 - Added basic fileserver.conf
 
 * Wed Jan 11 2006 David Lutterkort <dlutter@redhat.com> - 0.10.1-1
-- Updated. Moved installation of library files to sitelibdir. Pulled 
+- Updated. Moved installation of library files to sitelibdir. Pulled
 initscripts into separate files. Folded tools rpm into server
 
 * Thu Nov 24 2005 Duane Griffin <d.griffin@psenterprise.com>

diff --git a/conf/redhat/server.init b/conf/redhat/server.init
@@ -66,7 +66,7 @@ case "$1" in
   start)
 	start
 	;;
-  stop) 
+  stop)
 	stop
 	;;
   restart|reload|force-reload)

diff --git a/conf/suse/client.init b/conf/suse/client.init
@@ -14,7 +14,7 @@
 ### BEGIN INIT INFO
 # Provides: puppet
 # Required-Start: $local_fs $network $syslog
-# Should-Start: 
+# Should-Start:
 # Required-Stop:
 # Default-Start: 3 4 5
 # Default-Stop: 0 1 2 6

diff --git a/conf/suse/puppet.spec b/conf/suse/puppet.spec
@@ -22,9 +22,9 @@ BuildArchitectures: noarch
 BuildRequires: ruby >= 1.8.6
 
 %description
-Puppet lets you centrally manage every important aspect of your system using a 
-cross-platform specification language that manages all the separate elements 
-normally aggregated in different files, like users, cron jobs, and hosts, 
+Puppet lets you centrally manage every important aspect of your system using a
+cross-platform specification language that manages all the separate elements
+normally aggregated in different files, like users, cron jobs, and hosts,
 along with obviously discrete elements like packages, services, and files.
 
 %package server
@@ -132,13 +132,13 @@ fi
 * Sat Feb 16 2008 James Turnbull <james@lovedthanlost.net> - 0.24.1-1
 - Fixed puppet configuation file references to match single puppet.conf file
 - Update versions for 0.24.1 release
- 
+
 * Tue Aug  3 2006 Martin Vuk <martin.vuk@fri.uni-lj.si> - 0.18.4-3
 - Replaced puppet-bin.patch with %build section from David's spec
 
 * Tue Aug  1 2006 Martin Vuk <martin.vuk@fri.uni-lj.si> - 0.18.4-2
 - Added supprot for enabling services in SuSE
- 
+
 * Tue Aug  1 2006 Martin Vuk <martin.vuk@fri.uni-lj.si> - 0.18.4-1
 - New version and support for SuSE
 
@@ -150,7 +150,7 @@ fi
 
 * Mon Jun 19 2006 David Lutterkort <dlutter@redhat.com> - 0.18.0-1
 - Patch config for LSB compliance (lsb-config.patch)
-- Changed config moves /var/puppet to /var/lib/puppet, /etc/puppet/ssl 
+- Changed config moves /var/puppet to /var/lib/puppet, /etc/puppet/ssl
   to /var/lib/puppet, /etc/puppet/clases.txt to /var/lib/puppet/classes.txt,
   /etc/puppet/localconfig.yaml to /var/lib/puppet/localconfig.yaml
 
@@ -173,7 +173,7 @@ fi
 - Rebuilt for new version
 
 * Wed Mar 22 2006 David Lutterkort <dlutter@redhat.com> - 0.15.1-1
-- Patch0: Run puppetmaster as root; running as puppet is not ready 
+- Patch0: Run puppetmaster as root; running as puppet is not ready
   for primetime
 
 * Mon Mar 13 2006 David Lutterkort <dlutter@redhat.com> - 0.15.0-1
@@ -188,7 +188,7 @@ fi
   allocate the puppet uid/gid dynamically
 
 * Sun Feb 19 2006 David Lutterkort <dlutter@redhat.com> - 0.13.0-4
-- Use fedora-usermgmt to create puppet user/group. Use uid/gid 24. Fixed 
+- Use fedora-usermgmt to create puppet user/group. Use uid/gid 24. Fixed
 problem with listing fileserver.conf and puppetmaster.conf twice
 
 * Wed Feb  8 2006 David Lutterkort <dlutter@redhat.com> - 0.13.0-3
@@ -213,7 +213,7 @@ problem with listing fileserver.conf and puppetmaster.conf twice
 - Added basic fileserver.conf
 
 * Wed Jan 11 2006 David Lutterkort <dlutter@redhat.com> - 0.10.1-1
-- Updated. Moved installation of library files to sitelibdir. Pulled 
+- Updated. Moved installation of library files to sitelibdir. Pulled
 initscripts into separate files. Folded tools rpm into server
 
 * Thu Nov 24 2005 Duane Griffin <d.griffin@psenterprise.com>
-Original file line number
+Diff line change
@@ Expand Up / @@ -66,7 +66,7 @@ case "$1" in @@
       start)
     	start
     	;;
-      stop)
+      stop)
     	stop
     	;;
       restart)
@@ Expand Down @@