puppet 2.7.19 → 2.7.20.rc1

data/lib/puppet/version.rb

@@ -0,0 +1,18 @@
+# The version method and constant are isolated in puppet/version.rb so that a
+# simple `require 'puppet/version'` allows a rubygems gemspec or bundler
+# Gemfile to get the Puppet version of the gem install.
+#
+# The version is programatically settable because we want to allow the
+# Raketasks and such to set the version based on the output of `git describe`
+#
+module Puppet
+  PUPPETVERSION = '2.7.20-rc1'
+
+  def self.version
+    @puppet_version || PUPPETVERSION
+  end
+
+  def self.version=(version)
+    @puppet_version = version
+  end
+end

data/spec/fixtures/unit/util/filetype/aixtab_output

@@ -0,0 +1,44 @@
+# @(#)08        1.15.1.3  src/bos/usr/sbin/cron/root, cmdcntl, bos530 2/11/94 17:19:47
+# IBM_PROLOG_BEGIN_TAG 
+# This is an automatically generated prolog. 
+#  
+# bos530 src/bos/usr/sbin/cron/root 1.15.1.3 
+#  
+# Licensed Materials - Property of IBM 
+#  
+# (C) COPYRIGHT International Business Machines Corp. 1989,1994 
+# All Rights Reserved 
+#  
+# US Government Users Restricted Rights - Use, duplication or 
+# disclosure restricted by GSA ADP Schedule Contract with IBM Corp. 
+#  
+# IBM_PROLOG_END_TAG 
+#
+# COMPONENT_NAME: (CMDCNTL) commands needed for basic system needs
+#
+# FUNCTIONS: 
+#
+# ORIGINS: 27
+#
+# (C) COPYRIGHT International Business Machines Corp. 1989,1994
+# All Rights Reserved
+# Licensed Materials - Property of IBM
+#
+# US Government Users Restricted Rights - Use, duplication or
+# disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+#
+#0 3 * * * /usr/sbin/skulker
+#45 2 * * 0 /usr/lib/spell/compress
+#45 23 * * * ulimit 5000; /usr/lib/smdemon.cleanu > /dev/null
+0 11 * * * /usr/bin/errclear -d S,O 30
+0 12 * * * /usr/bin/errclear -d H 90
+0 15 * * *  /usr/lib/ras/dumpcheck >/dev/null 2>&1
+# SSA warning : Deleting the next two lines may cause errors in redundant
+# SSA warning : hardware to go undetected.
+01 5 * * * /usr/lpp/diagnostics/bin/run_ssa_ela 1>/dev/null 2>/dev/null
+0 * * * * /usr/lpp/diagnostics/bin/run_ssa_healthcheck 1>/dev/null 2>/dev/null
+# SSA warning : Deleting the next line may allow enclosure hardware errors to go undetected
+30 * * * * /usr/lpp/diagnostics/bin/run_ssa_encl_healthcheck 1>/dev/null 2>/dev/null
+# SSA warning : Deleting the next line may allow link speed exceptions to go undetected
+30 4 * * * /usr/lpp/diagnostics/bin/run_ssa_link_speed 1>/dev/null 2>/dev/null
+55 23 * * * /var/perf/pm/bin/pmcfg >/dev/null 2>&1      #Enable PM Data Collection

data/spec/fixtures/unit/util/filetype/suntab_output

@@ -0,0 +1,9 @@
+#ident  "@(#)root       1.19    98/07/06 SMI"   /* SVr4.0 1.1.3.1       */
+#
+# The root crontab should be used to perform accounting data collection.
+#
+#
+10 3 * * * /usr/sbin/logadm
+15 3 * * 0 /usr/lib/fs/nfs/nfsfind
+30 3 * * * [ -x /usr/lib/gss/gsscred_clean ] && /usr/lib/gss/gsscred_clean
+#10 3 * * * /usr/lib/krb5/kprop_script ___slave_kdcs___

data/spec/integration/defaults_spec.rb

@@ -5,7 +5,7 @@ require 'puppet/defaults'
 require 'puppet/rails'
 
 describe "Puppet defaults" do
