puppet 2.7.19 → 2.7.20.rc1

data/ext/packaging/tasks/update.rake

@@ -0,0 +1,16 @@
+namespace :package do
+  desc "Update your clone of the packaging repo with `git pull`"
+  task :update do
+    cd 'ext/packaging' do
+      remote = @packaging_url.split(' ')[0]
+      branch = @packaging_url.split(' ')[1].split('=')[1]
+      if branch.nil? or remote.nil?
+        STDERR.puts "Couldn't parse the packaging repo URL from 'ext/build_defaults.yaml'."
+        STDERR.puts "Normally this is a string in the format git@github.com:<User>/<packaging_repo> --branch=<branch>"
+      else
+        git_pull(remote, branch)
+      end
+    end
+  end
+end
+

data/ext/packaging/tasks/version.rake

@@ -0,0 +1,21 @@
+namespace :package do
+  desc "Update the version in #{@version_file} to current and commit."
+  task :versionbump  do
+    old_version =  get_version_file_version
+    contents = IO.read(@version_file)
+    new_version = '"' + @version.to_s.strip + '"'
+    if contents.match("@DEVELOPMENT_VERSION@")
+      contents.gsub!("@DEVELOPMENT_VERSION@", @version.to_s.strip)
+    elsif contents.match("VERSION = #{old_version}")
+      contents.gsub!("VERSION = #{old_version}", "VERSION = #{new_version}")
+    elsif contents.match("#{@name.upcase}VERSION = #{old_version}")
+      contents.gsub!("#{@name.upcase}VERSION = #{old_version}", "#{@name.upcase}VERSION = #{new_version}")
+    else
+      contents.gsub!(old_version, @version)
+    end
+    file = File.open(@version_file, 'w')
+    file.write contents
+    file.close
+  end
+end
+

data/ext/project_data.yaml

@@ -0,0 +1,24 @@
+---
+project: 'puppet'
+author: 'Puppet Labs'
+email: 'info@puppetlabs.com'
+homepage: 'https://github.com/puppetlabs/puppet'
+summary: 'Puppet, an automated configuration management tool'
+description: 'Puppet, an automated configuration management tool'
+version_file: 'lib/puppet/version.rb'
+# files and gem_files are space separated lists
+files: '[A-Z]* install.rb bin sbin lib conf man examples ext tasks test spec'
+# The gem specification bits only work on Puppet >= 3.0rc, NOT 2.7.x and earlier
+gem_files: '[A-Z]* install.rb bin lib conf man examples ext tasks test spec'
+gem_test_files: 'spec/**/*'
+gem_executables: 'filebucket pi puppet puppetdoc ralsh puppetca puppetd puppetmasterd puppetqd puppetrun'
+gem_default_executables: 'puppet'
+gem_forge_project: 'puppet'
+gem_dependencies:
+  facter: '~> 1.5'
+gem_rdoc_options:
+  - --title
+  - "Puppet - Configuration Management"
+  - --main
+  - README.md
+  - --line-numbers

data/{conf/redhat/puppet.spec → ext/redhat/puppet.spec.erb}

@@ -9,26 +9,26 @@
 %global puppet_libdir   %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["sitelibdir"]')
 %endif
 
+# VERSION is subbed out during rake srpm process
+# %global realversion <%= @version %>
+# %global rpmversion <%= @rpmversion %>
+
 %global confdir conf/redhat
 
 Name:           puppet
-Version:        2.7.19
-#Release:        0.1rc3%{?dist}
-Release:        1%{?dist}
+Version:        %{rpmversion}
+Release:        <%= @rpmrelease -%>%{?dist}
 Vendor:         %{?_host_vendor}
 Summary:        A network tool for managing many disparate systems
 License:        ASL 2.0
 URL:            http://puppetlabs.com
-Source0:        http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz
-#Source0:        http://puppetlabs.com/downloads/%{name}/%{name}-%{version}rc3.tar.gz
-Source1:        http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz.asc
-#Source1:        http://puppetlabs.com/downloads/%{name}/%{name}-%{version}rc3.tar.gz.asc
+Source0:        http://puppetlabs.com/downloads/%{name}/%{name}-%{realversion}.tar.gz
 
 Group:          System Environment/Base
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  facter >= 1.5, facter < 1:2.0
+BuildRequires:  facter < 1:2.0
 BuildRequires:  ruby >= 1.8.5
 
 BuildArch:      noarch
@@ -74,8 +74,7 @@ Provides the central puppet server daemon which provides manifests to clients.
 The server can also function as a certificate authority and file server.
 
 %prep
-%setup -q -n %{name}-%{version}
-#%setup -q -n %{name}-%{version}rc3
+%setup -q -n %{name}-%{realversion}
 patch -s -p1 < conf/redhat/rundir-perms.patch
 
 
@@ -125,6 +124,9 @@ install -d %{buildroot}%{_datadir}/%{name}
 cp -a ext/ %{buildroot}%{_datadir}/%{name}
 # emacs and vim bits are installed elsewhere
 rm -rf %{buildroot}%{_datadir}/%{name}/ext/{emacs,vim}
