puppet 3.0.1 → 3.0.2.rc1

data/Gemfile

@@ -1,10 +1,24 @@
 source :rubygems
 
-gemspec
+# This is a fake version just to make bundler happy during development
+FAKE_VERSION = '9999.0.0'
+
+def location_for(place)
+  if place =~ /^(git:[^#]*)#(.*)/
+    [{ :git => $1, :branch => $2, :require => false }]
+  elsif place =~ /^file:\/\/(.*)/
+    [FAKE_VERSION, { :path => File.expand_path($1), :require => false }]
+  else
+    [place, { :require => false }]
+  end
+end
 
 group(:development, :test) do
-  gem "facter", "~> 1.6.4", :require => false
+  gem "puppet", *location_for('file://.')
+  gem "facter", *location_for(ENV['FACTER_LOCATION'] || '~> 1.6.4')
+  gem "hiera", *location_for(ENV['HIERA_LOCATION'] || '~> 1.0.0')
   gem "rack", "~> 1.4.1", :require => false
+  gem "rake", "~> 0.9.2", :require => false
   gem "rspec", "~> 2.10.0", :require => false
   gem "mocha", "~> 0.10.5", :require => false
 end
@@ -17,7 +31,7 @@ platforms :mswin, :mingw do
   gem "win32-dir", "~> 0.3.7", :require => false
   gem "win32-eventlog", "~> 0.5.3", :require => false
   gem "win32-process", "~> 0.6.5", :require => false
-  gem "win32-security", "~> 0.1.2", :require => false
+  gem "win32-security", "~> 0.1.4", :require => false
   gem "win32-service", "~> 0.7.2", :require => false
   gem "win32-taskscheduler", "~> 0.2.2", :require => false
   gem "win32console", "~> 1.3.2", :require => false

data/Rakefile

@@ -9,6 +9,8 @@ $LOAD_PATH << File.join(File.dirname(__FILE__), 'tasks')
 begin
   require 'rubygems'
   require 'rubygems/package_task'
+  require 'rspec'
+  require 'rspec/core/rake_task'
 rescue LoadError
   # Users of older versions of Rake (0.8.7 for example) will not necessarily
   # have rubygems installed, or the newer rubygems package_task for that
@@ -18,8 +20,6 @@ rescue LoadError
 end
 
 require 'rake'
-require 'rspec'
-require "rspec/core/rake_task"
 
 Dir['tasks/**/*.rake'].each { |t| load t }
 Dir['ext/packaging/tasks/**/*'].sort.each { |t| load t }
@@ -60,7 +60,9 @@ task :default do
     sh %{rake -T}
 end
 
-RSpec::Core::RakeTask.new do |t|
-    t.pattern ='spec/{unit,integration}/**/*.rb'
-    t.fail_on_error = true
+if defined?(RSpec::Core::RakeTask)
+  RSpec::Core::RakeTask.new do |t|
+      t.pattern ='spec/{unit,integration}/**/*.rb'
+      t.fail_on_error = true
+  end
 end

data/ext/build_defaults.yaml

@@ -2,7 +2,7 @@
 packaging_url: 'git://github.com/puppetlabs/packaging.git --branch=master'
 packaging_repo: 'packaging'
 default_cow: 'base-squeeze-i386.cow'
-cows: 'base-lucid-i386.cow base-natty-i386.cow base-oneiric-i386.cow base-precise-i386.cow base-sid-i386.cow base-squeeze-i386.cow base-stable-i386.cow base-testing-i386.cow base-unstable-i386.cow base-wheezy-i386.cow'
+cows: 'base-lucid-i386.cow base-natty-i386.cow base-oneiric-i386.cow base-precise-i386.cow base-quantal-i386.cow base-sid-i386.cow base-squeeze-i386.cow base-stable-i386.cow base-testing-i386.cow base-unstable-i386.cow base-wheezy-i386.cow'
 pbuild_conf: '/etc/pbuilderrc'
 packager: 'puppetlabs'
 gpg_name: 'info@puppetlabs.com'

data/ext/debian/puppet.init

@@ -6,7 +6,7 @@
 # Should-Start:      puppet
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-### END INIT INFO                                                                                                                                          
+### END INIT INFO
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/bin/puppet
@@ -23,28 +23,28 @@ test -x $DAEMON || exit 0
 
 is_true() {
     if [ "x$1" = "xtrue" -o "x$1" = "xyes" -o "x$1" = "x0" ] ; then
-        return 0
+       return 0
     else
         return 1
     fi
 }
 
 reload_puppet_agent() {
-	start-stop-daemon --stop --quiet --signal HUP --pidfile $PIDFILE 
+    start-stop-daemon --stop --quiet --signal HUP --pidfile $PIDFILE
 }
 
 start_puppet_agent() {
     if is_true "$START" ; then
-	start-stop-daemon --start --quiet --pidfile $PIDFILE \
-	    --startas $DAEMON -- $NAME $DAEMON_OPTS
+        start-stop-daemon --start --quiet --pidfile $PIDFILE \
+          --startas $DAEMON -- $NAME $DAEMON_OPTS
     else
-	echo ""
-	echo "puppet not configured to start, please edit /etc/default/puppet to enable"
+        echo ""
+        echo "puppet not configured to start, please edit /etc/default/puppet to enable"
     fi
 }
 
 stop_puppet_agent() {
-	start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE
+    start-stop-daemon --stop --retry TERM/10/KILL/5 --quiet --oknodo --pidfile $PIDFILE
 }
 
 status_puppet_agent() {
@@ -53,7 +53,7 @@ status_puppet_agent() {
     else
         status_of_proc() {
             local pidfile daemon name status
-            
+
             pidfile=
             OPTIND=1
             while getopts p: opt ; do
@@ -62,7 +62,7 @@ status_puppet_agent() {
                 esac
             done
             shift $(($OPTIND - 1))
-            
+
             if [ -n "$pidfile" ]; then
                 pidfile="-p $pidfile"
             fi
@@ -79,40 +79,39 @@ status_puppet_agent() {
             else
                 log_failure_msg "$name is not running"
                 return $status
-            fi         
+            fi
         }
-	    status_of_proc -p "${PIDFILE}" "${DAEMON}" "${NAME}"
+        status_of_proc -p "${PIDFILE}" "${DAEMON}" "${NAME}"
     fi
 }
 
 case "$1" in
     start)
-	log_begin_msg "Starting $DESC"
-	start_puppet_agent
-	log_end_msg $?
-	;;
+        log_begin_msg "Starting $DESC"
+        start_puppet_agent
+        log_end_msg $?
+    ;;
     stop)
-	log_begin_msg "Stopping $DESC"
-	stop_puppet_agent
-	log_end_msg $?
-	;;
+        log_begin_msg "Stopping $DESC"
+        stop_puppet_agent
+        log_end_msg $?
+    ;;
     reload)
-    	log_begin_msg "Reloading $DESC"
+        log_begin_msg "Reloading $DESC"
         reload_puppet_agent
-    	log_end_msg $?
-    	;;
+        log_end_msg $?
+    ;;
     status)
         status_puppet_agent
-	;;
+    ;;
     restart|force-reload)
