puppet 2.7.18 → 2.7.19

data/lib/puppet/util/windows/user.rb

@@ -1,14 +1,13 @@
 require 'puppet/util/windows'
 
 require 'win32/security'
+require 'facter'
 
 module Puppet::Util::Windows::User
   include Windows::Security
   extend Windows::Security
 
   def admin?
-    require 'facter'
-
     majversion = Facter.value(:kernelmajversion)
     return false unless majversion
 

data/man/man8/puppet-agent.8

@@ -147,6 +147,10 @@ Shut down the puppet agent daemon\.
 SIGUSR1
 Immediately retrieve and apply configurations from the puppet master\.
 .
+.TP
+SIGUSR2
+Close file descriptors for log files and reopen them\. Used with logrotate\.
+.
 .SH "AUTHOR"
 Luke Kanies
 .

data/man/man8/puppet-master.8

@@ -67,6 +67,10 @@ Restart the puppet master server\.
 SIGINT and SIGTERM
 Shut down the puppet master server\.
 .
+.TP
+SIGUSR2
+Close file descriptors for log files and reopen them\. Used with logrotate\.
+.
 .SH "AUTHOR"
 Luke Kanies
 .

data/man/man8/puppetmasterd.8

@@ -67,6 +67,10 @@ Restart the puppet master server\.
 SIGINT and SIGTERM
 Shut down the puppet master server\.
 .
+.TP
+SIGUSR2
+Close file descriptors for log files and reopen them\. Used with logrotate\.
+.
 .SH "AUTHOR"
 Luke Kanies
 .

data/spec/fixtures/unit/provider/augeas/augeas/augeas/lenses/test.aug

@@ -0,0 +1,13 @@
+(*
+Simple lens, written to be distributed with Puppet unit tests.
+
+Author: Dominic Cleal <dcleal@redhat.com>
+
+About: License:
+  This file is licensed under the Apache 2.0 licence, like the rest of Puppet.
+*)
+
+module Test = autoload xfm
+let lns = [ seq "line" . store /[^\n]+/ . del "\n" "\n" ]*
+let filter = incl "/etc/test"
+let xfm = transform lns filter

data/spec/fixtures/unit/provider/augeas/augeas/etc/fstab

@@ -0,0 +1,10 @@
+/dev/vg00/lv00          /                       ext3    defaults        1 1
+LABEL=/boot             /boot                   ext3    defaults        1 2
+devpts                  /dev/pts                devpts  gid=5,mode=620  0 0
+tmpfs                   /dev/shm                tmpfs   defaults        0 0
+/dev/vg00/home          /home                   ext3    defaults        1 2
+proc                    /proc                   proc    defaults        0 0
+sysfs                   /sys                    sysfs   defaults        0 0
+/dev/vg00/local         /local                  ext3    defaults        1 2
+/dev/vg00/images        /var/lib/xen/images     ext3    defaults        1 2
+/dev/vg00/swap          swap                    swap    defaults        0 0

data/spec/fixtures/unit/provider/augeas/augeas/etc/hosts

@@ -0,0 +1,6 @@
+# Do not remove the following line, or various programs
+# that require network functionality will fail.
+127.0.0.1	localhost.localdomain	localhost galia.watzmann.net galia
+#172.31.122.254   granny.watzmann.net granny puppet
+#172.31.122.1     galia.watzmann.net galia
+172.31.122.14   orange.watzmann.net orange

data/spec/fixtures/unit/provider/augeas/augeas/etc/test

@@ -0,0 +1,3 @@
+foo
+bar
+baz

data/spec/fixtures/unit/provider/augeas/augeas/test.aug

@@ -0,0 +1,13 @@
+(*
+Simple lens, written to be distributed with Puppet unit tests.
+
+Author: Dominic Cleal <dcleal@redhat.com>
+
+About: License:
+  This file is licensed under the Apache 2.0 licence, like the rest of Puppet.
+*)
+
+module Test = autoload xfm
+let lns = [ seq "line" . store /[^\n]+/ . del "\n" "\n" ]*
+let filter = incl "/etc/test"
+let xfm = transform lns filter

data/spec/fixtures/unit/provider/service/openrc/rcservice_list

@@ -0,0 +1,8 @@
+alsasound
+consolefont
+lvm-monitoring
+pydoc-2.7
+pydoc-3.2
+wpa_supplicant
+xdm
+xdm-setup

data/spec/fixtures/unit/provider/service/openrc/rcstatus

