puppet 3.5.1-x86-mingw32 → 3.6.0.rc1-x86-mingw32

data/CONTRIBUTING.md

@@ -76,6 +76,11 @@ a ticket number.
 * Submit a pull request to the repository in the puppetlabs organization.
 * Update your Jira ticket to mark that you have submitted code and are ready for it to be reviewed (Status: Ready for Merge).
   * Include a link to the pull request in the ticket.
+* The core team looks at Pull Requests on a regular basis in a weekly triage
+  meeting that we hold in a public Google Hangout. The hangout is announced in
+  the weekly status updates that are sent to the puppet-dev list.
+* After feedback has been given we expect responses within two weeks. After two
+  weeks will may close the pull request if it isn't showing any activity.
 
 # Additional Resources
 

data/Gemfile

@@ -16,6 +16,11 @@ platforms :ruby do
   gem 'yard', :group => :development
   gem 'redcarpet', '~> 2.0', :group => :development
   gem "racc", "1.4.9", :group => :development
+
+  # To enable the augeas feature, use this gem.
+  # Note that it is a native gem, so the augeas headers/libs
+  # are neeed.
+  #gem 'ruby-augeas', :group => :development
 end
 
 gem "puppet", :path => File.dirname(__FILE__), :require => false
@@ -24,7 +29,6 @@ gem "hiera", *location_for(ENV['HIERA_LOCATION'] || '~> 1.0')
 gem "rake", "10.1.1", :require => false
 gem "rgen", "0.6.5", :require => false
 
-
 group(:development, :test) do
 
   # Jenkins workers may be using RSpec 2.9, so RSpec 2.11 syntax
@@ -38,12 +42,10 @@ group(:development, :test) do
 
   gem "yarjuf", "~> 1.0"
 
-  # json-schema does not support windows, so use the 'ruby' platform to exclude it on windows
-  platforms :ruby do
-    # json-schema uses multi_json, but chokes with multi_json 1.7.9, so prefer 1.7.7
-    gem "multi_json", "1.7.7", :require => false
-    gem "json-schema", "2.1.1", :require => false
-  end
+  # json-schema does not support windows, so omit it from the platforms list
+  # json-schema uses multi_json, but chokes with multi_json 1.7.9, so prefer 1.7.7
+  gem "multi_json", "1.7.7", :require => false, :platforms => [:ruby, :jruby]
+  gem "json-schema", "2.1.1", :require => false, :platforms => [:ruby, :jruby]
 end
 
 group(:development) do
@@ -61,10 +63,16 @@ group(:extra) do
   gem "couchrest", '~> 1.0', :require => false
   gem "net-ssh", '~> 2.1', :require => false
   gem "puppetlabs_spec_helper", :require => false
-  gem "sqlite3", :require => false
   gem "stomp", :require => false
   gem "tzinfo", :require => false
-  gem "msgpack", :require => false
+  case RUBY_PLATFORM
+  when 'java'
+    gem "jdbc-sqlite3", :require => false
+    gem "msgpack-jruby", :require => false
+  else
+    gem "sqlite3", :require => false
+    gem "msgpack", :require => false
+  end
 end
 
 require 'yaml'

data/README.md