-	log_begin_msg "Restarting $DESC"
-	stop_puppet_agent
-	sleep 1
-	start_puppet_agent
-	log_end_msg $?
-	;;
-  *)
-	echo "Usage: $0 {start|stop|status|restart|force-reload|reload}" >&2
-	exit 1
-	;;
+        log_begin_msg "Restarting $DESC"
+        stop_puppet_agent
+        start_puppet_agent
+        log_end_msg $?
+    ;;
+    *)
+        echo "Usage: $0 {start|stop|status|restart|force-reload|reload}" >&2
+        exit 1
+    ;;
 esac

data/ext/debian/puppet.logrotate

@@ -1,9 +1,10 @@
 /var/log/puppet/*log {
   missingok
+  sharedscripts
   create 0644 puppet puppet
   compress
   rotate 4
-  
+
   postrotate
     pkill -USR2 -u puppet -f 'puppet master' || true
     [ -e /etc/init.d/puppet ] && /etc/init.d/puppet reload > /dev/null 2>&1 || true

data/ext/debian/puppetmaster.init

@@ -58,7 +58,7 @@ start_puppet_master() {
 }
 
 stop_puppet_master() {
-    start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/puppet/${NAME}.pid
+    start-stop-daemon --stop --retry TERM/10/KILL/5 --quiet --oknodo --pidfile /var/run/puppet/${NAME}.pid
 }
 
 status_puppet_master() {
@@ -124,7 +124,6 @@ case "$1" in
     restart|force-reload)
         log_begin_msg "Restarting $DESC"
         stop_puppet_master
-        sleep 1
         start_puppet_master
         log_end_msg $?
         ;;

data/ext/suse/client.init

@@ -17,7 +17,7 @@
 # Should-Start: puppet
 # Required-Stop: $local_fs $remote_fs $network $syslog
 # Should-Stop: puppet
-# Default-Start: 3 4 5
+# Default-Start: 3 5
 # Default-Stop: 0 1 2 6
 # Short-Description: puppet
 # Description: Enables periodic system configuration checks through puppet.

data/ext/suse/puppet.spec

@@ -16,8 +16,11 @@ PreReq: %{insserv_prereq} %{fillup_prereq}
 Requires: ruby >= 1.8.7
 Requires: facter >= 1.6.11
 Requires: cron
+Requires: logrotate
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: ruby >= 1.8.7
+BuildRequires: klogd
+BuildRequires: sysconfig
 
 %description
 Puppet lets you centrally manage every important aspect of your system using a 

data/ext/suse/server.init

@@ -15,7 +15,7 @@
 # Should-Start: puppetmaster
 # Required-Stop: $local_fs $remote_fs $network $syslog
 # Should-Stop: puppetmaster
-# Default-Start: 3 4 5
+# Default-Start: 3 5
 # Default-Stop: 0 1 2 6
 # Short-Description: puppetmaster
 # Description: Server for the puppet system management tool.

data/ext/windows/service/daemon.rb

@@ -45,7 +45,7 @@ class WindowsDaemon < Win32::Daemon
 
       log_debug("Using '#{puppet}'")
       begin
-        runinterval = %x{ "#{puppet}" config print runinterval }.to_i
+        runinterval = %x{ "#{puppet}" agent --configprint runinterval }.to_i
         if runinterval == 0
           runinterval = 1800
           log_err("Failed to determine runinterval, defaulting to #{runinterval} seconds")

data/install.rb

@@ -14,20 +14,17 @@
 #
 #   bin/    # executable files -- "commands"
 #   lib/    # the source of the library
-#   tests/  # unit tests
 #
 # The default behaviour:
-# 1) Run all unit test files (ending in .rb) found in all directories under
-#    tests/.
-# 2) Build Rdoc documentation from all files in bin/ (excluding .bat and .cmd),
+# 1) Build Rdoc documentation from all files in bin/ (excluding .bat and .cmd),
 #    all .rb files in lib/, ./README, ./ChangeLog, and ./Install.
-# 3) Build ri documentation from all files in bin/ (excluding .bat and .cmd),
+# 2) Build ri documentation from all files in bin/ (excluding .bat and .cmd),
 #    and all .rb files in lib/. This is disabled by default on Microsoft Windows.
-# 4) Install commands from bin/ into the Ruby bin directory. On Windows, if a
+# 3) Install commands from bin/ into the Ruby bin directory. On Windows, if a
 #    if a corresponding batch file (.bat or .cmd) exists in the bin directory,
 #    it will be copied over as well. Otherwise, a batch file (always .bat) will
 #    be created to run the specified command.
-# 5) Install all library files ending in .rb from lib/ into Ruby's
+# 4) Install all library files ending in .rb from lib/ into Ruby's
 #    site_lib/version directory.
 #
 #++
@@ -66,15 +63,6 @@ def glob(list)
   g
 end
 
-# Set these values to what you want installed.
-configs = glob(%w{conf/auth.conf})
-bins  = glob(%w{bin/*})
-rdoc  = glob(%w{bin/* lib/**/*.rb README README-library CHANGELOG TODO Install}).reject { |e| e=~ /\.(bat|cmd)$/ }
-ri    = glob(%w{bin/*.rb lib/**/*.rb}).reject { |e| e=~ /\.(bat|cmd)$/ }
-man   = glob(%w{man/man[0-9]/*})
-libs  = glob(%w{lib/**/*.rb lib/**/*.erb lib/**/*.py lib/puppet/util/command_line/*})
-tests = glob(%w{test/**/*.rb})
-
 def do_configs(configs, target, strip = 'conf/')
   Dir.mkdir(target) unless File.directory? target
   configs.each do |cf|