+# remove misc packaging files we shouldn't ship with the rpm
+rm -rf %{buildroot}%{_datadir}/%{name}/ext/{debian,osx}
+rm -rf %{buildroot}%{_datadir}/%{name}/ext/{build_defaults.yaml,project_data.yaml}
 
 # Install emacs mode files
 emacsdir=%{buildroot}%{_datadir}/emacs/site-lisp
@@ -301,6 +303,12 @@ fi
 rm -rf %{buildroot}
 
 %changelog
+* <%= Time.now.strftime("%a %b %d %Y") %> Puppet Labs Release <info@puppetlabs.com> -  <%= @rpmversion %>-<%= @rpmrelease %>
+- Build for <%= @version %>
+
+* Tue Oct 30 2012 Michael Stahnke <stahnma@puppetlabs.com> - 2.7.19-1.0
+- Remove the asc file as a source since it was never used
+
 * Tue Aug 21 2012 Moses Mendoza <moses@puppetlabs.com> - 2.7.19-1
 - Update for 2.7.19
 

data/install.rb

@@ -84,7 +84,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
 
@@ -94,7 +94,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'
@@ -130,7 +130,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
@@ -146,7 +146,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!
@@ -420,12 +420,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
 
@@ -439,13 +439,13 @@ 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
 

data/lib/puppet.rb

@@ -1,3 +1,5 @@
+require 'puppet/version'
+
 # Try to load rubygems.  Hey rubygems, I hate you.
 begin
   require 'rubygems'
@@ -24,12 +26,6 @@ require 'puppet/util/run_mode'
 # it's also a place to find top-level commands like 'debug'
 
 module Puppet
-  PUPPETVERSION = '2.7.19'
-
-  def Puppet.version
-    PUPPETVERSION
-  end
-
   class << self
     include Puppet::Util
     attr_reader :features

data/lib/puppet/agent/locker.rb

@@ -5,11 +5,13 @@ require 'puppet/util/pidlock'
 module Puppet::Agent::Locker
   # Let the daemon run again, freely in the filesystem.
   def enable
+    Puppet.notice "Enabling Puppet."
     lockfile.unlock(:anonymous => true)
   end
 
   # Stop the daemon from making any catalog runs.
   def disable
+    Puppet.notice "Disabling Puppet."
     lockfile.lock(:anonymous => true)
   end
 

data/lib/puppet/application.rb

@@ -190,7 +190,7 @@ class Application
     # used to declare code that handle an option
     def option(*options, &block)
       long = options.find { |opt| opt =~ /^--/ }.gsub(/^--(?:\[no-\])?([^ =]+).*$/, '\1' ).gsub('-','_')
-      fname = symbolize("handle_#{long}")
+      fname = "handle_#{long}".intern
       if (block_given?)
         define_method(fname, &block)
       else

data/lib/puppet/application/agent.rb

@@ -85,7 +85,7 @@ class Puppet::Application::Agent < Puppet::Application
   end
 
   def help
-    <<-HELP
+    <<-'HELP'
 
 puppet-agent(8) -- The puppet agent daemon
 ========

data/lib/puppet/application/apply.rb

@@ -40,7 +40,7 @@ EOM
   end
 
   def help
-    <<-HELP
+    <<-'HELP'
 
 puppet-apply(8) -- Apply Puppet manifests locally
 ========

data/lib/puppet/application/cert.rb

@@ -53,7 +53,7 @@ class Puppet::Application::Cert < Puppet::Application
   end
 
   def help
-    <<-HELP
+    <<-'HELP'
 
 puppet-cert(8) -- Manage certificates and requests
 ========
@@ -109,11 +109,10 @@ unless the '--all' option is set.
   Print the full-text version of a host's certificate.
 
 * revoke:
-  Revoke the certificate of a client. The certificate can be specified
-  either by its serial number (given as a decimal number or a
-  hexadecimal number prefixed by '0x') or by its hostname. The
-  certificate is revoked by adding it to the Certificate Revocation List
-  given by the 'cacrl' configuration option. Note that the puppet master
+  Revoke the certificate of a client. The certificate can be specified either
+  by its serial number (given as a hexadecimal number prefixed by '0x') or by its
+  hostname. The certificate is revoked by adding it to the Certificate Revocation
+  List given by the 'cacrl' configuration option. Note that the puppet master
   needs to be restarted after revoking certificates.
 
 * sign:

data/lib/puppet/application/describe.rb

@@ -181,7 +181,7 @@ class Puppet::Application::Describe < Puppet::Application
   option("--meta","-m")
 
   def help
-    <<-HELP
+    <<-'HELP'
 
 puppet-describe(8) -- Display help about resource types
 ========

data/lib/puppet/application/device.rb

@@ -57,7 +57,7 @@ class Puppet::Application::Device < Puppet::Application
   end
 
     def help
-      <<-HELP
+      <<-'HELP'
 
 puppet-device(8) -- Manage remote network devices
 ========

data/lib/puppet/application/doc.rb

@@ -50,7 +50,7 @@ class Puppet::Application::Doc < Puppet::Application
   end
 
   def help