-    include Puppet::Util::Execution
+  include Puppet::Util::Execution
   after { Puppet.settings.clear }
 
   describe "when setting the :factpath" do
@@ -134,11 +134,23 @@ describe "Puppet defaults" do
     end
   end
 
-  it "should add /usr/sbin and /sbin to the path if they're not there" do
-    withenv("PATH" => "/usr/bin:/usr/local/bin") do
-      Puppet.settings[:path] = "none" # this causes it to ignore the setting
-      ENV["PATH"].split(File::PATH_SEPARATOR).should be_include("/usr/sbin")
-      ENV["PATH"].split(File::PATH_SEPARATOR).should be_include("/sbin")
+  describe "on a Unix-like platform it", :as_platform => :posix do
+    it "should add /usr/sbin and /sbin to the path if they're not there" do
+      withenv("PATH" => "/usr/bin#{File::PATH_SEPARATOR}/usr/local/bin") do
+        Puppet.settings[:path] = "none" # this causes it to ignore the setting
+        ENV["PATH"].split(File::PATH_SEPARATOR).should be_include("/usr/sbin")
+        ENV["PATH"].split(File::PATH_SEPARATOR).should be_include("/sbin")
+      end
+    end
+  end
+
+  describe "on a Windows-like platform it", :as_platform => :windows do
+    it "should not add anything" do
+      path = "c:\\windows\\system32#{File::PATH_SEPARATOR}c:\\windows"
+      withenv("PATH" => path) do
+        Puppet.settings[:path] = "none" # this causes it to ignore the setting
+        ENV["PATH"].should == path
+      end
     end
   end
 
@@ -162,7 +174,7 @@ describe "Puppet defaults" do
 
     it "should not set the Catalog cache class to :store_configs if asynchronous storeconfigs is enabled" do
       Puppet::Resource::Catalog.indirection.expects(:cache_class=).with(:store_configs).never
-      Puppet.settings.expects(:value).with(:async_storeconfigs).returns true
+      Puppet.settings[:async_storeconfigs] = true
       Puppet.settings[:storeconfigs] = true
     end
 
@@ -314,4 +326,11 @@ describe "Puppet defaults" do
       Puppet.settings[:diff].should == ''
     end
   end
+
+  describe "puppetdlock" do
+    it "(#2888) is not a file setting so it is absent from the Settings catalog" do
+      Puppet.settings.setting(:puppetdlockfile).should_not be_a_kind_of Puppet::Util::Settings::FileSetting
+      Puppet.settings.setting(:puppetdlockfile).should be_a Puppet::Util::Settings::Setting
+    end
+  end
 end

data/spec/integration/parser/functions_spec.rb

@@ -2,10 +2,6 @@
 require 'spec_helper'
 
 describe Puppet::Parser::Functions do