@@ -82,7 +70,7 @@ def do_configs(configs, target, strip = 'conf/')
     if $haveftools
       File.install(cf, ocf, 0644, true)
     else
-      FileUtils.install(cf, ocf, {:mode => 0644, :verbose => true})
+      FileUtils.install(cf, ocf, {:mode => 0644, :preserve => true, :verbose => true})
     end
   end
 
@@ -92,7 +80,7 @@ def do_configs(configs, target, strip = 'conf/')
     if $haveftools
       File.install(src_dll, dst_dll, 0644, true)
     else
-      FileUtils.install(src_dll, dst_dll, {:mode => 0644, :verbose => true})
+      FileUtils.install(src_dll, dst_dll, {:mode => 0644, :preserve => true, :verbose => true})
     end
 
     require 'win32/registry'
@@ -128,7 +116,7 @@ def do_libs(libs, strip = 'lib/')
     else
       FileUtils.makedirs(op, {:mode => 0755, :verbose => true})
       FileUtils.chmod(0755, op)
-      FileUtils.install(lf, olf, {:mode => 0644, :verbose => true})
+      FileUtils.install(lf, olf, {:mode => 0644, :preserve => true, :verbose => true})
     end
   end
 end
@@ -144,7 +132,7 @@ def do_man(man, strip = 'man/')
     else
       FileUtils.makedirs(om, {:mode => 0755, :verbose => true})
       FileUtils.chmod(0755, om)