@@ -0,0 +1,43 @@
+Runlevel: boot
+ hwclock                                                           [  started  ]
+ modules                                                           [  started  ]
+ dmcrypt                                                           [  started  ]
+ lvm                                                               [  started  ]
+ fsck                                                              [  started  ]
+ root                                                              [  started  ]
+ mtab                                                              [  started  ]
+ swap                                                              [  started  ]
+ localmount                                                        [  started  ]
+ sysctl                                                            [  started  ]
+ bootmisc                                                          [  started  ]
+ hostname                                                          [  started  ]
+ termencoding                                                      [  started  ]
+ keymaps                                                           [  started  ]
+ net.lo                                                            [  started  ]
+ procfs                                                            [  started  ]
+ rsyslog                                                           [  started  ]
+ swapfiles                                                         [  started  ]
+ urandom                                                           [  started  ]
+Runlevel: default
+ netmount                                                          [  started  ]
+ foo_with_very_very_long_servicename_no_still_not_the_end_wait_for_it_almost_there_almost_there_now_finally_the_end [  started  ]
+ xdm                                                               [  started  ]
+ alsasound                                                         [  started  ]
+ udev-postmount                                                    [  started  ]
+ local                                                             [  started  ]
+Runlevel: shutdown
+ killprocs                                                         [  stopped  ]
+ savecache                                                         [  stopped  ]
+ mount-ro                                                          [  stopped  ]
+Runlevel: sysinit
+ dmesg                                                             [  started  ]
+ udev                                                              [  started  ]
+ devfs                                                             [  started  ]
+Dynamic Runlevel: hotplugged
+ net.eth0                                                          [  started  ]
+ pcscd                                                             [  started  ]
+Dynamic Runlevel: needed
+ sysfs                                                             [  started  ]
+ udev-mount                                                        [  started  ]
+Dynamic Runlevel: manual
+ sshd                                                              [  started  ]

data/spec/integration/defaults_spec.rb

@@ -18,7 +18,7 @@ describe "Puppet defaults" do
 
   describe "when setting the :certname" do
     it "should fail if the certname is not downcased" do
-      lambda { Puppet.settings[:certname] = "Host.Domain.Com" }.should raise_error(ArgumentError)
+      expect { Puppet.settings[:certname] = "Host.Domain.Com" }.to raise_error(ArgumentError)
     end
   end
 
@@ -46,7 +46,7 @@ describe "Puppet defaults" do
 
   describe "when :certdnsnames is set" do
     it "should not fail" do
-      expect { Puppet[:certdnsnames] = 'fred:wilma' }.should_not raise_error
+      expect { Puppet[:certdnsnames] = 'fred:wilma' }.to_not raise_error
     end
 
     it "should warn the value is ignored" do
@@ -300,7 +300,7 @@ describe "Puppet defaults" do
       end
 
       it "should raise an error if set to true" do
-        lambda { Puppet.settings[:daemonize] = true }.should raise_error(/Cannot daemonize on Windows/)
+        expect { Puppet.settings[:daemonize] = true }.to raise_error(/Cannot daemonize on Windows/)
       end
     end
   end

data/spec/integration/network/server/mongrel_spec.rb

@@ -25,15 +25,16 @@ describe Puppet::Network::Server, :'fails_on_ruby_1.9.2' => true do
 
     describe "before listening" do
       it "should not be reachable at the specified address and port" do
-        lambda { Net::HTTP.get('127.0.0.1', '/', port) }.
-          should raise_error(Errno::ECONNREFUSED)
+        expect {
+          Net::HTTP.get('127.0.0.1', '/', port)
+        }.to raise_error(Errno::ECONNREFUSED)
       end
     end
 
     describe "when listening" do
       it "should be reachable on the specified address and port" do
         @server.listen
-        expect { Net::HTTP.get('127.0.0.1', '/', port) }.should_not raise_error
+        expect { Net::HTTP.get('127.0.0.1', '/', port) }.to_not raise_error
       end
 
       it "should default to '127.0.0.1' as its bind address" do
@@ -54,7 +55,7 @@ describe Puppet::Network::Server, :'fails_on_ruby_1.9.2' => true do
       it "should not allow multiple servers to listen on the same address and port" do
         @server.listen
         @server2 = Puppet::Network::Server.new(@params)
-        lambda { @server2.listen }.should raise_error
+        expect { @server2.listen }.to raise_error
       end
     end
 
