puppet 2.6.1 → 2.6.2

data/LICENSE

@@ -1,6 +1,6 @@
-Puppet - Automating Configuration Management. Copyright (C) 2005 Reductive Labs LLC
+Puppet - Automating Configuration Management. Copyright (C) 2005 Puppet Labs LLC
 
-Reductive Labs can be contacted at: info@reductivelabs.com
+Puppet Labs can be contacted at: info@puppetlabs.com
 
 This program and entire repository is free software; you can
 redistribute it and/or modify it under the terms of the GNU

data/conf/suse/puppet.spec

@@ -4,23 +4,20 @@
 
 Summary: A network tool for managing many disparate systems
 Name: puppet
-Version: 2.6.0
+Version: 2.6.1
 Release: 1%{?dist}
 License: GPL
 Group:    Productivity/Networking/System
 
 URL: http://puppetlabs.com/projects/puppet/
 Source0: http://puppetlabs.com/downloads/puppet/%{name}-%{version}.tar.gz
-Source1: client.init
-Source2: server.init
-Patch0: ruby-env.patch
 
 PreReq: %{insserv_prereq} %{fillup_prereq}
 Requires: ruby >= 1.8.2
 Requires: facter >= 1.5
 Requires: cron
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: ruby >= 1.8.7
+BuildRequires: ruby >= 1.8.2
 
 %description
 Puppet lets you centrally manage every important aspect of your system using a 
@@ -39,11 +36,10 @@ The server can also function as a certificate authority and file server.
 
 %prep
 %setup -q
-%patch0 -p0
 
 %build
-for f in bin/* ; do
- sed -i -e '1c#!/usr/bin/ruby' $f
+for f in bin/* sbin/*; do
+ sed -i -e '1s,^#!.*ruby$,#!/usr/bin/ruby,' $f
 done
 
 %install
@@ -63,16 +59,16 @@ done
 find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -exec chmod a-x '{}' \;
 %{__cp} -a %{pbuild}/conf/redhat/client.sysconfig %{buildroot}%{_confdir}/client.sysconfig
 %{__install} -Dp -m0644 %{buildroot}%{_confdir}/client.sysconfig %{buildroot}/var/adm/fillup-templates/sysconfig.puppet
-%{__install} -Dp -m0755 %SOURCE1 %{buildroot}%{_initrddir}/puppet
 %{__cp} -a %{pbuild}/conf/redhat/server.sysconfig %{buildroot}%{_confdir}/server.sysconfig
 %{__install} -Dp -m0644 %{buildroot}%{_confdir}/server.sysconfig %{buildroot}/var/adm/fillup-templates/sysconfig.puppetmaster
-%{__install} -Dp -m0755 %SOURCE2 %{buildroot}%{_initrddir}/puppetmaster
 %{__cp} -a %{pbuild}/conf/redhat/fileserver.conf %{buildroot}%{_confdir}/fileserver.conf
 %{__install} -Dp -m0644 %{buildroot}%{_confdir}/fileserver.conf %{buildroot}%{_sysconfdir}/puppet/fileserver.conf
 %{__cp} -a %{pbuild}/conf/redhat/puppet.conf %{buildroot}%{_confdir}/puppet.conf
 %{__install} -Dp -m0644 %{buildroot}%{_confdir}/puppet.conf %{buildroot}%{_sysconfdir}/puppet/puppet.conf
 %{__cp} -a %{pbuild}/conf/redhat/logrotate %{buildroot}%{_confdir}/logrotate
 %{__install} -Dp -m0644 %{buildroot}%{_confdir}/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/puppet
+%{__install} -Dp -m0755 %{confdir}/client.init %{buildroot}%{_initrddir}/puppet
+%{__install} -Dp -m0755 %{confdir}/server.init %{buildroot}%{_initrddir}/puppetmaster
 %{__ln_s}  %{_initrddir}/puppet %{buildroot}%{_sbindir}/rcpuppet
 %{__ln_s}  %{_initrddir}/puppetmaster %{buildroot}%{_sbindir}/rcpuppetmaster
 
@@ -140,6 +136,13 @@ find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -exec chmod a-x '{}' \;
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Tue Sep 14 2010 Ben Kevan <ben.kevan@gmail.com> - 2.6.1
+- New version to 2.6.1
+- Add client.init and server.init from source since it's now included in the packages
+- Change BuildRequires Ruby version to match Requires Ruby version
+- Removed ruby-env patch, replaced with sed in prep
+- Update urls to puppetlabs.com
+
 * Wed Jul 21 2010 Ben Kevan <ben.kevan@gmail.com> - 2.6.0
 - New version and ruby version bump
 - Add puppetdoc to %_bindir (unknown why original suse package, excluded or forgot to add)

data/install.rb

@@ -88,6 +88,7 @@ libs  = glob(%w{lib/**/*.rb lib/**/*.py lib/puppet/util/command_line/*})
 tests = glob(%w{test/**/*.rb})
 
 def do_bins(bins, target, strip = 's?bin/')