-      FileUtils.install(mf, omf, {:mode => 0644, :verbose => true})
+      FileUtils.install(mf, omf, {:mode => 0644, :preserve => true, :verbose => true})
     end
     gzip = %x{which gzip}
     gzip.chomp!
@@ -365,25 +353,6 @@ def build_ri(files)
   end
 end
 
-def run_tests(test_list)
-    require 'test/unit/ui/console/testrunner'
-    $LOAD_PATH.unshift "lib"
-    test_list.each do |test|
-      next if File.directory?(test)
-      require test
-    end
-
-    tests = []
-    ObjectSpace.each_object { |o| tests << o if o.kind_of?(Class) }
-    tests.delete_if { |o| !o.ancestors.include?(Test::Unit::TestCase) }
-    tests.delete_if { |o| o == Test::Unit::TestCase }
-
-    tests.each { |test| Test::Unit::UI::Console::TestRunner.run(test) }
-    $LOAD_PATH.shift
-rescue LoadError
-    puts "Missing testrunner library; skipping tests"
-end
-
 ##
 # Install file(s) from ./bin to RbConfig::CONFIG['bindir']. Patch it on the way
 # to insert a #! line; on a Unix install, the command is named as expected
@@ -411,12 +380,12 @@ def install_binfile(from, op_file, target)
     installed_wrapper = false
 
     if File.exists?("#{from}.bat")