-  before :each do
-    Puppet::Parser::Functions.rmfunction("template") if Puppet::Parser::Functions.functions.include?("template")
-  end
-
   it "should support multiple threads autoloading the same function" do
     threads = []
     lambda {

data/spec/integration/util/file_locking_spec.rb

@@ -36,7 +36,7 @@ describe Puppet::Util::FileLocking, :'fails_on_ruby_1.9.2' => true do
     threads.each { |th| th.join }
   end
 
-  it "should be able to keep file corruption from happening when there are multiple writers processes" do
+  it "should be able to keep file corruption from happening when there are multiple writers processes", :unless => Puppet.features.microsoft_windows? do
     unless Process.fork
       50.times { |b|
         Puppet::Util::FileLocking.writelock(@file) { |f|

data/spec/integration/util/windows/security_spec.rb

@@ -15,9 +15,9 @@ describe "Puppet::Util::Windows::Security", :if => Puppet.features.microsoft_win
 
   before :all do
     @sids = {
-      :current_user => Puppet::Util::ADSI.sid_for_account(Sys::Admin.get_login),
-      :admin => Puppet::Util::ADSI.sid_for_account("Administrator"),
-      :guest => Puppet::Util::ADSI.sid_for_account("Guest"),
+      :current_user => Puppet::Util::Windows::Security.name_to_sid(Sys::Admin.get_login),
+      :admin => Puppet::Util::Windows::Security.name_to_sid("Administrator"),
+      :guest => Puppet::Util::Windows::Security.name_to_sid("Guest"),
       :users => Win32::Security::SID::BuiltinUsers,
       :power_users => Win32::Security::SID::PowerUsers,
     }
@@ -371,26 +371,6 @@ describe "Puppet::Util::Windows::Security", :if => Puppet.features.microsoft_win
           # end
         end
 
-        describe "#string_to_sid_ptr" do
-          it "should raise an error if an invalid SID is specified" do
-            expect do
-              winsec.string_to_sid_ptr('foobar')
-            end.to raise_error(Puppet::Util::Windows::Error) { |error| error.code.should == 1337 }
-          end
-
-          it "should yield if a block is given" do
-            yielded = nil
-            winsec.string_to_sid_ptr('S-1-1-0') do |sid|
-              yielded = sid
-            end
-            yielded.should_not be_nil
-          end
-
-          it "should allow no block to be specified" do
-            winsec.string_to_sid_ptr('S-1-1-0').should be_true
-          end
-        end
-
         describe "when the parent directory" do
           before :each do
             winsec.set_owner(sids[:current_user], parent)

data/spec/lib/puppet_spec/files.rb

@@ -36,10 +36,10 @@ module PuppetSpec::Files
     path
   end
 
-  def tmpfile(name) PuppetSpec::Files.tmpfile(name) end
-  def self.tmpfile(name)
+  def tmpfile(name, dir = nil) PuppetSpec::Files.tmpfile(name, dir) end
+  def self.tmpfile(name, dir = nil)
     # Generate a temporary file, just for the name...
-    source = Tempfile.new(name)
+    source = dir ? Tempfile.new(name, dir) : Tempfile.new(name)
     path = source.path
     source.close!
 

data/spec/shared_contexts/platform.rb

@@ -12,13 +12,17 @@ shared_context "windows", :as_platform => :windows do
 
   around do |example|
     file_alt_separator = File::ALT_SEPARATOR
+    file_path_separator = File::PATH_SEPARATOR
+
     # prevent Ruby from warning about changing a constant
     with_verbose_disabled do
       File::ALT_SEPARATOR = '\\'
+      File::PATH_SEPARATOR = ';'
     end
     example.run
     with_verbose_disabled do
       File::ALT_SEPARATOR = file_alt_separator
+      File::PATH_SEPARATOR = file_path_separator
     end
   end
 end
@@ -31,13 +35,17 @@ shared_context "posix", :as_platform => :posix do
 
   around do |example|
     file_alt_separator = File::ALT_SEPARATOR
+    file_path_separator = File::PATH_SEPARATOR
+
     # prevent Ruby from warning about changing a constant
     with_verbose_disabled do
       File::ALT_SEPARATOR = nil
+      File::PATH_SEPARATOR = ':'
     end
     example.run
     with_verbose_disabled do
       File::ALT_SEPARATOR = file_alt_separator
+      File::PATH_SEPARATOR = file_path_separator
     end
   end
 end

data/spec/spec_helper.rb

@@ -9,7 +9,6 @@ $LOAD_PATH.unshift File.join(dir, 'lib')
 ARGV.clear
 
 require 'puppet'
-require 'mocha'
 gem 'rspec', '>=2.0.0'
 require 'rspec/expectations'
 
@@ -43,6 +42,12 @@ RSpec.configure do |config|
 
   config.mock_with :mocha
 
+  if Puppet::Util::Platform.windows?
+    config.output_stream = $stdout
+    config.error_stream = $stderr
+    config.formatters.each { |f| f.instance_variable_set(:@output, $stdout) }
+  end
+
   config.before :all do
     Puppet::Test::TestHelper.before_all_tests()
   end

data/spec/unit/application/queue_spec.rb

@@ -8,7 +8,7 @@ describe Puppet::Application::Queue, :unless => Puppet.features.microsoft_window
   before :each do
     @queue = Puppet::Application[:queue]
     @queue.stubs(:puts)
-    @daemon = stub_everything 'daemon', :daemonize => nil
+    @daemon = stub_everything 'daemon'
     Puppet::Util::Log.stubs(:newdestination)
 
     Puppet::Resource::Catalog.indirection.stubs(:terminus_class=)
@@ -70,6 +70,7 @@ describe Puppet::Application::Queue, :unless => Puppet.features.microsoft_window
 
   describe "during setup" do
     before :each do
+      @queue.preinit
       @queue.options.stubs(:[])
       @queue.daemon.stubs(:daemonize)
       Puppet.stubs(:info)

data/spec/unit/configurer_spec.rb

@@ -441,7 +441,7 @@ describe Puppet::Configurer do
       Puppet::Util.expects(:replace_file).yields(fh)
 
       Puppet.expects(:err)
-      expect { @configurer.save_last_run_summary(@report) }.should_not raise_error
+      expect { @configurer.save_last_run_summary(@report) }.to_not raise_error
     end
   end
 

data/spec/unit/indirector/catalog/static_compiler_spec.rb

@@ -0,0 +1,194 @@
+#! /usr/bin/env ruby -S rspec
+require 'spec_helper'
+require 'puppet/indirector/catalog/static_compiler'
+require 'puppet/file_serving/metadata'
+require 'puppet/file_serving/content'
+require 'yaml'
+
+describe Puppet::Resource::Catalog::StaticCompiler do
+  before :all do
+    @num_file_resources = 10
+  end
+
+  let(:request) do
+    Puppet::Indirector::Request.new(:the_indirection_named_foo,
+                                    :find,
+                                    "the-node-named-foo",
+                                    :environment => "production")
+  end
+
+  describe "#find" do
+    it "returns a catalog" do
+      subject.find(request).should be_a_kind_of(Puppet::Resource::Catalog)
+    end
+
+    it "returns nil if there is no compiled catalog" do
+      compiler = mock('compiler indirection')
+      compiler.expects(:find).with(request).returns(nil)
+
+      subject.expects(:compiler).returns(compiler)
+      subject.find(request).should be_nil
+    end
+
+    describe "a catalog with file resources containing source parameters with puppet:// URIs" do
+      it "filters file resource source URI's to checksums" do
+        stub_the_compiler
+        resource_catalog = subject.find(request)
+        resource_catalog.resources.each do |resource|
+          next unless resource.type == "File"
+          resource[:content].should == "{md5}361fadf1c712e812d198c4cab5712a79"
+          resource[:source].should be_nil
+        end
+      end
+
+      it "does not modify file resources with non-puppet:// URI's" do
+        uri = "/this/is/not/a/puppet/uri.txt"
+        stub_the_compiler(:source => uri)
+        resource_catalog = subject.find(request)
+        resource_catalog.resources.each do |resource|
+          next unless resource.type == "File"
+          resource[:content].should be_nil
+          resource[:source].should == uri
+        end
+      end
+
+      it "copies the owner, group and mode from the fileserer" do
+        stub_the_compiler
+        resource_catalog = subject.find(request)
+        resource_catalog.resources.each do |resource|
+          next unless resource.type == "File"
+          resource[:owner].should == 0
+          resource[:group].should == 0
+          resource[:mode].should  == 420
+        end
+      end
+    end
+  end
+
+  describe "(#15193) when storing content to the filebucket" do
+    it "explicitly uses the indirection method" do
+      # Do not stub the store_content method which is stubbed by default in the
+      # value of the stub_methods option.
+      stub_the_compiler(:stub_methods => false)
+
+      # We expect the content to be retrieved from the FileServer ...
+      fake_content = mock('FileServer Content')
+      fake_content.expects(:content).returns("HELLO WORLD")
+
+      # Mock the FileBucket to behave as if the file content does not exist.
+      # NOTE, we're simulating the first call returning false, indicating the
+      # file is not present, then all subsequent calls returning true.  This
+      # mocked behavior is intended to replicate the real behavior of the same
+      # file being stored to the filebucket multiple times.
+      Puppet::FileBucket::File.indirection.
+        expects(:find).times(@num_file_resources).
+        returns(false).then.returns(true)
+
+      Puppet::FileServing::Content.indirection.
+        expects(:find).once.
+        returns(fake_content)
+
+      # Once retrived from the FileServer, we expect the file to be stored into
+      # the FileBucket only once.  All of the file resources in the fake
+      # catalog have the same content.
+      Puppet::FileBucket::File.indirection.expects(:save).once.with do |file|
+        file.contents == "HELLO WORLD"
+      end
+
+      # Obtain the Static Catalog
+      resource_catalog = subject.find(request)
+
+      # Ensure all of the file resources were filtered
+      resource_catalog.resources.each do |resource|
+        next unless resource.type == "File"
+        resource[:content].should == "{md5}361fadf1c712e812d198c4cab5712a79"
+        resource[:source].should be_nil
+      end
+    end
+  end
+
+  # Spec helper methods
+
+  def stub_the_compiler(options = {:stub_methods => [:store_content]})
+    # Build a resource catalog suitable for specifying the behavior of the
+    # static compiler.
+    compiler = mock('indirection terminus compiler')
+    compiler.stubs(:find).returns(build_catalog(options))
+    subject.stubs(:compiler).returns(compiler)
+    # Mock the store content method to prevent copying the contents to the
+    # file bucket.
+    (options[:stub_methods] || []).each do |mthd|
+      subject.stubs(mthd)
+    end
+  end
+
+  def build_catalog(options = {})
+    options = options.dup
+    options[:source] ||= 'puppet:///modules/mymodule/config_file.txt'
+    options[:request] ||= request
+
+    # Build a catalog suitable for the static compiler to operate on
+    catalog = Puppet::Resource::Catalog.new("#{options[:request].key}")
+
+    # Mock out the fileserver, otherwise converting the catalog to a
+    fake_fileserver_metadata = fileserver_metadata(options)
+
+    # Stub the call to the FileServer metadata API so we don't have to have
+    # a real fileserver initialized for testing.
+    Puppet::FileServing::Metadata.
+      indirection.stubs(:find).
+      with(options[:source].sub('puppet:///','')).
+      returns(fake_fileserver_metadata)
+
+    # I want a resource that all the file resources require and another
+    # that requires them.
+    resources = Array.new
+    resources << Puppet::Resource.new("notify", "alpha")
+    resources << Puppet::Resource.new("notify", "omega")
+
+    # Create some File resources with source parameters.
+    1.upto(@num_file_resources) do |idx|
+      parameters = {
+        :ensure  => 'file',
+        :source  => options[:source],
+        :require => "Notify[alpha]",
+        :before  => "Notify[omega]"
+      }
+      # The static compiler does not operate on a RAL catalog, so we're
+      # using Puppet::Resource to produce a resource catalog.
+      agnostic_path = File.expand_path("/tmp/file_#{idx}.txt") # Windows Friendly
+      rsrc = Puppet::Resource.new("file", agnostic_path, :parameters => parameters)
+      rsrc.file = 'site.pp'
+      rsrc.line = idx
+      resources << rsrc
+    end
+
+    resources.each do |rsrc|
+      catalog.add_resource(rsrc)
+    end
+
+    # Return the resource catalog
+    catalog
+  end
+
+  def fileserver_metadata(options = {})
+    yaml = <<EOFILESERVERMETADATA
+--- !ruby/object:Puppet::FileServing::Metadata
+  checksum: "{md5}361fadf1c712e812d198c4cab5712a79"
+  checksum_type: md5
+  destination: 
+  expiration: #{Time.now + 1800}
+  ftype: file
+  group: 0
+  links: !ruby/sym manage
+  mode: 420
+  owner: 0
+  path: #{File.expand_path('/etc/puppet/modules/mymodule/files/config_file.txt')}
+  source: #{options[:source]}
+  stat_method: !ruby/sym lstat
+EOFILESERVERMETADATA
+    # Return a deserialized metadata object suitable for returning from a stub.
+    YAML.load(yaml)
+  end
+end
+