@@ -2,6 +2,7 @@ Puppet
 ======
 
 [![Build Status](https://travis-ci.org/puppetlabs/puppet.png?branch=master)](https://travis-ci.org/puppetlabs/puppet)
+[![Inline docs](http://inch-pages.github.io/github/puppetlabs/puppet.png)](http://inch-pages.github.io/github/puppetlabs/puppet)
 
 Puppet, an automated administrative engine for your Linux, Unix, and Windows systems, performs
 administrative tasks (such as adding users, installing packages, and updating server

data/conf/fileserver.conf

@@ -30,12 +30,13 @@
 # Every static mount point should have an `allow *` line; setting more
 # granular permissions in this file is deprecated. Instead, you can
 # control file access in auth.conf by controlling the
-# /file_metadata/<mount point> and /file_content/<mount point> paths:
+# /file_metadata(s)/<mount point> and /file_content(s)/<mount point> paths.
+# For example:
 #
-# path ~ ^/file_(metadata|content)/extra_files/
+# path ~ ^/file_(metadata|content)s?/extra_files/
 # auth yes
 # allow /^(.+)\.example\.com$/
 # allow_ip 192.168.100.0/24
 #
-# If added to auth.conf BEFORE the "path /file" rule, the rule above
+# If added to auth.conf BEFORE the default "path /file" rule, this rule
 # will add stricter restrictions to the extra_files mount point.

data/ext/README.environment

@@ -0,0 +1,8 @@
+This is an example environment directory. The environment's modules can be
+placed in a "modules" subdirectory. The environments initial manifests are
+placed in a "manifests" subdirectory. By default the environment also has any
+modules that are installed globally (normally in /etc/puppet/modules) for the
+puppet master.
+
+For more information see
+http://docs.puppetlabs.com/puppet/latest/reference/environments.html

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-precise-i386.cow base-quantal-i386.cow base-raring-i386.cow base-squeeze-i386.cow base-stable-i386.cow base-testing-i386.cow base-wheezy-i386.cow base-saucy-i386.cow'
+cows: 'base-lucid-i386.cow base-precise-i386.cow base-quantal-i386.cow base-squeeze-i386.cow base-stable-i386.cow base-testing-i386.cow base-trusty-i386.cow base-wheezy-i386.cow base-saucy-i386.cow'
 pbuild_conf: '/etc/pbuilderrc'
 packager: 'puppetlabs'
 gpg_name: 'info@puppetlabs.com'

data/ext/debian/control

@@ -3,7 +3,7 @@ Section: admin
 Priority: optional
 Maintainer: Puppet Labs <info@puppetlabs.com>
 Uploaders: Micah Anderson <micah@debian.org>, Andrew Pollock <apollock@debian.org>, Nigel Kersten <nigel@explanatorygap.net>, Stig Sandbeck Mathisen <ssm@debian.org>
-Build-Depends-Indep: ruby | ruby-interpreter, libopenssl-ruby | libopenssl-ruby1.9.1, facter (>= 1.7.0)
+Build-Depends-Indep: ruby | ruby-interpreter, libopenssl-ruby | libopenssl-ruby1.9.1 | libruby (>= 1:1.9.3.4), facter (>= 1.7.0), hiera (>= 1.0.0)
 Build-Depends: debhelper (>= 7.0.0), openssl
 Standards-Version: 3.9.1
 Vcs-Git: git://github.com/puppetlabs/puppet
@@ -11,7 +11,7 @@ Homepage: http://projects.puppetlabs.com/projects/puppet
 
 Package: puppet-common
 Architecture: all
-Depends: ${misc:Depends}, ruby | ruby-interpreter, libxmlrpc-ruby, libopenssl-ruby | libopenssl-ruby1.9.1, ruby-shadow | libshadow-ruby1.8, libaugeas-ruby | libaugeas-ruby1.9.1 | libaugeas-ruby1.8, adduser, lsb-base, sysv-rc (>= 2.86) | file-rc, hiera (>= 1.0.0), facter (>= 1.7.0), ruby-rgen (>= 0.6.5), libjson-ruby | ruby-json
+Depends: ${misc:Depends}, ruby | ruby-interpreter, libopenssl-ruby | libopenssl-ruby1.9.1 | libruby (>= 1:1.9.3.4), ruby-shadow | libshadow-ruby1.8, libaugeas-ruby | libaugeas-ruby1.9.1 | libaugeas-ruby1.8, adduser, lsb-base, sysv-rc (>= 2.86) | file-rc, hiera (>= 1.0.0), facter (>= 1.7.0), ruby-rgen (>= 0.6.5), libjson-ruby | ruby-json
 Recommends: lsb-release, debconf-utils
 Suggests: ruby-selinux | libselinux-ruby1.8, librrd-ruby1.9.1 | librrd-ruby1.8
 Breaks: puppet (<< 2.6.0~rc2-1), puppetmaster (<< 0.25.4-1)

data/ext/debian/puppet-common.dirs

@@ -1,4 +1,8 @@
 etc/puppet
+etc/puppet/environments
+etc/puppet/environments/example_env
+etc/puppet/environments/example_env/modules
+etc/puppet/environments/example_env/manifests
 etc/puppet/manifests
 etc/puppet/templates
 etc/puppet/modules

data/ext/debian/rules

@@ -73,6 +73,10 @@ install: build
 	$(INSTALL) -m0644 ext/rack/example-passenger-vhost.conf \
 		$(CURDIR)/debian/puppetmaster-passenger/usr/share/puppetmaster-passenger/apache2.site.conf.tmpl
 
+	# Install example environment README
+	$(INSTALL) -m0644 ext/README.environment \
+		$(CURDIR)/debian/puppet-common/etc/puppet/environments/example_env/README.environment
+
 	# Add ext directory
 	cp -pr ext $(CURDIR)/debian/puppet-common/usr/share/puppet
 	# Remove misc packaging artifacts not applicable to debian

data/ext/emacs/puppet-mode-init.el

@@ -3,4 +3,4 @@
 ;;
 (autoload 'puppet-mode "puppet-mode" "Major mode for editing puppet manifests")
 
-(add-to-list 'auto-mode-alist '("\\.pp$" . puppet-mode))
+(add-to-list 'auto-mode-alist '("\\.pp\\'" . puppet-mode))

data/ext/emacs/puppet-mode.el

@@ -9,7 +9,7 @@
 ;;	Russ Allbery <rra@stanford.edu>
 ;; Maintainer: Russ Allbery <rra@stanford.edu>
 ;; Created: 2006-02-07
-;; Version: 1.1
+;; Version: 1.2
 ;; Keywords: languages
 
 ;; This file is part of Puppet.
@@ -28,7 +28,7 @@
 
 ;;; Code:
 
-(defconst puppet-mode-version "1.1")
+(defconst puppet-mode-version "1.2")
 
 (defvar puppet-mode-abbrev-table nil
   "Abbrev table in use in puppet-mode buffers.")
@@ -165,17 +165,23 @@ we should use, or nil if we can't determine one."
    ((puppet-comment-line-p)
     (if (bobp) 0 nil))
 
-   ;; Brace or paren on a line by itself will already be indented to the right
-   ;; level, so we can cheat and stop there.
+   ;; Closing brace or paren on a line by itself will already be indented to
+   ;; the right level, so we can cheat and stop there.
    ((looking-at "^\\s-*[\)}]\\s-*$")
     (current-indentation))
 
-   ;; Brace (possibly followed by a comma) or paren not on a line by itself
-   ;; will be indented one level too much, but don't catch cases where the
-   ;; block is started and closed on the same line.
-   ((looking-at "^[^\n\({]*[\)}],?\\s-*$")
+   ;; Closing brace or paren not on a line by itself will be indented one
+   ;; level too much, but don't catch cases where the block is started and
+   ;; closed on the same line.
+   ((looking-at "^[^\n\({]*[\)}]\\s-*$")
     (- (current-indentation) puppet-indent-level))
 
+   ;; Closing brace followed by a comma ends a selector within a resource and
+   ;; will be indented just the right amount.  Take similar precautions about
+   ;; blocks started and closed on the same line.
+   ((looking-at "^[^\n\({]*},\\s-*$")
+    (current-indentation))
+
    ;; Indent by one level more than the start of our block.  We lose if there
    ;; is more than one block opened and closed on the same line but it's still
    ;; unbalanced; hopefully people don't do that.
@@ -183,7 +189,7 @@ we should use, or nil if we can't determine one."
     (+ (current-indentation) puppet-indent-level))
 
    ;; Indent by one level if the line ends with an open paren.
-   ((looking-at "^.*\(\\s-*$")
+   ((looking-at "^.*(\\s-*$")
     (+ (current-indentation) puppet-indent-level))
 
    ;; Semicolon ends a block for a resource when multiple resources are
@@ -192,6 +198,17 @@ we should use, or nil if we can't determine one."
    ((looking-at "^\\([^'\":\n]\\|\"[^\n\"]*\"\\|'[^\n']*'\\)*;\\s-*$")
     (- (current-indentation) puppet-indent-level))
 
+   ;; The line following the end of an array and a : should be indented one
+   ;; level more than the indentation of the start of the array.
+   ((looking-at "^.*\\]\\s-*:\\s-*$")
+      (let ((array-start (puppet-in-array)))
+        (if array-start
+          (save-excursion
+            (beginning-of-line)
+            (goto-char array-start)
+            (+ (current-indentation) puppet-indent-level))
+        (+ (current-indentation) puppet-indent-level))))
+
    ;; Indent an extra level after : since it introduces a resource.
    ((looking-at "^.*:\\s-*$")
     (+ (current-indentation) puppet-indent-level))
@@ -264,9 +281,10 @@ worrying about saving the excursion."
                      (forward-line -1)
                      (setq cur-indent (puppet-analyze-indent))))))
 
-        ;; If this line contains only a closing paren, we should lose one
-        ;; level of indentation.
-        (if (looking-at "^\\s-*\)\\s-*$")
+        ;; If this line contains only a closing paren or a closing paren
+        ;; followed by an opening brace, we added one too many levels of
+        ;; indentation and should lose one level.
+        (if (looking-at "^\\s-*)\\s-*\\({\\s-*\\)?$")
             (setq cur-indent (- cur-indent puppet-indent-level)))))
 
       ;; We've figured out the indentation, so do it.
@@ -291,8 +309,9 @@ worrying about saving the excursion."
     tbl))
 
 ;; Stupid hack required to allow me to assign a default face to something.