-      FileUtils.install("#{from}.bat", File.join(target, "#{op_file}.bat"), :mode => 0755, :verbose => true)
+      FileUtils.install("#{from}.bat", File.join(target, "#{op_file}.bat"), :mode => 0755, :preserve => true, :verbose => true)
       installed_wrapper = true
     end
 
     if File.exists?("#{from}.cmd")
-      FileUtils.install("#{from}.cmd", File.join(target, "#{op_file}.cmd"), :mode => 0755, :verbose => true)
+      FileUtils.install("#{from}.cmd", File.join(target, "#{op_file}.cmd"), :mode => 0755, :preserve => true, :verbose => true)
       installed_wrapper = true
     end
 
@@ -430,23 +399,33 @@ set RUBY_BIN=%RUBY_BIN:\\=/%
 "%RUBY_BIN%ruby.exe" -x "%RUBY_BIN%puppet" %*
 EOS
       File.open(tmp_file2.path, "w") { |cw| cw.puts cwv }
-      FileUtils.install(tmp_file2.path, File.join(target, "#{op_file}.bat"), :mode => 0755, :verbose => true)
+      FileUtils.install(tmp_file2.path, File.join(target, "#{op_file}.bat"), :mode => 0755, :preserve => true, :verbose => true)
 
       tmp_file2.unlink
       installed_wrapper = true
     end
   end
-  FileUtils.install(tmp_file.path, File.join(target, op_file), :mode => 0755, :verbose => true)
+  FileUtils.install(tmp_file.path, File.join(target, op_file), :mode => 0755, :preserve => true, :verbose => true)
   tmp_file.unlink
 end
 
-check_prereqs
-prepare_installation
-
-#run_tests(tests) if InstallOptions.tests
-#build_rdoc(rdoc) if InstallOptions.rdoc
-#build_ri(ri) if InstallOptions.ri
-do_configs(configs, InstallOptions.config_dir) if InstallOptions.configs
-do_bins(bins, InstallOptions.bin_dir)
-do_libs(libs)
-do_man(man) unless $operatingsystem == "windows"
+# Change directory into the puppet root so we don't get the wrong files for install.
+FileUtils.cd File.dirname(__FILE__) do
+  # Set these values to what you want installed.
+  configs = glob(%w{conf/auth.conf})
+  bins  = glob(%w{bin/*})
+  rdoc  = glob(%w{bin/* lib/**/*.rb README* }).reject { |e| e=~ /\.(bat|cmd)$/ }
+  ri    = glob(%w{bin/*.rb lib/**/*.rb}).reject { |e| e=~ /\.(bat|cmd)$/ }
+  man   = glob(%w{man/man[0-9]/*})
+  libs  = glob(%w{lib/**/*.rb lib/**/*.erb lib/**/*.py lib/puppet/util/command_line/*})
+
+  check_prereqs
+  prepare_installation
+
+  #build_rdoc(rdoc) if InstallOptions.rdoc
+  #build_ri(ri) if InstallOptions.ri
+  do_configs(configs, InstallOptions.config_dir) if InstallOptions.configs
+  do_bins(bins, InstallOptions.bin_dir)
+  do_libs(libs)
+  do_man(man) unless $operatingsystem == "windows"
+end

data/lib/hiera/backend/puppet_backend.rb

@@ -1,3 +1,5 @@
+require 'hiera/backend'
+
 class Hiera
   module Backend
     class Puppet_backend
@@ -71,9 +73,10 @@ class Hiera
             temp_answer = scope[varname]
           end
 
-          next if temp_answer == :undefined
-
-          if temp_answer
+          # Note that temp_answer might be define but false.
+          if temp_answer.nil?
+            next
+          else
             # For array resolution we just append to the array whatever we
             # find, we then go onto the next file and keep adding to the array.
             #
@@ -92,8 +95,6 @@ class Hiera
           end
         end
 
-        answer = nil if answer == :undefined
-
         answer
       end
     end