@@ -62,8 +63,9 @@ describe Puppet::Network::Server, :'fails_on_ruby_1.9.2' => true do
       it "should not be reachable on the port and address assigned" do
         @server.listen
         @server.unlisten
-        expect { Net::HTTP.get('127.0.0.1', '/', port) }.
-          should raise_error Errno::ECONNREFUSED
+        expect {
+          Net::HTTP.get('127.0.0.1', '/', port)
+        }.to raise_error Errno::ECONNREFUSED
       end
     end
   end

data/spec/integration/parser/parser_spec.rb

@@ -119,7 +119,7 @@ describe Puppet::Parser::Parser do
     end
 
     it "should fail if asked to parse '$foo::::bar'" do
-      expect { @parser.parse("$foo::::bar") }.should raise_error(Puppet::ParseError, /Syntax error at ':'/)
+      expect { @parser.parse("$foo::::bar") }.to raise_error(Puppet::ParseError, /Syntax error at ':'/)
     end
 
     describe "function calls" do

data/spec/integration/type/file_spec.rb

@@ -14,7 +14,12 @@ describe Puppet::Type.type(:file) do
   include PuppetSpec::Files
 
   let(:catalog) { Puppet::Resource::Catalog.new }
-  let(:path) { tmpfile('file_testing') }
+  let(:path) do
+    # we create a directory first so backups of :path that are stored in
+    # the same directory will also be removed after the tests
+    parent = tmpdir('file_spec')
+    File.join(parent, 'file_testing')
+  end
 
   if Puppet.features.posix?
     def set_mode(mode, file)
@@ -65,11 +70,37 @@ describe Puppet::Type.type(:file) do
 
     file.parameter(:mode).expects(:retrieve).never
 
-    report = catalog.apply.report
-    report.resource_statuses["File[#{path}]"].should_not be_failed
+    status = catalog.apply.report.resource_statuses["File[#{path}]"]
+    status.should_not be_failed
+    status.should_not be_changed
     File.should_not be_exist(path)
   end
 
+  describe "when ensure is absent" do
+    it "should remove the file if present" do
+      FileUtils.touch(path)
+      catalog.add_resource(described_class.new(:path => path, :ensure => :absent, :backup => :false))
+      report = catalog.apply.report
+      report.resource_statuses["File[#{path}]"].should_not be_failed
+      File.should_not be_exist(path)
+    end
+
+    it "should do nothing if file is not present" do
+      catalog.add_resource(described_class.new(:path => path, :ensure => :absent, :backup => :false))
+      report = catalog.apply.report
+      report.resource_statuses["File[#{path}]"].should_not be_failed
+      File.should_not be_exist(path)
+    end
+
+    # issue #14599
+    it "should not fail if parts of path aren't directories" do
+      FileUtils.touch(path)
+      catalog.add_resource(described_class.new(:path => File.join(path,'no_such_file'), :ensure => :absent, :backup => :false))
+      report = catalog.apply.report
+      report.resource_statuses["File[#{File.join(path,'no_such_file')}]"].should_not be_failed
+    end
+  end
+
   describe "when setting permissions" do
     it "should set the owner" do
       FileUtils.touch(path)
@@ -182,14 +213,11 @@ describe Puppet::Type.type(:file) do
         describe "when managing links" do
           let(:target) { tmpfile('target') }
 
-          before :each do
+          it "should not set the executable bit on the link nor the target" do
             FileUtils.touch(target)
             File.chmod(0444, target)
-
             File.symlink(target, link)
-          end
 
-          it "should not set the executable bit on the link nor the target" do
             catalog.add_resource described_class.new(:path => link, :ensure => :link, :mode => 0666, :target => target, :links => :manage)
             catalog.apply
 
@@ -198,13 +226,23 @@ describe Puppet::Type.type(:file) do
           end
 
           it "should ignore dangling symlinks (#6856)" do
-            File.delete(target)
+            File.symlink(target, link)
 
             catalog.add_resource described_class.new(:path => link, :ensure => :link, :mode => 0666, :target => target, :links => :manage)
             catalog.apply
 
             File.should_not be_exist(link)
           end
+
+          it "should create a link to the target if ensure is omitted" do
+            FileUtils.touch(target)
+            catalog.add_resource described_class.new(:path => link, :target => target)
+            catalog.apply
+
+            File.should be_exist link
+            File.lstat(link).ftype.should == 'link'
+            File.readlink(link).should == target
+          end
         end
 
         describe "when following links" do