-    <<-HELP
+    <<-'HELP'
 
 puppet-doc(8) -- Generate Puppet documentation and references
 ========

data/lib/puppet/application/filebucket.rb

@@ -13,7 +13,7 @@ class Puppet::Application::Filebucket < Puppet::Application
   attr :args
 
   def help
-    <<-HELP
+    <<-'HELP'
 
 puppet-filebucket(8) -- Store and retrieve files in a filebucket
 ========

data/lib/puppet/application/inspect.rb

@@ -18,7 +18,7 @@ class Puppet::Application::Inspect < Puppet::Application
   end
 
   def help
-    <<-HELP
+    <<-'HELP'
 
 puppet-inspect(8) -- Send an inspection report
 ========

data/lib/puppet/application/kick.rb

@@ -38,7 +38,7 @@ class Puppet::Application::Kick < Puppet::Application
   end
 
   def help
-    <<-HELP
+    <<-'HELP'
 
 puppet-kick(8) -- Remotely control puppet agent
 ========

data/lib/puppet/application/master.rb

@@ -31,7 +31,7 @@ class Puppet::Application::Master < Puppet::Application
   end
 
   def help
-    <<-HELP
+    <<-'HELP'
 
 puppet-master(8) -- The puppet master daemon
 ========

data/lib/puppet/application/resource.rb

@@ -35,7 +35,7 @@ class Puppet::Application::Resource < Puppet::Application
   end
 
   def help
-    <<-HELP
+    <<-'HELP'
 
 puppet-resource(8) -- The resource abstraction layer shell
 ========

data/lib/puppet/defaults.rb

@@ -72,7 +72,7 @@ module Puppet
         ENV["PATH"] = "" if ENV["PATH"].nil?
         ENV["PATH"] = value unless value == "none"
         paths = ENV["PATH"].split(File::PATH_SEPARATOR)
-        %w{/usr/sbin /sbin}.each do |path|
+        Puppet::Util::Platform.default_paths.each do |path|
           ENV["PATH"] += File::PATH_SEPARATOR + path unless paths.include?(path)
         end
         value
@@ -652,7 +652,10 @@ EOT
       instances will be serialized using this method, since not all classes
       can be guaranteed to support this format, but it will be used for all
       classes that support it."],
-    :puppetdlockfile => [ "$statedir/puppetdlock", "A lock file to temporarily stop puppet agent from doing anything."],
+    :puppetdlockfile => { :default => "$statedir/puppetdlock",
+      :type => :setting, # (#2888) Ensure this file is not added to the settings catalog.
+      :desc => "A lock file to temporarily stop puppet agent from doing anything.",
+    },
     :usecacheonfailure => [true,
       "Whether to use the cached configuration when the remote
       configuration will not compile.  This option is useful for testing
@@ -943,7 +946,22 @@ database from within the Puppet Master process."
     :templatedir => ["$vardir/templates",
       "Where Puppet looks for template files.  Can be a list of colon-separated
       directories."
-    ]
+    ],
+
+    :allow_variables_with_dashes => {
+      :default => false,
+      :desc    => <<-'EOT'
+Permit hyphens (`-`) in variable names and issue deprecation warnings about
+them. This setting **should always be `false`;** setting it to `true`
+will cause subtle and wide-ranging bugs. It will be removed in a future version.
+
+Hyphenated variables caused major problems in the language, but were allowed
+between Puppet 2.7.3 and 2.7.14. If you used them during this window, we
+apologize for the inconvenience --- you can temporarily set this to `true`
+in order to upgrade, and can rename your variables at your leisure. Please
+revert it to `false` after you have renamed all affected variables.
+EOT
+    }
   )
   setdefaults(
     :puppetdoc,

data/lib/puppet/external/dot.rb

@@ -35,7 +35,7 @@ module DOT
     'fontcolor',   # default: black; type face color
     'fontname',    # default: Times-Roman; font family
     'fontsize',    # default: 14; point size of label
-    'group',       # name of node�s group
+    'group',       # name of node's group
     'height',      # default: .5; height in inches
     'label',       # default: node name; any string
     'layer',       # default: overlay range; all, id or id:id

data/lib/puppet/face/help/global.erb

@@ -16,4 +16,4 @@ Available applications, soon to be ported to Faces:
 
 See 'puppet help <subcommand> <action>' for help on a specific subcommand action.
 See 'puppet help <subcommand>' for help on a specific subcommand.
-Puppet v<%= Puppet::PUPPETVERSION %>
+Puppet v<%= Puppet.version %>

data/lib/puppet/face/module/install.rb

@@ -13,7 +13,7 @@ Puppet::Face.define(:module, '1.0.0') do
 
     returns "Pathname object representing the path to the installed module."
 
-    examples <<-EOT
+    examples <<-'EOT'
       Install a module:
 
       $ puppet module install puppetlabs-vcsrepo

data/lib/puppet/face/module/list.rb

@@ -34,7 +34,7 @@ Puppet::Face.define(:module, '1.0.0') do
       summary "Whether to show dependencies as a tree view"
     end
 
-    examples <<-EOT
+    examples <<-'EOT'
       List installed modules:
 
       $ puppet module list