puppet 2.7.26 → 3.0.0.rc4

data/Gemfile

@@ -1,39 +1,23 @@
-source "https://rubygems.org"
+source :rubygems
 
-def location_for(place)
-  if place =~ /^(git:[^#]*)#(.*)/
-    [{ :git => $1, :branch => $2, :require => false }]
-  elsif place =~ /^file:\/\/(.*)/
-    ['>= 0', { :path => File.expand_path($1), :require => false }]
-  else
-    [place, { :require => false }]
-  end
-end
+gemspec
 
 group(:development, :test) do
-  gem "puppet", :path => File.dirname(__FILE__), :require => false
-  gem "facter", *location_for(ENV['FACTER_LOCATION'] || '~> 1.6')
-  gem "hiera", *location_for(ENV['HIERA_LOCATION'] || '~> 1.0')
-  gem "rack", "~> 1.4", :require => false
-  gem "rake", :require => false
-  gem "rspec", "~> 2.11.0", :require => false
+  gem "facter", "~> 1.6.4", :require => false
+  gem "rack", "~> 1.4.1", :require => false
+  gem "rspec", "~> 2.10.0", :require => false
   gem "mocha", "~> 0.10.5", :require => false
-  gem "activerecord", *location_for('~> 3.0.7')
-  gem "couchrest", *location_for('~> 1.0')
-  gem "net-ssh", *location_for('~> 2.1')
-  gem "puppetlabs_spec_helper"
-  gem "sqlite3"
-  gem "stomp"
-  gem "tzinfo"
 end
 
 platforms :mswin, :mingw do
+  # See http://jenkins.puppetlabs.com/ for current Gem listings for the Windows
+  # CI Jobs.
   gem "sys-admin", "~> 1.5.6", :require => false
   gem "win32-api", "~> 1.4.8", :require => false
   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.4", :require => false
+  gem "win32-security", "~> 0.1.2", :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/Gemfile.lock

@@ -0,0 +1,44 @@
+PATH
+  remote: .
+  specs:
+    puppet (2.7.19)
+      facter (~> 1.5)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.1.3)
+    facter (1.6.11)
+    metaclass (0.0.1)
+    mocha (0.10.5)
+      metaclass (~> 0.0.1)
+    rack (1.4.1)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.1)
+    rspec-expectations (2.10.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.10.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  facter (~> 1.6.4)
+  mocha (~> 0.10.5)
+  puppet!
+  rack (~> 1.4.1)
+  rspec (~> 2.10.0)
+  sys-admin (~> 1.5.6)
+  win32-api (~> 1.4.8)
+  win32-dir (~> 0.3.7)
+  win32-eventlog (~> 0.5.3)
+  win32-process (~> 0.6.5)
+  win32-security (~> 0.1.2)
+  win32-service (~> 0.7.2)
+  win32-taskscheduler (~> 0.2.2)
+  win32console (~> 1.3.2)
+  windows-api (~> 0.4.1)
+  windows-pr (~> 1.2.1)

data/LICENSE

@@ -1,6 +1,6 @@
    Puppet - Automating Configuration Management.
 
-   Copyright (C) 2005-2012 Puppet Labs Inc
+   Copyright (C) 2011 Puppet Labs Inc
 
    Puppet Labs can be contacted at: info@puppetlabs.com
 

data/README.md

@@ -22,7 +22,7 @@ Generally, you need the following things installed:
 
 * The Ruby OpenSSL library.  For some reason, this often isn't included
   in the main ruby distributions.  You can test for it by running
-  'ruby -ropenssl -e "puts :yep"'.  If that errors out, you're missing the
+  `ruby -ropenssl -e "puts :yep"`.  If that errors out, you're missing the
   library.
 
   If your distribution doesn't come with the necessary library (e.g., on Debian
@@ -31,7 +31,7 @@ Generally, you need the following things installed:
   available separately.  You could probably just compile and install that one
   library, though.
 
-* Facter => 1.5.1 (available via your package manager or from the [Facter site](http://puppetlabs.com/projects/facter).
+* Facter => 1.6.11 (available via your package manager or from the [Facter site](http://puppetlabs.com/projects/facter)).
 
 Contributions
 ------

data/README_DEVELOPER.md

@@ -25,133 +25,7 @@ When we setup CI nodes, but this is not standard or expected behavior.
 Please consider rbenv instead of rvm.  The default behavior of rvm is difficult
 to maintain with `set -e` shell environments.
 
-# Two Types of Catalog
-
-When working on subsystems of Puppet that deal with the catalog it is important
-to be aware of the two different types of Catalog.  I often ran into this when
-working in Professional Services when I built a small tool to diff two catalogs
-to determine if an upgrade in Puppet produces the same configuration catalogs.
-As a developer I've run into this difference while working on spec tests for
-the static compiler and working on spec tests for types and providers.
-
-The two different types of catalog becomes relevant when writing spec tests
-because we frequently need to wire up a fake catalog so that we can exercise
-types, providers, or terminii that filter the catalog.
-
-The two different types of catalogs are so-called "resource" catalogs and "RAL"
-(resource abstraction layer) catalogs.  At a high level, the resource catalog
-is the in-memory object we serialize and transfer around the network.  The
-compiler terminus is expected to produce a resource catalog.  The agent takes a
-resource catalog and converts it into a RAL catalog.  The RAL catalog is what
-is used to apply the configuration model to the system.
-
-Resource dependency information is most easily obtained from a RAL catalog by
-walking the graph instance produced by the `relationship_graph` method.
-
-## Resource Catalog
-
-If you're writing spec tests for something that deals with a catalog "server
-side," a new catalog terminus for example, then you'll be dealing with a
-resource catalog.  You can produce a resource catalog suitable for spec tests
-using something like this:
-
-    let(:catalog) do
-      catalog = Puppet::Resource::Catalog.new("node-name-val") # NOT certname!
-      rsrc = Puppet::Resource.new("file", "sshd_config",
-        :parameters => {
-          :ensure => 'file',
-          :source => 'puppet:///modules/filetest/sshd_config',
-        }
-      )
-      rsrc.file = 'site.pp'
-      rsrc.line = 21
-      catalog.add_resource(rsrc)
-    end
-
-The resources in this catalog may be accessed using `catalog.resources`.
-Resource dependencies are not easily walked using a resource catalog however.
-To walk the dependency tree convert the catalog to a RAL catalog as described
-in
-
-## RAL Catalog
-
-The resource catalog may be converted to a RAL catalog using `catalog.to_ral`.
-The RAL catalog contains `Puppet::Type` instances instead of `Puppet::Resource`
-instances as is the case with the resource catalog.
-
-One very useful feature of the RAL catalog are the methods to work with
-resource relationships.  For example:
-
-    irb> catalog = catalog.to_ral
-    irb> graph = catalog.relationship_graph
-    irb> pp graph.edges
-    [{ Notify[alpha] => File[/tmp/file_20.txt] },
-     { Notify[alpha] => File[/tmp/file_21.txt] },
-     { Notify[alpha] => File[/tmp/file_22.txt] },
-     { Notify[alpha] => File[/tmp/file_23.txt] },
-     { Notify[alpha] => File[/tmp/file_24.txt] },
-     { Notify[alpha] => File[/tmp/file_25.txt] },
-     { Notify[alpha] => File[/tmp/file_26.txt] },
-     { Notify[alpha] => File[/tmp/file_27.txt] },
-     { Notify[alpha] => File[/tmp/file_28.txt] },
-     { Notify[alpha] => File[/tmp/file_29.txt] },
-     { File[/tmp/file_20.txt] => Notify[omega] },
-     { File[/tmp/file_21.txt] => Notify[omega] },
-     { File[/tmp/file_22.txt] => Notify[omega] },
-     { File[/tmp/file_23.txt] => Notify[omega] },
-     { File[/tmp/file_24.txt] => Notify[omega] },
-     { File[/tmp/file_25.txt] => Notify[omega] },
-     { File[/tmp/file_26.txt] => Notify[omega] },
-     { File[/tmp/file_27.txt] => Notify[omega] },
-     { File[/tmp/file_28.txt] => Notify[omega] },
-     { File[/tmp/file_29.txt] => Notify[omega] }]
-
-If the `relationship_graph` method is throwing exceptions at you, there's a
-good chance the catalog is not a RAL catalog.
-
-## Settings Catalog ##
-
-Be aware that Puppet creates a mini catalog and applies this catalog locally to
-manage file resource from the settings.  This behavior made it difficult and
-time consuming to track down a race condition in
-[2888](http://projects.puppetlabs.com/issues/2888).
-
-Even more surprising, the `File[puppetdlockfile]` resource is only added to the
-settings catalog if the file exists on disk.  This caused the race condition as
-it will exist when a separate process holds the lock while applying the
-catalog.
-
-It may be sufficient to simply be aware of the settings catalog and the
-potential for race conditions it presents.  An effective way to be reasonably
-sure and track down the problem is to wrap the File.open method like so:
-
-    # We're wrapping ourselves around the File.open method.
-    # As described at: http://goo.gl/lDsv6
-    class File
-      WHITELIST = [ /pidlock.rb:39/ ]
-
-      class << self
-        alias xxx_orig_open open
-      end
-
-      def self.open(name, *rest, &block)
-        # Check the whitelist for any "good" File.open calls against the #
-        puppetdlock file
-        white_listed = caller(0).find do |line|
-          JJM_WHITELIST.find { |re| re.match(line) }
-        end
-
-        # If you drop into IRB here, take a look at your caller, it might be
-        # the ghost in the machine you're looking for.
-        binding.pry if name =~ /puppetdlock/ and not white_listed
-        xxx_orig_open(name, *rest, &block)
-      end
-    end
-
-The settings catalog is populated by the `Puppet::Util::Settings#to\_catalog`
-method.
-
-# Ruby Dependencies #
+# Dependencies #
 
 Puppet is considered an Application as it relates to the recommendation of
 adding a Gemfile.lock file to the repository and the information published at
@@ -308,7 +182,7 @@ Puppet directly from source without using install.rb or copying files around.
  * Don't assume file paths are separated by ':'.  Use `File::PATH_SEPARATOR`
    instead, which is ':' on POSIX and ';' on Windows.
 
- * On Windows, File::SEPARATOR is '/', and `File::ALT_SEPARATOR` is '\'.  On
+ * On Windows, `File::SEPARATOR` is '/', and `File::ALT_SEPARATOR` is '\'.  On
    POSIX systems, `File::ALT_SEPARATOR` is nil.  In general, use '/' as the
    separator as most Windows APIs, e.g. CreateFile, accept both types of
    separators.
@@ -321,6 +195,22 @@ Puppet directly from source without using install.rb or copying files around.
 
     "#{ENV['windir']}/system32/netsh.exe"
 
+# Configuration Directory #
+
+In Puppet 3.x we've simplified the behavior of selecting a configuration file
+to load.  The intended behavior of reading `puppet.conf` is:
+
+ 1. Use the explicit configuration provided by --confdir or --config if present
+ 2. If running as root (`Puppet.features.root?`) then use the system
+    `puppet.conf`
+ 3. Otherwise, use `~/.puppet/puppet.conf`.
+
+When Puppet master is started from Rack, Puppet 3.x will read from
+~/.puppet/puppet.conf by default.  This is intended behavior.  Rack
+configurations should start Puppet master with an explicit configuration
+directory using `ARGV << "--confdir" << "/etc/puppet"`.  Please see the
+`ext/rack/files/config.ru` file for an up-to-date example.
+
 # Determining the Puppet Version
 
 If you need to programmatically work with the Puppet version, please use the
@@ -336,86 +226,4 @@ Please do not monkey patch the constant `Puppet::PUPPETVERSION` or obtain the
 version using the constant.  The only supported way to set and get the Puppet
 version is through the accessor methods.
 
-# Static Compiler
-
-The static compiler was added to Puppet in the 2.7.0 release.
-[1](http://links.puppetlabs.com/static-compiler-announce)
-
-The static compiler is intended to provide a configuration catalog that
-requires a minimal amount of network communication in order to apply the
-catalog to the system.  As implemented in Puppet 2.7.x and Puppet 3.0.x this
-intention takes the form of replacing all of the source parameters of File
-resources with a content parameter containing an address in the form of a
-checksum.  The expected behavior is that the process applying the catalog to
-the node will retrieve the file content from the FileBucket instead of the
-FileServer.
-
-The high level approach can be described as follows.  The `StaticCompiler` is a
-terminus that inserts itself between the "normal" compiler terminus and the
-request.  The static compiler takes the resource catalog produced by the
-compiler and filters all File resources.  Any file resource that contains a
-source parameter with a value starting with 'puppet://' is filtered in the
-following way in a "standard" single master / networked agents deployment
-scenario:
-
- 1. The content, owner, group, and mode values are retrieved from th
-     FileServer by the master.
- 2. The file content is stored in the file bucket on the master.
- 3. The source parameter value is stripped from the File resource.
- 4. The content parameter value is set in the File resource using the form
-    '{XXX}1234567890' which can be thought of as a content address indexed by
-    checksum.
- 5. The owner, group and mode values are set in the File resource if they are
-    not already set.
- 6. The filtered catalog is returned in the response.
-
-In addition to the catalog terminus, the process requesting the catalog needs
-to obtain the file content.  The default behavior of `puppet agent` is to
-obtain file contents from the local client bucket.  The method we expect users
-to employ to reconfigure the agent to use the server bucket is to declare the
-`Filebucket[puppet]` resource with the address of the master. For example:
-
-    node default {
-      filebucket { puppet:
-        server => $server,
-        path   => false,
-      }
-      class { filetest: }
-    }
-
-This special filebucket resource named "puppet" will cause the agent to fetch
-file contents specified by checksum from the remote filebucket instead of the
-default clientbucket.
-
-## Quick start
-
-Create a module that recursively downloads something.  The jeffmccune-filetest
-module will recursively copy the rubygems source tree.
-
-    $ puppet module install jeffmccune-filetest
-
-Start the master with the StaticCompiler turned on:
-
-    $ puppet master \
-        --catalog_terminus=static_compiler \
-        --verbose \
-        --no-daemonize
-
-Add the special Filebucket[puppet] resource:
-
-    # site.pp
-    node default {
-      filebucket { puppet: server => $server, path => false }
-      class { filetest: }
-    }
-
-Get the static catalog:
-
-    $ puppet agent --test
-
-You should expect all file metadata to be contained in the catalog, including a
-checksum representing the content.  When managing an out of sync file resource,
-the real contents should be fetched from the server instead of the
-clientbucket.
-
 EOF

data/Rakefile

@@ -18,63 +18,46 @@ rescue LoadError
 end
 
 require 'rake'
+require 'rspec'
+require "rspec/core/rake_task"
 
-Dir['tasks/**/*.rake'].each { |t| load t }
 
-begin
-  load File.join(File.dirname(__FILE__), 'ext', 'packaging', 'packaging.rake')
-rescue LoadError
+%x{which git &> /dev/null}
+if $?.success? and File.exist?('.git')
+  # remove the git hash from git describe string
+  Puppet.version = %x{git describe}.chomp.gsub('-','.').split('.')[0..3].join('.')
 end
 
-build_defs_file = 'ext/build_defaults.yaml'
-if File.exist?(build_defs_file)
-  begin
-    require 'yaml'
-    @build_defaults ||= YAML.load_file(build_defs_file)
-  rescue Exception => e
-    STDERR.puts "Unable to load yaml from #{build_defs_file}:"
-    STDERR.puts e
-  end
-  @packaging_url  = @build_defaults['packaging_url']
-  @packaging_repo = @build_defaults['packaging_repo']
-  raise "Could not find packaging url in #{build_defs_file}" if @packaging_url.nil?
-  raise "Could not find packaging repo in #{build_defs_file}" if @packaging_repo.nil?
+Dir['tasks/**/*.rake'].each { |t| load t }
 
-  namespace :package do
-    desc "Bootstrap packaging automation, e.g. clone into packaging repo"
-    task :bootstrap do
-      if File.exist?("ext/#{@packaging_repo}")
-        puts "It looks like you already have ext/#{@packaging_repo}. If you don't like it, blow it away with package:implode."
-      else
-        cd 'ext' do
-          %x{git clone #{@packaging_url}}
-        end
-      end
-    end
-    desc "Remove all cloned packaging automation"
-    task :implode do
-      rm_rf "ext/#{@packaging_repo}"
-    end
-  end
+FILES = FileList[
+    '[A-Z]*',
+    'install.rb',
+    'bin/**/*',
+    'sbin/**/*',
+    'lib/**/*',
+    'conf/**/*',
+    'man/**/*',
+    'examples/**/*',
+    'ext/**/*',
+    'tasks/**/*',
+    'spec/**/*'
+]
+
+Rake::PackageTask.new("puppet", Puppet.version) do |pkg|
+    pkg.package_dir = 'pkg'
+    pkg.need_tar_gz = true
+    pkg.package_files = FILES.to_a
 end
 
 task :default do
     sh %{rake -T}
 end
 
-if defined?(RSpec::Core::RakeTask)
-  RSpec::Core::RakeTask.new do |t|
-      t.pattern ='spec/{unit,integration}/**/*.rb'
-      t.fail_on_error = true
-  end
-end
-
-desc "Run the unit tests"
-task :unit do
-  Dir.chdir("test") { sh "rake" }
-end
+desc "Create the tarball and the gem - use when releasing"
+task :puppetpackages => [:gem, :package]
 
-desc "Run the spec tests on windows"
-task :windows_spec do
-  sh %{rspec --tag ~fails_on_windows #{ENV['TESTS'] || 'spec'}}
+RSpec::Core::RakeTask.new do |t|
+    t.pattern ='spec/{unit,integration}/**/*.rb'
+    t.fail_on_error = true
 end