@@ -381,8 +419,7 @@ describe Puppet::Type.type(:file) do
     end
 
     it "should fail if no backup can be performed" do
-      dir = tmpfile("backups")
-      Dir.mkdir(dir)
+      dir = tmpdir("backups")
 
       file = described_class.new :path => File.join(dir, "testfile"), :backup => ".bak", :content => "foo"
       catalog.add_resource file
@@ -839,8 +876,8 @@ describe Puppet::Type.type(:file) do
 
     it "should add each generated resource to the catalog" do
       catalog.apply do |trans|
-        catalog.resource(:file, File.join(path, "one")).should be_a(described_class)
-        catalog.resource(:file, File.join(path, "two")).should be_a(described_class)
+        catalog.resource(:file, File.join(path, "one")).must be_a(described_class)
+        catalog.resource(:file, File.join(path, "two")).must be_a(described_class)
       end
     end
 

data/spec/lib/puppet_spec/database.rb

@@ -22,9 +22,11 @@ end
 # ready to roll with a serious database and all.  Cleanup is handled
 # automatically for you.  Nothing to do there.
 def setup_scratch_database
-  dir = PuppetSpec::Files.tmpdir('puppet-sqlite')
-  Puppet[:dbadapter]    = 'sqlite3'
-  Puppet[:dblocation]   = (dir + 'storeconfigs.sqlite').to_s
+  Puppet::Rails.stubs(:database_arguments).returns(
+    :adapter => 'sqlite3',
+    :log_level => Puppet[:rails_loglevel],
+    :database => ':memory:'
+  )
   Puppet[:railslog]     = '/dev/null'
   Puppet::Rails.init
 end

data/spec/lib/puppet_spec/files.rb

@@ -29,7 +29,8 @@ module PuppetSpec::Files
     end
   end
 
-  def make_absolute(path)
+  def make_absolute(path) PuppetSpec::Files.make_absolute(path) end
+  def self.make_absolute(path)
     path = File.expand_path(path)
     path[0] = 'c' if Puppet.features.microsoft_windows?
     path

data/spec/monkey_patches/alias_should_to_must.rb

@@ -1,8 +1,21 @@
 require 'rspec'
 
+# This is necessary because the RAL has a 'should' method.
 class Object
-  # This is necessary because the RAL has a 'should'
-  # method.
   alias :must :should
   alias :must_not :should_not
 end
+
+# ...and this is because we want to make sure we don't ignore that change
+# above.  Gotta love overwriting functions, but the performance cost at
+# runtime is pretty terrible if we don't.
+require 'puppet/type'
+class Puppet::Type
+  alias :should_native :should
+  def should(value)
+    unless value.is_a? String or value.is_a? Symbol
+      raise "you need to call .must rather than .should on Puppet::Type instances"
+    end
+    should_native(value)
+  end
+end

data/spec/shared_behaviours/file_serving_model.rb

@@ -4,6 +4,9 @@ shared_examples_for "a file_serving model" do
   include PuppetSpec::Files
 
   describe "#indirection" do
+    localpath = PuppetSpec::Files.make_absolute("/etc/sudoers")
+    localurl = "file://" + localpath
+
     before :each do
       # Never connect to the network, no matter what
       described_class.indirection.terminus(:rest).class.any_instance.stubs(:find)
@@ -15,8 +18,8 @@ shared_examples_for "a file_serving model" do
       end
 
       {
-       "/etc/sudoers"                    => :file_server,
-       "file:///etc/sudoers"             => :file_server,
+       localpath     => :file_server,
+       localurl => :file_server,
        "puppet:///modules/foo/bar"       => :file_server,
        "puppet://server/modules/foo/bar" => :file_server,
       }.each do |key, terminus|
@@ -36,8 +39,8 @@ shared_examples_for "a file_serving model" do
       end
 
       {
-       "/etc/sudoers"                    => :file,
-       "file:///etc/sudoers"             => :file,
+       localpath => :file,
+       localurl => :file,
        "puppet:///modules/foo/bar"       => :file_server,
        "puppet://server/modules/foo/bar" => :rest,
       }.each do |key, terminus|
@@ -57,8 +60,8 @@ shared_examples_for "a file_serving model" do
       end
 
       {
-       "/etc/sudoers"                    => :file,
-       "file:///etc/sudoers"             => :file,
+       localpath => :file,
+       localurl => :file,
        "puppet:///modules/foo/bar"       => :rest,
        "puppet://server/modules/foo/bar" => :rest,
       }.each do |key, terminus|