+  Dir.mkdir(target) unless File.directory? target
   bins.each do |bf|
     obf = bf.gsub(/#{strip}/, '')
     install_binfile(bf, obf, target)
@@ -154,10 +155,12 @@ end
 # Prepare the file installation.
 #
 def prepare_installation
+  $operatingsystem = Facter["operatingsystem"].value
+
   # Only try to do docs if we're sure they have rdoc
   if $haverdoc
     InstallOptions.rdoc  = true
-    InstallOptions.ri  = RUBY_PLATFORM != "i386-mswin32"
+    InstallOptions.ri  = $operatingsystem != "windows"
   else
     InstallOptions.rdoc  = false
     InstallOptions.ri  = false
@@ -166,7 +169,7 @@ def prepare_installation
 
   if $haveman
     InstallOptions.man = true
-    if RUBY_PLATFORM == "i386-mswin32"
+    if $operatingsystem == "windows"
       InstallOptions.man  = false
     end
   else
@@ -175,15 +178,6 @@ def prepare_installation
 
   InstallOptions.tests = true
 
-  if $haveman
-    InstallOptions.man = true
-    if RUBY_PLATFORM == "i386-mswin32"
-      InstallOptions.man  = false
-    end
-  else
-    InstallOptions.man = false
-  end
-
   ARGV.options do |opts|
     opts.banner = "Usage: #{File.basename($0)} [options]"
     opts.separator ""
@@ -418,7 +412,7 @@ def install_binfile(from, op_file, target)
     end
   end
 
-  if Config::CONFIG["target_os"] =~ /win/io and Config::CONFIG["target_os"] !~ /darwin/io
+  if $operatingsystem == "windows"
     installed_wrapper = false
 
     if File.exists?("#{from}.bat")
@@ -468,4 +462,4 @@ prepare_installation
 do_bins(sbins, InstallOptions.sbin_dir)
 do_bins(bins, InstallOptions.bin_dir)
 do_libs(libs)
-do_man(man)
+do_man(man) unless $operatingsystem == "windows"

data/lib/puppet.rb

@@ -24,7 +24,7 @@ require 'puppet/util/run_mode'
 # it's also a place to find top-level commands like 'debug'
 
 module Puppet
-  PUPPETVERSION = '2.6.1'
+  PUPPETVERSION = '2.6.2'
 
   def Puppet.version
     PUPPETVERSION

data/lib/puppet/application.rb

@@ -254,19 +254,6 @@ class Application
   def preinit
   end
 
-  def option_parser
-    return @option_parser if defined?(@option_parser)
-
-    @option_parser = OptionParser.new(self.class.banner)
-
-    self.class.option_parser_commands.each do |options, fname|
-      @option_parser.on(*options) do |value|
-        self.send(fname, value)
-      end
-    end
-    @option_parser
-  end
-
   def initialize(command_line = nil)
     require 'puppet/util/command_line'
     @command_line = command_line || Puppet::Util::CommandLine.new
@@ -323,20 +310,29 @@ class Application
   end
 
   def parse_options
-    # get all puppet options
-    optparse_opt = []
-    optparse_opt = Puppet.settings.optparse_addargs(optparse_opt)
+    # Create an option parser
+    option_parser = OptionParser.new(self.class.banner)
 
-    # convert them to OptionParser format
-    optparse_opt.each do |option|
-      self.option_parser.on(*option) do |arg|
+    # Add all global options to it.
+    Puppet.settings.optparse_addargs([]).each do |option|
+      option_parser.on(*option) do |arg|
         handlearg(option[0], arg)
       end
     end
 
-    # scan command line argument
+    # Add options that are local to this application, which were
+    # created using the "option()" metaprogramming method.  If there
+    # are any conflicts, this application's options will be favored.
+    self.class.option_parser_commands.each do |options, fname|
+      option_parser.on(*options) do |value|
+        # Call the method that "option()" created.
+        self.send(fname, value)
+      end
+    end
+
+    # scan command line.
     begin
-      self.option_parser.parse!(self.command_line.args)
+      option_parser.parse!(self.command_line.args)
     rescue OptionParser::ParseError => detail
       $stderr.puts detail
       $stderr.puts "Try 'puppet #{command_line.subcommand_name} --help'"

data/lib/puppet/defaults.rb

@@ -268,7 +268,7 @@ module Puppet
 
     setdefaults(
     :ca,
-    :ca_name => ["$certname", "The name to use the Certificate Authority certificate."],
+    :ca_name => ["Puppet CA: $certname", "The name to use the Certificate Authority certificate."],
     :cadir => {  :default => "$ssldir/ca",
       :owner => "service",
       :group => "service",

data/lib/puppet/dsl.rb

@@ -5,7 +5,3 @@ end
 
 require 'puppet/dsl/resource_type_api'
 require 'puppet/dsl/resource_api'
-
-class Object
-  include Puppet::DSL::ResourceTypeAPI
-end

data/lib/puppet/dsl/resource_type_api.rb

@@ -1,33 +1,39 @@
 require 'puppet/resource/type'
 
-module Puppet::DSL::ResourceTypeAPI
+class Puppet::DSL::ResourceTypeAPI
   def define(name, *args, &block)
-    result = mk_resource_type(:definition, name, Hash.new, block)
-    result.set_arguments(munge_type_arguments(args))
-    result
+    result = __mk_resource_type__(:definition, name, Hash.new, block)
+    result.set_arguments(__munge_type_arguments__(args))
+    nil
   end
 
   def hostclass(name, options = {}, &block)
-    mk_resource_type(:hostclass, name, options, block)
+    __mk_resource_type__(:hostclass, name, options, block)
+    nil
   end
 
   def node(name, options = {}, &block)
-    mk_resource_type(:node, name, options, block)
+    __mk_resource_type__(:node, name, options, block)
+    nil
   end
 
-  private
+  # Note: we don't want the user to call the following methods
+  # directly.  However, we can't stop them by making the methods
+  # private because the user's .rb code gets instance_eval'ed on an
+  # instance of this class.  So instead we name the methods using
+  # double underscores to discourage customers from calling them.
 
-  def mk_resource_type(type, name, options, code)
+  def __mk_resource_type__(type, name, options, code)
     klass = Puppet::Resource::Type.new(type, name, options)
 
     klass.ruby_code = code if code
 
-    Puppet::Node::Environment.new.known_resource_types.add klass
+    Thread.current[:known_resource_types].add klass
 
     klass
   end
 
-  def munge_type_arguments(args)
+  def __munge_type_arguments__(args)
     args.inject([]) do |result, item|
       if item.is_a?(Hash)
         item.each { |p, v| result << [p, v] }

data/lib/puppet/external/event-loop/event-loop.rb

@@ -75,8 +75,10 @@ class EventLoop
     @notify_src, @notify_snk = IO.pipe
 
     # prevent file descriptor leaks
-    @notify_src.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
-    @notify_snk.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
+    if @notify_src.respond_to?(:fcntl) and defined?(Fcntl) and defined?(Fcntl::F_SETFD) and defined?(Fcntl::FD_CLOEXEC)
+      @notify_src.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
+      @notify_snk.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
+    end
 
     @notify_src.will_block = false
     @notify_snk.will_block = false
@@ -234,19 +236,21 @@ class IO
   end
 
   def will_block?
-    require "fcntl"
-    fcntl(Fcntl::F_GETFL, 0) & Fcntl::O_NONBLOCK == 0
+    if respond_to?(:fcntl) and defined?(Fcntl) and defined?(Fcntl::F_GETFL) and defined?(Fcntl::O_NONBLOCK)
+      fcntl(Fcntl::F_GETFL, 0) & Fcntl::O_NONBLOCK == 0
+    end
   end
 
   def will_block= (wants_blocking)
-    require "fcntl"
-    flags = fcntl(Fcntl::F_GETFL, 0)
-    if wants_blocking
-      flags &= ~Fcntl::O_NONBLOCK
-    else
-      flags |= Fcntl::O_NONBLOCK
+    if respond_to?(:fcntl) and defined?(Fcntl) and defined?(Fcntl::F_GETFL) and defined?(Fcntl::O_NONBLOCK)
+      flags = fcntl(Fcntl::F_GETFL, 0)
+      if wants_blocking
+        flags &= ~Fcntl::O_NONBLOCK
+      else
+        flags |= Fcntl::O_NONBLOCK
+      end
+      fcntl(Fcntl::F_SETFL, flags)
     end
-    fcntl(Fcntl::F_SETFL, flags)
   end
 end
 

data/lib/puppet/feature/base.rb

@@ -27,7 +27,8 @@ Puppet.features.add :diff, :libs => %w{diff/lcs diff/lcs/hunk}
 Puppet.features.add(:augeas, :libs => ["augeas"])
 
 # We have RRD available
-Puppet.features.add(:rrd, :libs => ["RRDtool"])
+Puppet.features.add(:rrd_legacy, :libs => ["RRDtool"])
+Puppet.features.add(:rrd, :libs => ["RRD"])
 
 # We have OpenSSL
 Puppet.features.add(:openssl, :libs => ["openssl"])

data/lib/puppet/feature/rails.rb

@@ -24,9 +24,7 @@ Puppet.features.add(:rails) do
     end
   end
 
-  if ! (defined?(::ActiveRecord) and defined?(::ActiveRecord::VERSION) and defined?(::ActiveRecord::VERSION::MAJOR) and defined?(::ActiveRecord::VERSION::MINOR))
-    false
-  elsif ! (::ActiveRecord::VERSION::MAJOR == 2 and ::ActiveRecord::VERSION::MINOR >= 1)
+  unless (Puppet::Util.activerecord_version >= 2.1)
     Puppet.info "ActiveRecord 2.1 or later required for StoreConfigs"
     false
   else

data/lib/puppet/network/http/webrick/rest.rb

@@ -1,5 +1,6 @@
 require 'puppet/network/http/handler'
 require 'resolv'
+require 'webrick'
 
 class Puppet::Network::HTTP::WEBrickREST < WEBrick::HTTPServlet::AbstractServlet
 

data/lib/puppet/network/http_pool.rb

@@ -58,18 +58,6 @@ module Puppet::Network::HttpPool
     http.cert = ssl_host.certificate.content
     http.verify_mode = OpenSSL::SSL::VERIFY_PEER
     http.key = ssl_host.key.content
-    http.verify_callback = self.method(:ssl_verify_callback).to_proc if Puppet[:debug]
-  end
-
-  def self.ssl_verify_callback(peer_ok, x509_store_ctx)
-    if not peer_ok
-      Puppet.debug "OpenSSL: Error(#{x509_store_ctx.error}): #{x509_store_ctx.error_string}"
-      Puppet.debug "OpenSSL: Cert: #{x509_store_ctx.current_cert.issuer}"
-      Puppet.debug "OpenSSL: Current CRL: #{x509_store_ctx.current_crl}"
-      Puppet.debug "OpenSSL: Chain:"
-      x509_store_ctx.chain.each_index { |i| Puppet.debug "OpenSSL: \t#{i} #{x509_store_ctx.chain[i].issuer}" }
-    end
-    peer_ok
   end
 
   # Retrieve a cached http instance if caching is enabled, else return

data/lib/puppet/parser/ast/function.rb

@@ -28,7 +28,7 @@ class Puppet::Parser::AST
       end
 
       # We don't need to evaluate the name, because it's plaintext
-      args = @arguments.safeevaluate(scope)
+      args = @arguments.safeevaluate(scope).map { |x| x == :undef ? '' : x }
 
       scope.send("function_#{@name}", args)
     end

data/lib/puppet/parser/ast/resource.rb

@@ -46,7 +46,6 @@ class Resource < AST::ResourceReference
           :virtual => virt,
           :source => scope.source,
           :scope => scope,
-        
           :strict => true
         )
 
@@ -64,12 +63,9 @@ class Resource < AST::ResourceReference
     if params.is_a?(AST::ASTArray)
       @parameters = params
     else
-
-            @parameters = AST::ASTArray.new(
-                
+      @parameters = AST::ASTArray.new(
         :line => params.line,
         :file => params.file,
-        
         :children => [params]
       )
     end

data/lib/puppet/parser/functions/extlookup.rb

@@ -52,7 +52,7 @@ the exact same outcome:
 
    $snmp_contact = extlookup(\"snmp_contact\")
 
-The obove code shows some other features, you can use any fact or variable that
+The above code shows some other features, you can use any fact or variable that
 is in scope by simply using %{varname} in your data files, you can return arrays
 by just having multiple values in the csv after the initial variable name.
 

data/lib/puppet/parser/functions/versioncmp.rb

@@ -14,9 +14,9 @@ Where a and b are arbitrary version strings
 
 This functions returns a number:
 
-* > 0 if version a is greater than version b
-* == 0 if both version are equals
-* < 0 if version a is less than version b
+* Greater than 0 if version a is greater than version b
+* Equal to 0 if both version are equals
+* Less than 0 if version a is less than version b
 
 Example:
 

data/lib/puppet/parser/lexer.rb

@@ -520,7 +520,7 @@ class Puppet::Parser::Lexer
   def slurpstring(terminators,escapes=%w{ \\  $ ' " n t s }+["\n"],ignore_invalid_escapes=false)
     # we search for the next quote that isn't preceded by a
     # backslash; the caret is there to match empty strings
-    str = @scanner.scan_until(/([^\\]|^)[#{terminators}]/) or lex_error "Unclosed quote after '#{last}' in '#{rest}'"
+    str = @scanner.scan_until(/([^\\]|^|[^\\])([\\]{2})*[#{terminators}]/) or lex_error "Unclosed quote after '#{last}' in '#{rest}'"
     @line += str.count("\n") # literal carriage returns add to the line count.
     str.gsub!(/\\(.)/) {
       ch = $1

data/lib/puppet/parser/parser_support.rb

@@ -111,7 +111,7 @@ class Puppet::Parser::Parser
   end
 
   def import(file)
-    known_resource_types.loader.import_if_possible(file, @lexer.file)
+    known_resource_types.loader.import(file, @lexer.file)
   end
 
   def initialize(env)
@@ -215,7 +215,9 @@ class Puppet::Parser::Parser
   end
 
   def parse_ruby_file
-    require self.file
+    # Execute the contents of the file inside its own "main" object so
+    # that it can call methods in the resource type API.
+    Puppet::DSL::ResourceTypeAPI.new.instance_eval(File.read(self.file))
   end
 
   def string=(string)