-;; WTF, font-lock mode?
-(defvar puppet-font-lock-default-face 'default)
+;; WTF, font-lock mode?  Not required on XEmacs (and breaks XEmacs).
+(if (not (string-match "XEmacs" emacs-version))
+    (defvar puppet-font-lock-default-face 'default))
 
 (defvar puppet-font-lock-keywords
   (list
@@ -310,9 +329,9 @@ worrying about saving the excursion."
    ;; usage of types
    '("^\\s *\\([a-z][a-zA-Z0-9_:-]*\\)\\s +{"
      1 font-lock-type-face)
-   ;; overrides and type references
-   '("\\s +\\([A-Z][a-zA-Z0-9_:-]*\\)\\["
-     1 font-lock-type-face)
+   ;; overrides, type references, and defaults
+   '("\\(\\s \\|[\\[]\\)\\([A-Z][a-zA-Z0-9_:-]*\\)\\s *[\\[{]"
+     2 font-lock-type-face)
    ;; general delimited string
    '("\\(^\\|[[ \t\n<+(,=]\\)\\(%[xrqQwW]?\\([^<[{(a-zA-Z0-9 \n]\\)[^\n\\\\]*\\(\\\\.[^\n\\\\]*\\)*\\(\\3\\)\\)"
      2 font-lock-string-face)

data/ext/redhat/client.init

@@ -10,6 +10,9 @@
 # processname: puppet
 # config: /etc/sysconfig/puppet
 
+# Source function library.
+. /etc/rc.d/init.d/functions
+
 PATH=/usr/bin:/sbin:/bin:/usr/sbin
 export PATH
 
@@ -19,9 +22,6 @@ pidfile=${PIDFILE-/var/run/puppet/agent.pid}
 puppetd=${PUPPETD-/usr/bin/puppet}
 RETVAL=0
 
-# Source function library.
-. /etc/rc.d/init.d/functions
-
 PUPPET_OPTS="agent "
 [ -n "${PUPPET_SERVER}" ] && PUPPET_OPTS="${PUPPET_OPTS} --server=${PUPPET_SERVER}"
 [ -n "$PUPPET_LOG" ] && PUPPET_OPTS="${PUPPET_OPTS} --logdest=${PUPPET_LOG}"

data/ext/redhat/puppet.spec.erb

@@ -39,6 +39,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  facter >= 1:1.7.0
 # Puppet 3.x drops ruby 1.8.5 support and adds ruby 1.9 support
 BuildRequires:  ruby >= 1.8.7
+BuildRequires:  hiera >= 1.0.0
 BuildArch:      noarch
 Requires:       ruby >= 1.8
 Requires:       ruby-shadow
@@ -114,6 +115,8 @@ find examples/ -type f | xargs --no-run-if-empty chmod a-x
 rm -rf %{buildroot}
 ruby install.rb --destdir=%{buildroot} --quick --no-rdoc --sitelibdir=%{puppet_libdir}
 
+install -d -m0755 %{buildroot}%{_sysconfdir}/puppet/environments/example_env/manifests
+install -d -m0755 %{buildroot}%{_sysconfdir}/puppet/environments/example_env/modules
 install -d -m0755 %{buildroot}%{_sysconfdir}/puppet/manifests
 install -d -m0755 %{buildroot}%{_datadir}/%{name}/modules
 install -d -m0755 %{buildroot}%{_localstatedir}/lib/puppet
@@ -140,6 +143,7 @@ install -Dp -m0755 %{confdir}/queue.init %{buildroot}%{_initrddir}/puppetqueue
 install -Dp -m0644 %{confdir}/fileserver.conf %{buildroot}%{_sysconfdir}/puppet/fileserver.conf
 install -Dp -m0644 %{confdir}/puppet.conf %{buildroot}%{_sysconfdir}/puppet/puppet.conf
 install -Dp -m0644 %{confdir}/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/puppet
+install -Dp -m0644 ext/README.environment %{buildroot}%{_sysconfdir}/puppet/environments/example_env/README.environment
 
 # Install the ext/ directory to %%{_datadir}/%%{name}
 install -d %{buildroot}%{_datadir}/%{name}
@@ -272,6 +276,11 @@ cp -pr ext/puppet-nm-dispatcher \
 %endif
 %config(noreplace) %{_sysconfdir}/puppet/fileserver.conf
 %dir %{_sysconfdir}/puppet/manifests
+%dir %{_sysconfdir}/puppet/environments
+%dir %{_sysconfdir}/puppet/environments/example_env
+%dir %{_sysconfdir}/puppet/environments/example_env/manifests
+%dir %{_sysconfdir}/puppet/environments/example_env/modules
+%{_sysconfdir}/puppet/environments/example_env/README.environment
 %{_mandir}/man8/puppet-ca.8.gz
 %{_mandir}/man8/puppet-master.8.gz
 

data/ext/systemd/puppet.service

@@ -1,13 +1,12 @@
 [Unit]
 Description=Puppet agent
 Wants=basic.target
-After=basic.target network.target
+After=basic.target network.target puppetmaster.service
 
 [Service]
-Type=forking
 EnvironmentFile=-/etc/sysconfig/puppetagent
-PIDFile=/run/puppet/agent.pid
-ExecStart=/usr/bin/puppet agent $PUPPET_EXTRA_OPTS
+EnvironmentFile=-/etc/sysconfig/puppet
+ExecStart=/usr/bin/puppet agent ${PUPPET_EXTRA_OPTS} --no-daemonize
 
 [Install]
 WantedBy=multi-user.target

data/ext/systemd/puppetmaster.service

@@ -4,10 +4,8 @@ Wants=basic.target
 After=basic.target network.target
 
 [Service]
-Type=forking
 EnvironmentFile=-/etc/sysconfig/puppetmaster
-PIDFile=/run/puppet/master.pid
-ExecStart=/usr/bin/puppet master $PUPPETMASTER_EXTRA_OPTS
+ExecStart=/usr/bin/puppet master ${PUPPETMASTER_EXTRA_OPTS} --no-daemonize
 
 [Install]
 WantedBy=multi-user.target

data/install.rb

@@ -51,7 +51,7 @@ rescue LoadError
   $haverdoc = false
 end
 
-PREREQS = %w{openssl facter cgi}
+PREREQS = %w{openssl facter cgi hiera}
 MIN_FACTER_VERSION = 1.5
 
 InstallOptions = OpenStruct.new

data/lib/puppet.rb

@@ -152,6 +152,7 @@ module Puppet
     Puppet.settings.initialize_app_defaults(Puppet::Settings.app_defaults_for_run_mode(run_mode))
     Puppet.push_context(Puppet.base_context(Puppet.settings), "Initial context after settings initialization")
     Puppet::Parser::Functions.reset
+    Puppet::Util::Log.level = Puppet[:log_level]
   end
   private_class_method :do_initialize_settings_for_run_mode
 
@@ -190,7 +191,7 @@ module Puppet
     end
 
     {
-      :environments => Puppet::Environments::Combined.new(*loaders)
+      :environments => Puppet::Environments::Cached.new(*loaders)
     }
   end
 

data/lib/puppet/agent.rb

@@ -20,7 +20,7 @@ class Puppet::Agent
   end
 
   def can_fork?
-    Puppet.features.posix?
+    Puppet.features.posix? && RUBY_PLATFORM != 'java'
   end
 
   def needing_restart?

data/lib/puppet/application.rb

@@ -353,23 +353,23 @@ class Application
       plugin_hook('initialize_app_defaults') { initialize_app_defaults }
     end
 
-    new_context = Puppet.base_context(Puppet.settings)
-    configured_environment = new_context[:environments].get(Puppet[:environment])
-    configured_environment = configured_environment.override_from_commandline(Puppet.settings)
-    new_context[:current_environment] = configured_environment
-
-    # Setup a new context using the app's configuration
-    Puppet.override(new_context,
-                    "New base context and current environment from application's configuration") do
-      require 'puppet'
-      require 'puppet/util/instrumentation'
-      Puppet::Util::Instrumentation.init
-
-      exit_on_fail("initialize")                                   { plugin_hook('preinit')       { preinit } }
-      exit_on_fail("parse application options")                    { plugin_hook('parse_options') { parse_options } }
-      exit_on_fail("prepare for execution")                        { plugin_hook('setup')         { setup } }
-      exit_on_fail("configure routes from #{Puppet[:route_file]}") { configure_indirector_routes }
-      exit_on_fail("run")                                          { plugin_hook('run_command')   { run_command } }
+    Puppet.override(Puppet.base_context(Puppet.settings)) do
+      configured_environment = Puppet.lookup(:environments).get(Puppet[:environment])
+      configured_environment = configured_environment.override_from_commandline(Puppet.settings)
+
+      # Setup a new context using the app's configuration
+      Puppet.override({ :current_environment => configured_environment },
+                      "New base context and current environment from application's configuration") do
+        require 'puppet'
+        require 'puppet/util/instrumentation'
+        Puppet::Util::Instrumentation.init
+
+        exit_on_fail("initialize")                                   { plugin_hook('preinit')       { preinit } }
+        exit_on_fail("parse application options")                    { plugin_hook('parse_options') { parse_options } }
+        exit_on_fail("prepare for execution")                        { plugin_hook('setup')         { setup } }
+        exit_on_fail("configure routes from #{Puppet[:route_file]}") { configure_indirector_routes }
+        exit_on_fail("run")                                          { plugin_hook('run_command')   { run_command } }
+      end
     end
   end
 

data/lib/puppet/application/doc.rb

@@ -173,7 +173,7 @@ HELP
     unless @manifest
       env = Puppet.lookup(:environments).get(Puppet[:environment])
       files += env.modulepath
-      files << ::File.dirname(env[:manifest])
+      files << ::File.dirname(env.manifest)
     end
     files += command_line.args
     Puppet.info "scanning: #{files.inspect}"